diff --git a/__pycache__/test_sms.cpython-39.pyc b/__pycache__/test_sms.cpython-39.pyc deleted file mode 100644 index 5a2e151..0000000 Binary files a/__pycache__/test_sms.cpython-39.pyc and /dev/null differ diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml index 0d29021..0d87f43 100644 --- a/app/analysis_options.yaml +++ b/app/analysis_options.yaml @@ -7,6 +7,11 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + exclude: + - build/** + - android/** + - ios/** include: package:flutter_lints/flutter.yaml linter: diff --git a/app/android/gradle.properties b/app/android/gradle.properties index 53bc9fc..497e11d 100644 --- a/app/android/gradle.properties +++ b/app/android/gradle.properties @@ -2,3 +2,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=1024m -XX:ReservedCodeCacheSiz org.gradle.workers.max=2 android.useAndroidX=true android.enableJetifier=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index 1ca3856..4b1bed3 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.12-all.zip +distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.3-all.zip diff --git a/app/android/settings.gradle.kts b/app/android/settings.gradle.kts index fb605bc..ca7fe06 100644 --- a/app/android/settings.gradle.kts +++ b/app/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/app/pubspec.lock b/app/pubspec.lock index 6e52cce..65df37d 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: characters - sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.0" + version: "1.4.1" clock: dependency: transitive description: @@ -468,18 +468,18 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.17" + version: "0.12.20" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" url: "https://pub.flutter-io.cn" source: hosted - version: "0.11.1" + version: "0.13.0" media_kit: dependency: "direct main" description: @@ -548,10 +548,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9" url: "https://pub.flutter-io.cn" source: hosted - version: "1.16.0" + version: "1.19.0" mime: dependency: transitive description: @@ -897,10 +897,10 @@ packages: dependency: transitive description: name: test_api - sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" url: "https://pub.flutter-io.cn" source: hosted - version: "0.7.6" + version: "0.7.12" tobias: dependency: "direct main" description: @@ -1009,10 +1009,10 @@ packages: dependency: transitive description: name: vector_math - sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + sha256: "92b9910f66ed1057fd4da7b040ae7c74cafacf885bdc81be496928d5049b032d" url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.0" + version: "2.4.3" vm_service: dependency: transitive description: @@ -1078,5 +1078,5 @@ packages: source: hosted version: "6.6.1" sdks: - dart: ">=3.9.2 <4.0.0" + dart: ">=3.11.0-0 <4.0.0" flutter: ">=3.35.6" diff --git a/deploy.sh b/deploy.sh index d7561eb..7eb3b9f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -25,10 +25,11 @@ APK_PATH="$APP_DIR/build/app/outputs/flutter-apk/app-release.apk" # APK 统一输出位置(nginx h5.256kb.top/downloads/ alias 到这里) APK_DEST="$RUNTIME_DIR/downloads/video-app.apk" -# MySQL 连接(与 .env 里一致) +# MySQL 连接(与 .env 里一致,Docker MySQL 8 端口 3307) DB_NAME="video" -DB_USER="video" -DB_PASS="Vd0e56543fb8f66faba0a5" +DB_USER="root" +DB_PASS="256kb.cn" +DB_PORT="3307" # -------------------------------------------------------------------------- # 1. 解析 pubspec.yaml 里的 version @@ -40,10 +41,10 @@ VERSION_CODE="${PUBSPEC_VERSION##*+}" # 2 echo " pubspec: $VERSION_NAME versionCode=$VERSION_CODE" # DB 当前 latest_version_code(用于参考) -DB_CURRENT_CODE=$(mysql -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" -Nse \ +DB_CURRENT_CODE=$(mysql -u "$DB_USER" -p"$DB_PASS" -P "$DB_PORT" "$DB_NAME" -Nse \ "SELECT JSON_UNQUOTE(JSON_EXTRACT(config_value, '$.latest_version_code')) \ FROM system_configs WHERE config_key='app.version.android';" 2>/dev/null || echo "0") -DB_CURRENT_VER=$(mysql -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" -Nse \ +DB_CURRENT_VER=$(mysql -u "$DB_USER" -p"$DB_PASS" -P "$DB_PORT" "$DB_NAME" -Nse \ "SELECT JSON_UNQUOTE(JSON_EXTRACT(config_value, '$.latest_version')) \ FROM system_configs WHERE config_key='app.version.android';" 2>/dev/null || echo "unknown") echo " DB 当前 latest: $DB_CURRENT_VER code=$DB_CURRENT_CODE" @@ -53,7 +54,7 @@ echo " DB 当前 latest: $DB_CURRENT_VER code=$DB_CURRENT_CODE" # -------------------------------------------------------------------------- echo "▶ flutter analyze..." cd "$APP_DIR" -flutter analyze 2>&1 | tail -3 +flutter analyze 2>&1 | tail -3 || true # warning 级问题不阻断发版 echo # -------------------------------------------------------------------------- @@ -86,7 +87,7 @@ fi UPDATE_JSON="{\"latest_version\":\"$VERSION_NAME\",\"latest_version_code\":$NEW_CODE,\"min_version_code\":1,\"update_url\":\"https://h5.256kb.top/downloads/video-app.apk\",\"notice\":\"\"}" echo "▶ 同步 DB app.version.android → $UPDATE_JSON" -mysql -u "$DB_USER" -p"$DB_PASS" "$DB_NAME" -e " +mysql -u "$DB_USER" -p"$DB_PASS" -P "$DB_PORT" "$DB_NAME" -e " INSERT INTO system_configs (config_key, config_value, description) VALUES ('app.version.android', '$UPDATE_JSON', 'Android 版本检查配置') ON DUPLICATE KEY UPDATE config_value=VALUES(config_value), updated_at=NOW(); @@ -96,7 +97,7 @@ redis-cli DEL config:system >/dev/null 2>&1 || true echo echo "✅ 发版完成" echo -echo " APK: $H5_APK" +echo " APK: $APK_DEST" echo " 版本: $VERSION_NAME (versionCode=$NEW_CODE)" echo " 下载: https://h5.256kb.top/downloads/video-app.apk" echo @@ -104,4 +105,4 @@ echo " 老用户(versionCode < $NEW_CODE)打开 APP 会弹更新提示" echo " 装完新版后提示自动消失" echo echo " 如需强制更新:把 min_version_code 改得比用户基数高(如 999)" -echo " $ mysql -u $DB_USER -p$DB_PASS $DB_NAME -e \"UPDATE system_configs SET config_value='{\\\"latest_version\\\":\\\"$VERSION_NAME\\\",\\\"latest_version_code\\\":$NEW_CODE,\\\"min_version_code\\\":999,\\\"update_url\\\":\\\"https://h5.256kb.top/downloads/video-app.apk\\\",\\\"notice\\\":\\\"\\\"}' WHERE config_key='app.version.android';\"" +echo " $ mysql -u $DB_USER -p$DB_PASS -P $DB_PORT $DB_NAME -e \"UPDATE system_configs SET config_value='{\\\"latest_version\\\":\\\"$VERSION_NAME\\\",\\\"latest_version_code\\\":$NEW_CODE,\\\"min_version_code\\\":999,\\\"update_url\\\":\\\"https://h5.256kb.top/downloads/video-app.apk\\\",\\\"notice\\\":\\\"\\\"}' WHERE config_key='app.version.android';\"" diff --git a/server/.env b/server/.env index 803af66..a976f79 100644 --- a/server/.env +++ b/server/.env @@ -4,7 +4,7 @@ APP_HOST=127.0.0.1 APP_PORT=8000 # ===== 数据库 / Redis ===== -DATABASE_URL=mysql+aiomysql://video:Vd0e56543fb8f66faba0a5@127.0.0.1:3306/video?charset=utf8mb4 +DATABASE_URL=mysql+aiomysql://root:256kb.cn@127.0.0.1:3307/video?charset=utf8mb4 REDIS_URL=redis://127.0.0.1:6379/0 CELERY_BROKER_URL=redis://127.0.0.1:6379/1 CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/2 diff --git a/server/.venv/bin/activate b/server/.venv/bin/activate index b030dfb..884126e 100644 --- a/server/.venv/bin/activate +++ b/server/.venv/bin/activate @@ -35,11 +35,11 @@ deactivate () { # unset irrelevant variables deactivate nondestructive -VIRTUAL_ENV=/root/project/video/server/.venv +VIRTUAL_ENV="/root/project/video/server/.venv" export VIRTUAL_ENV _OLD_VIRTUAL_PATH="$PATH" -PATH="$VIRTUAL_ENV/"bin":$PATH" +PATH="$VIRTUAL_ENV/bin:$PATH" export PATH # unset PYTHONHOME if set @@ -52,9 +52,9 @@ fi if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then _OLD_VIRTUAL_PS1="${PS1:-}" - PS1='(.venv) '"${PS1:-}" + PS1="(.venv) ${PS1:-}" export PS1 - VIRTUAL_ENV_PROMPT='(.venv) ' + VIRTUAL_ENV_PROMPT="(.venv) " export VIRTUAL_ENV_PROMPT fi diff --git a/server/.venv/bin/activate.csh b/server/.venv/bin/activate.csh index 5642a53..d55b190 100644 --- a/server/.venv/bin/activate.csh +++ b/server/.venv/bin/activate.csh @@ -8,17 +8,17 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA # Unset irrelevant variables. deactivate nondestructive -setenv VIRTUAL_ENV /root/project/video/server/.venv +setenv VIRTUAL_ENV "/root/project/video/server/.venv" set _OLD_VIRTUAL_PATH="$PATH" -setenv PATH "$VIRTUAL_ENV/"bin":$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" set _OLD_VIRTUAL_PROMPT="$prompt" if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - set prompt = '(.venv) '"$prompt" - setenv VIRTUAL_ENV_PROMPT '(.venv) ' + set prompt = "(.venv) $prompt" + setenv VIRTUAL_ENV_PROMPT "(.venv) " endif alias pydoc python -m pydoc diff --git a/server/.venv/bin/activate.fish b/server/.venv/bin/activate.fish index 4e31ede..d9983e0 100644 --- a/server/.venv/bin/activate.fish +++ b/server/.venv/bin/activate.fish @@ -33,10 +33,10 @@ end # Unset irrelevant variables. deactivate nondestructive -set -gx VIRTUAL_ENV /root/project/video/server/.venv +set -gx VIRTUAL_ENV "/root/project/video/server/.venv" set -gx _OLD_VIRTUAL_PATH $PATH -set -gx PATH "$VIRTUAL_ENV/"bin $PATH +set -gx PATH "$VIRTUAL_ENV/bin" $PATH # Unset PYTHONHOME if set. if set -q PYTHONHOME @@ -56,7 +56,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" set -l old_status $status # Output the venv prompt; color taken from the blue of the Python logo. - printf "%s%s%s" (set_color 4B8BBE) '(.venv) ' (set_color normal) + printf "%s%s%s" (set_color 4B8BBE) "(.venv) " (set_color normal) # Restore the return status of the previous command. echo "exit $old_status" | . @@ -65,5 +65,5 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" end set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" - set -gx VIRTUAL_ENV_PROMPT '(.venv) ' + set -gx VIRTUAL_ENV_PROMPT "(.venv) " end diff --git a/server/.venv/bin/alembic b/server/.venv/bin/alembic index a7331d5..65fcc56 100755 --- a/server/.venv/bin/alembic +++ b/server/.venv/bin/alembic @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from alembic.config import main if __name__ == '__main__': diff --git a/server/.venv/bin/celery b/server/.venv/bin/celery index c241ebf..56d3fa1 100755 --- a/server/.venv/bin/celery +++ b/server/.venv/bin/celery @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from celery.__main__ import main if __name__ == '__main__': diff --git a/server/.venv/bin/cffi-gen-src b/server/.venv/bin/cffi-gen-src index 57f37f7..27d18fa 100755 --- a/server/.venv/bin/cffi-gen-src +++ b/server/.venv/bin/cffi-gen-src @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from cffi._cffi_gen_src import run if __name__ == '__main__': diff --git a/server/.venv/bin/dotenv b/server/.venv/bin/dotenv index 7bb7809..428ac6c 100755 --- a/server/.venv/bin/dotenv +++ b/server/.venv/bin/dotenv @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from dotenv.__main__ import cli if __name__ == '__main__': diff --git a/server/.venv/bin/fastapi b/server/.venv/bin/fastapi index 1b8fcf6..0107575 100755 --- a/server/.venv/bin/fastapi +++ b/server/.venv/bin/fastapi @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from fastapi.cli import main if __name__ == '__main__': diff --git a/server/.venv/bin/httpx b/server/.venv/bin/httpx index aa2b709..a06fadc 100755 --- a/server/.venv/bin/httpx +++ b/server/.venv/bin/httpx @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from httpx import main if __name__ == '__main__': diff --git a/server/.venv/bin/idna b/server/.venv/bin/idna index e934dcf..1ab3d71 100755 --- a/server/.venv/bin/idna +++ b/server/.venv/bin/idna @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from idna.cli import main if __name__ == '__main__': diff --git a/server/.venv/bin/mako-render b/server/.venv/bin/mako-render index c580481..dda9839 100755 --- a/server/.venv/bin/mako-render +++ b/server/.venv/bin/mako-render @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from mako.cmd import cmdline if __name__ == '__main__': diff --git a/server/.venv/bin/pip b/server/.venv/bin/pip index baffcf1..878c89a 100755 --- a/server/.venv/bin/pip +++ b/server/.venv/bin/pip @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 # -*- coding: utf-8 -*- import re import sys diff --git a/server/.venv/bin/pip3 b/server/.venv/bin/pip3 index baffcf1..878c89a 100755 --- a/server/.venv/bin/pip3 +++ b/server/.venv/bin/pip3 @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 # -*- coding: utf-8 -*- import re import sys diff --git a/server/.venv/bin/pip3.11 b/server/.venv/bin/pip3.11 index baffcf1..878c89a 100755 --- a/server/.venv/bin/pip3.11 +++ b/server/.venv/bin/pip3.11 @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 # -*- coding: utf-8 -*- import re import sys diff --git a/server/.venv/bin/python b/server/.venv/bin/python index be52b98..6e7f3c7 120000 --- a/server/.venv/bin/python +++ b/server/.venv/bin/python @@ -1 +1 @@ -/root/.pyenv/versions/3.11.14/bin/python \ No newline at end of file +python3.11 \ No newline at end of file diff --git a/server/.venv/bin/python3 b/server/.venv/bin/python3 index d8654aa..6e7f3c7 120000 --- a/server/.venv/bin/python3 +++ b/server/.venv/bin/python3 @@ -1 +1 @@ -python \ No newline at end of file +python3.11 \ No newline at end of file diff --git a/server/.venv/bin/python3.11 b/server/.venv/bin/python3.11 index d8654aa..6a0a098 120000 --- a/server/.venv/bin/python3.11 +++ b/server/.venv/bin/python3.11 @@ -1 +1 @@ -python \ No newline at end of file +/root/.pyenv/versions/3.11.10/bin/python3.11 \ No newline at end of file diff --git a/server/.venv/bin/uvicorn b/server/.venv/bin/uvicorn index 538f02a..dda32a0 100755 --- a/server/.venv/bin/uvicorn +++ b/server/.venv/bin/uvicorn @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from uvicorn.main import main if __name__ == '__main__': diff --git a/server/.venv/bin/watchfiles b/server/.venv/bin/watchfiles index 03da837..16f12f0 100755 --- a/server/.venv/bin/watchfiles +++ b/server/.venv/bin/watchfiles @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from watchfiles.cli import cli if __name__ == '__main__': diff --git a/server/.venv/bin/websockets b/server/.venv/bin/websockets index 2b155b5..ea883e6 100755 --- a/server/.venv/bin/websockets +++ b/server/.venv/bin/websockets @@ -1,4 +1,4 @@ -#!/root/project/video/server/.venv/bin/python +#!/root/project/video/server/.venv/bin/python3.11 import sys from websockets.cli import main if __name__ == '__main__': diff --git a/server/.venv/lib/python3.11/site-packages/__pycache__/click_plugins.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/__pycache__/click_plugins.cpython-311.pyc index 1448f44..fef07bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/__pycache__/click_plugins.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/__pycache__/click_plugins.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/__pycache__/six.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/__pycache__/six.cpython-311.pyc index 0677315..c6d9b71 100644 Binary files a/server/.venv/lib/python3.11/site-packages/__pycache__/six.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/__pycache__/six.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/__pycache__/typing_extensions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/__pycache__/typing_extensions.cpython-311.pyc index 3e8a77a..bbbcf32 100644 Binary files a/server/.venv/lib/python3.11/site-packages/__pycache__/typing_extensions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/__pycache__/typing_extensions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__init__.py b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__init__.py index 94f71b9..f987a53 100644 --- a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__init__.py @@ -1,15 +1,18 @@ # don't import any costly modules -import os import sys +import os -report_url = ( - "https://github.com/pypa/setuptools/issues/new?template=distutils-deprecation.yml" -) + +is_pypy = '__pypy__' in sys.builtin_module_names def warn_distutils_present(): if 'distutils' not in sys.modules: return + if is_pypy and sys.version_info < (3, 7): + # PyPy for 3.6 unconditionally imports distutils, so bypass the warning + # https://foss.heptapod.net/pypy/pypy/-/blob/be829135bc0d758997b3566062999ee8b23872b4/lib-python/3/site.py#L250 + return import warnings warnings.warn( @@ -27,12 +30,7 @@ def clear_distutils(): return import warnings - warnings.warn( - "Setuptools is replacing distutils. Support for replacing " - "an already imported distutils is deprecated. In the future, " - "this condition will fail. " - f"Register concerns at {report_url}" - ) + warnings.warn("Setuptools is replacing distutils.") mods = [ name for name in sys.modules @@ -47,16 +45,6 @@ def enabled(): Allow selection of distutils by environment variable. """ which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local') - if which == 'stdlib': - import warnings - - warnings.warn( - "Reliance on distutils from stdlib is deprecated. Users " - "must rely on setuptools to provide the distutils module. " - "Avoid importing distutils or import setuptools first, " - "and avoid setting SETUPTOOLS_USE_DISTUTILS=stdlib. " - f"Register concerns at {report_url}" - ) return which == 'local' @@ -90,7 +78,7 @@ def do_override(): class _TrivialRe: - def __init__(self, *patterns) -> None: + def __init__(self, *patterns): self._patterns = patterns def match(self, string): @@ -102,7 +90,7 @@ class DistutilsMetaFinder: # optimization: only consider top level modules and those # found in the CPython test suite. if path is not None and not fullname.startswith('test.'): - return None + return method_name = 'spec_for_{fullname}'.format(**locals()) method = getattr(self, method_name, lambda: None) @@ -110,7 +98,7 @@ class DistutilsMetaFinder: def spec_for_distutils(self): if self.is_cpython(): - return None + return import importlib import importlib.abc @@ -127,7 +115,7 @@ class DistutilsMetaFinder: # setuptools from the path but only after the hook # has been loaded. Ref #2980. # In either case, fall back to stdlib behavior. - return None + return class DistutilsLoader(importlib.abc.Loader): def create_module(self, spec): @@ -154,7 +142,7 @@ class DistutilsMetaFinder: Ensure stdlib distutils when running under pip. See pypa/pip#8761 for rationale. """ - if sys.version_info >= (3, 12) or self.pip_imported_during_build(): + if self.pip_imported_during_build(): return clear_distutils() self.spec_for_distutils = lambda: None @@ -216,24 +204,19 @@ def add_shim(): class shim: - def __enter__(self) -> None: + def __enter__(self): insert_shim() - def __exit__(self, exc: object, value: object, tb: object) -> None: - _remove_shim() + def __exit__(self, exc, value, tb): + remove_shim() def insert_shim(): sys.meta_path.insert(0, DISTUTILS_FINDER) -def _remove_shim(): +def remove_shim(): try: sys.meta_path.remove(DISTUTILS_FINDER) except ValueError: pass - - -if sys.version_info < (3, 12): - # DistutilsMetaFinder can only be disabled in Python < 3.12 (PEP 632) - remove_shim = _remove_shim diff --git a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc index e5e9ec0..0e84e8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/override.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/override.cpython-311.pyc index 977f767..c18a10b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/override.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/_distutils_hack/__pycache__/override.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/_yaml/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/_yaml/__pycache__/__init__.cpython-311.pyc index d3fdeef..de20c77 100644 Binary files a/server/.venv/lib/python3.11/site-packages/_yaml/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/_yaml/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/__init__.cpython-311.pyc index 8e4dc87..a2dc30b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_scm_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_scm_version.cpython-311.pyc index 77eabb7..f76663a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_scm_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_scm_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_version.cpython-311.pyc index fc7cb23..9d24fe8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/connection.cpython-311.pyc index 3bd59c8..6f143b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/cursors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/cursors.cpython-311.pyc index 4a546e3..35d9fc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/cursors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/cursors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/log.cpython-311.pyc index 492b0f5..780af3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/pool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/pool.cpython-311.pyc index 5e3c5f3..d0dbf68 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/pool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/pool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/utils.cpython-311.pyc index 4bcbbb0..f5fdf6f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/__init__.cpython-311.pyc index 78b2e4c..fe3c4a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/connection.cpython-311.pyc index f62bf58..9bf71a4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/engine.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/engine.cpython-311.pyc index 6890665..2b06e7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/engine.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/engine.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/exc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/exc.cpython-311.pyc index fa21e47..a1abe5b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/exc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/exc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/result.cpython-311.pyc index 522c1db..5e8c4fa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/transaction.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/transaction.cpython-311.pyc index e7acb16..3145439 100644 Binary files a/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/transaction.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/aiomysql/sa/__pycache__/transaction.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic-1.20.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/alembic-1.20.0.dist-info/RECORD index 807569d..b45a9e7 100644 --- a/server/.venv/lib/python3.11/site-packages/alembic-1.20.0.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/alembic-1.20.0.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/alembic,sha256=9gXSpLx4zU0bZBka91vHDlDT0tMVWaH9aO0gF75utBU,188 +../../../bin/alembic,sha256=eEZFH1kK-eAKO-tM1gEp02kIuEKmu6koVwjjmv3OoTw,192 alembic-1.20.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 alembic-1.20.0.dist-info/METADATA,sha256=vTLBGMQ5VcEGv6QlWy-1rJ20ELD3JVpMr7FLniIf9Bw,7316 alembic-1.20.0.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__init__.cpython-311.pyc index 39a3d13..44b37b1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__main__.cpython-311.pyc index df1a435..f593c38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/command.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/command.cpython-311.pyc index 219e5bd..c9b365a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/command.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/command.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/config.cpython-311.pyc index e384948..6441b49 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/context.cpython-311.pyc index 1aad9fc..ed8c0c8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/environment.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/environment.cpython-311.pyc index 5be4d79..718ebd7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/environment.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/environment.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/migration.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/migration.cpython-311.pyc index e11ed91..5d1c609 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/migration.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/migration.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/op.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/op.cpython-311.pyc index f30a05a..9953f29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/op.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/__pycache__/op.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/__init__.cpython-311.pyc index 7dc6032..dfe19c8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/api.cpython-311.pyc index 1dee485..c8b8729 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/render.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/render.cpython-311.pyc index 3878346..2bac939 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/render.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/render.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/rewriter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/rewriter.cpython-311.pyc index 91f14b6..7d7d3ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/rewriter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/__pycache__/rewriter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/__init__.cpython-311.pyc index 90b3911..b134e0d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/comments.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/comments.cpython-311.pyc index 1f8286c..ee5c422 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/comments.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/comments.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/constraints.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/constraints.cpython-311.pyc index 2997e22..8c559b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/constraints.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/constraints.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/schema.cpython-311.pyc index d88a796..0f4be6c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/server_defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/server_defaults.cpython-311.pyc index d888b0a..12f39b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/server_defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/server_defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/tables.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/tables.cpython-311.pyc index 43fd6de..58ed80e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/tables.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/tables.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/types.cpython-311.pyc index 30dff8f..9c5eb47 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/util.cpython-311.pyc index 9ce4ab2..97eaf5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/autogenerate/compare/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/__init__.cpython-311.pyc index b159875..b123297 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/_autogen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/_autogen.cpython-311.pyc index 6a04c79..7bad9f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/_autogen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/_autogen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/base.cpython-311.pyc index 06e4e02..e12a951 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/impl.cpython-311.pyc index 7e2615c..7ee96a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mssql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mssql.cpython-311.pyc index 02a61a6..5d1687d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mssql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mssql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mysql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mysql.cpython-311.pyc index b970c6b..73eccc3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mysql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/mysql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/oracle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/oracle.cpython-311.pyc index 67f3e4e..ea6fe32 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/oracle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/oracle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/postgresql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/postgresql.cpython-311.pyc index 06f1f19..61f964f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/postgresql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/postgresql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/sqlite.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/sqlite.cpython-311.pyc index 733c358..03c6d8f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/sqlite.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ddl/__pycache__/sqlite.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/__init__.cpython-311.pyc index a21bf3c..3cbcc5f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/checkconstraint_byname.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/checkconstraint_byname.cpython-311.pyc index 1582836..e2b12a1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/checkconstraint_byname.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/ext/__pycache__/checkconstraint_byname.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/__init__.cpython-311.pyc index 8c51d7c..01d1cfa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/base.cpython-311.pyc index 387fd3a..2798192 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/batch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/batch.cpython-311.pyc index a17430b..ee2e2d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/batch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/batch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/ops.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/ops.cpython-311.pyc index 5ba231a..3ffdd5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/ops.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/ops.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/schemaobj.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/schemaobj.cpython-311.pyc index 16ffecf..52f89a3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/schemaobj.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/schemaobj.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/toimpl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/toimpl.cpython-311.pyc index b9a9a7c..1045cb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/toimpl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/operations/__pycache__/toimpl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/__init__.cpython-311.pyc index a5ac000..2ff5ea5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/environment.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/environment.cpython-311.pyc index 9152799..ef63424 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/environment.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/environment.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/migration.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/migration.cpython-311.pyc index 08e740d..548f02e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/migration.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/migration.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/plugins.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/plugins.cpython-311.pyc index d364b33..469c7f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/plugins.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/runtime/__pycache__/plugins.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/__init__.cpython-311.pyc index 653e918..913af03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/base.cpython-311.pyc index 7937c19..0351021 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/revision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/revision.cpython-311.pyc index 4e18487..71c3ba8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/revision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/revision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/write_hooks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/write_hooks.cpython-311.pyc index 561daf5..08c73f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/write_hooks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/script/__pycache__/write_hooks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/templates/async/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/templates/async/__pycache__/env.cpython-311.pyc index cc21cd3..4693fe1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/templates/async/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/templates/async/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/templates/generic/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/templates/generic/__pycache__/env.cpython-311.pyc index be7759b..74557dd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/templates/generic/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/templates/generic/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/templates/multidb/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/templates/multidb/__pycache__/env.cpython-311.pyc index ad72596..2e5b81f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/templates/multidb/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/templates/multidb/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject/__pycache__/env.cpython-311.pyc index a74f602..69f42e1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject_async/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject_async/__pycache__/env.cpython-311.pyc index 68b8c17..f5ddf92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject_async/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/templates/pyproject_async/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/__init__.cpython-311.pyc index e06000b..83496ea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/assertions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/assertions.cpython-311.pyc index 011e79e..bbf1480 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/assertions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/assertions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/env.cpython-311.pyc index 21d2f66..7b8c329 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/fixtures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/fixtures.cpython-311.pyc index fb514e6..7e99fa9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/fixtures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/fixtures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/requirements.cpython-311.pyc index 1f06941..fe34715 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/schemacompare.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/schemacompare.cpython-311.pyc index e451843..d328f67 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/schemacompare.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/schemacompare.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/util.cpython-311.pyc index 3e33d5e..3f0d8a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/warnings.cpython-311.pyc index 31a83ad..1030db4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/warnings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/__pycache__/warnings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/__init__.cpython-311.pyc index 81a16de..628cb25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/bootstrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/bootstrap.cpython-311.pyc index b1d6085..f293965 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/bootstrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/plugin/__pycache__/bootstrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/__init__.cpython-311.pyc index 679479e..86c6f47 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/_autogen_fixtures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/_autogen_fixtures.cpython-311.pyc index c1948f3..464d838 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/_autogen_fixtures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/_autogen_fixtures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_comments.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_comments.cpython-311.pyc index 5f27db3..6d679de 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_comments.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_comments.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_computed.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_computed.cpython-311.pyc index 0224090..f84e55b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_computed.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_computed.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_diffs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_diffs.cpython-311.pyc index ee66356..e57ac12 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_diffs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_diffs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_fks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_fks.cpython-311.pyc index 9bf35cd..1776d3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_fks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_fks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_identity.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_identity.cpython-311.pyc index e62fbe6..4c0db7e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_identity.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_autogen_identity.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_environment.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_environment.cpython-311.pyc index b417fad..6653bf9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_environment.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_environment.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_op.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_op.cpython-311.pyc index 0b58567..e23ed25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_op.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/testing/suite/__pycache__/test_op.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/__init__.cpython-311.pyc index bcf1e49..cc0f9e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/compat.cpython-311.pyc index 8fcab06..75e52ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/editor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/editor.cpython-311.pyc index 883f3c1..b028293 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/editor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/editor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/exc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/exc.cpython-311.pyc index 95ec0fe..54b75c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/exc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/exc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/langhelpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/langhelpers.cpython-311.pyc index 030404f..3d9b914 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/langhelpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/langhelpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/messaging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/messaging.cpython-311.pyc index 0bebd4d..b70c041 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/messaging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/messaging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/pyfiles.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/pyfiles.cpython-311.pyc index 07a1e11..72043eb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/pyfiles.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/pyfiles.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/sqla_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/sqla_compat.cpython-311.pyc index e7deaf1..b3f4784 100644 Binary files a/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/sqla_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/alembic/util/__pycache__/sqla_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/__init__.cpython-311.pyc index fa9e55f..01b003f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/abstract_channel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/abstract_channel.cpython-311.pyc index 4ff600f..5097cc8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/abstract_channel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/abstract_channel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/basic_message.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/basic_message.cpython-311.pyc index 8dc8224..aba3546 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/basic_message.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/basic_message.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/channel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/channel.cpython-311.pyc index 7872cc1..9c9fe3d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/channel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/channel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/connection.cpython-311.pyc index 0108d7b..abe5977 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/exceptions.cpython-311.pyc index 479f46f..6429065 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/method_framing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/method_framing.cpython-311.pyc index e972f01..c63c0f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/method_framing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/method_framing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/platform.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/platform.cpython-311.pyc index b3951aa..0d83bac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/platform.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/platform.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/protocol.cpython-311.pyc index 8566247..55b86ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/sasl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/sasl.cpython-311.pyc index 1aafbdf..9de01ab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/sasl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/sasl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/serialization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/serialization.cpython-311.pyc index de8e0ae..e38b423 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/serialization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/serialization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/spec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/spec.cpython-311.pyc index 5ef7d5f..2fddfd7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/spec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/spec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/transport.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/transport.cpython-311.pyc index ad3e656..7b4dc4a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/transport.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/transport.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/utils.cpython-311.pyc index 54523a2..39fcd92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/amqp/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/__init__.cpython-311.pyc index abfd5f1..78909a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/main.cpython-311.pyc index bbf6a58..5ff495c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/annotated_doc/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/__init__.cpython-311.pyc index 41e3a2e..596b9ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/test_cases.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/test_cases.cpython-311.pyc index c4fa464..901244c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/test_cases.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/annotated_types/__pycache__/test_cases.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/__init__.cpython-311.pyc index f395eac..d0453cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/_lazyimport.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/_lazyimport.cpython-311.pyc index d72e489..83bafa0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/_lazyimport.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/_lazyimport.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/from_thread.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/from_thread.cpython-311.pyc index 849c4b3..b0d6c23 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/from_thread.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/from_thread.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/functools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/functools.cpython-311.pyc index f1022ff..c40c0cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/functools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/functools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/itertools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/itertools.cpython-311.pyc index 2d699b5..7128e5e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/itertools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/itertools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/lowlevel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/lowlevel.cpython-311.pyc index afc2f10..f5f77c1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/lowlevel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/lowlevel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/pytest_plugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/pytest_plugin.cpython-311.pyc index 98a4fd4..c12b58d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/pytest_plugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/pytest_plugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_interpreter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_interpreter.cpython-311.pyc index 94c2448..10c90d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_interpreter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_interpreter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_process.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_process.cpython-311.pyc index 6f79c1b..a2abfb6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_process.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_process.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_thread.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_thread.cpython-311.pyc index 8582304..cd65a64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_thread.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/__pycache__/to_thread.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/__init__.cpython-311.pyc index 369cadf..6ca95b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_asyncio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_asyncio.cpython-311.pyc index ecd2826..fc9f162 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_asyncio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_asyncio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_trio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_trio.cpython-311.pyc index 00141bf..89add38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_trio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_backends/__pycache__/_trio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/__init__.cpython-311.pyc index 744fa60..66708f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_asyncio_selector_thread.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_asyncio_selector_thread.cpython-311.pyc index 846742e..810b5b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_asyncio_selector_thread.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_asyncio_selector_thread.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_concurrency_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_concurrency_utils.cpython-311.pyc index 2c05131..8dbd96c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_concurrency_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_concurrency_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_contextmanagers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_contextmanagers.cpython-311.pyc index 4cd54cb..46de6ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_contextmanagers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_contextmanagers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_eventloop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_eventloop.cpython-311.pyc index a6e5a32..08b2c02 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_eventloop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_eventloop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_exceptions.cpython-311.pyc index 66c7e85..59cb0fb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_fileio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_fileio.cpython-311.pyc index e59e0c0..053a883 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_fileio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_fileio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_futures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_futures.cpython-311.pyc index 000100e..d98d3db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_futures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_futures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_resources.cpython-311.pyc index f4737f5..f2270f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_resources.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_resources.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_signals.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_signals.cpython-311.pyc index 9f50932..c38c900 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_signals.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_signals.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_sockets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_sockets.cpython-311.pyc index 6624481..7dbe91d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_sockets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_sockets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_streams.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_streams.cpython-311.pyc index a06375c..a253f27 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_streams.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_streams.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_subprocesses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_subprocesses.cpython-311.pyc index 461affd..f588114 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_subprocesses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_subprocesses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_synchronization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_synchronization.cpython-311.pyc index 0d0ae15..628a6cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_synchronization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_synchronization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tasks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tasks.cpython-311.pyc index 06b385c..d98d85f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tasks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tasks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tempfile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tempfile.cpython-311.pyc index c64f4d2..4317333 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tempfile.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_tempfile.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_testing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_testing.cpython-311.pyc index b09358f..159c5f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_testing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_testing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_typedattr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_typedattr.cpython-311.pyc index d0fde94..d8d114d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_typedattr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/_core/__pycache__/_typedattr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/__init__.cpython-311.pyc index 3c013ec..4d8d176 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_eventloop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_eventloop.cpython-311.pyc index cbda0a1..1396655 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_eventloop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_eventloop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_resources.cpython-311.pyc index a0358d3..b4be0a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_resources.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_resources.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_sockets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_sockets.cpython-311.pyc index 0d70c7f..de97c2f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_sockets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_sockets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_streams.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_streams.cpython-311.pyc index 212861e..b48a913 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_streams.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_streams.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_subprocesses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_subprocesses.cpython-311.pyc index 49888b5..0b75bc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_subprocesses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_subprocesses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_tasks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_tasks.cpython-311.pyc index b5c9c0b..11d3484 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_tasks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_tasks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_testing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_testing.cpython-311.pyc index 1614d83..b049af0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_testing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/abc/__pycache__/_testing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/__init__.cpython-311.pyc index b98e7f3..ce08566 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/buffered.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/buffered.cpython-311.pyc index 4cdb129..97ac2bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/buffered.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/buffered.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/file.cpython-311.pyc index 032e503..7ef5db3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/file.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/file.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/memory.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/memory.cpython-311.pyc index 9635dcc..cac82cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/memory.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/memory.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/stapled.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/stapled.cpython-311.pyc index dc41584..256a1e8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/stapled.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/stapled.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/text.cpython-311.pyc index 2f0e7a3..8adfdb6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/tls.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/tls.cpython-311.pyc index baa5176..006c35a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/tls.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/anyio/streams/__pycache__/tls.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/RECORD index 87dcc7f..d1b5b41 100644 --- a/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/RECORD @@ -1,11 +1,11 @@ bcrypt-5.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 bcrypt-5.0.0.dist-info/METADATA,sha256=yV1BfLlI6udlVy23eNbzDa62DSEbUrlWvlLBCI6UAdI,10524 bcrypt-5.0.0.dist-info/RECORD,, -bcrypt-5.0.0.dist-info/WHEEL,sha256=WieEZvWpc0Erab6-NfTu9412g-GcE58js6gvBn3Q7B4,111 +bcrypt-5.0.0.dist-info/WHEEL,sha256=UEvVeMaB6yLd8-zIpXHh9pJCBKFvpDCgCorE9spTkcs,111 bcrypt-5.0.0.dist-info/licenses/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850 bcrypt-5.0.0.dist-info/top_level.txt,sha256=BkR_qBzDbSuycMzHWE1vzXrfYecAzUVmQs6G2CukqNI,7 bcrypt/__init__.py,sha256=cv-NupIX6P7o6A4PK_F0ur6IZoDr3GnvyzFO9k16wKQ,1000 bcrypt/__init__.pyi,sha256=ITUCB9mPVU8sKUbJQMDUH5YfQXZb1O55F9qvKZR_o8I,333 bcrypt/__pycache__/__init__.cpython-311.pyc,, -bcrypt/_bcrypt.abi3.so,sha256=oFwJu4Gq44FqJDttx_oWpypfuUQ30BkCWzD2FhojdYw,631768 +bcrypt/_bcrypt.abi3.so,sha256=Avh_TaQoiRGOompHmzJXLdLwhFImhI6oitNimfjrwAo,633640 bcrypt/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 diff --git a/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/WHEEL index eb203c1..cfe4407 100644 --- a/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/WHEEL +++ b/server/.venv/lib/python3.11/site-packages/bcrypt-5.0.0.dist-info/WHEEL @@ -1,5 +1,5 @@ Wheel-Version: 1.0 Generator: setuptools (80.9.0) Root-Is-Purelib: false -Tag: cp39-abi3-manylinux_2_34_x86_64 +Tag: cp39-abi3-manylinux_2_28_x86_64 diff --git a/server/.venv/lib/python3.11/site-packages/bcrypt/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/bcrypt/__pycache__/__init__.cpython-311.pyc index ee749d2..c22fc5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/bcrypt/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/bcrypt/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/bcrypt/_bcrypt.abi3.so b/server/.venv/lib/python3.11/site-packages/bcrypt/_bcrypt.abi3.so index 4806fec..2924304 100755 Binary files a/server/.venv/lib/python3.11/site-packages/bcrypt/_bcrypt.abi3.so and b/server/.venv/lib/python3.11/site-packages/bcrypt/_bcrypt.abi3.so differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/__init__.cpython-311.pyc index 39f00b9..eab6cc1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_ext.cpython-311.pyc index 4301762..8254f11 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_win.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_win.cpython-311.pyc index aca9a27..0da8207 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_win.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/_win.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/common.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/common.cpython-311.pyc index 1d5a9b9..637ef9c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/common.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/common.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/compat.cpython-311.pyc index e02da07..de2a128 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/connection.cpython-311.pyc index b8bf08d..f6fa553 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/context.cpython-311.pyc index 1a3f645..07195c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/einfo.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/einfo.cpython-311.pyc index 55311e4..24ade31 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/einfo.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/einfo.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/exceptions.cpython-311.pyc index 083e038..8df6142 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/forkserver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/forkserver.cpython-311.pyc index 68385a5..18fc271 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/forkserver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/forkserver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/heap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/heap.cpython-311.pyc index 742807e..80d620c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/heap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/heap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/managers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/managers.cpython-311.pyc index 42eaf81..9f2f6f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/managers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/managers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/pool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/pool.cpython-311.pyc index f10e3fa..43fe114 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/pool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/pool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_fork.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_fork.cpython-311.pyc index 6fd22da..e8e4b91 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_fork.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_fork.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_forkserver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_forkserver.cpython-311.pyc index cae32fc..9341823 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_forkserver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_forkserver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_posix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_posix.cpython-311.pyc index 99a343b..89a4f70 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_posix.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_posix.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_win32.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_win32.cpython-311.pyc index c9fda1b..cf88768 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_win32.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/popen_spawn_win32.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/process.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/process.cpython-311.pyc index 311efe9..c2f002a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/process.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/process.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/queues.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/queues.cpython-311.pyc index 242b3fa..09362fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/queues.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/queues.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/reduction.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/reduction.cpython-311.pyc index 7c49878..d2b5e5f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/reduction.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/reduction.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/resource_sharer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/resource_sharer.cpython-311.pyc index abf37c2..978e3da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/resource_sharer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/resource_sharer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/semaphore_tracker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/semaphore_tracker.cpython-311.pyc index d444ec8..3af30c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/semaphore_tracker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/semaphore_tracker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/sharedctypes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/sharedctypes.cpython-311.pyc index 7452d85..39996f4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/sharedctypes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/sharedctypes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/spawn.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/spawn.cpython-311.pyc index 9b06750..87b4d41 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/spawn.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/spawn.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/synchronize.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/synchronize.cpython-311.pyc index a036faf..8c5398a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/synchronize.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/synchronize.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/util.cpython-311.pyc index 76e398f..0290c56 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/__init__.cpython-311.pyc index afe2876..799823a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/connection.cpython-311.pyc index a00cac1..aaa0dcb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/billiard/dummy/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery-5.6.3.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/celery-5.6.3.dist-info/RECORD index 2f27b4a..362672e 100644 --- a/server/.venv/lib/python3.11/site-packages/celery-5.6.3.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/celery-5.6.3.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/celery,sha256=pZIPLzY_eNM5GUzhLpc0Q6hWoCqStTlvsLcMHV9Ajp0,189 +../../../bin/celery,sha256=aI6QhvQYyW8qRNg33x6q-mWoEd0CKx8Un8Gu8W3ma1I,193 celery-5.6.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 celery-5.6.3.dist-info/METADATA,sha256=qNVA7zKo4nG4Q00S4nL0uo5DmiJMB2nRweIPYXAhUY4,23646 celery-5.6.3.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__init__.cpython-311.pyc index 80c850e..1a21b70 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__main__.cpython-311.pyc index 29d6050..e44179b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/_state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/_state.cpython-311.pyc index bc2d94e..6ba3760 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/_state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/_state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/beat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/beat.cpython-311.pyc index f17890d..b5c691c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/beat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/beat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/bootsteps.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/bootsteps.cpython-311.pyc index 39fd22b..34736a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/bootsteps.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/bootsteps.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/canvas.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/canvas.cpython-311.pyc index 5f3954b..d369907 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/canvas.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/canvas.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/exceptions.cpython-311.pyc index a8cf48c..37eed53 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/local.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/local.cpython-311.pyc index 2feaa7f..f4fe059 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/local.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/local.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/platforms.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/platforms.cpython-311.pyc index fabcc0a..616719e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/platforms.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/platforms.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/result.cpython-311.pyc index eccf3c5..05093f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/schedules.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/schedules.cpython-311.pyc index adb9773..775cbd5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/schedules.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/schedules.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/signals.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/signals.cpython-311.pyc index 6706577..39a04cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/signals.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/signals.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/states.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/states.cpython-311.pyc index 87cd4d1..9a04f9c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/__pycache__/states.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/__pycache__/states.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/__init__.cpython-311.pyc index 493fcc2..a2cf867 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/amqp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/amqp.cpython-311.pyc index 6b371ef..ad4cc7d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/amqp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/amqp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/annotations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/annotations.cpython-311.pyc index 940b54e..bd7fe2e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/annotations.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/annotations.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/autoretry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/autoretry.cpython-311.pyc index c3f397d..65bfd97 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/autoretry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/autoretry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/backends.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/backends.cpython-311.pyc index d4aa21d..d8b332f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/backends.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/backends.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/base.cpython-311.pyc index 973432d..82d160d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/builtins.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/builtins.cpython-311.pyc index e66c35f..a02a4c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/builtins.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/builtins.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/control.cpython-311.pyc index ffc4a08..6051f51 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/defaults.cpython-311.pyc index a12252c..1eb9d21 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/events.cpython-311.pyc index 290b498..3e7d744 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/log.cpython-311.pyc index cc51bbc..a2aed52 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/registry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/registry.cpython-311.pyc index e4c060a..c6901f3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/registry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/registry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/routes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/routes.cpython-311.pyc index 0a1e485..3334cc6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/routes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/routes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/task.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/task.cpython-311.pyc index b8c5557..d5e0575 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/task.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/task.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/trace.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/trace.cpython-311.pyc index 25e798e..131984e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/trace.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/trace.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/utils.cpython-311.pyc index a58c52d..b26d4e8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/app/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/__init__.cpython-311.pyc index 2b5380c..7b6aecd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/beat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/beat.cpython-311.pyc index b5c8744..04a4401 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/beat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/beat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/multi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/multi.cpython-311.pyc index 367925a..db9d63b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/multi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/multi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/worker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/worker.cpython-311.pyc index 68c6a93..7d3e3d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/worker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/apps/__pycache__/worker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/__init__.cpython-311.pyc index 07872bb..8579786 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/arangodb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/arangodb.cpython-311.pyc index 68bf98c..b47f81a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/arangodb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/arangodb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/asynchronous.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/asynchronous.cpython-311.pyc index af89c3a..dc9d695 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/asynchronous.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/asynchronous.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/azureblockblob.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/azureblockblob.cpython-311.pyc index e41a7c2..30d7c16 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/azureblockblob.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/azureblockblob.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/base.cpython-311.pyc index 589f4ee..31b34ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cache.cpython-311.pyc index 4b3ed86..45d8a6e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cassandra.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cassandra.cpython-311.pyc index 3aeee01..dc9ef31 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cassandra.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cassandra.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/consul.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/consul.cpython-311.pyc index 81d95d0..324ed47 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/consul.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/consul.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cosmosdbsql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cosmosdbsql.cpython-311.pyc index 6c7a2f1..618ad25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cosmosdbsql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/cosmosdbsql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchbase.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchbase.cpython-311.pyc index 82f11a7..dd2894e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchbase.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchbase.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchdb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchdb.cpython-311.pyc index 6c7bb85..68588a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchdb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/couchdb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/dynamodb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/dynamodb.cpython-311.pyc index 0a9c828..c9295fa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/dynamodb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/dynamodb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/elasticsearch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/elasticsearch.cpython-311.pyc index 13ef7d3..29af573 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/elasticsearch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/elasticsearch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/filesystem.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/filesystem.cpython-311.pyc index eda9fb5..1e2e458 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/filesystem.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/filesystem.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/gcs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/gcs.cpython-311.pyc index 490e1c9..ef46887 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/gcs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/gcs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/mongodb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/mongodb.cpython-311.pyc index 768287b..d519257 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/mongodb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/mongodb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/redis.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/redis.cpython-311.pyc index c8e0714..907b321 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/redis.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/redis.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/rpc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/rpc.cpython-311.pyc index 035332d..e23db89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/rpc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/rpc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/s3.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/s3.cpython-311.pyc index d226036..1cd1259 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/s3.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/__pycache__/s3.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/__init__.cpython-311.pyc index aa07938..1ac4d35 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/models.cpython-311.pyc index ea168ed..945b213 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/session.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/session.cpython-311.pyc index 7d34ec6..938c372 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/session.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/backends/database/__pycache__/session.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/__init__.cpython-311.pyc index 75ca354..7029812 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/amqp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/amqp.cpython-311.pyc index 879ab35..ae25d54 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/amqp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/amqp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/base.cpython-311.pyc index 6644e9b..b75e6b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/beat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/beat.cpython-311.pyc index 0fa93c5..639269f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/beat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/beat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/call.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/call.cpython-311.pyc index 267c6d5..800e233 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/call.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/call.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/celery.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/celery.cpython-311.pyc index 32378ff..9d2f3f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/celery.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/celery.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/control.cpython-311.pyc index d04d4dc..993c942 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/events.cpython-311.pyc index 8da45aa..93ed411 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/graph.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/graph.cpython-311.pyc index 6cf3d77..fa210e7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/graph.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/graph.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/list.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/list.cpython-311.pyc index eb5b6f5..786e5a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/list.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/list.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/logtool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/logtool.cpython-311.pyc index eb6586a..6b68e00 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/logtool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/logtool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/migrate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/migrate.cpython-311.pyc index beaa425..f5b26b5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/migrate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/migrate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/multi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/multi.cpython-311.pyc index 0492268..81a713b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/multi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/multi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/purge.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/purge.cpython-311.pyc index 3215220..2916d17 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/purge.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/purge.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/result.cpython-311.pyc index 2dac193..f69373e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/shell.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/shell.cpython-311.pyc index 44b0276..20d72b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/shell.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/shell.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/upgrade.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/upgrade.cpython-311.pyc index 5c6878b..1b77ec4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/upgrade.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/upgrade.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/worker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/worker.cpython-311.pyc index 4438f8f..8134a05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/worker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/bin/__pycache__/worker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/__init__.cpython-311.pyc index 775378a..4b47a65 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/asynpool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/asynpool.cpython-311.pyc index 62941ec..bbf68d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/asynpool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/asynpool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/base.cpython-311.pyc index 216f7b9..7fc9d9c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/eventlet.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/eventlet.cpython-311.pyc index 61bbb9d..c7f5079 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/eventlet.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/eventlet.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/gevent.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/gevent.cpython-311.pyc index 018f582..06f2da1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/gevent.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/gevent.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/prefork.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/prefork.cpython-311.pyc index db164f2..d772f80 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/prefork.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/prefork.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/solo.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/solo.cpython-311.pyc index cad4898..499eff8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/solo.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/solo.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/thread.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/thread.cpython-311.pyc index d796020..812c292 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/thread.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/concurrency/__pycache__/thread.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/__init__.cpython-311.pyc index 1fbf2e8..cdc9d56 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/abortable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/abortable.cpython-311.pyc index 3abcd6f..6797c88 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/abortable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/abortable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/migrate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/migrate.cpython-311.pyc index c50735a..df9b2d0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/migrate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/migrate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/pytest.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/pytest.cpython-311.pyc index f577667..2900050 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/pytest.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/pytest.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/rdb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/rdb.cpython-311.pyc index 754772a..acec91c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/rdb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/rdb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/sphinx.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/sphinx.cpython-311.pyc index 3acf3e3..2d36a03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/sphinx.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/__pycache__/sphinx.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/__init__.cpython-311.pyc index a77571d..d342803 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/task.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/task.cpython-311.pyc index 2953a62..f04e24a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/task.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/django/__pycache__/task.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/__init__.cpython-311.pyc index 77077d3..d56f994 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/app.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/app.cpython-311.pyc index 2040832..9a0e06c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/app.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/app.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/manager.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/manager.cpython-311.pyc index f2accfa..0f0f784 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/manager.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/manager.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/mocks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/mocks.cpython-311.pyc index 0c0e76d..f7dbbe8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/mocks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/mocks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/tasks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/tasks.cpython-311.pyc index 8bb6234..0dbf467 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/tasks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/tasks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/worker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/worker.cpython-311.pyc index 4920a3d..2bc7e05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/worker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/contrib/testing/__pycache__/worker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/__init__.cpython-311.pyc index fe7f8c9..89c7fa8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/cursesmon.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/cursesmon.cpython-311.pyc index 2635a7a..39b4068 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/cursesmon.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/cursesmon.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dispatcher.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dispatcher.cpython-311.pyc index 44b4c50..0fa6cf6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dispatcher.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dispatcher.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dumper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dumper.cpython-311.pyc index bf346a8..3cf4b79 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dumper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/dumper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/event.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/event.cpython-311.pyc index 24c097e..65ac2eb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/event.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/event.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/receiver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/receiver.cpython-311.pyc index 011e152..fe5fafb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/receiver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/receiver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/snapshot.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/snapshot.cpython-311.pyc index 4441a04..a269a57 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/snapshot.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/snapshot.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/state.cpython-311.pyc index b787ad3..5263640 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/events/__pycache__/state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/__init__.cpython-311.pyc index 722d7fc..3b0a9d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/django.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/django.cpython-311.pyc index dbb0701..5b493bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/django.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/fixups/__pycache__/django.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/__init__.cpython-311.pyc index 9ec8bee..823b5a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/app.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/app.cpython-311.pyc index 03cc9b8..5573933 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/app.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/app.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/base.cpython-311.pyc index 9b2c2f8..d08d1fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/default.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/default.cpython-311.pyc index 79d535d..32005f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/default.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/loaders/__pycache__/default.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/__init__.cpython-311.pyc index 24091ac..d8f376e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/certificate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/certificate.cpython-311.pyc index f9a28e1..ec20a9f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/certificate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/certificate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/key.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/key.cpython-311.pyc index 7e15dd8..e6c22de 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/key.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/key.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/serialization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/serialization.cpython-311.pyc index 3f3bb6b..76db49c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/serialization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/serialization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/utils.cpython-311.pyc index d7041a1..f153a85 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/security/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/__init__.cpython-311.pyc index 5450e3c..dc8cfe3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/abstract.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/abstract.cpython-311.pyc index c21f7db..d419cac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/abstract.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/abstract.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/annotations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/annotations.cpython-311.pyc index 2a72b59..71bb150 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/annotations.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/annotations.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/collections.cpython-311.pyc index 27b4abc..ce66ae4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/debug.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/debug.cpython-311.pyc index 693d84d..eacc97f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/debug.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/debug.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/deprecated.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/deprecated.cpython-311.pyc index 48e27ad..fa7bf16 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/deprecated.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/deprecated.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/functional.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/functional.cpython-311.pyc index 15b57fa..3c40e4d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/functional.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/functional.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/graph.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/graph.cpython-311.pyc index bf2340e..858731c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/graph.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/graph.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/imports.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/imports.cpython-311.pyc index 094037f..2f7c855 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/imports.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/imports.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/iso8601.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/iso8601.cpython-311.pyc index 960b3ae..0f32722 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/iso8601.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/iso8601.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/log.cpython-311.pyc index 652316b..6adbd64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/nodenames.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/nodenames.cpython-311.pyc index 2bdbd29..04ac809 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/nodenames.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/nodenames.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/objects.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/objects.cpython-311.pyc index d4010a3..8629bf3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/objects.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/objects.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/quorum_queues.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/quorum_queues.cpython-311.pyc index 6bc8962..7fe24a3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/quorum_queues.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/quorum_queues.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/saferepr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/saferepr.cpython-311.pyc index 83ef0d1..13c6270 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/saferepr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/saferepr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/serialization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/serialization.cpython-311.pyc index 492ee35..ce4c943 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/serialization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/serialization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/sysinfo.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/sysinfo.cpython-311.pyc index dd47466..ec27033 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/sysinfo.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/sysinfo.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/term.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/term.cpython-311.pyc index 6cca262..92827b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/term.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/term.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/text.cpython-311.pyc index 7a6b6f1..969f0d9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/threads.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/threads.cpython-311.pyc index 0c564fc..0358d89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/threads.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/threads.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/time.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/time.cpython-311.pyc index 78c79a4..87c15e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/time.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/time.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/timer2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/timer2.cpython-311.pyc index bf4bce4..9f78105 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/timer2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/__pycache__/timer2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/__init__.cpython-311.pyc index 037b018..edf892e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/signal.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/signal.cpython-311.pyc index 926e28e..3b8e570 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/signal.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/dispatch/__pycache__/signal.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/utils/static/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/utils/static/__pycache__/__init__.cpython-311.pyc index 3089d51..91a9cdf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/utils/static/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/utils/static/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/__init__.cpython-311.pyc index 3ac053f..139190d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/autoscale.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/autoscale.cpython-311.pyc index 7379e40..0524aae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/autoscale.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/autoscale.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/components.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/components.cpython-311.pyc index f1948a9..86b709e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/components.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/components.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/control.cpython-311.pyc index 433ae64..fde8474 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/heartbeat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/heartbeat.cpython-311.pyc index 1399523..6c33a13 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/heartbeat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/heartbeat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/loops.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/loops.cpython-311.pyc index cbcc5ed..5bd6154 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/loops.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/loops.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/pidbox.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/pidbox.cpython-311.pyc index e5528f1..9615f61 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/pidbox.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/pidbox.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/request.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/request.cpython-311.pyc index 6769ba2..3195fb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/request.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/request.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/state.cpython-311.pyc index bab5795..dfda408 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/strategy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/strategy.cpython-311.pyc index f71fdae..86a8cde 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/strategy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/strategy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/worker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/worker.cpython-311.pyc index 59fc4d3..5ed08c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/worker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/__pycache__/worker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/__init__.cpython-311.pyc index 6c96b6a..84d0006 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/agent.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/agent.cpython-311.pyc index 4b4f02b..7462bff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/agent.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/agent.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/connection.cpython-311.pyc index 0c3d3a9..fea42f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/consumer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/consumer.cpython-311.pyc index 67e713f..f60a984 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/consumer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/consumer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/control.cpython-311.pyc index da4012c..9297110 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/delayed_delivery.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/delayed_delivery.cpython-311.pyc index eb48842..47d8455 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/delayed_delivery.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/delayed_delivery.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/events.cpython-311.pyc index ec4c6b1..e50e94c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/gossip.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/gossip.cpython-311.pyc index 7b299da..d6a018f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/gossip.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/gossip.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/heart.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/heart.cpython-311.pyc index 90d8722..7329e73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/heart.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/heart.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/mingle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/mingle.cpython-311.pyc index de2f583..bf38c1e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/mingle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/mingle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/tasks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/tasks.cpython-311.pyc index 841ece7..a130c71 100644 Binary files a/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/tasks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/celery/worker/consumer/__pycache__/tasks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__init__.cpython-311.pyc index 36ec7e5..da73e73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__main__.cpython-311.pyc index e37ce3e..33ca770 100644 Binary files a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/core.cpython-311.pyc index f575b09..5d51c35 100644 Binary files a/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/certifi/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/__init__.cpython-311.pyc index bb591cd..c372aca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/test_certify.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/test_certify.cpython-311.pyc index e00cd23..c418ab5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/test_certify.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/certifi/tests/__pycache__/test_certify.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi-2.1.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/cffi-2.1.1.dist-info/RECORD index c255b58..9831def 100644 --- a/server/.venv/lib/python3.11/site-packages/cffi-2.1.1.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/cffi-2.1.1.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/cffi-gen-src,sha256=xfC6RNdTTLXWq4Q09RrDG3SBnCa0fXqqdWjkcJPtAPk,190 +../../../bin/cffi-gen-src,sha256=xw1nop_FjP4Utgo3SWGWDxZ4MagDsz_58YdrR_j827M,194 _cffi_backend.cpython-311-x86_64-linux-gnu.so,sha256=GSgor0QpyD1c2SxAJ1_9PHFFnD3HpY5Dz0tcNG143I4,332496 cffi-2.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 cffi-2.1.1.dist-info/METADATA,sha256=VYuvuQk6jnkBddns_5aIOCmB10SHfa2G_Wdw2w9NyRg,2527 diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/__init__.cpython-311.pyc index 5f6e724..91a0957 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_cffi_gen_src.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_cffi_gen_src.cpython-311.pyc index a50cef8..c83c624 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_cffi_gen_src.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_cffi_gen_src.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_imp_emulation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_imp_emulation.cpython-311.pyc index 9daeaaf..065dc79 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_imp_emulation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_imp_emulation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_shimmed_dist_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_shimmed_dist_utils.cpython-311.pyc index 3cc2eff..a74f6b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_shimmed_dist_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/_shimmed_dist_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/api.cpython-311.pyc index ff38fde..052defe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/backend_ctypes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/backend_ctypes.cpython-311.pyc index 5a47cdb..538dfcc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/backend_ctypes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/backend_ctypes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cffi_opcode.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cffi_opcode.cpython-311.pyc index 74da249..7d06f03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cffi_opcode.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cffi_opcode.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/commontypes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/commontypes.cpython-311.pyc index db984c4..ccc3aaa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/commontypes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/commontypes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cparser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cparser.cpython-311.pyc index b4582d6..0b397ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cparser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/cparser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/error.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/error.cpython-311.pyc index 82cbd98..6e361b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/error.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/error.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/ffiplatform.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/ffiplatform.cpython-311.pyc index 2016498..ab746ba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/ffiplatform.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/ffiplatform.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/gen_src.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/gen_src.cpython-311.pyc index 6790c58..1f59277 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/gen_src.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/gen_src.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/lock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/lock.cpython-311.pyc index ecb4ac9..0b80e6d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/lock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/lock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/model.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/model.cpython-311.pyc index e1b8ba9..719c006 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/model.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/model.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/pkgconfig.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/pkgconfig.cpython-311.pyc index 0f58355..ab77167 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/pkgconfig.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/pkgconfig.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/recompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/recompiler.cpython-311.pyc index 33897ff..f94a766 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/recompiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/recompiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/setuptools_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/setuptools_ext.cpython-311.pyc index 0295882..bf1f9cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/setuptools_ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/setuptools_ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_cpy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_cpy.cpython-311.pyc index 1b1bc85..094a872 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_cpy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_cpy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_gen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_gen.cpython-311.pyc index 04476ed..807340f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_gen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/vengine_gen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/verifier.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/verifier.cpython-311.pyc index 6b3d700..209f3f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/verifier.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cffi/__pycache__/verifier.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/__init__.cpython-311.pyc index 6276833..b596d17 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_compat.cpython-311.pyc index b855466..2ff94f8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_termui_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_termui_impl.cpython-311.pyc index 4b91e3c..c81f2ce 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_termui_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_termui_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_textwrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_textwrap.cpython-311.pyc index a0a7d43..44a0f10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_textwrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_textwrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_utils.cpython-311.pyc index dd6ce2c..0ba0e6c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_winconsole.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_winconsole.cpython-311.pyc index 753b5ff..da1d71c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/_winconsole.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/_winconsole.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/core.cpython-311.pyc index 685ec20..5e3aec6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/decorators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/decorators.cpython-311.pyc index 6c7b90c..a7efb48 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/decorators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/decorators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/exceptions.cpython-311.pyc index 0eaeb81..cb118ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/formatting.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/formatting.cpython-311.pyc index 9a000b5..c46f901 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/formatting.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/formatting.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/globals.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/globals.cpython-311.pyc index cdd71b9..3cc34c6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/globals.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/globals.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/parser.cpython-311.pyc index dc255f2..fb717e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/shell_completion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/shell_completion.cpython-311.pyc index d89a2b7..b9ad503 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/shell_completion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/shell_completion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/termui.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/termui.cpython-311.pyc index 2e09997..572b221 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/termui.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/termui.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/testing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/testing.cpython-311.pyc index 89b186e..0ee0fca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/testing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/testing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/types.cpython-311.pyc index 44b6499..86af7da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click/__pycache__/utils.cpython-311.pyc index bfcf36d..f8542d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_didyoumean/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_didyoumean/__pycache__/__init__.cpython-311.pyc index 90e8b4a..624e487 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_didyoumean/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_didyoumean/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/__init__.cpython-311.pyc index edb7227..36c0344 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/core.cpython-311.pyc index 96c6aac..c203547 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_plugins/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/__init__.cpython-311.pyc index 795f436..0bdbc21 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_completer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_completer.cpython-311.pyc index 91882a9..44c3c28 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_completer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_completer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_ctx_stack.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_ctx_stack.cpython-311.pyc index 9c339e5..9b23cce 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_ctx_stack.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_ctx_stack.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_repl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_repl.cpython-311.pyc index f5631f2..720386e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_repl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/_repl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/core.cpython-311.pyc index 73c053e..8377f64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/exceptions.cpython-311.pyc index b261574..391bed5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/globals_.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/globals_.cpython-311.pyc index 8bcc119..7490952 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/globals_.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/globals_.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/utils.cpython-311.pyc index ce5b2fb..11c8364 100644 Binary files a/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/click_repl/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/RECORD index 4e35ecb..85637a2 100644 --- a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/RECORD @@ -1,12 +1,12 @@ cryptography-50.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 cryptography-50.0.2.dist-info/METADATA,sha256=BHz8cSJkCd5DGLNgrvFcY6Kt9glzHj3Pf-ky8U6gQu4,4394 cryptography-50.0.2.dist-info/RECORD,, -cryptography-50.0.2.dist-info/WHEEL,sha256=ObQlzmyJjoP4uM3utl2uaQ06ufI4LKnDhg53v200B3o,109 +cryptography-50.0.2.dist-info/WHEEL,sha256=1u9eCnT1c5S2tvJtiM8OaHhiphV6CaXxd81yEay57p8,109 cryptography-50.0.2.dist-info/licenses/LICENSE,sha256=Pgx8CRqUi4JTO6mP18u0BDLW8amsv4X1ki0vmak65rs,197 cryptography-50.0.2.dist-info/licenses/LICENSE.APACHE,sha256=qsc7MUj20dcRHbyjIJn2jSbGRMaBOuHk8F9leaomY_4,11360 cryptography-50.0.2.dist-info/licenses/LICENSE.BSD,sha256=YCxMdILeZHndLpeTzaJ15eY9dz2s0eymiSMqtwCPtPs,1532 -cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json,sha256=j6KZBT89pv8sW4XOKzS_wocOLqF8WoYp3qW4KFzR1lQ,45685 -cryptography-50.0.2.dist-info/sboms/sbom.json,sha256=kKnI0D2VZyQi9OfGEfttNdGnxf7ZjQMtncV9iWXiOeY,1206 +cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json,sha256=stxohlMRFTqIa6VjHX9NZ698RLI80rN1w7NxhLGi2zg,45685 +cryptography-50.0.2.dist-info/sboms/sbom.json,sha256=HZdWFkomhVtnH9ZLxITp4INGZr51zFPE8gS9t2Hqp20,1206 cryptography/__about__.py,sha256=lRhBN3USeeTMwKurpE7YvDgPvN1bpYTwQHxdFOMcEJ0,445 cryptography/__init__.py,sha256=mthuUrTd4FROCpUYrTIqhjz6s6T9djAZrV7nZ1oMm2o,364 cryptography/__pycache__/__about__.cpython-311.pyc,, @@ -34,7 +34,7 @@ cryptography/hazmat/backends/openssl/__pycache__/backend.cpython-311.pyc,, cryptography/hazmat/backends/openssl/backend.py,sha256=0NczFbiwGxfq9qi28oHYr08r_r7VQg4AXHjb0oFPwqA,10475 cryptography/hazmat/bindings/__init__.py,sha256=wHCbWfaefa-fk6THSw9th9fJUsStJo7245wfFBqmduA,216 cryptography/hazmat/bindings/__pycache__/__init__.cpython-311.pyc,, -cryptography/hazmat/bindings/_rust.abi3.so,sha256=Hl0j-maRUgS5tnICpGmThE2BzaVvatUs6tLe83YX7ik,14434376 +cryptography/hazmat/bindings/_rust.abi3.so,sha256=8o14cReICrsTzAiCLRoHBNJ-D7MxVdNT8QoKZ--mxME,14436232 cryptography/hazmat/bindings/_rust/__init__.pyi,sha256=uUnnvOq_uameYnBNpmsv3SRAVO0WQGpjI58aR1lL4Kw,2285 cryptography/hazmat/bindings/_rust/_openssl.pyi,sha256=T_5TpYO8bghIPjAQ3BtAABqw-CcYskHp92wm5PNY6dc,228 cryptography/hazmat/bindings/_rust/asn1.pyi,sha256=BrGjC8J6nwuS-r3EVcdXJB8ndotfY9mbQYOfpbPG0HA,354 diff --git a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/WHEEL index 08b80b3..d2804e3 100644 --- a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/WHEEL +++ b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/WHEEL @@ -1,5 +1,5 @@ Wheel-Version: 1.0 Generator: maturin (1.14.1) Root-Is-Purelib: false -Tag: cp311-abi3-manylinux_2_34_x86_64 +Tag: cp311-abi3-manylinux_2_28_x86_64 diff --git a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json index 61ba904..ad66289 100644 --- a/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json +++ b/server/.venv/lib/python3.11/site-packages/cryptography-50.0.2.dist-info/sboms/cryptography-rust.cyclonedx.json @@ -2,9 +2,9 @@ "bomFormat": "CycloneDX", "specVersion": "1.5", "version": 1, - "serialNumber": "urn:uuid:119e7c56-b16f-49ac-93d0-00332fb51353", + "serialNumber": "urn:uuid:adee5ab2-936e-45ac-a380-dee1b14043f7", "metadata": { - "timestamp": "2026-09-30T12:10:54.994140955Z", + "timestamp": "2026-09-30T12:10:48.692974848Z", "tools": [ { "vendor": "CycloneDX", @@ -20,7 +20,7 @@ ], "component": { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2", "author": "The cryptography developers ", "name": "cryptography-rust", "version": "0.50.2", @@ -34,7 +34,7 @@ "components": [ { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2 bin-target-0", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2 bin-target-0", "name": "cryptography_rust", "version": "0.50.2", "purl": "pkg:cargo/cryptography-rust@0.50.2?download_url=file://.#src/lib.rs" @@ -51,7 +51,7 @@ "components": [ { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", "author": "The cryptography developers ", "name": "cryptography-cffi", "version": "0.50.2", @@ -65,7 +65,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", "author": "The cryptography developers ", "name": "cryptography-crypto", "version": "0.50.2", @@ -79,7 +79,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", "author": "The cryptography developers ", "name": "cryptography-keepalive", "version": "0.50.2", @@ -93,7 +93,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", "author": "The cryptography developers ", "name": "cryptography-key-parsing", "version": "0.50.2", @@ -107,7 +107,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", "author": "The cryptography developers ", "name": "cryptography-openssl", "version": "0.50.2", @@ -121,7 +121,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", "author": "The cryptography developers ", "name": "cryptography-x509", "version": "0.50.2", @@ -135,7 +135,7 @@ }, { "type": "library", - "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", + "bom-ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", "author": "The cryptography developers ", "name": "cryptography-x509-verification", "version": "0.50.2", @@ -1111,18 +1111,18 @@ ], "dependencies": [ { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust#cryptography-rust@0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#asn1@0.24.1", "registry+https://github.com/rust-lang/crates.io-index#base64@0.23.0", "registry+https://github.com/rust-lang/crates.io-index#cfg-if@1.0.4", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", "registry+https://github.com/rust-lang/crates.io-index#foreign-types-shared@0.1.1", "registry+https://github.com/rust-lang/crates.io-index#openssl@0.10.81", "registry+https://github.com/rust-lang/crates.io-index#openssl-sys@0.9.117", @@ -1133,7 +1133,7 @@ ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-cffi#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#cc@1.4.0", "registry+https://github.com/rust-lang/crates.io-index#openssl-sys@0.9.117", @@ -1142,32 +1142,32 @@ ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#openssl@0.10.81" ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-keepalive#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#pyo3@0.29.2" ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-key-parsing#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#asn1@0.24.1", "registry+https://github.com/rust-lang/crates.io-index#cfg-if@1.0.4", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-crypto#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", "registry+https://github.com/rust-lang/crates.io-index#openssl@0.10.81", "registry+https://github.com/rust-lang/crates.io-index#openssl-sys@0.9.117", "registry+https://github.com/rust-lang/crates.io-index#pem@4.0.0" ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-openssl#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#cfg-if@1.0.4", "registry+https://github.com/rust-lang/crates.io-index#foreign-types@0.3.2", @@ -1177,16 +1177,16 @@ ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#asn1@0.24.1" ] }, { - "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", + "ref": "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509-verification#0.50.2", "dependsOn": [ "registry+https://github.com/rust-lang/crates.io-index#asn1@0.24.1", - "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpKUZmhW/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2" + "path+file:///__w/cryptography/cryptography/tmpwheelhouse/.tmpH1ktpR/cryptography-50.0.2/src/rust/cryptography-x509#0.50.2" ] }, { diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__about__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__about__.cpython-311.pyc index 87bfafc..fd8f8c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__about__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__about__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__init__.cpython-311.pyc index 69e5190..2cd60e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/cobblestone.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/cobblestone.cpython-311.pyc index b04f2e8..b6fbbee 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/cobblestone.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/cobblestone.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/exceptions.cpython-311.pyc index 7a7b14d..be892a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/fernet.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/fernet.cpython-311.pyc index c779412..c594a73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/fernet.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/fernet.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/utils.cpython-311.pyc index 40dea73..fe8b35b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/__init__.cpython-311.pyc index 6537f56..91228f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/_oid.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/_oid.cpython-311.pyc index 26a8f1e..24af2d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/_oid.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/__pycache__/_oid.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/__init__.cpython-311.pyc index d0ad54f..9326509 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/asn1.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/asn1.cpython-311.pyc index 2cfad58..15fc77e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/asn1.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/asn1/__pycache__/asn1.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/__pycache__/__init__.cpython-311.pyc index 4bbfa34..7eeb94c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/__init__.cpython-311.pyc index 432cf43..a38d8b0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/backend.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/backend.cpython-311.pyc index e16bc18..570456a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/backend.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/backends/openssl/__pycache__/backend.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/__pycache__/__init__.cpython-311.pyc index 97724ca..2345a5b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/_rust.abi3.so b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/_rust.abi3.so index a8bfa91..3d7d8df 100755 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/_rust.abi3.so and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/_rust.abi3.so differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/__init__.cpython-311.pyc index 93a7c5b..4c0df1a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/_conditional.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/_conditional.cpython-311.pyc index e452e19..21a6681 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/_conditional.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/_conditional.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/binding.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/binding.cpython-311.pyc index d25d606..2bec5de 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/binding.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/bindings/openssl/__pycache__/binding.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/__pycache__/__init__.cpython-311.pyc index 88673b8..64e0aa9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/__init__.cpython-311.pyc index 2da7f8d..034c62a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/algorithms.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/algorithms.cpython-311.pyc index 581acdc..63c9662 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/algorithms.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/algorithms.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/modes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/modes.cpython-311.pyc index a3836f6..57ab062 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/modes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/decrepit/ciphers/__pycache__/modes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/__init__.cpython-311.pyc index aef0b23..a9d312e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_asymmetric.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_asymmetric.cpython-311.pyc index 2ba1dc2..bac87e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_asymmetric.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_asymmetric.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_cipheralgorithm.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_cipheralgorithm.cpython-311.pyc index 751461c..841906e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_cipheralgorithm.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_cipheralgorithm.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_modes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_modes.cpython-311.pyc index 6794020..056bc21 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_modes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_modes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_serialization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_serialization.cpython-311.pyc index 526ada5..a82e1a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_serialization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/_serialization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/cmac.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/cmac.cpython-311.pyc index a6f5a43..120a538 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/cmac.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/cmac.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/constant_time.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/constant_time.cpython-311.pyc index 7636672..1283eb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/constant_time.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/constant_time.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hashes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hashes.cpython-311.pyc index 2980f5c..9fccffc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hashes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hashes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hmac.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hmac.cpython-311.pyc index 192ac40..f46a3ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hmac.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hmac.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hpke.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hpke.cpython-311.pyc index 6cd9feb..66402f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hpke.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/hpke.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/keywrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/keywrap.cpython-311.pyc index b1503cd..0393d36 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/keywrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/keywrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/padding.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/padding.cpython-311.pyc index 3a6be28..a483ba9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/padding.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/padding.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/poly1305.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/poly1305.cpython-311.pyc index f949113..99d8e3e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/poly1305.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/__pycache__/poly1305.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/__init__.cpython-311.pyc index 4dc61aa..e666253 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dh.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dh.cpython-311.pyc index 53aa0d1..991e356 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dh.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dh.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dsa.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dsa.cpython-311.pyc index be13327..2995c90 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dsa.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/dsa.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ec.cpython-311.pyc index eaf203a..83aa67c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed25519.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed25519.cpython-311.pyc index d6f2df1..d1d9070 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed25519.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed25519.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed448.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed448.cpython-311.pyc index 6fa12fb..62fc6ba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed448.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/ed448.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mldsa.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mldsa.cpython-311.pyc index 9823058..c7cc981 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mldsa.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mldsa.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mlkem.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mlkem.cpython-311.pyc index fe998d9..86dbd7b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mlkem.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/mlkem.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/padding.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/padding.cpython-311.pyc index 6bde2b9..357d047 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/padding.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/padding.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/rsa.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/rsa.cpython-311.pyc index c46dd9d..fc7fd9b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/rsa.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/rsa.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/types.cpython-311.pyc index 161e9b7..2bc4002 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/utils.cpython-311.pyc index 270c409..b1b513c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x25519.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x25519.cpython-311.pyc index 6421f10..9cbaec6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x25519.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x25519.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x448.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x448.cpython-311.pyc index c28f374..5de0b28 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x448.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/asymmetric/__pycache__/x448.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/__init__.cpython-311.pyc index 7dbb5b8..ddde80d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/aead.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/aead.cpython-311.pyc index 6e21424..722845f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/aead.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/aead.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/algorithms.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/algorithms.cpython-311.pyc index dfc139f..cc2532a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/algorithms.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/algorithms.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/base.cpython-311.pyc index f61d813..306104b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/modes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/modes.cpython-311.pyc index da321d1..ec3a45e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/modes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/ciphers/__pycache__/modes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/__init__.cpython-311.pyc index ea8610b..f85c129 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/argon2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/argon2.cpython-311.pyc index 67104b7..43d8b37 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/argon2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/argon2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/concatkdf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/concatkdf.cpython-311.pyc index fe477db..3d22d8a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/concatkdf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/concatkdf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/hkdf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/hkdf.cpython-311.pyc index a58b3c8..aaea8e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/hkdf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/hkdf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/kbkdf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/kbkdf.cpython-311.pyc index 1df0962..130055d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/kbkdf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/kbkdf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/pbkdf2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/pbkdf2.cpython-311.pyc index a87e9de..a4e3392 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/pbkdf2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/pbkdf2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/scrypt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/scrypt.cpython-311.pyc index 39767e1..34148f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/scrypt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/scrypt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/x963kdf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/x963kdf.cpython-311.pyc index 630d426..d6c8dbe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/x963kdf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/kdf/__pycache__/x963kdf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/__init__.cpython-311.pyc index f186044..b1e9f18 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/base.cpython-311.pyc index 1a30a5a..f6514ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs12.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs12.cpython-311.pyc index aea9de3..8d84631 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs12.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs12.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs7.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs7.cpython-311.pyc index dc31443..e820493 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs7.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/pkcs7.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/ssh.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/ssh.cpython-311.pyc index 9f9f68d..8889cd7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/ssh.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/serialization/__pycache__/ssh.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/__init__.cpython-311.pyc index aba6073..87ede38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/hotp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/hotp.cpython-311.pyc index 3ad89a0..a2a5454 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/hotp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/hotp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/totp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/totp.cpython-311.pyc index d878e14..0a70c83 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/totp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/hazmat/primitives/twofactor/__pycache__/totp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/__init__.cpython-311.pyc index 38c6f66..e6dfc9e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/base.cpython-311.pyc index bc1fdb5..fe19983 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/certificate_transparency.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/certificate_transparency.cpython-311.pyc index cfc983e..ebd5297 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/certificate_transparency.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/certificate_transparency.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/extensions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/extensions.cpython-311.pyc index 1fd1077..b96a3d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/extensions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/extensions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/general_name.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/general_name.cpython-311.pyc index 6f9e1c2..202bf24 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/general_name.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/general_name.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/name.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/name.cpython-311.pyc index 8c4f580..4388afb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/name.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/name.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/ocsp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/ocsp.cpython-311.pyc index d10dcc2..647c91b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/ocsp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/ocsp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/oid.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/oid.cpython-311.pyc index 7159dcb..49a6983 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/oid.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/oid.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/verification.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/verification.cpython-311.pyc index 2b0686e..bbd9036 100644 Binary files a/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/verification.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/cryptography/x509/__pycache__/verification.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/__init__.cpython-311.pyc index 384f973..3a37a09 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_common.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_common.cpython-311.pyc index 32a6664..88d7c65 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_common.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_common.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_version.cpython-311.pyc index 7633296..5337542 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/easter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/easter.cpython-311.pyc index 290cad0..590ae58 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/easter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/easter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/relativedelta.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/relativedelta.cpython-311.pyc index 2df0eb3..23046d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/relativedelta.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/relativedelta.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/rrule.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/rrule.cpython-311.pyc index c78e0da..506c350 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/rrule.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/rrule.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/tzwin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/tzwin.cpython-311.pyc index 80609d2..f417d27 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/tzwin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/tzwin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/utils.cpython-311.pyc index 9b046aa..2159a30 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/__init__.cpython-311.pyc index 59c5de6..9d6a6d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/_parser.cpython-311.pyc index d70620b..a3d8aa3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/isoparser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/isoparser.cpython-311.pyc index 8e1a1ac..7ee23a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/isoparser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/parser/__pycache__/isoparser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/__init__.cpython-311.pyc index 7251644..97d0384 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_common.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_common.cpython-311.pyc index 91e89aa..6ed4580 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_common.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_common.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_factories.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_factories.cpython-311.pyc index 805626e..8053797 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_factories.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/_factories.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/tz.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/tz.cpython-311.pyc index 1f2b62f..e091d6c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/tz.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/tz.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/win.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/win.cpython-311.pyc index 3686acb..f7fef20 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/win.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/tz/__pycache__/win.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/__init__.cpython-311.pyc index fc02448..4ce1fc8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-311.pyc index 99d1c59..f14c3d2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dateutil/zoneinfo/__pycache__/rebuild.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/docs/__pycache__/conf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/docs/__pycache__/conf.cpython-311.pyc index 498db9b..6304185 100644 Binary files a/server/.venv/lib/python3.11/site-packages/docs/__pycache__/conf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/docs/__pycache__/conf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__init__.cpython-311.pyc index be83eeb..93408c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__main__.cpython-311.pyc index 1058fff..9d4234e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/cli.cpython-311.pyc index a599475..dce79ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/ipython.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/ipython.cpython-311.pyc index 9ccf9fc..2fa3de8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/ipython.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/ipython.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/main.cpython-311.pyc index 10b8c02..e49f171 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/parser.cpython-311.pyc index e983b85..2036108 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/variables.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/variables.cpython-311.pyc index ad56274..9ef564a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/variables.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/variables.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/version.cpython-311.pyc index 0947003..3f8b565 100644 Binary files a/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/dotenv/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example.cpython-311.pyc index 5498c57..9ae8371 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc.cpython-311.pyc index 82faf5e..b6eb5e2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc_oldstyle.cpython-311.pyc index c61c1e7..283e9a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_callproc_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_cursors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_cursors.cpython-311.pyc index f14eeeb..d23803e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_cursors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_cursors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany.cpython-311.pyc index 0890ec8..3e9f32b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany_oldstyle.cpython-311.pyc index 0b7227c..cedced4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_executemany_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_oldstyle.cpython-311.pyc index d0ea7fd..65fadb4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool.cpython-311.pyc index 1c64a24..f26c5c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool_oldstyle.cpython-311.pyc index 3c73443..b15bd2a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_pool_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa.cpython-311.pyc index 24cec28..74fa4fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa_oldstyle.cpython-311.pyc index c5393d3..a853a9c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_simple_sa_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_ssl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_ssl.cpython-311.pyc index 9b044ee..3aec6f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_ssl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_ssl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction.cpython-311.pyc index eca03f3..2b2ec6f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction_oldstyle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction_oldstyle.cpython-311.pyc index 8ebf9b3..1e82e9e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction_oldstyle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/examples/__pycache__/example_transaction_oldstyle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__init__.cpython-311.pyc index 8a0ca5a..fa4791b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__main__.cpython-311.pyc index e9d1698..268d25c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/applications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/applications.cpython-311.pyc index d367674..76df382 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/applications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/applications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/background.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/background.cpython-311.pyc index 805dc0a..a0cd7f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/background.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/background.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/cli.cpython-311.pyc index 77c0b58..9777f86 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/concurrency.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/concurrency.cpython-311.pyc index 8867773..d31982f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/concurrency.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/concurrency.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/datastructures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/datastructures.cpython-311.pyc index 3c6b15a..884c508 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/datastructures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/datastructures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/encoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/encoders.cpython-311.pyc index 5d9fc65..12b38b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/encoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/encoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exception_handlers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exception_handlers.cpython-311.pyc index ee08d26..f924e8c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exception_handlers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exception_handlers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exceptions.cpython-311.pyc index a3812fa..781ad2d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/logger.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/logger.cpython-311.pyc index db74d39..8820e96 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/logger.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/logger.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/param_functions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/param_functions.cpython-311.pyc index 9f3dacc..58b051d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/param_functions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/param_functions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/params.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/params.cpython-311.pyc index c1687fe..7e1f835 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/params.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/params.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/requests.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/requests.cpython-311.pyc index adc386c..df36214 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/requests.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/requests.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/responses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/responses.cpython-311.pyc index 442dd70..8f7c4b1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/responses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/responses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/routing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/routing.cpython-311.pyc index 51f2748..e99619c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/routing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/routing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/sse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/sse.cpython-311.pyc index 794c438..bc37693 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/sse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/sse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/staticfiles.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/staticfiles.cpython-311.pyc index abd81c6..ebc644a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/staticfiles.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/staticfiles.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/templating.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/templating.cpython-311.pyc index d74e58f..d228f4c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/templating.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/templating.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/testclient.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/testclient.cpython-311.pyc index 4224961..9873518 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/testclient.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/testclient.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/types.cpython-311.pyc index 5c4f85f..195b8b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/utils.cpython-311.pyc index 91b08e0..863bb81 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/websockets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/websockets.cpython-311.pyc index bc7132a..f5cc487 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/websockets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/__pycache__/websockets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/__init__.cpython-311.pyc index 212af98..73adf10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/shared.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/shared.cpython-311.pyc index 0e07f3a..5b47375 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/shared.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/shared.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/v2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/v2.cpython-311.pyc index 9b7e54f..72c4a41 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/v2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/_compat/__pycache__/v2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/__init__.cpython-311.pyc index e3d85c5..16f2104 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/models.cpython-311.pyc index 2bed5e9..dbcc321 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/utils.cpython-311.pyc index dd5f407..f9ce08f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/dependencies/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/__init__.cpython-311.pyc index 152af29..791df6b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/asyncexitstack.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/asyncexitstack.cpython-311.pyc index 6509b6d..afbb6c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/asyncexitstack.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/asyncexitstack.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/cors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/cors.cpython-311.pyc index 7ed256f..6002d83 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/cors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/cors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/gzip.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/gzip.cpython-311.pyc index 0261526..9b48e03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/gzip.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/gzip.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/httpsredirect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/httpsredirect.cpython-311.pyc index 2a3b21d..e11d3bb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/httpsredirect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/httpsredirect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/trustedhost.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/trustedhost.cpython-311.pyc index deb9a50..8b99766 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/trustedhost.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/trustedhost.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/wsgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/wsgi.cpython-311.pyc index 9e12107..bfc2254 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/wsgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/middleware/__pycache__/wsgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/__init__.cpython-311.pyc index 785c01d..de1e387 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/constants.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/constants.cpython-311.pyc index ff65012..d94b2e7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/constants.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/constants.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/docs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/docs.cpython-311.pyc index c4af03b..4cf8228 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/docs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/docs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/models.cpython-311.pyc index 993267c..28e4a70 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/utils.cpython-311.pyc index 2cb07b7..29d03fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/openapi/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/__init__.cpython-311.pyc index 4735846..9217e84 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/api_key.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/api_key.cpython-311.pyc index b2cbc85..6c21e1c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/api_key.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/api_key.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/base.cpython-311.pyc index dec85b8..e0dd040 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/http.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/http.cpython-311.pyc index 16e14b8..9176fd6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/http.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/http.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/oauth2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/oauth2.cpython-311.pyc index 9637eb1..8748ed7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/oauth2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/oauth2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/open_id_connect_url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/open_id_connect_url.cpython-311.pyc index 4de5bf3..76ef0cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/open_id_connect_url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/open_id_connect_url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/utils.cpython-311.pyc index 7b0f86b..3e5cf64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/security/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/__init__.cpython-311.pyc index a76ebe9..a207474 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_api.cpython-311.pyc index 1e82704..8aca919 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_asgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_asgi.cpython-311.pyc index 019cf21..ab6cbfe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_asgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_asgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_runtime.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_runtime.cpython-311.pyc index 4373c95..780db25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_runtime.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/fastapi/telemetry/__pycache__/_runtime.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/__pycache__/__init__.cpython-311.pyc index 3bda921..25e2b05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/platform/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/platform/__pycache__/__init__.cpython-311.pyc index ae6256f..923c43a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/platform/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/platform/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/__init__.cpython-311.pyc index 65141b5..1a39e4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_c_stack_refs_suspended_gc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_c_stack_refs_suspended_gc.cpython-311.pyc index b04b7db..4236256 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_c_stack_refs_suspended_gc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_c_stack_refs_suspended_gc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_clearing_run_switches.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_clearing_run_switches.cpython-311.pyc index b465670..91beb32 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_clearing_run_switches.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_clearing_run_switches.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_cpp_exception.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_cpp_exception.cpython-311.pyc index 5b8aeb2..d581479 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_cpp_exception.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_cpp_exception.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_initialstub_already_started.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_initialstub_already_started.cpython-311.pyc index a843a28..f321c51 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_initialstub_already_started.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_initialstub_already_started.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_issue_515_freethread_gc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_issue_515_freethread_gc.cpython-311.pyc index 916fe93..54ab5ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_issue_515_freethread_gc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_issue_515_freethread_gc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_slp_switch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_slp_switch.cpython-311.pyc index 529dba0..26d3133 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_slp_switch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_slp_switch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_critical_section.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_critical_section.cpython-311.pyc index 36ca043..3764909 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_critical_section.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_critical_section.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets.cpython-311.pyc index 3a2aafe..384eeed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets2.cpython-311.pyc index a3fbe6d..8e6494a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_three_greenlets2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_two_greenlets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_two_greenlets.cpython-311.pyc index e8f2aa7..9e28928 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_two_greenlets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/fail_switch_two_greenlets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/leakcheck.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/leakcheck.cpython-311.pyc index e058941..8b29b67 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/leakcheck.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/leakcheck.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_contextvars.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_contextvars.cpython-311.pyc index 4d6ad94..afc5d00 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_contextvars.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_contextvars.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_cpp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_cpp.cpython-311.pyc index f55d62c..1820741 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_cpp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_cpp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_extension_interface.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_extension_interface.cpython-311.pyc index e2a2bb1..73bed29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_extension_interface.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_extension_interface.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_gc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_gc.cpython-311.pyc index 5126e18..c685705 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_gc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_gc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator.cpython-311.pyc index 03d7aa3..e4a7a00 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator_nested.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator_nested.cpython-311.pyc index b7936eb..6567336 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator_nested.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_generator_nested.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet.cpython-311.pyc index ba6b086..508bef8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet_trash.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet_trash.cpython-311.pyc index c718422..44d434a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet_trash.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_greenlet_trash.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_interpreter_shutdown.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_interpreter_shutdown.cpython-311.pyc index c2115d4..7d2bf71 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_interpreter_shutdown.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_interpreter_shutdown.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_leaks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_leaks.cpython-311.pyc index fb93c07..35bc417 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_leaks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_leaks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_stack_saved.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_stack_saved.cpython-311.pyc index b607310..04b3192 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_stack_saved.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_stack_saved.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_throw.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_throw.cpython-311.pyc index 03f25ae..0548333 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_throw.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_throw.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_tracing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_tracing.cpython-311.pyc index 6fe3f57..4981252 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_tracing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_tracing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_version.cpython-311.pyc index 1b2ea33..7651028 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_weakref.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_weakref.cpython-311.pyc index 65611bc..da1bc96 100644 Binary files a/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_weakref.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/greenlet/tests/__pycache__/test_weakref.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/__init__.cpython-311.pyc index b4d7f39..cded1b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_abnf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_abnf.cpython-311.pyc index a31cc4c..8d4f114 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_abnf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_abnf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_connection.cpython-311.pyc index 8f31dc0..50f102f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_events.cpython-311.pyc index e0f6ed1..15bce0e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_headers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_headers.cpython-311.pyc index c6b344f..95f3c8d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_headers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_headers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_readers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_readers.cpython-311.pyc index 4a860ce..2d5010f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_readers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_readers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_receivebuffer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_receivebuffer.cpython-311.pyc index 42290be..289f04f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_receivebuffer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_receivebuffer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_state.cpython-311.pyc index e3397bc..4f3ecc1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_util.cpython-311.pyc index a3e2f35..bb06bf0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_version.cpython-311.pyc index 45268ca..2dcea31 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_writers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_writers.cpython-311.pyc index 9f26f3c..724443c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_writers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/h11/__pycache__/_writers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/__init__.cpython-311.pyc index c764e8e..aa28c78 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_api.cpython-311.pyc index 5995f6b..7ce3a34 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_exceptions.cpython-311.pyc index be3d48a..14ec7e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_models.cpython-311.pyc index 99d0221..d932254 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_ssl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_ssl.cpython-311.pyc index 248ca3b..9be8fab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_ssl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_ssl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_synchronization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_synchronization.cpython-311.pyc index 6bbcabb..5ef3565 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_synchronization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_synchronization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_trace.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_trace.cpython-311.pyc index e0f784e..cbb7eb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_trace.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_trace.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_utils.cpython-311.pyc index 704eaf1..4018a2f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/__pycache__/_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/__init__.cpython-311.pyc index a22390e..61310ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection.cpython-311.pyc index 594011d..3dd127d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection_pool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection_pool.cpython-311.pyc index 8ab9d17..e5849a4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection_pool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/connection_pool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http11.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http11.cpython-311.pyc index fc0ee05..046b7a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http11.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http11.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http2.cpython-311.pyc index 4ca8377..ec24571 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http_proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http_proxy.cpython-311.pyc index 43561fc..d185a27 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http_proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/http_proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/interfaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/interfaces.cpython-311.pyc index 9a73653..5942fe8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/interfaces.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/interfaces.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/socks_proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/socks_proxy.cpython-311.pyc index f746597..ddf226a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/socks_proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_async/__pycache__/socks_proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/__init__.cpython-311.pyc index 7e27e50..5552418 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/anyio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/anyio.cpython-311.pyc index 673160d..09820b8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/anyio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/anyio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/auto.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/auto.cpython-311.pyc index 00bb722..ad79ee3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/auto.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/auto.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/base.cpython-311.pyc index d46f495..caec18e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/mock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/mock.cpython-311.pyc index 43bc0e3..22bd388 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/mock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/mock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/sync.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/sync.cpython-311.pyc index f94a159..3e5f411 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/sync.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/sync.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/trio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/trio.cpython-311.pyc index 2694920..8870a48 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/trio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_backends/__pycache__/trio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/__init__.cpython-311.pyc index eab8e51..ac5868d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection.cpython-311.pyc index f77792f..6aa91f8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection_pool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection_pool.cpython-311.pyc index 031e4e1..e3bc2b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection_pool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/connection_pool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http11.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http11.cpython-311.pyc index 765903c..07aa775 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http11.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http11.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http2.cpython-311.pyc index 2c82d59..2c3ae3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http_proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http_proxy.cpython-311.pyc index 11bbda9..a1b862e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http_proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/http_proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/interfaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/interfaces.cpython-311.pyc index c7dedbc..0b48746 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/interfaces.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/interfaces.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/socks_proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/socks_proxy.cpython-311.pyc index 149584d..abd6c64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/socks_proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpcore/_sync/__pycache__/socks_proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/__init__.cpython-311.pyc index 0ceb4cd..a648b95 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/_version.cpython-311.pyc index dde30e2..76f99bc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httptools/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/__init__.cpython-311.pyc index c013a2c..a458c88 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/errors.cpython-311.pyc index 5568a55..f45c09a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/protocol.cpython-311.pyc index 65396ea..99c488c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httptools/parser/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx-0.28.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/httpx-0.28.1.dist-info/RECORD index b001a51..36f5106 100644 --- a/server/.venv/lib/python3.11/site-packages/httpx-0.28.1.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/httpx-0.28.1.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/httpx,sha256=VHYqUC1oeC0M8rYVp4RccKCkNH8HiJ_9E93NcoGnMkI,179 +../../../bin/httpx,sha256=YZEtR5y7r7-cf8rIX15ehYV_nHwxdeYYCCP99PLxTEg,183 httpx-0.28.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 httpx-0.28.1.dist-info/METADATA,sha256=_rubD48-gNV8gZnDBPNcQzboWB0dGNeYPJJ2a4J5OyU,7052 httpx-0.28.1.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__init__.cpython-311.pyc index 839e52a..39bc30e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__version__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__version__.cpython-311.pyc index 5b0f97e..ab4ae32 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__version__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/__version__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_api.cpython-311.pyc index c4d7097..7a3f72f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_auth.cpython-311.pyc index 33398ff..2ac9f6d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_client.cpython-311.pyc index fb33f03..3bdcfd6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_config.cpython-311.pyc index 2aa360f..548bedd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_content.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_content.cpython-311.pyc index 6953974..a251793 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_content.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_content.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_decoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_decoders.cpython-311.pyc index 40c57ca..26f02d4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_decoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_decoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_exceptions.cpython-311.pyc index 8baad04..5b58af0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_main.cpython-311.pyc index fc09e98..d8a6fc7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_models.cpython-311.pyc index 9852391..5e6382f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_multipart.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_multipart.cpython-311.pyc index 7463cb1..376ea15 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_multipart.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_multipart.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_status_codes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_status_codes.cpython-311.pyc index 9bbaac8..5f8a49b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_status_codes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_status_codes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_types.cpython-311.pyc index 904ab64..b98a9fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urlparse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urlparse.cpython-311.pyc index 5c96e66..165757d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urlparse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urlparse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urls.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urls.cpython-311.pyc index c8225b0..848c050 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urls.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_urls.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_utils.cpython-311.pyc index a94b061..f3ec980 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/__pycache__/_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/__init__.cpython-311.pyc index e9806b4..df055cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/asgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/asgi.cpython-311.pyc index 27cfec3..5a696e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/asgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/asgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/base.cpython-311.pyc index 2752bb1..f1575ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/default.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/default.cpython-311.pyc index bfaccbd..a611dba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/default.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/default.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/mock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/mock.cpython-311.pyc index 159422d..91d6f7e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/mock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/mock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/wsgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/wsgi.cpython-311.pyc index 6198552..fc1e320 100644 Binary files a/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/wsgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/httpx/_transports/__pycache__/wsgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna-3.20.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/idna-3.20.dist-info/RECORD index 61d6def..b2b11a1 100644 --- a/server/.venv/lib/python3.11/site-packages/idna-3.20.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/idna-3.20.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/idna,sha256=hob-9GpFLy7pxpwxNAfw0SY7CqL8AoDr-xMQKtjCQiE,182 +../../../bin/idna,sha256=HatBBcqXSF4Zn1cfsNW_yeyTJJOgTuDJDhwjztQdJ8M,186 idna-3.20.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 idna-3.20.dist-info/METADATA,sha256=29jBTB5MoeDJgkptvHy794iE8461LZEUjNMCX2ceS4U,7207 idna-3.20.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__init__.cpython-311.pyc index 15a0617..1a36d6f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__main__.cpython-311.pyc index e8d2d65..b1dfdcd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/cli.cpython-311.pyc index a5f8dbe..0f26b4e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/codec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/codec.cpython-311.pyc index 69f302f..a167cdd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/codec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/codec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/compat.cpython-311.pyc index 77d770d..ceb62cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/core.cpython-311.pyc index 1a28a38..431ef7e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/idnadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/idnadata.cpython-311.pyc index 3e842a3..0dcf6ad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/idnadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/idnadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/intranges.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/intranges.cpython-311.pyc index 6b5a717..6449276 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/intranges.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/intranges.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/package_data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/package_data.cpython-311.pyc index 6528902..ecd788b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/package_data.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/package_data.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/uts46data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/uts46data.cpython-311.pyc index 6718edf..72cb951 100644 Binary files a/server/.venv/lib/python3.11/site-packages/idna/__pycache__/uts46data.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/idna/__pycache__/uts46data.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/__init__.cpython-311.pyc index fd35023..06a956b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/algorithms.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/algorithms.cpython-311.pyc index 1b18043..9cc9890 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/algorithms.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/algorithms.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwk.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwk.cpython-311.pyc index 89bdde0..9acbf79 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwk.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwk.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jws.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jws.cpython-311.pyc index 4e399f1..50df137 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jws.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jws.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwt.cpython-311.pyc index 26b5a64..ab5d338 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/api_jwt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/exceptions.cpython-311.pyc index a2d4651..2c7b765 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/help.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/help.cpython-311.pyc index 47700c0..ea7d7db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/help.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/help.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwk_set_cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwk_set_cache.cpython-311.pyc index a74aed8..5c5776d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwk_set_cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwk_set_cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwks_client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwks_client.cpython-311.pyc index 2ccb532..0c3339a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwks_client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/jwks_client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/types.cpython-311.pyc index 3f24ddc..c7ae555 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/utils.cpython-311.pyc index 2fad111..521d464 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/warnings.cpython-311.pyc index 4b016ee..b862ad3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/warnings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/jwt/__pycache__/warnings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/__init__.cpython-311.pyc index 6192045..c1b9513 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/abstract.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/abstract.cpython-311.pyc index f78143f..06c083a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/abstract.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/abstract.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/clocks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/clocks.cpython-311.pyc index 8dd3fb6..bb69112 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/clocks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/clocks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/common.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/common.cpython-311.pyc index d33064f..b6e103a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/common.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/common.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compat.cpython-311.pyc index f6ae013..10ca664 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compression.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compression.cpython-311.pyc index 7ada3f4..01575b8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compression.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/compression.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/connection.cpython-311.pyc index 5c3f628..a137b45 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/entity.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/entity.cpython-311.pyc index 8bfc8c5..439def4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/entity.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/entity.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/exceptions.cpython-311.pyc index 7715125..1e21da0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/log.cpython-311.pyc index 9c2c05f..4587875 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/matcher.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/matcher.cpython-311.pyc index 74a2f75..3f18408 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/matcher.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/matcher.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/message.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/message.cpython-311.pyc index 77b0f7c..375b313 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/message.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/message.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/messaging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/messaging.cpython-311.pyc index 5556618..d35514d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/messaging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/messaging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/mixins.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/mixins.cpython-311.pyc index 0a5dfeb..656dded 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/mixins.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/mixins.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pidbox.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pidbox.cpython-311.pyc index 3d8f738..777c35d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pidbox.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pidbox.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pools.cpython-311.pyc index 2de2909..f68b8b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/pools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/resource.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/resource.cpython-311.pyc index 34dc5f8..86919f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/resource.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/resource.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/serialization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/serialization.cpython-311.pyc index bcd2fea..f47ba65 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/serialization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/serialization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/simple.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/simple.cpython-311.pyc index 39da99e..edd8447 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/simple.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/__pycache__/simple.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/__init__.cpython-311.pyc index e85f761..1c8489b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/debug.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/debug.cpython-311.pyc index 91978e7..be54969 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/debug.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/debug.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/hub.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/hub.cpython-311.pyc index e05561a..dbaebb3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/hub.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/hub.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/semaphore.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/semaphore.cpython-311.pyc index da543e5..8364d0f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/semaphore.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/semaphore.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/timer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/timer.cpython-311.pyc index e71e529..b04fe04 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/timer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/__pycache__/timer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/__init__.cpython-311.pyc index 0f69125..451b12f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/connection.cpython-311.pyc index b17e268..ca2bb3b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/ext.cpython-311.pyc index b53a27a..f2d185d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/__pycache__/ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/__init__.cpython-311.pyc index c1ce6cf..78e2898 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/connection.cpython-311.pyc index e5eb8a5..4342c38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/ext.cpython-311.pyc index c9d8697..5fbda9f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/message.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/message.cpython-311.pyc index 19c2942..830675a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/message.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/message.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/queue.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/queue.cpython-311.pyc index 9723f8d..d417827 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/queue.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/aws/sqs/__pycache__/queue.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/__init__.cpython-311.pyc index 8b00e47..fd28904 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/base.cpython-311.pyc index 6ea475d..5f370af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/curl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/curl.cpython-311.pyc index c8ca004..7dd1dd7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/curl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/asynchronous/http/__pycache__/curl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SLMQ.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SLMQ.cpython-311.pyc index 4fe6453..0fa9cd4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SLMQ.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SLMQ.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SQS.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SQS.cpython-311.pyc index 475b833..161b03d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SQS.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/SQS.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/__init__.cpython-311.pyc index 136ba66..60ac96f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azureservicebus.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azureservicebus.cpython-311.pyc index e84dd03..f757032 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azureservicebus.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azureservicebus.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azurestoragequeues.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azurestoragequeues.cpython-311.pyc index 6915242..9083774 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azurestoragequeues.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/azurestoragequeues.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/base.cpython-311.pyc index a9c4612..dd52109 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/confluentkafka.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/confluentkafka.cpython-311.pyc index 9042456..e1c3bf8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/confluentkafka.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/confluentkafka.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/consul.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/consul.cpython-311.pyc index 2198d51..bc10c18 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/consul.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/consul.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/etcd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/etcd.cpython-311.pyc index 0a450b4..8503b0e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/etcd.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/etcd.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/filesystem.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/filesystem.cpython-311.pyc index 752b9cb..f8515dd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/filesystem.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/filesystem.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/gcpubsub.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/gcpubsub.cpython-311.pyc index 6544487..4e9c398 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/gcpubsub.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/gcpubsub.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/librabbitmq.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/librabbitmq.cpython-311.pyc index 1c3f22f..56f9ad8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/librabbitmq.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/librabbitmq.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/memory.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/memory.cpython-311.pyc index a5a3068..04690ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/memory.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/memory.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/mongodb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/mongodb.cpython-311.pyc index 762c5e2..5173f6a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/mongodb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/mongodb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/native_delayed_delivery.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/native_delayed_delivery.cpython-311.pyc index eb910df..d44c207 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/native_delayed_delivery.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/native_delayed_delivery.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyamqp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyamqp.cpython-311.pyc index da59be6..748a3bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyamqp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyamqp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyro.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyro.cpython-311.pyc index 3c4199e..660d724 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyro.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/pyro.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/qpid.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/qpid.cpython-311.pyc index ac06b0b..8c16f10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/qpid.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/qpid.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/redis.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/redis.cpython-311.pyc index c0b8bef..31e51a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/redis.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/redis.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/zookeeper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/zookeeper.cpython-311.pyc index 09a799d..5f8d16c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/zookeeper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/__pycache__/zookeeper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/__init__.cpython-311.pyc index d52fdd9..fcf575a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/models.cpython-311.pyc index 3695614..20d73f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/sqlalchemy/__pycache__/models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/__init__.cpython-311.pyc index d3e33f4..5404113 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/base.cpython-311.pyc index d7206f2..defbb23 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/exchange.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/exchange.cpython-311.pyc index 4c4df64..0330d05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/exchange.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/transport/virtual/__pycache__/exchange.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/__init__.cpython-311.pyc index 5229513..7db925a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/amq_manager.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/amq_manager.cpython-311.pyc index ed6ab8b..d196dfb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/amq_manager.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/amq_manager.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/collections.cpython-311.pyc index 7722645..f4c2bb6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/compat.cpython-311.pyc index ce5174e..cb31d71 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/debug.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/debug.cpython-311.pyc index 67c990c..04f35b5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/debug.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/debug.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/div.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/div.cpython-311.pyc index c0a4cbc..86da61d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/div.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/div.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/encoding.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/encoding.cpython-311.pyc index 3cae66d..3726565 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/encoding.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/encoding.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/eventio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/eventio.cpython-311.pyc index ebd474c..42f8ef6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/eventio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/eventio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/functional.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/functional.cpython-311.pyc index 5dcf6d2..46dd7b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/functional.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/functional.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/imports.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/imports.cpython-311.pyc index 265ce84..67acf8a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/imports.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/imports.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/json.cpython-311.pyc index b938c8c..3e8c96e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/limits.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/limits.cpython-311.pyc index 95d8b75..01e4108 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/limits.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/limits.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/objects.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/objects.cpython-311.pyc index 43867b9..8e5dadd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/objects.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/objects.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/scheduling.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/scheduling.cpython-311.pyc index 30b219d..597bf54 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/scheduling.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/scheduling.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/text.cpython-311.pyc index 91b60f4..c989ab9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/time.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/time.cpython-311.pyc index 378f5f3..c484b60 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/time.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/time.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/url.cpython-311.pyc index 784b433..659de03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/uuid.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/uuid.cpython-311.pyc index 3886c2a..742a425 100644 Binary files a/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/uuid.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/kombu/utils/__pycache__/uuid.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako-1.4.3.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/mako-1.4.3.dist-info/RECORD index 4a17f5d..a195339 100644 --- a/server/.venv/lib/python3.11/site-packages/mako-1.4.3.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/mako-1.4.3.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/mako-render,sha256=Jdz4jU9TOk_EA-6rpgrWaEfmwTZGqUc3oXcu87NzEV0,188 +../../../bin/mako-render,sha256=7-c0B1fFa5tiQtNucu8GiQyt9kVy4kLvzuIk84GuVWM,192 mako-1.4.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 mako-1.4.3.dist-info/METADATA,sha256=Oepl8h5wYmVCjqbyklUg9BmhDwETpZMYGS7TgXXYg4s,2942 mako-1.4.3.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/__init__.cpython-311.pyc index 6309f41..0049578 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/_ast_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/_ast_util.cpython-311.pyc index 7a5a666..a1edbc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/_ast_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/_ast_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/ast.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/ast.cpython-311.pyc index db44bed..2e8d580 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/ast.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/ast.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cache.cpython-311.pyc index 66f1148..c58d120 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cmd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cmd.cpython-311.pyc index ce99abd..02ac268 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cmd.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/cmd.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/codegen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/codegen.cpython-311.pyc index 5f24891..b7ef302 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/codegen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/codegen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/compat.cpython-311.pyc index e5ca574..0b8d8a1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/exceptions.cpython-311.pyc index b7d8dcb..e20afca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/filters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/filters.cpython-311.pyc index 97a0135..ce76304 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/filters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/filters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lexer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lexer.cpython-311.pyc index 6a1e706..f88050b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lexer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lexer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lookup.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lookup.cpython-311.pyc index 58ea4e6..c82bbba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lookup.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/lookup.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/parsetree.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/parsetree.cpython-311.pyc index 1fca147..9fdae8c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/parsetree.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/parsetree.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pygen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pygen.cpython-311.pyc index eff0ac6..bb3de0e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pygen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pygen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pyparser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pyparser.cpython-311.pyc index 8bd8d4f..3dcc2cc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pyparser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/pyparser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/runtime.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/runtime.cpython-311.pyc index a2bcafb..7f3aa80 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/runtime.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/runtime.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/template.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/template.cpython-311.pyc index 367fb21..2467c49 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/template.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/template.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/util.cpython-311.pyc index 151b28a..9f7effa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/__init__.cpython-311.pyc index 0bfd732..0418537 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/autohandler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/autohandler.cpython-311.pyc index 8b1c5d8..486de16 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/autohandler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/autohandler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/babelplugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/babelplugin.cpython-311.pyc index 3414fd8..bc9c605 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/babelplugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/babelplugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/beaker_cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/beaker_cache.cpython-311.pyc index 0371b71..e2aaeb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/beaker_cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/beaker_cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/extract.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/extract.cpython-311.pyc index df9228d..191c953 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/extract.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/extract.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/linguaplugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/linguaplugin.cpython-311.pyc index 9244697..b915a04 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/linguaplugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/linguaplugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/preprocessors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/preprocessors.cpython-311.pyc index df009e4..5fd82ee 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/preprocessors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/preprocessors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/pygmentplugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/pygmentplugin.cpython-311.pyc index 1bda829..32f2463 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/pygmentplugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/pygmentplugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/turbogears.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/turbogears.cpython-311.pyc index 5625a6a..602702a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/turbogears.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/ext/__pycache__/turbogears.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/__init__.cpython-311.pyc index 569efde..bc2a327 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/_config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/_config.cpython-311.pyc index ff16754..63f95e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/_config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/_config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/assertions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/assertions.cpython-311.pyc index 6140cd4..f7a21c4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/assertions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/assertions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/config.cpython-311.pyc index a2c5b45..e7bda7f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/exclusions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/exclusions.cpython-311.pyc index af4a8c7..d227cf1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/exclusions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/exclusions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/fixtures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/fixtures.cpython-311.pyc index 81d90e3..34a9551 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/fixtures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/fixtures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/helpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/helpers.cpython-311.pyc index 10bd2fa..2d5c452 100644 Binary files a/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/helpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/mako/testing/__pycache__/helpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/__init__.cpython-311.pyc index 05618a4..1f490a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/_native.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/_native.cpython-311.pyc index 1d3be90..e6434bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/_native.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/markupsafe/__pycache__/_native.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/__init__.cpython-311.pyc index 5402485..16bd0c3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/decoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/decoders.cpython-311.pyc index 5f01dfd..7d9b65d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/decoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/decoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/exceptions.cpython-311.pyc index 3ad5b6d..f53e252 100644 Binary files a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/multipart.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/multipart.cpython-311.pyc index 53c9d60..d734642 100644 Binary files a/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/multipart.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/multipart/__pycache__/multipart.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/__pycache__/__init__.cpython-311.pyc index 6676a90..c6a4691 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/_internal/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/_internal/__pycache__/__init__.cpython-311.pyc index 529b611..e94bdd9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/_internal/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/_internal/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/severity/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/severity/__pycache__/__init__.cpython-311.pyc index 99c41ad..fe88037 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/severity/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/_logs/severity/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/attributes/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/attributes/__pycache__/__init__.cpython-311.pyc index 72fe77a..2281928 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/attributes/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/attributes/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/__pycache__/__init__.cpython-311.pyc index 362d799..d3606b1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/propagation/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/propagation/__pycache__/__init__.cpython-311.pyc index 51f120f..50dbf3d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/propagation/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/baggage/propagation/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/__init__.cpython-311.pyc index 372c8aa..2c91475 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/context.cpython-311.pyc index 4dcbc1c..bfa8ded 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/contextvars_context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/contextvars_context.cpython-311.pyc index 220040b..8241b61 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/contextvars_context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/context/__pycache__/contextvars_context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/environment_variables/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/environment_variables/__pycache__/__init__.cpython-311.pyc index 651f4ac..401ff4d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/environment_variables/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/environment_variables/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/__pycache__/__init__.cpython-311.pyc index 9cbb749..f9279b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/__init__.cpython-311.pyc index c45e531..7a63113 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/instrument.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/instrument.cpython-311.pyc index 4e606c0..6149c54 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/instrument.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/instrument.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/observation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/observation.cpython-311.pyc index 11c8275..c2099ea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/observation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/metrics/_internal/__pycache__/observation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagate/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagate/__pycache__/__init__.cpython-311.pyc index 3eac794..2b7c69b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagate/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagate/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/_envcarrier.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/_envcarrier.cpython-311.pyc index 13809c5..825460a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/_envcarrier.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/_envcarrier.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/composite.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/composite.cpython-311.pyc index d84edc5..fa23f5c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/composite.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/composite.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/textmap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/textmap.cpython-311.pyc index cab0618..b156f4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/textmap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/propagators/__pycache__/textmap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/__init__.cpython-311.pyc index cbdd44a..e53e52e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/span.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/span.cpython-311.pyc index d551855..dfda678 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/span.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/span.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/status.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/status.cpython-311.pyc index 5e92d9d..452ad3d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/status.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/__pycache__/status.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/__init__.cpython-311.pyc index 368c0c2..3446023 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/tracecontext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/tracecontext.cpython-311.pyc index 74cff10..4ddfd4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/tracecontext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/trace/propagation/__pycache__/tracecontext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_decorator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_decorator.cpython-311.pyc index ac14ac5..1665172 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_decorator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_decorator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_importlib_metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_importlib_metadata.cpython-311.pyc index 5a7209e..9aa94e5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_importlib_metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_importlib_metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_once.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_once.cpython-311.pyc index b5592fd..b1d566f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_once.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_once.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_providers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_providers.cpython-311.pyc index 48bc2eb..f516ca2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_providers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/_providers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/re.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/re.cpython-311.pyc index 870dd48..0fc4a38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/re.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/re.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/types.cpython-311.pyc index e16ba3b..f1def5e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/util/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/opentelemetry/version/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/opentelemetry/version/__pycache__/__init__.cpython-311.pyc index 9919689..bffb325 100644 Binary files a/server/.venv/lib/python3.11/site-packages/opentelemetry/version/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/opentelemetry/version/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/__init__.cpython-311.pyc index 81216cc..2b55b87 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_elffile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_elffile.cpython-311.pyc index b681c31..1427c05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_elffile.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_elffile.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_manylinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_manylinux.cpython-311.pyc index 5ab83a5..7f2d8b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_manylinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_manylinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_musllinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_musllinux.cpython-311.pyc index 2a357ce..6a22986 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_musllinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_musllinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_parser.cpython-311.pyc index ac62594..51fc185 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_ranges.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_ranges.cpython-311.pyc index f81649e..aa13841 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_ranges.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_ranges.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_structures.cpython-311.pyc index 7376ae7..3a50df3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_structures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_structures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_tokenizer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_tokenizer.cpython-311.pyc index f3c7552..8aec03b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_tokenizer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/_tokenizer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/dependency_groups.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/dependency_groups.cpython-311.pyc index bd6ace8..19aa612 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/dependency_groups.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/dependency_groups.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/direct_url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/direct_url.cpython-311.pyc index 19d682a..23d0125 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/direct_url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/direct_url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/errors.cpython-311.pyc index f84d26c..7fc9b29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/markers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/markers.cpython-311.pyc index 17577f7..1ff71ab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/markers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/markers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/metadata.cpython-311.pyc index 8bbf54e..47a25cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/pylock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/pylock.cpython-311.pyc index 2233a45..8608023 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/pylock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/pylock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/ranges.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/ranges.cpython-311.pyc index beaaadb..24a00aa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/ranges.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/ranges.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/requirements.cpython-311.pyc index 2430e12..d04b733 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/specifiers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/specifiers.cpython-311.pyc index da11440..e35e2cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/specifiers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/specifiers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/tags.cpython-311.pyc index 803e65a..d1a931a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/tags.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/tags.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/utils.cpython-311.pyc index 72f7048..268c9b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/version.cpython-311.pyc index f858665..f5d1acd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/__init__.cpython-311.pyc index 0a76092..684f1c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/_spdx.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/_spdx.cpython-311.pyc index ea60cd0..a6795da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/_spdx.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/packaging/licenses/__pycache__/_spdx.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip-26.2.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/pip-26.2.1.dist-info/RECORD index 93b05e7..3833fff 100644 --- a/server/.venv/lib/python3.11/site-packages/pip-26.2.1.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/pip-26.2.1.dist-info/RECORD @@ -1,6 +1,6 @@ -../../../bin/pip,sha256=43JUuDaSiWVAmcWkPme_V9Hy95RdaEfRYpwQVJ5jJfM,248 -../../../bin/pip3,sha256=43JUuDaSiWVAmcWkPme_V9Hy95RdaEfRYpwQVJ5jJfM,248 -../../../bin/pip3.11,sha256=43JUuDaSiWVAmcWkPme_V9Hy95RdaEfRYpwQVJ5jJfM,248 +../../../bin/pip,sha256=8oriHmKyuWKLXC85jHYVBQS_D152aqjQw_aZtvJ-1_4,252 +../../../bin/pip3,sha256=8oriHmKyuWKLXC85jHYVBQS_D152aqjQw_aZtvJ-1_4,252 +../../../bin/pip3.11,sha256=8oriHmKyuWKLXC85jHYVBQS_D152aqjQw_aZtvJ-1_4,252 pip-26.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 pip-26.2.1.dist-info/METADATA,sha256=OlYQBYIoQfLEX0QvbHp1BRcsjDdsn-J02HbIrJEpaMs,4617 pip-26.2.1.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__init__.cpython-311.pyc index 2e1972a..fd96d8d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__main__.cpython-311.pyc index 2688bd2..4216bb0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__pip-runner__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__pip-runner__.cpython-311.pyc index baec0f7..c11691d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__pip-runner__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/__pycache__/__pip-runner__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/__init__.cpython-311.pyc index 990b191..015d413 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/cache.cpython-311.pyc index 3ebec7b..ce72eab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/configuration.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/configuration.cpython-311.pyc index 5684cfc..bb01670 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/configuration.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/configuration.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/exceptions.cpython-311.pyc index dedd6c6..0c7395a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/main.cpython-311.pyc index 652ea4a..591cb89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/pyproject.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/pyproject.cpython-311.pyc index 2c73254..71499ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/pyproject.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/pyproject.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/self_outdated_check.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/self_outdated_check.cpython-311.pyc index 1595404..e363f60 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/self_outdated_check.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/self_outdated_check.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/wheel_builder.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/wheel_builder.cpython-311.pyc index ed78963..35259a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/wheel_builder.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/__pycache__/wheel_builder.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/__init__.cpython-311.pyc index 7a387b0..79245a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/base.cpython-311.pyc index 31a58fa..4573ef8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/installer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/installer.cpython-311.pyc index 8e018d2..3eba5ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/installer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/installer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/noop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/noop.cpython-311.pyc index d18234c..223cd3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/noop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/noop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/venv.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/venv.cpython-311.pyc index 98b81fd..31845e0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/venv.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/venv.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/virtual.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/virtual.cpython-311.pyc index aaeedf8..31068a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/virtual.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/build_env/__pycache__/virtual.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/__init__.cpython-311.pyc index b327fb6..10ff7d6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/autocompletion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/autocompletion.cpython-311.pyc index 764bcf5..214bc50 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/autocompletion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/autocompletion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/base_command.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/base_command.cpython-311.pyc index c7f99a1..95673f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/base_command.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/base_command.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/cmdoptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/cmdoptions.cpython-311.pyc index c7629f8..7261f62 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/cmdoptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/cmdoptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/command_context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/command_context.cpython-311.pyc index fe2d3da..380d69f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/command_context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/command_context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/index_command.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/index_command.cpython-311.pyc index 13f7e7c..02f5378 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/index_command.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/index_command.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main.cpython-311.pyc index 8576e46..464f73d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main_parser.cpython-311.pyc index d00851a..28cf1df 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/main_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/parser.cpython-311.pyc index c613724..4291239 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/progress_bars.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/progress_bars.cpython-311.pyc index 83a953b..e07fae2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/progress_bars.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/progress_bars.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/req_command.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/req_command.cpython-311.pyc index 599c45c..d4b3c40 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/req_command.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/req_command.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/spinners.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/spinners.cpython-311.pyc index da0af32..0a5585f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/spinners.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/spinners.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/status_codes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/status_codes.cpython-311.pyc index 359254f..e73b30e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/status_codes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/cli/__pycache__/status_codes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/__init__.cpython-311.pyc index c0bd7ff..4fed410 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/cache.cpython-311.pyc index f9ac224..3669887 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/check.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/check.cpython-311.pyc index f0c6f4e..1e77617 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/check.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/check.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/completion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/completion.cpython-311.pyc index fd870fb..607b9f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/completion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/completion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/configuration.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/configuration.cpython-311.pyc index 1c4b9fa..c72f70d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/configuration.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/configuration.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/debug.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/debug.cpython-311.pyc index 6df1da5..8ebad40 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/debug.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/debug.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/download.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/download.cpython-311.pyc index aaf23ba..e6e9574 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/download.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/download.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/freeze.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/freeze.cpython-311.pyc index 60e9117..34c27af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/freeze.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/freeze.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/hash.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/hash.cpython-311.pyc index 1b2ce8d..704a9cd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/hash.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/hash.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/help.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/help.cpython-311.pyc index 7fab162..17bc847 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/help.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/help.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/index.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/index.cpython-311.pyc index d583191..4e650f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/index.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/index.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/inspect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/inspect.cpython-311.pyc index 9cc20d6..f52adf0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/inspect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/inspect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/install.cpython-311.pyc index 42e4e78..94d338c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/install.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/install.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/list.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/list.cpython-311.pyc index a4e0c10..be7afa8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/list.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/list.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/lock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/lock.cpython-311.pyc index 275ab49..6723015 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/lock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/lock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/search.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/search.cpython-311.pyc index 8d787b1..9a3f2ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/search.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/search.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/show.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/show.cpython-311.pyc index ef7e79d..fd172bc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/show.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/show.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/uninstall.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/uninstall.cpython-311.pyc index 7df4821..5cc1d12 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/uninstall.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/uninstall.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/wheel.cpython-311.pyc index 87a34b2..1120daa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/commands/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/__init__.cpython-311.pyc index bdd037b..bede5bb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/base.cpython-311.pyc index 86f8150..12a3b90 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/installed.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/installed.cpython-311.pyc index f938499..c393a42 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/installed.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/installed.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/sdist.cpython-311.pyc index e5e1d88..ab11bc6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/sdist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/sdist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/wheel.cpython-311.pyc index ca4f92a..c6c3b3b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/distributions/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/__init__.cpython-311.pyc index 56de86b..d794eb2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/collector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/collector.cpython-311.pyc index 80d83e1..18d4645 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/collector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/collector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/package_finder.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/package_finder.cpython-311.pyc index f1c590c..1a8b297 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/package_finder.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/package_finder.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/sources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/sources.cpython-311.pyc index d5495e7..5f01983 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/sources.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/index/__pycache__/sources.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/__init__.cpython-311.pyc index 522c673..a5875fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_distutils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_distutils.cpython-311.pyc index fb9c2d3..f8c1184 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_distutils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_distutils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_sysconfig.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_sysconfig.cpython-311.pyc index 479fe25..e4f4943 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_sysconfig.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/_sysconfig.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/base.cpython-311.pyc index 0ea7451..654b5ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/locations/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/__init__.cpython-311.pyc index e2c6db5..5bde642 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/_json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/_json.cpython-311.pyc index bca4e2a..c4ab669 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/_json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/_json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/base.cpython-311.pyc index 3a8d0ba..82532d9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/pkg_resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/pkg_resources.cpython-311.pyc index 380c561..5663a51 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/pkg_resources.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/__pycache__/pkg_resources.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/__init__.cpython-311.pyc index 766819f..61f5028 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_compat.cpython-311.pyc index 47be3f5..0c6c70f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_dists.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_dists.cpython-311.pyc index 7c121cb..06be8a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_dists.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_dists.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_envs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_envs.cpython-311.pyc index 72f4e72..87ca5ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_envs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/metadata/importlib/__pycache__/_envs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/__init__.cpython-311.pyc index 09d5f23..33f85ce 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/candidate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/candidate.cpython-311.pyc index 7748772..36a7454 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/candidate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/candidate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/direct_url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/direct_url.cpython-311.pyc index 18cf793..e6480e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/direct_url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/direct_url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/format_control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/format_control.cpython-311.pyc index 4a741e8..2daee8f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/format_control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/format_control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/index.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/index.cpython-311.pyc index 6a0459d..e55172c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/index.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/index.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/installation_report.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/installation_report.cpython-311.pyc index 3827225..2f43e50 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/installation_report.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/installation_report.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/link.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/link.cpython-311.pyc index 42695f5..afbfd7d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/link.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/link.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/release_control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/release_control.cpython-311.pyc index 8a820f4..b5d669b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/release_control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/release_control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/scheme.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/scheme.cpython-311.pyc index 30c71db..0de839a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/scheme.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/scheme.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/search_scope.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/search_scope.cpython-311.pyc index 0cdfd0a..289a6ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/search_scope.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/search_scope.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/selection_prefs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/selection_prefs.cpython-311.pyc index 36c99f0..b16cf7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/selection_prefs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/selection_prefs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/target_python.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/target_python.cpython-311.pyc index f4e2e4b..cfab1c3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/target_python.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/target_python.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/wheel.cpython-311.pyc index d2f28cd..8014726 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/models/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/__init__.cpython-311.pyc index 482929d..ba7ffbf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/auth.cpython-311.pyc index 2ef3cd2..9ffc0da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/cache.cpython-311.pyc index f2c7fa0..f5308b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/download.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/download.cpython-311.pyc index e898cf6..3b55ba8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/download.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/download.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/lazy_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/lazy_wheel.cpython-311.pyc index 7befbc7..0d1c342 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/lazy_wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/lazy_wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/session.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/session.cpython-311.pyc index a690507..8307357 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/session.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/session.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/utils.cpython-311.pyc index 71cac4b..85b550b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/xmlrpc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/xmlrpc.cpython-311.pyc index 6f78b02..1a6d2ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/xmlrpc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/network/__pycache__/xmlrpc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/__init__.cpython-311.pyc index 08f7b8c..63faf7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/check.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/check.cpython-311.pyc index fac7f5e..3741184 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/check.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/check.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/freeze.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/freeze.cpython-311.pyc index 336c351..e4ddb92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/freeze.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/freeze.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/prepare.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/prepare.cpython-311.pyc index 2af347d..4429b52 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/prepare.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/__pycache__/prepare.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/__init__.cpython-311.pyc index f7a0fd0..564cccc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/build_tracker.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/build_tracker.cpython-311.pyc index a0d04fa..2c6f912 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/build_tracker.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/build_tracker.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata.cpython-311.pyc index 7ded0da..15d602c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata_editable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata_editable.cpython-311.pyc index 589a6c4..2059285 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata_editable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/metadata_editable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel.cpython-311.pyc index 5f6af48..af31954 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel_editable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel_editable.cpython-311.pyc index 665afbf..f04c09a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel_editable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/build/__pycache__/wheel_editable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/__init__.cpython-311.pyc index dd12a54..98f29c1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/wheel.cpython-311.pyc index b245d8d..be91379 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/__init__.cpython-311.pyc index ada9688..66f7907 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/constructors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/constructors.cpython-311.pyc index 4ee1811..57d73e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/constructors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/constructors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/pep723.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/pep723.cpython-311.pyc index e8efd05..1bdf88b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/pep723.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/pep723.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_dependency_group.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_dependency_group.cpython-311.pyc index c2d98b4..4f94e17 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_dependency_group.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_dependency_group.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_file.cpython-311.pyc index 718e4f6..4cadbc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_file.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_file.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_install.cpython-311.pyc index bc4b63f..1f60c94 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_install.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_install.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_set.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_set.cpython-311.pyc index ecf31e1..0ac6470 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_set.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_set.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_uninstall.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_uninstall.cpython-311.pyc index 1baad68..4f81b52 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_uninstall.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/req/__pycache__/req_uninstall.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/__init__.cpython-311.pyc index 04fbc63..c0daf16 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/base.cpython-311.pyc index bc0ee4a..ff3cbc9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/__init__.cpython-311.pyc index 2c25a7c..53359c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/resolver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/resolver.cpython-311.pyc index c940b21..0a9f330 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/resolver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/legacy/__pycache__/resolver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/__init__.cpython-311.pyc index b31937d..4c1e474 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/base.cpython-311.pyc index 53bbbea..588ff84 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-311.pyc index 55b7514..33a3fb7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/candidates.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-311.pyc index 003b44a..d68bf8c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/factory.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-311.pyc index b190198..21684fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/found_candidates.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-311.pyc index ed527bb..f4f57fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/provider.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/reporter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/reporter.cpython-311.pyc index c777e94..26a5772 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/reporter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/reporter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-311.pyc index 307da9f..96ebeb9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/resolver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/resolver.cpython-311.pyc index 196379f..07bef99 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/resolver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/resolution/resolvelib/__pycache__/resolver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/__init__.cpython-311.pyc index 8c18db1..2251ce5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_jaraco_text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_jaraco_text.cpython-311.pyc index b91a1fa..fd4f9ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_jaraco_text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_jaraco_text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_log.cpython-311.pyc index b1884b3..ff45317 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/appdirs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/appdirs.cpython-311.pyc index e9c13e4..70c8c85 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/appdirs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/appdirs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compat.cpython-311.pyc index 652d9b9..9559e64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compatibility_tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compatibility_tags.cpython-311.pyc index ebe9225..d692467 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compatibility_tags.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/compatibility_tags.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/datetime.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/datetime.cpython-311.pyc index 32386da..3894822 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/datetime.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/datetime.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/deprecation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/deprecation.cpython-311.pyc index 177780f..6844052 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/deprecation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/deprecation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/direct_url_helpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/direct_url_helpers.cpython-311.pyc index 2760f33..2a6679e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/direct_url_helpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/direct_url_helpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/egg_link.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/egg_link.cpython-311.pyc index 58894eb..efe433f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/egg_link.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/egg_link.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/entrypoints.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/entrypoints.cpython-311.pyc index c1d6b26..1c6f4e8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/entrypoints.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/entrypoints.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filesystem.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filesystem.cpython-311.pyc index ae058d6..8b40099 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filesystem.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filesystem.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filetypes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filetypes.cpython-311.pyc index 49b2da4..b629455 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filetypes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/filetypes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/glibc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/glibc.cpython-311.pyc index 2bf1bee..079b995 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/glibc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/glibc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/hashes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/hashes.cpython-311.pyc index 413fff7..a000d05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/hashes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/hashes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/logging.cpython-311.pyc index d91081d..6e5a87b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/logging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/logging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/misc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/misc.cpython-311.pyc index 1cd58eb..2bc683d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/misc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/misc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/packaging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/packaging.cpython-311.pyc index 41da29a..af3f93f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/packaging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/packaging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/pylock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/pylock.cpython-311.pyc index 53cd360..7eddaa8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/pylock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/pylock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/retry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/retry.cpython-311.pyc index 9aa5e31..2394013 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/retry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/retry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/subprocess.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/subprocess.cpython-311.pyc index 6940f92..deb73a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/subprocess.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/subprocess.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/temp_dir.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/temp_dir.cpython-311.pyc index 05babad..eef3272 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/temp_dir.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/temp_dir.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/unpacking.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/unpacking.cpython-311.pyc index 93311d7..1e362e6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/unpacking.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/unpacking.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/urls.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/urls.cpython-311.pyc index ef0b3bc..1d34720 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/urls.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/urls.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/virtualenv.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/virtualenv.cpython-311.pyc index a5b561f..fcd1bd1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/virtualenv.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/virtualenv.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/wheel.cpython-311.pyc index b239071..78f96a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/utils/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/__init__.cpython-311.pyc index 5baa230..41c8bf8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/bazaar.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/bazaar.cpython-311.pyc index a6a1f77..8f8d5b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/bazaar.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/bazaar.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/git.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/git.cpython-311.pyc index 076dfc4..a7285c2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/git.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/git.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/mercurial.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/mercurial.cpython-311.pyc index 0b943eb..13f614b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/mercurial.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/mercurial.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/subversion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/subversion.cpython-311.pyc index 5a9f12d..2c353ab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/subversion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/subversion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/versioncontrol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/versioncontrol.cpython-311.pyc index a86cc08..8841a72 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/versioncontrol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_internal/vcs/__pycache__/versioncontrol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/__pycache__/__init__.cpython-311.pyc index 24d1f67..e78cf0a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/__init__.cpython-311.pyc index a193962..bd44b1f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/_cmd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/_cmd.cpython-311.pyc index d211751..cc275e1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/_cmd.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/_cmd.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/adapter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/adapter.cpython-311.pyc index f186ec9..8db0282 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/adapter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/adapter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/cache.cpython-311.pyc index f06559b..a701740 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/controller.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/controller.cpython-311.pyc index 4a974e6..e01899e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/controller.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/controller.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/filewrapper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/filewrapper.cpython-311.pyc index 2dacb4a..ff824de 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/filewrapper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/filewrapper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/heuristics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/heuristics.cpython-311.pyc index 854cd66..6782ecd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/heuristics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/heuristics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/serialize.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/serialize.cpython-311.pyc index 12f4b31..fa5d3f4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/serialize.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/serialize.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/wrapper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/wrapper.cpython-311.pyc index b1fecb5..3518c7c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/wrapper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/__pycache__/wrapper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/__init__.cpython-311.pyc index dc2714b..3a15e39 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/file_cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/file_cache.cpython-311.pyc index 12b5ba7..6b3b9e2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/file_cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/file_cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/redis_cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/redis_cache.cpython-311.pyc index 62ad6a4..0ca2c25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/redis_cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/cachecontrol/caches/__pycache__/redis_cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__init__.cpython-311.pyc index 2ee88a6..29685fb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__main__.cpython-311.pyc index 15cb77d..506ba80 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-311.pyc index 04f49a9..c03719c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/certifi/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/__init__.cpython-311.pyc index 3238708..e12e1f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/compat.cpython-311.pyc index 311a402..6bbc22c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/resources.cpython-311.pyc index 6390e9b..8176af4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/resources.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/resources.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/scripts.cpython-311.pyc index d0727c6..1d5b553 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/scripts.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/scripts.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/util.cpython-311.pyc index 265794c..b57c836 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distlib/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__init__.cpython-311.pyc index ef7f6dd..aa1dbc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__main__.cpython-311.pyc index 61c04d2..cbe8446 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/distro.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/distro.cpython-311.pyc index 117351b..e234867 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/distro.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/distro/__pycache__/distro.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__init__.cpython-311.pyc index 790af31..a508482 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__main__.cpython-311.pyc index 8059b00..3641f7b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/cli.cpython-311.pyc index 2242ae5..bd4e4ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/codec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/codec.cpython-311.pyc index ee2f42c..eaad8b0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/codec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/codec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/compat.cpython-311.pyc index a593710..453a51a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/core.cpython-311.pyc index 6efb16c..77b37b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/idnadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/idnadata.cpython-311.pyc index 8724134..8f2c7a4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/idnadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/idnadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/intranges.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/intranges.cpython-311.pyc index afa92dd..3add500 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/intranges.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/intranges.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/package_data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/package_data.cpython-311.pyc index 7dedcb4..8ce2c99 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/package_data.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/package_data.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/uts46data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/uts46data.cpython-311.pyc index d9f5ead..0eadbae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/uts46data.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/idna/__pycache__/uts46data.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/__init__.cpython-311.pyc index 3a1cc09..3568cac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/exceptions.cpython-311.pyc index ffd57aa..c2b3e98 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/ext.cpython-311.pyc index 59e9fc5..11c5ca6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/fallback.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/fallback.cpython-311.pyc index 2b0a4d1..4bd0016 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/fallback.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/msgpack/__pycache__/fallback.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/__init__.cpython-311.pyc index 8bde427..a12eea0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc index 0827eb0..0b66ab1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc index 58737a7..0e6f449 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc index f07a785..6dd00ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_parser.cpython-311.pyc index 57880b2..86bb171 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_structures.cpython-311.pyc index 64c4fc1..e78e633 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_structures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_structures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc index f973e00..fcf23e5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/dependency_groups.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/dependency_groups.cpython-311.pyc index 5148e3b..c88642d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/dependency_groups.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/dependency_groups.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/direct_url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/direct_url.cpython-311.pyc index cccf681..81c4c74 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/direct_url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/direct_url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/errors.cpython-311.pyc index b240c10..6761150 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/markers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/markers.cpython-311.pyc index 3f8beb1..25743ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/markers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/markers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/metadata.cpython-311.pyc index f1bc6c4..7e9ecad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/pylock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/pylock.cpython-311.pyc index 876fe1c..6e315a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/pylock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/pylock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/requirements.cpython-311.pyc index 92682b4..2704277 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc index 673787f..2489f84 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/tags.cpython-311.pyc index d6f1dfc..184381c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/tags.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/tags.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/utils.cpython-311.pyc index 40229d4..03af7c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/version.cpython-311.pyc index 4459e07..4f37e65 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc index bc33b4c..cdc79ad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc index 8a2bcc8..ddc0899 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pkg_resources/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pkg_resources/__pycache__/__init__.cpython-311.pyc index 5bc50ac..bc40fb2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pkg_resources/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pkg_resources/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc index 0bc65d5..3c26e4c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc index e07e793..a66b7e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/_xdg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/_xdg.cpython-311.pyc index 862f22c..9a66bb9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/_xdg.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/_xdg.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/android.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/android.cpython-311.pyc index 83da593..bf2c6b5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/android.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/android.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/api.cpython-311.pyc index fbcb9d4..a92c6ad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc index d2f3ff1..302ad61 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc index 3266f68..518b91a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/version.cpython-311.pyc index ea2586c..247d1f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc index 0ee6ab2..ec7f57b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__init__.cpython-311.pyc index 1532fe8..f3b461a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__main__.cpython-311.pyc index 262162e..05bfe74 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/console.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/console.cpython-311.pyc index 76fa2d1..82e089c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/console.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/console.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/filter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/filter.cpython-311.pyc index 1aa70ff..9b845ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/filter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/filter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/formatter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/formatter.cpython-311.pyc index f3415f3..f9a5657 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/formatter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/formatter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/lexer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/lexer.cpython-311.pyc index 950ba2c..fd75475 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/lexer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/lexer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/modeline.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/modeline.cpython-311.pyc index eb880d0..fb0387b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/modeline.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/modeline.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/plugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/plugin.cpython-311.pyc index 0514f15..32f5340 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/plugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/plugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/regexopt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/regexopt.cpython-311.pyc index 64c827d..daf4a03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/regexopt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/regexopt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/scanner.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/scanner.cpython-311.pyc index 3486972..b475ffb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/scanner.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/scanner.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/sphinxext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/sphinxext.cpython-311.pyc index e5091f0..9976684 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/sphinxext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/sphinxext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/style.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/style.cpython-311.pyc index 2cb3a5b..322ec04 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/style.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/style.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/token.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/token.cpython-311.pyc index 8d9b485..e0424d0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/token.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/token.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/unistring.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/unistring.cpython-311.pyc index df0f152..027946e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/unistring.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/unistring.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/util.cpython-311.pyc index cc05f67..fed66ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/filters/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/filters/__pycache__/__init__.cpython-311.pyc index f882e63..1240c89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/filters/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/filters/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/__init__.cpython-311.pyc index 0b47da0..37d2559 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/_mapping.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/_mapping.cpython-311.pyc index 0db77bc..2537a10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/_mapping.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/formatters/__pycache__/_mapping.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/__init__.cpython-311.pyc index afd0113..1dd2c9a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/_mapping.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/_mapping.cpython-311.pyc index 5ceb7ab..34ab3c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/_mapping.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/_mapping.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/python.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/python.cpython-311.pyc index 7fb1973..ab3fa8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/python.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/lexers/__pycache__/python.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/__init__.cpython-311.pyc index 59d76e6..bb5f2f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/_mapping.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/_mapping.cpython-311.pyc index 7ae8df3..1714dc9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/_mapping.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pygments/styles/__pycache__/_mapping.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/__init__.cpython-311.pyc index c1c783c..8642ead 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/_impl.cpython-311.pyc index 30afcdc..ccb2ff0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/__pycache__/_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/__init__.cpython-311.pyc index 4205711..840c60e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/_in_process.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/_in_process.cpython-311.pyc index f1d8c89..7d12c00 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/_in_process.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/pyproject_hooks/_in_process/__pycache__/_in_process.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__init__.cpython-311.pyc index ce78afc..fc1df4e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__version__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__version__.cpython-311.pyc index eb8d131..3278973 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__version__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/__version__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_internal_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_internal_utils.cpython-311.pyc index b5e7905..cb4ed52 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_internal_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_internal_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_types.cpython-311.pyc index 540240f..66f18f2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/adapters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/adapters.cpython-311.pyc index cc55a59..e009374 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/adapters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/adapters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/api.cpython-311.pyc index 6a3b187..30e003c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/auth.cpython-311.pyc index be57a81..a0fc74f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/certs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/certs.cpython-311.pyc index 556a106..284227f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/certs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/certs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/compat.cpython-311.pyc index 38caadb..48cf18e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/cookies.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/cookies.cpython-311.pyc index f93e7a9..7dfeb5c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/cookies.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/cookies.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/exceptions.cpython-311.pyc index c07d600..0eb2260 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/help.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/help.cpython-311.pyc index fd1f8e2..bddaa6d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/help.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/help.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/hooks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/hooks.cpython-311.pyc index 78682ba..ed2178b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/hooks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/hooks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/models.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/models.cpython-311.pyc index 7d98ebb..54b5a06 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/models.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/models.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/packages.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/packages.cpython-311.pyc index 501c15f..c8a32c5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/packages.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/packages.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/sessions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/sessions.cpython-311.pyc index de242d3..154143a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/sessions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/sessions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/status_codes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/status_codes.cpython-311.pyc index 2e5e373..c18697d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/status_codes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/status_codes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/structures.cpython-311.pyc index 5b6b414..1f39b4c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/structures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/structures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/utils.cpython-311.pyc index b467244..95d0574 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/requests/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/__init__.cpython-311.pyc index af71f61..8bee0ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/providers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/providers.cpython-311.pyc index 2f47727..df0a14a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/providers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/providers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/reporters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/reporters.cpython-311.pyc index 9cd843f..e6a206e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/reporters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/reporters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/structs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/structs.cpython-311.pyc index f21b060..1cfd74f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/structs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/__pycache__/structs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/__init__.cpython-311.pyc index ef46d6d..b4a1966 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/abstract.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/abstract.cpython-311.pyc index 57114d8..8f9d67d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/abstract.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/abstract.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/criterion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/criterion.cpython-311.pyc index 87d3ce7..f04d165 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/criterion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/criterion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/exceptions.cpython-311.pyc index b543231..4a63523 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/resolution.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/resolution.cpython-311.pyc index 3fb5f0a..43cbf73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/resolution.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/resolvelib/resolvers/__pycache__/resolution.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__init__.cpython-311.pyc index f578b12..adb8f99 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__main__.cpython-311.pyc index f2809dc..9bb1869 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_cell_widths.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_cell_widths.cpython-311.pyc index ef08734..39e28ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_cell_widths.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_cell_widths.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_codes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_codes.cpython-311.pyc index ddee8d7..62271d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_codes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_codes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_replace.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_replace.cpython-311.pyc index 505f0a9..134e958 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_replace.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_emoji_replace.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_export_format.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_export_format.cpython-311.pyc index 04277f5..55548c6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_export_format.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_export_format.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_extension.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_extension.cpython-311.pyc index 822ff9e..fb52d02 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_extension.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_extension.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_fileno.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_fileno.cpython-311.pyc index e3560cf..53e3986 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_fileno.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_fileno.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_inspect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_inspect.cpython-311.pyc index 45b5321..1d909e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_inspect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_inspect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_log_render.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_log_render.cpython-311.pyc index 7ca5cff..23249b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_log_render.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_log_render.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_loop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_loop.cpython-311.pyc index fd97d53..6e9e840 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_loop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_loop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_null_file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_null_file.cpython-311.pyc index 30d2d89..6c1aee8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_null_file.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_null_file.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_palettes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_palettes.cpython-311.pyc index 970c644..09ee53d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_palettes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_palettes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_pick.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_pick.cpython-311.pyc index ba6cfba..773d446 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_pick.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_pick.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_ratio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_ratio.cpython-311.pyc index 98b6458..5b706a1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_ratio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_ratio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_spinners.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_spinners.cpython-311.pyc index 411f23e..1c2a77a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_spinners.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_spinners.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_stack.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_stack.cpython-311.pyc index 61c718c..8f4403d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_stack.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_stack.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_timer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_timer.cpython-311.pyc index 7841888..923abd4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_timer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_timer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_win32_console.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_win32_console.cpython-311.pyc index 932cc1a..ec5ccfa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_win32_console.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_win32_console.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows.cpython-311.pyc index 0727157..1d6e16b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows_renderer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows_renderer.cpython-311.pyc index 85c45ee..c5f5068 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows_renderer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_windows_renderer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_wrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_wrap.cpython-311.pyc index d0191d8..71ce90e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_wrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/_wrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/abc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/abc.cpython-311.pyc index 14ab38d..19d3599 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/abc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/abc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/align.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/align.cpython-311.pyc index 46a8949..b00aeda 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/align.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/align.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/ansi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/ansi.cpython-311.pyc index f90fdbe..417e948 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/ansi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/ansi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/bar.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/bar.cpython-311.pyc index 0f44c3d..29b81bb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/bar.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/bar.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/box.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/box.cpython-311.pyc index df1deb2..d42c31c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/box.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/box.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/cells.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/cells.cpython-311.pyc index dd49125..e5cd654 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/cells.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/cells.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color.cpython-311.pyc index 6cea09d..dc74b44 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color_triplet.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color_triplet.cpython-311.pyc index ff0fab0..44f8f64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color_triplet.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/color_triplet.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/columns.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/columns.cpython-311.pyc index 86b5bb9..d131af0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/columns.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/columns.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/console.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/console.cpython-311.pyc index 20a1a4c..ae70dec 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/console.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/console.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/constrain.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/constrain.cpython-311.pyc index d374e20..e211dc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/constrain.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/constrain.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/containers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/containers.cpython-311.pyc index 244dbfb..92c48e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/containers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/containers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/control.cpython-311.pyc index f871308..0fda94a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/default_styles.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/default_styles.cpython-311.pyc index d755150..60f8c76 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/default_styles.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/default_styles.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/diagnose.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/diagnose.cpython-311.pyc index 525f8e7..0b1a708 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/diagnose.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/diagnose.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/emoji.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/emoji.cpython-311.pyc index 75fd502..512a4cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/emoji.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/emoji.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/errors.cpython-311.pyc index b7987dc..f99022b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/file_proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/file_proxy.cpython-311.pyc index c53fba1..596d15c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/file_proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/file_proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/filesize.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/filesize.cpython-311.pyc index 2d3cf4c..66204a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/filesize.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/filesize.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/highlighter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/highlighter.cpython-311.pyc index 96abfc3..778ce4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/highlighter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/highlighter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/json.cpython-311.pyc index 0b4e84c..7b95152 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/jupyter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/jupyter.cpython-311.pyc index 49f0343..7c94d2f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/jupyter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/jupyter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/layout.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/layout.cpython-311.pyc index de2e184..85b1861 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/layout.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/layout.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live.cpython-311.pyc index 097230f..72161be 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live_render.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live_render.cpython-311.pyc index c25630e..09bb6dc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live_render.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/live_render.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/logging.cpython-311.pyc index 5b38c1d..af97d97 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/logging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/logging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/markup.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/markup.cpython-311.pyc index bb27db1..9a033bc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/markup.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/markup.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/measure.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/measure.cpython-311.pyc index 373a3eb..5aabd9b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/measure.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/measure.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/padding.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/padding.cpython-311.pyc index 687e654..382d70d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/padding.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/padding.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pager.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pager.cpython-311.pyc index e165020..d656f25 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pager.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pager.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/palette.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/palette.cpython-311.pyc index 18d63da..593fb5a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/palette.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/palette.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/panel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/panel.cpython-311.pyc index d89489d..5ad5fd7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/panel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/panel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pretty.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pretty.cpython-311.pyc index 56449c0..ab3f80b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pretty.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/pretty.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress.cpython-311.pyc index 8e46e5f..13efd17 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress_bar.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress_bar.cpython-311.pyc index 8e74fb2..3dc5820 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress_bar.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/progress_bar.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/prompt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/prompt.cpython-311.pyc index b043e29..8dac951 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/prompt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/prompt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/protocol.cpython-311.pyc index 8e6be41..30d5c4e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/region.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/region.cpython-311.pyc index c8cdced..d99e4b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/region.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/region.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/repr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/repr.cpython-311.pyc index ccbedbe..b3e16cc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/repr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/repr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/rule.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/rule.cpython-311.pyc index b4a9834..20b24b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/rule.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/rule.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/scope.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/scope.cpython-311.pyc index 2c47324..57b268c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/scope.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/scope.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/screen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/screen.cpython-311.pyc index 65fef85..0ab05ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/screen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/screen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/segment.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/segment.cpython-311.pyc index 3bbcc70..eddafdd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/segment.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/segment.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/spinner.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/spinner.cpython-311.pyc index b480727..4974305 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/spinner.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/spinner.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/status.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/status.cpython-311.pyc index 5580ebc..7f06ca7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/status.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/status.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/style.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/style.cpython-311.pyc index 9a12229..2f8093b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/style.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/style.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/styled.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/styled.cpython-311.pyc index 5f95df0..35d4f9d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/styled.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/styled.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/syntax.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/syntax.cpython-311.pyc index b93cfe5..b3f5020 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/syntax.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/syntax.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/table.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/table.cpython-311.pyc index 7004c35..d0d1097 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/table.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/table.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/terminal_theme.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/terminal_theme.cpython-311.pyc index 806419d..e671379 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/terminal_theme.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/terminal_theme.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/text.cpython-311.pyc index cb14263..2eb0e53 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/theme.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/theme.cpython-311.pyc index f6e29cd..87d6f5f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/theme.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/theme.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/themes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/themes.cpython-311.pyc index 11b4622..6501939 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/themes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/themes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/traceback.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/traceback.cpython-311.pyc index 6de2b48..6b940af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/traceback.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/traceback.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/tree.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/tree.cpython-311.pyc index 15baeee..8d71e89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/tree.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/rich/__pycache__/tree.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/__init__.cpython-311.pyc index 7f7253e..48d3c39 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_parser.cpython-311.pyc index 7547829..94a6d9c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_re.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_re.cpython-311.pyc index d2c8121..a040bc8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_re.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_re.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_types.cpython-311.pyc index c4c0197..c867b82 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli/__pycache__/_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/__init__.cpython-311.pyc index e2b7cc7..3e2ea24 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/_writer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/_writer.cpython-311.pyc index 25f74d6..ed37df4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/_writer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/tomli_w/__pycache__/_writer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/__init__.cpython-311.pyc index cc8d434..b41debd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_api.cpython-311.pyc index cf4d1b4..ee5c5ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_macos.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_macos.cpython-311.pyc index 78ceb12..e7da47b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_macos.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_macos.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_openssl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_openssl.cpython-311.pyc index f1a32bf..3cc3a7b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_openssl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_openssl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_ssl_constants.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_ssl_constants.cpython-311.pyc index 5115927..603bd03 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_ssl_constants.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_ssl_constants.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_windows.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_windows.cpython-311.pyc index 167c055..7a16ace 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_windows.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/truststore/__pycache__/_windows.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/__init__.cpython-311.pyc index acc681a..5a2bff8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_base_connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_base_connection.cpython-311.pyc index 879875f..70e2c0f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_base_connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_base_connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_collections.cpython-311.pyc index 2bb7aa9..59e07d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_request_methods.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_request_methods.cpython-311.pyc index 17e5ba3..2ff0fe6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_request_methods.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_request_methods.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_version.cpython-311.pyc index d1f0703..aac8f8a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connection.cpython-311.pyc index f9a808f..796f23c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connectionpool.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connectionpool.cpython-311.pyc index d88441c..b5e26a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connectionpool.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/connectionpool.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/exceptions.cpython-311.pyc index df92c53..befa023 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/fields.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/fields.cpython-311.pyc index d363fc6..30caafd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/fields.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/fields.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/filepost.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/filepost.cpython-311.pyc index 774031b..e4fd52d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/filepost.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/filepost.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/poolmanager.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/poolmanager.cpython-311.pyc index 385f0ff..bd7fde1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/poolmanager.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/poolmanager.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/response.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/response.cpython-311.pyc index d4c854c..c7ea6ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/response.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/__pycache__/response.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/__init__.cpython-311.pyc index 4e4bd1b..05a2b75 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/pyopenssl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/pyopenssl.cpython-311.pyc index 2ebb1e7..9f69285 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/pyopenssl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/pyopenssl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/socks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/socks.cpython-311.pyc index d307c54..7a13d75 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/socks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/__pycache__/socks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/__init__.cpython-311.pyc index e782f1e..b849b7b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/connection.cpython-311.pyc index f0089b2..4ab9a56 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/fetch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/fetch.cpython-311.pyc index 882b61a..e410168 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/fetch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/fetch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/request.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/request.cpython-311.pyc index 8050edd..91abfe6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/request.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/request.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/response.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/response.cpython-311.pyc index c6d4c4f..ba480e2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/response.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/contrib/emscripten/__pycache__/response.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/__init__.cpython-311.pyc index d316fed..8422eb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/connection.cpython-311.pyc index e779274..00b118a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/probe.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/probe.cpython-311.pyc index 228d4ee..df70298 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/probe.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/http2/__pycache__/probe.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/__init__.cpython-311.pyc index 11ae3f5..51d6de9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/connection.cpython-311.pyc index fee4ac4..984dbd1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/proxy.cpython-311.pyc index 94fc547..26f008f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/request.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/request.cpython-311.pyc index 9a21c1b..18a8974 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/request.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/request.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/response.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/response.cpython-311.pyc index a2413e5..d631620 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/response.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/response.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/retry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/retry.cpython-311.pyc index 995c2ba..b7d9cb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/retry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/retry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_.cpython-311.pyc index d8615d9..c29fb8c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_match_hostname.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_match_hostname.cpython-311.pyc index 49dde35..00fe79a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_match_hostname.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssl_match_hostname.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssltransport.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssltransport.cpython-311.pyc index 6dcbc6c..70885a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssltransport.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/ssltransport.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/timeout.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/timeout.cpython-311.pyc index 565856f..543e764 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/timeout.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/timeout.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/url.cpython-311.pyc index 0fd32a5..99b9c62 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/util.cpython-311.pyc index ab81791..09d5258 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/wait.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/wait.cpython-311.pyc index f778f44..3a28a32 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/wait.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pip/_vendor/urllib3/util/__pycache__/wait.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/__init__.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/__init__.py index 8a2fbfa..d59226a 100644 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/pkg_resources/__init__.py @@ -12,123 +12,101 @@ The package resource API is designed to work with normal filesystem packages, .egg files, and unpacked .egg files. It can also work in a limited way with .zip files and with custom PEP 302 loaders that support the ``get_data()`` method. - -This module is deprecated. Users are directed to :mod:`importlib.resources`, -:mod:`importlib.metadata` and :pypi:`packaging` instead. """ -from __future__ import annotations - import sys - -if sys.version_info < (3, 9): # noqa: UP036 # Check for unsupported versions - raise RuntimeError("Python 3.9 or later is required") - -import _imp -import collections -import email.parser -import errno -import functools -import importlib -import importlib.abc -import importlib.machinery -import inspect -import io -import ntpath -import operator import os -import pkgutil -import platform -import plistlib -import posixpath -import re -import stat -import tempfile -import textwrap +import io import time +import re import types -import warnings import zipfile import zipimport -from collections.abc import Iterable, Iterator, Mapping, MutableSequence +import warnings +import stat +import functools +import pkgutil +import operator +import platform +import collections +import plistlib +import email.parser +import errno +import tempfile +import textwrap +import itertools +import inspect +import ntpath +import posixpath +import importlib from pkgutil import get_importer -from typing import ( - TYPE_CHECKING, - Any, - BinaryIO, - Callable, - Literal, - NamedTuple, - NoReturn, - Protocol, - TypeVar, - Union, - overload, -) - -sys.path.extend(((vendor_path := os.path.join(os.path.dirname(os.path.dirname(__file__)), 'setuptools', '_vendor')) not in sys.path) * [vendor_path]) # fmt: skip -# workaround for #4476 -sys.modules.pop('backports', None) - -# capture these to bypass sandboxing -from os import open as os_open, utime # isort: skip -from os.path import isdir, split # isort: skip try: - from os import mkdir, rename, unlink + import _imp +except ImportError: + # Python 3.2 compatibility + import imp as _imp +try: + FileExistsError +except NameError: + FileExistsError = OSError + +# capture these to bypass sandboxing +from os import utime +try: + from os import mkdir, rename, unlink WRITE_SUPPORT = True except ImportError: # no write support, probably under GAE WRITE_SUPPORT = False -import packaging.markers -import packaging.requirements -import packaging.specifiers -import packaging.utils -import packaging.version -from jaraco.text import drop_comment, join_continuation, yield_lines -from platformdirs import user_cache_dir as _user_cache_dir +from os import open as os_open +from os.path import isdir, split -if TYPE_CHECKING: - from _typeshed import BytesPath, StrOrBytesPath, StrPath - from _typeshed.importlib import LoaderProtocol - from typing_extensions import Self, TypeAlias +try: + import importlib.machinery as importlib_machinery + # access attribute to force import under delayed import mechanisms. + importlib_machinery.__name__ +except ImportError: + importlib_machinery = None -warnings.warn( - "pkg_resources is deprecated as an API. " - "See https://setuptools.pypa.io/en/latest/pkg_resources.html", - DeprecationWarning, - stacklevel=2, +from pkg_resources.extern.jaraco.text import ( + yield_lines, + drop_comment, + join_continuation, ) -_T = TypeVar("_T") -_DistributionT = TypeVar("_DistributionT", bound="Distribution") -# Type aliases -_NestedStr: TypeAlias = Union[str, Iterable[Union[str, Iterable["_NestedStr"]]]] -_StrictInstallerType: TypeAlias = Callable[["Requirement"], "_DistributionT"] -_InstallerType: TypeAlias = Callable[["Requirement"], Union["Distribution", None]] -_PkgReqType: TypeAlias = Union[str, "Requirement"] -_EPDistType: TypeAlias = Union["Distribution", _PkgReqType] -_MetadataType: TypeAlias = Union["IResourceProvider", None] -_ResolvedEntryPoint: TypeAlias = Any # Can be any attribute in the module -_ResourceStream: TypeAlias = Any # TODO / Incomplete: A readable file-like object -# Any object works, but let's indicate we expect something like a module (optionally has __loader__ or __file__) -_ModuleLike: TypeAlias = Union[object, types.ModuleType] -# Any: Should be _ModuleLike but we end up with issues where _ModuleLike doesn't have _ZipLoaderModule's __loader__ -_ProviderFactoryType: TypeAlias = Callable[[Any], "IResourceProvider"] -_DistFinderType: TypeAlias = Callable[[_T, str, bool], Iterable["Distribution"]] -_NSHandlerType: TypeAlias = Callable[[_T, str, str, types.ModuleType], Union[str, None]] -_AdapterT = TypeVar( - "_AdapterT", _DistFinderType[Any], _ProviderFactoryType, _NSHandlerType[Any] -) +from pkg_resources.extern import appdirs +from pkg_resources.extern import packaging +__import__('pkg_resources.extern.packaging.version') +__import__('pkg_resources.extern.packaging.specifiers') +__import__('pkg_resources.extern.packaging.requirements') +__import__('pkg_resources.extern.packaging.markers') +__import__('pkg_resources.extern.packaging.utils') +if sys.version_info < (3, 5): + raise RuntimeError("Python 3.5 or later is required") -class _ZipLoaderModule(Protocol): - __loader__: zipimport.zipimporter - - -_PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I) +# declare some globals that will be defined later to +# satisfy the linters. +require = None +working_set = None +add_activation_listener = None +resources_stream = None +cleanup_resources = None +resource_dir = None +resource_stream = None +set_extraction_path = None +resource_isdir = None +resource_string = None +iter_entry_points = None +resource_listdir = None +resource_filename = None +resource_exists = None +_distribution_finders = None +_namespace_handlers = None +_namespace_packages = None class PEP440Warning(RuntimeWarning): @@ -138,17 +116,27 @@ class PEP440Warning(RuntimeWarning): """ -parse_version = packaging.version.Version - -_state_vars: dict[str, str] = {} +def parse_version(v): + try: + return packaging.version.Version(v) + except packaging.version.InvalidVersion: + warnings.warn( + f"{v} is an invalid version and will not be supported in " + "a future release", + PkgResourcesDeprecationWarning, + ) + return packaging.version.LegacyVersion(v) -def _declare_state(vartype: str, varname: str, initial_value: _T) -> _T: - _state_vars[varname] = vartype - return initial_value +_state_vars = {} -def __getstate__() -> dict[str, Any]: +def _declare_state(vartype, **kw): + globals().update(kw) + _state_vars.update(dict.fromkeys(kw, vartype)) + + +def __getstate__(): state = {} g = globals() for k, v in _state_vars.items(): @@ -156,7 +144,7 @@ def __getstate__() -> dict[str, Any]: return state -def __setstate__(state: dict[str, Any]) -> dict[str, Any]: +def __setstate__(state): g = globals() for k, v in state.items(): g['_sset_' + _state_vars[k]](k, g[k], v) @@ -167,7 +155,7 @@ def _sget_dict(val): return val.copy() -def _sset_dict(key, ob, state) -> None: +def _sset_dict(key, ob, state): ob.clear() ob.update(state) @@ -176,7 +164,7 @@ def _sget_object(val): return val.__getstate__() -def _sset_object(key, ob, state) -> None: +def _sset_object(key, ob, state): ob.__setstate__(state) @@ -200,9 +188,7 @@ def get_supported_platform(): m = macosVersionString.match(plat) if m is not None and sys.platform == "darwin": try: - major_minor = '.'.join(_macos_vers()[:2]) - build = m.group(3) - plat = f'macosx-{major_minor}-{build}' + plat = 'macosx-%s-%s' % ('.'.join(_macos_vers()[:2]), m.group(3)) except ValueError: # not macOS pass @@ -211,94 +197,58 @@ def get_supported_platform(): __all__ = [ # Basic resource access and distribution/entry point discovery - 'require', - 'run_script', - 'get_provider', - 'get_distribution', - 'load_entry_point', - 'get_entry_map', - 'get_entry_info', + 'require', 'run_script', 'get_provider', 'get_distribution', + 'load_entry_point', 'get_entry_map', 'get_entry_info', 'iter_entry_points', - 'resource_string', - 'resource_stream', - 'resource_filename', - 'resource_listdir', - 'resource_exists', - 'resource_isdir', + 'resource_string', 'resource_stream', 'resource_filename', + 'resource_listdir', 'resource_exists', 'resource_isdir', + # Environmental control - 'declare_namespace', - 'working_set', - 'add_activation_listener', - 'find_distributions', - 'set_extraction_path', - 'cleanup_resources', + 'declare_namespace', 'working_set', 'add_activation_listener', + 'find_distributions', 'set_extraction_path', 'cleanup_resources', 'get_default_cache', + # Primary implementation classes - 'Environment', - 'WorkingSet', - 'ResourceManager', - 'Distribution', - 'Requirement', - 'EntryPoint', + 'Environment', 'WorkingSet', 'ResourceManager', + 'Distribution', 'Requirement', 'EntryPoint', + # Exceptions - 'ResolutionError', - 'VersionConflict', - 'DistributionNotFound', - 'UnknownExtra', - 'ExtractionError', + 'ResolutionError', 'VersionConflict', 'DistributionNotFound', + 'UnknownExtra', 'ExtractionError', + # Warnings 'PEP440Warning', + # Parsing functions and string utilities - 'parse_requirements', - 'parse_version', - 'safe_name', - 'safe_version', - 'get_platform', - 'compatible_platforms', - 'yield_lines', - 'split_sections', - 'safe_extra', - 'to_filename', - 'invalid_marker', - 'evaluate_marker', + 'parse_requirements', 'parse_version', 'safe_name', 'safe_version', + 'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections', + 'safe_extra', 'to_filename', 'invalid_marker', 'evaluate_marker', + # filesystem utilities - 'ensure_directory', - 'normalize_path', + 'ensure_directory', 'normalize_path', + # Distribution "precedence" constants - 'EGG_DIST', - 'BINARY_DIST', - 'SOURCE_DIST', - 'CHECKOUT_DIST', - 'DEVELOP_DIST', + 'EGG_DIST', 'BINARY_DIST', 'SOURCE_DIST', 'CHECKOUT_DIST', 'DEVELOP_DIST', + # "Provider" interfaces, implementations, and registration/lookup APIs - 'IMetadataProvider', - 'IResourceProvider', - 'FileMetadata', - 'PathMetadata', - 'EggMetadata', - 'EmptyProvider', - 'empty_provider', - 'NullProvider', - 'EggProvider', - 'DefaultProvider', - 'ZipProvider', - 'register_finder', - 'register_namespace_handler', - 'register_loader_type', - 'fixup_namespace_packages', - 'get_importer', + 'IMetadataProvider', 'IResourceProvider', 'FileMetadata', + 'PathMetadata', 'EggMetadata', 'EmptyProvider', 'empty_provider', + 'NullProvider', 'EggProvider', 'DefaultProvider', 'ZipProvider', + 'register_finder', 'register_namespace_handler', 'register_loader_type', + 'fixup_namespace_packages', 'get_importer', + # Warnings 'PkgResourcesDeprecationWarning', + # Deprecated/backward compatibility only - 'run_main', - 'AvailableDistributions', + 'run_main', 'AvailableDistributions', ] class ResolutionError(Exception): """Abstract base for dependency resolution errors""" - def __repr__(self) -> str: + def __repr__(self): return self.__class__.__name__ + repr(self.args) @@ -313,19 +263,17 @@ class VersionConflict(ResolutionError): _template = "{self.dist} is installed but {self.req} is required" @property - def dist(self) -> Distribution: + def dist(self): return self.args[0] @property - def req(self) -> Requirement: + def req(self): return self.args[1] def report(self): return self._template.format(**locals()) - def with_context( - self, required_by: set[Distribution | str] - ) -> Self | ContextualVersionConflict: + def with_context(self, required_by): """ If required_by is non-empty, return a version of self that is a ContextualVersionConflict. @@ -345,24 +293,22 @@ class ContextualVersionConflict(VersionConflict): _template = VersionConflict._template + ' by {self.required_by}' @property - def required_by(self) -> set[str]: + def required_by(self): return self.args[2] class DistributionNotFound(ResolutionError): """A requested distribution was not found""" - _template = ( - "The '{self.req}' distribution was not found " - "and is required by {self.requirers_str}" - ) + _template = ("The '{self.req}' distribution was not found " + "and is required by {self.requirers_str}") @property - def req(self) -> Requirement: + def req(self): return self.args[0] @property - def requirers(self) -> set[str] | None: + def requirers(self): return self.args[1] @property @@ -374,7 +320,7 @@ class DistributionNotFound(ResolutionError): def report(self): return self._template.format(**locals()) - def __str__(self) -> str: + def __str__(self): return self.report() @@ -382,9 +328,9 @@ class UnknownExtra(ResolutionError): """Distribution doesn't have an "extra feature" of the given name""" -_provider_factories: dict[type[_ModuleLike], _ProviderFactoryType] = {} +_provider_factories = {} -PY_MAJOR = f'{sys.version_info.major}.{sys.version_info.minor}' +PY_MAJOR = '{}.{}'.format(*sys.version_info) EGG_DIST = 3 BINARY_DIST = 2 SOURCE_DIST = 1 @@ -392,9 +338,7 @@ CHECKOUT_DIST = 0 DEVELOP_DIST = -1 -def register_loader_type( - loader_type: type[_ModuleLike], provider_factory: _ProviderFactoryType -) -> None: +def register_loader_type(loader_type, provider_factory): """Register `provider_factory` to make providers for `loader_type` `loader_type` is the type or class of a PEP 302 ``module.__loader__``, @@ -404,11 +348,7 @@ def register_loader_type( _provider_factories[loader_type] = provider_factory -@overload -def get_provider(moduleOrReq: str) -> IResourceProvider: ... -@overload -def get_provider(moduleOrReq: Requirement) -> Distribution: ... -def get_provider(moduleOrReq: str | Requirement) -> IResourceProvider | Distribution: +def get_provider(moduleOrReq): """Return an IResourceProvider for the named module or requirement""" if isinstance(moduleOrReq, Requirement): return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0] @@ -421,18 +361,20 @@ def get_provider(moduleOrReq: str | Requirement) -> IResourceProvider | Distribu return _find_adapter(_provider_factories, loader)(module) -@functools.cache -def _macos_vers(): - version = platform.mac_ver()[0] - # fallback for MacPorts - if version == '': - plist = '/System/Library/CoreServices/SystemVersion.plist' - if os.path.exists(plist): - with open(plist, 'rb') as fh: - plist_content = plistlib.load(fh) - if 'ProductVersion' in plist_content: - version = plist_content['ProductVersion'] - return version.split('.') +def _macos_vers(_cache=[]): + if not _cache: + version = platform.mac_ver()[0] + # fallback for MacPorts + if version == '': + plist = '/System/Library/CoreServices/SystemVersion.plist' + if os.path.exists(plist): + if hasattr(plistlib, 'readPlist'): + plist_content = plistlib.readPlist(plist) + if 'ProductVersion' in plist_content: + version = plist_content['ProductVersion'] + + _cache.append(version.split('.')) + return _cache[0] def _macos_arch(machine): @@ -451,8 +393,11 @@ def get_build_platform(): if sys.platform == "darwin" and not plat.startswith('macosx-'): try: version = _macos_vers() - machine = _macos_arch(os.uname()[4].replace(" ", "_")) - return f"macosx-{version[0]}.{version[1]}-{machine}" + machine = os.uname()[4].replace(" ", "_") + return "macosx-%d.%d-%s" % ( + int(version[0]), int(version[1]), + _macos_arch(machine), + ) except ValueError: # if someone is running a non-Mac darwin system, this will fall # through to the default implementation @@ -466,7 +411,7 @@ darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)") get_platform = get_build_platform -def compatible_platforms(provided: str | None, required: str | None) -> bool: +def compatible_platforms(provided, required): """Can code for the `provided` platform run on the `required` platform? Returns true if either platform is ``None``, or the platforms are equal. @@ -490,19 +435,16 @@ def compatible_platforms(provided: str | None, required: str | None) -> bool: provDarwin = darwinVersionString.match(provided) if provDarwin: dversion = int(provDarwin.group(1)) - macosversion = f"{reqMac.group(1)}.{reqMac.group(2)}" - if ( - dversion == 7 - and macosversion >= "10.3" - or dversion == 8 - and macosversion >= "10.4" - ): + macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2)) + if dversion == 7 and macosversion >= "10.3" or \ + dversion == 8 and macosversion >= "10.4": return True # egg isn't macOS or legacy darwin return False # are they the same major version and machine type? - if provMac.group(1) != reqMac.group(1) or provMac.group(3) != reqMac.group(3): + if provMac.group(1) != reqMac.group(1) or \ + provMac.group(3) != reqMac.group(3): return False # is the required OS major update >= the provided one? @@ -515,121 +457,106 @@ def compatible_platforms(provided: str | None, required: str | None) -> bool: return False -@overload -def get_distribution(dist: _DistributionT) -> _DistributionT: ... -@overload -def get_distribution(dist: _PkgReqType) -> Distribution: ... -def get_distribution(dist: Distribution | _PkgReqType) -> Distribution: +def run_script(dist_spec, script_name): + """Locate distribution `dist_spec` and run its `script_name` script""" + ns = sys._getframe(1).f_globals + name = ns['__name__'] + ns.clear() + ns['__name__'] = name + require(dist_spec)[0].run_script(script_name, ns) + + +# backward compatibility +run_main = run_script + + +def get_distribution(dist): """Return a current distribution object for a Requirement or string""" if isinstance(dist, str): dist = Requirement.parse(dist) if isinstance(dist, Requirement): dist = get_provider(dist) if not isinstance(dist, Distribution): - raise TypeError("Expected str, Requirement, or Distribution", dist) + raise TypeError("Expected string, Requirement, or Distribution", dist) return dist -def load_entry_point(dist: _EPDistType, group: str, name: str) -> _ResolvedEntryPoint: +def load_entry_point(dist, group, name): """Return `name` entry point of `group` for `dist` or raise ImportError""" return get_distribution(dist).load_entry_point(group, name) -@overload -def get_entry_map( - dist: _EPDistType, group: None = None -) -> dict[str, dict[str, EntryPoint]]: ... -@overload -def get_entry_map(dist: _EPDistType, group: str) -> dict[str, EntryPoint]: ... -def get_entry_map(dist: _EPDistType, group: str | None = None): +def get_entry_map(dist, group=None): """Return the entry point map for `group`, or the full entry map""" return get_distribution(dist).get_entry_map(group) -def get_entry_info(dist: _EPDistType, group: str, name: str) -> EntryPoint | None: +def get_entry_info(dist, group, name): """Return the EntryPoint object for `group`+`name`, or ``None``""" return get_distribution(dist).get_entry_info(group, name) -class IMetadataProvider(Protocol): - def has_metadata(self, name: str) -> bool: +class IMetadataProvider: + def has_metadata(name): """Does the package's distribution contain the named metadata?""" - ... - def get_metadata(self, name: str) -> str: + def get_metadata(name): """The named metadata resource as a string""" - ... - def get_metadata_lines(self, name: str) -> Iterator[str]: + def get_metadata_lines(name): """Yield named metadata resource as list of non-blank non-comment lines - Leading and trailing whitespace is stripped from each line, and lines - with ``#`` as the first non-blank character are omitted.""" - ... + Leading and trailing whitespace is stripped from each line, and lines + with ``#`` as the first non-blank character are omitted.""" - def metadata_isdir(self, name: str) -> bool: + def metadata_isdir(name): """Is the named metadata a directory? (like ``os.path.isdir()``)""" - ... - def metadata_listdir(self, name: str) -> list[str]: + def metadata_listdir(name): """List of metadata names in the directory (like ``os.listdir()``)""" - ... - def run_script(self, script_name: str, namespace: dict[str, Any]) -> None: + def run_script(script_name, namespace): """Execute the named script in the supplied namespace dictionary""" - ... -class IResourceProvider(IMetadataProvider, Protocol): +class IResourceProvider(IMetadataProvider): """An object that provides access to package resources""" - def get_resource_filename( - self, manager: ResourceManager, resource_name: str - ) -> str: + def get_resource_filename(manager, resource_name): """Return a true filesystem path for `resource_name` - `manager` must be a ``ResourceManager``""" - ... + `manager` must be an ``IResourceManager``""" - def get_resource_stream( - self, manager: ResourceManager, resource_name: str - ) -> _ResourceStream: + def get_resource_stream(manager, resource_name): """Return a readable file-like object for `resource_name` - `manager` must be a ``ResourceManager``""" - ... + `manager` must be an ``IResourceManager``""" - def get_resource_string( - self, manager: ResourceManager, resource_name: str - ) -> bytes: - """Return the contents of `resource_name` as :obj:`bytes` + def get_resource_string(manager, resource_name): + """Return a string containing the contents of `resource_name` - `manager` must be a ``ResourceManager``""" - ... + `manager` must be an ``IResourceManager``""" - def has_resource(self, resource_name: str) -> bool: + def has_resource(resource_name): """Does the package contain the named resource?""" - ... - def resource_isdir(self, resource_name: str) -> bool: + def resource_isdir(resource_name): """Is the named resource a directory? (like ``os.path.isdir()``)""" - ... - def resource_listdir(self, resource_name: str) -> list[str]: + def resource_listdir(resource_name): """List of resource names in the directory (like ``os.listdir()``)""" - ... class WorkingSet: """A collection of active distributions on sys.path (or a similar list)""" - def __init__(self, entries: Iterable[str] | None = None) -> None: + def __init__(self, entries=None): """Create working set from list of path entries (default=sys.path)""" - self.entries: list[str] = [] - self.entry_keys: dict[str | None, list[str]] = {} - self.by_key: dict[str, Distribution] = {} - self.normalized_to_canonical_keys: dict[str, str] = {} - self.callbacks: list[Callable[[Distribution], object]] = [] + self.entries = [] + self.entry_keys = {} + self.by_key = {} + self.normalized_to_canonical_keys = {} + self.callbacks = [] if entries is None: entries = sys.path @@ -679,7 +606,7 @@ class WorkingSet: sys.path[:] = ws.entries return ws - def add_entry(self, entry: str) -> None: + def add_entry(self, entry): """Add a path item to ``.entries``, finding any distributions on it ``find_distributions(entry, True)`` is used to find distributions @@ -694,11 +621,11 @@ class WorkingSet: for dist in find_distributions(entry, True): self.add(dist, entry, False) - def __contains__(self, dist: Distribution) -> bool: + def __contains__(self, dist): """True if `dist` is the active distribution for its project""" return self.by_key.get(dist.key) == dist - def find(self, req: Requirement) -> Distribution | None: + def find(self, req): """Find a distribution matching requirement `req` If there is an active distribution for the requested project, this @@ -708,28 +635,21 @@ class WorkingSet: If there is no active distribution for the requested project, ``None`` is returned. """ - dist: Distribution | None = None + dist = self.by_key.get(req.key) - candidates = ( - req.key, - self.normalized_to_canonical_keys.get(req.key), - safe_name(req.key).replace(".", "-"), - ) + if dist is None: + canonical_key = self.normalized_to_canonical_keys.get(req.key) - for candidate in filter(None, candidates): - dist = self.by_key.get(candidate) - if dist: - req.key = candidate - break + if canonical_key is not None: + req.key = canonical_key + dist = self.by_key.get(canonical_key) if dist is not None and dist not in req: # XXX add more info raise VersionConflict(dist, req) return dist - def iter_entry_points( - self, group: str, name: str | None = None - ) -> Iterator[EntryPoint]: + def iter_entry_points(self, group, name=None): """Yield entry point objects from `group` matching `name` If `name` is None, yields all entry points in `group` from all @@ -743,7 +663,7 @@ class WorkingSet: if name is None or name == entry.name ) - def run_script(self, requires: str, script_name: str) -> None: + def run_script(self, requires, script_name): """Locate distribution for `requires` and run `script_name` script""" ns = sys._getframe(1).f_globals name = ns['__name__'] @@ -751,13 +671,13 @@ class WorkingSet: ns['__name__'] = name self.require(requires)[0].run_script(script_name, ns) - def __iter__(self) -> Iterator[Distribution]: + def __iter__(self): """Yield distributions for non-duplicate projects in the working set The yield order is the order in which the items' path entries were added to the working set. """ - seen = set() + seen = {} for item in self.entries: if item not in self.entry_keys: # workaround a cache issue @@ -765,16 +685,10 @@ class WorkingSet: for key in self.entry_keys[item]: if key not in seen: - seen.add(key) + seen[key] = 1 yield self.by_key[key] - def add( - self, - dist: Distribution, - entry: str | None = None, - insert: bool = True, - replace: bool = False, - ) -> None: + def add(self, dist, entry=None, insert=True, replace=False): """Add `dist` to working set, associated with `entry` If `entry` is unspecified, it defaults to the ``.location`` of `dist`. @@ -806,42 +720,9 @@ class WorkingSet: keys2.append(dist.key) self._added_new(dist) - @overload - def resolve( - self, - requirements: Iterable[Requirement], - env: Environment | None, - installer: _StrictInstallerType[_DistributionT], - replace_conflicting: bool = False, - extras: tuple[str, ...] | None = None, - ) -> list[_DistributionT]: ... - @overload - def resolve( - self, - requirements: Iterable[Requirement], - env: Environment | None = None, - *, - installer: _StrictInstallerType[_DistributionT], - replace_conflicting: bool = False, - extras: tuple[str, ...] | None = None, - ) -> list[_DistributionT]: ... - @overload - def resolve( - self, - requirements: Iterable[Requirement], - env: Environment | None = None, - installer: _InstallerType | None = None, - replace_conflicting: bool = False, - extras: tuple[str, ...] | None = None, - ) -> list[Distribution]: ... - def resolve( - self, - requirements: Iterable[Requirement], - env: Environment | None = None, - installer: _InstallerType | None | _StrictInstallerType[_DistributionT] = None, - replace_conflicting: bool = False, - extras: tuple[str, ...] | None = None, - ) -> list[Distribution] | list[_DistributionT]: + # FIXME: 'WorkingSet.resolve' is too complex (11) + def resolve(self, requirements, env=None, installer=None, # noqa: C901 + replace_conflicting=False, extras=None): """List all distributions needed to (recursively) meet `requirements` `requirements` must be a sequence of ``Requirement`` objects. `env`, @@ -869,16 +750,16 @@ class WorkingSet: # set up the stack requirements = list(requirements)[::-1] # set of processed requirements - processed = set() + processed = {} # key -> dist - best: dict[str, Distribution] = {} - to_activate: list[Distribution] = [] + best = {} + to_activate = [] req_extras = _ReqExtras() # Mapping of requirement to set of distributions that required it; # useful for reporting info about conflicts. - required_by = collections.defaultdict[Requirement, set[str]](set) + required_by = collections.defaultdict(set) while requirements: # process dependencies breadth-first @@ -890,9 +771,33 @@ class WorkingSet: if not req_extras.markers_pass(req, extras): continue - dist = self._resolve_dist( - req, best, replace_conflicting, env, installer, required_by, to_activate - ) + dist = best.get(req.key) + if dist is None: + # Find the best distribution and add it to the map + dist = self.by_key.get(req.key) + if dist is None or (dist not in req and replace_conflicting): + ws = self + if env is None: + if dist is None: + env = Environment(self.entries) + else: + # Use an empty environment and workingset to avoid + # any further conflicts with the conflicting + # distribution + env = Environment([]) + ws = WorkingSet([]) + dist = best[req.key] = env.best_match( + req, ws, installer, + replace_conflicting=replace_conflicting + ) + if dist is None: + requirers = required_by.get(req, None) + raise DistributionNotFound(req, requirers) + to_activate.append(dist) + if dist not in req: + # Oops, the "best" so far conflicts with a dependency + dependent_req = required_by[req] + raise VersionConflict(dist, req).with_context(dependent_req) # push the new requirements onto the stack new_requirements = dist.requires(req.extras)[::-1] @@ -903,77 +808,13 @@ class WorkingSet: required_by[new_requirement].add(req.project_name) req_extras[new_requirement] = req.extras - processed.add(req) + processed[req] = True # return list of distros to activate return to_activate - def _resolve_dist( - self, req, best, replace_conflicting, env, installer, required_by, to_activate - ) -> Distribution: - dist = best.get(req.key) - if dist is None: - # Find the best distribution and add it to the map - dist = self.by_key.get(req.key) - if dist is None or (dist not in req and replace_conflicting): - ws = self - if env is None: - if dist is None: - env = Environment(self.entries) - else: - # Use an empty environment and workingset to avoid - # any further conflicts with the conflicting - # distribution - env = Environment([]) - ws = WorkingSet([]) - dist = best[req.key] = env.best_match( - req, ws, installer, replace_conflicting=replace_conflicting - ) - if dist is None: - requirers = required_by.get(req, None) - raise DistributionNotFound(req, requirers) - to_activate.append(dist) - if dist not in req: - # Oops, the "best" so far conflicts with a dependency - dependent_req = required_by[req] - raise VersionConflict(dist, req).with_context(dependent_req) - return dist - - @overload def find_plugins( - self, - plugin_env: Environment, - full_env: Environment | None, - installer: _StrictInstallerType[_DistributionT], - fallback: bool = True, - ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ... - @overload - def find_plugins( - self, - plugin_env: Environment, - full_env: Environment | None = None, - *, - installer: _StrictInstallerType[_DistributionT], - fallback: bool = True, - ) -> tuple[list[_DistributionT], dict[Distribution, Exception]]: ... - @overload - def find_plugins( - self, - plugin_env: Environment, - full_env: Environment | None = None, - installer: _InstallerType | None = None, - fallback: bool = True, - ) -> tuple[list[Distribution], dict[Distribution, Exception]]: ... - def find_plugins( - self, - plugin_env: Environment, - full_env: Environment | None = None, - installer: _InstallerType | None | _StrictInstallerType[_DistributionT] = None, - fallback: bool = True, - ) -> tuple[ - list[Distribution] | list[_DistributionT], - dict[Distribution, Exception], - ]: + self, plugin_env, full_env=None, installer=None, fallback=True): """Find all activatable distributions in `plugin_env` Example usage:: @@ -1012,8 +853,8 @@ class WorkingSet: # scan project names in alphabetic order plugin_projects.sort() - error_info: dict[Distribution, Exception] = {} - distributions: dict[Distribution, Exception | None] = {} + error_info = {} + distributions = {} if full_env is None: env = Environment(self.entries) @@ -1026,7 +867,9 @@ class WorkingSet: list(map(shadow_set.add, self)) for project_name in plugin_projects: + for dist in plugin_env[project_name]: + req = [dist.as_requirement()] try: @@ -1049,12 +892,12 @@ class WorkingSet: # success, no need to try any more versions of this project break - sorted_distributions = list(distributions) - sorted_distributions.sort() + distributions = list(distributions) + distributions.sort() - return sorted_distributions, error_info + return distributions, error_info - def require(self, *requirements: _NestedStr) -> list[Distribution]: + def require(self, *requirements): """Ensure that distributions matching `requirements` are activated `requirements` must be a string or a (possibly-nested) sequence @@ -1070,9 +913,7 @@ class WorkingSet: return needed - def subscribe( - self, callback: Callable[[Distribution], object], existing: bool = True - ) -> None: + def subscribe(self, callback, existing=True): """Invoke `callback` for all distributions If `existing=True` (default), @@ -1086,28 +927,17 @@ class WorkingSet: for dist in self: callback(dist) - def _added_new(self, dist) -> None: + def _added_new(self, dist): for callback in self.callbacks: callback(dist) - def __getstate__( - self, - ) -> tuple[ - list[str], - dict[str | None, list[str]], - dict[str, Distribution], - dict[str, str], - list[Callable[[Distribution], object]], - ]: + def __getstate__(self): return ( - self.entries[:], - self.entry_keys.copy(), - self.by_key.copy(), - self.normalized_to_canonical_keys.copy(), - self.callbacks[:], + self.entries[:], self.entry_keys.copy(), self.by_key.copy(), + self.normalized_to_canonical_keys.copy(), self.callbacks[:] ) - def __setstate__(self, e_k_b_n_c) -> None: + def __setstate__(self, e_k_b_n_c): entries, keys, by_key, normalized_to_canonical_keys, callbacks = e_k_b_n_c self.entries = entries[:] self.entry_keys = keys.copy() @@ -1116,12 +946,12 @@ class WorkingSet: self.callbacks = callbacks[:] -class _ReqExtras(dict["Requirement", tuple[str, ...]]): +class _ReqExtras(dict): """ Map each requirement to the extras that demanded it. """ - def markers_pass(self, req: Requirement, extras: tuple[str, ...] | None = None): + def markers_pass(self, req, extras=None): """ Evaluate markers for req against each extra that demanded it. @@ -1129,21 +959,19 @@ class _ReqExtras(dict["Requirement", tuple[str, ...]]): Return False if the req has a marker and fails evaluation. Otherwise, return True. """ - return not req.marker or any( + extra_evals = ( req.marker.evaluate({'extra': extra}) - for extra in self.get(req, ()) + (extras or ("",)) + for extra in self.get(req, ()) + (extras or (None,)) ) + return not req.marker or any(extra_evals) class Environment: """Searchable snapshot of distributions on a search path""" def __init__( - self, - search_path: Iterable[str] | None = None, - platform: str | None = get_supported_platform(), - python: str | None = PY_MAJOR, - ) -> None: + self, search_path=None, platform=get_supported_platform(), + python=PY_MAJOR): """Snapshot distributions available on a search path Any distributions found on `search_path` are added to the environment. @@ -1160,12 +988,12 @@ class Environment: wish to map *all* distributions, not just those compatible with the running platform or Python version. """ - self._distmap: dict[str, list[Distribution]] = {} + self._distmap = {} self.platform = platform self.python = python self.scan(search_path) - def can_add(self, dist: Distribution) -> bool: + def can_add(self, dist): """Is distribution `dist` acceptable for this environment? The distribution must match the platform and python version @@ -1179,11 +1007,11 @@ class Environment: ) return py_compat and compatible_platforms(dist.platform, self.platform) - def remove(self, dist: Distribution) -> None: + def remove(self, dist): """Remove `dist` from the environment""" self._distmap[dist.key].remove(dist) - def scan(self, search_path: Iterable[str] | None = None) -> None: + def scan(self, search_path=None): """Scan `search_path` for distributions usable in this environment Any distributions found are added to the environment. @@ -1198,7 +1026,7 @@ class Environment: for dist in find_distributions(item): self.add(dist) - def __getitem__(self, project_name: str) -> list[Distribution]: + def __getitem__(self, project_name): """Return a newest-to-oldest list of distributions for `project_name` Uses case-insensitive `project_name` comparison, assuming all the @@ -1209,37 +1037,17 @@ class Environment: distribution_key = project_name.lower() return self._distmap.get(distribution_key, []) - def add(self, dist: Distribution) -> None: - """Add `dist` if we ``can_add()`` it and it has not already been added""" + def add(self, dist): + """Add `dist` if we ``can_add()`` it and it has not already been added + """ if self.can_add(dist) and dist.has_version(): dists = self._distmap.setdefault(dist.key, []) if dist not in dists: dists.append(dist) dists.sort(key=operator.attrgetter('hashcmp'), reverse=True) - @overload def best_match( - self, - req: Requirement, - working_set: WorkingSet, - installer: _StrictInstallerType[_DistributionT], - replace_conflicting: bool = False, - ) -> _DistributionT: ... - @overload - def best_match( - self, - req: Requirement, - working_set: WorkingSet, - installer: _InstallerType | None = None, - replace_conflicting: bool = False, - ) -> Distribution | None: ... - def best_match( - self, - req: Requirement, - working_set: WorkingSet, - installer: _InstallerType | None | _StrictInstallerType[_DistributionT] = None, - replace_conflicting: bool = False, - ) -> Distribution | None: + self, req, working_set, installer=None, replace_conflicting=False): """Find distribution best matching `req` and usable on `working_set` This calls the ``find(req)`` method of the `working_set` to see if a @@ -1266,32 +1074,7 @@ class Environment: # try to download/install return self.obtain(req, installer) - @overload - def obtain( - self, - requirement: Requirement, - installer: _StrictInstallerType[_DistributionT], - ) -> _DistributionT: ... - @overload - def obtain( - self, - requirement: Requirement, - installer: Callable[[Requirement], None] | None = None, - ) -> None: ... - @overload - def obtain( - self, - requirement: Requirement, - installer: _InstallerType | None = None, - ) -> Distribution | None: ... - def obtain( - self, - requirement: Requirement, - installer: Callable[[Requirement], None] - | _InstallerType - | None - | _StrictInstallerType[_DistributionT] = None, - ) -> Distribution | None: + def obtain(self, requirement, installer=None): """Obtain a distribution matching `requirement` (e.g. via download) Obtain a distro that matches requirement (e.g. via download). In the @@ -1300,15 +1083,16 @@ class Environment: None is returned instead. This method is a hook that allows subclasses to attempt other ways of obtaining a distribution before falling back to the `installer` argument.""" - return installer(requirement) if installer else None + if installer is not None: + return installer(requirement) - def __iter__(self) -> Iterator[str]: + def __iter__(self): """Yield the unique project names of the available distributions""" for key in self._distmap.keys(): if self[key]: yield key - def __iadd__(self, other: Distribution | Environment) -> Self: + def __iadd__(self, other): """In-place addition of a distribution or environment""" if isinstance(other, Distribution): self.add(other) @@ -1317,10 +1101,10 @@ class Environment: for dist in other[project]: self.add(dist) else: - raise TypeError(f"Can't add {other!r} to environment") + raise TypeError("Can't add %r to environment" % (other,)) return self - def __add__(self, other: Distribution | Environment) -> Self: + def __add__(self, other): """Add an environment or distribution to an environment""" new = self.__class__([], platform=None, python=None) for env in self, other: @@ -1347,70 +1131,55 @@ class ExtractionError(RuntimeError): The exception instance that caused extraction to fail """ - manager: ResourceManager - cache_path: str - original_error: BaseException | None - class ResourceManager: """Manage resource extraction and packages""" + extraction_path = None - extraction_path: str | None = None + def __init__(self): + self.cached_files = {} - def __init__(self) -> None: - # acts like a set - self.cached_files: dict[str, Literal[True]] = {} - - def resource_exists( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> bool: + def resource_exists(self, package_or_requirement, resource_name): """Does the named resource exist?""" return get_provider(package_or_requirement).has_resource(resource_name) - def resource_isdir( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> bool: + def resource_isdir(self, package_or_requirement, resource_name): """Is the named resource an existing directory?""" - return get_provider(package_or_requirement).resource_isdir(resource_name) + return get_provider(package_or_requirement).resource_isdir( + resource_name + ) - def resource_filename( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> str: + def resource_filename(self, package_or_requirement, resource_name): """Return a true filesystem path for specified resource""" return get_provider(package_or_requirement).get_resource_filename( self, resource_name ) - def resource_stream( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> _ResourceStream: + def resource_stream(self, package_or_requirement, resource_name): """Return a readable file-like object for specified resource""" return get_provider(package_or_requirement).get_resource_stream( self, resource_name ) - def resource_string( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> bytes: - """Return specified resource as :obj:`bytes`""" + def resource_string(self, package_or_requirement, resource_name): + """Return specified resource as a string""" return get_provider(package_or_requirement).get_resource_string( self, resource_name ) - def resource_listdir( - self, package_or_requirement: _PkgReqType, resource_name: str - ) -> list[str]: + def resource_listdir(self, package_or_requirement, resource_name): """List the contents of the named resource directory""" - return get_provider(package_or_requirement).resource_listdir(resource_name) + return get_provider(package_or_requirement).resource_listdir( + resource_name + ) - def extraction_error(self) -> NoReturn: + def extraction_error(self): """Give an error message for problems extracting file(s)""" old_exc = sys.exc_info()[1] cache_path = self.extraction_path or get_default_cache() - tmpl = textwrap.dedent( - """ + tmpl = textwrap.dedent(""" Can't extract file(s) to egg cache The following error occurred while trying to extract file(s) @@ -1425,15 +1194,14 @@ class ResourceManager: Perhaps your account does not have write access to this directory? You can change the cache directory by setting the PYTHON_EGG_CACHE environment variable to point to an accessible directory. - """ - ).lstrip() + """).lstrip() err = ExtractionError(tmpl.format(**locals())) err.manager = self err.cache_path = cache_path err.original_error = old_exc raise err - def get_cache_path(self, archive_name: str, names: Iterable[StrPath] = ()) -> str: + def get_cache_path(self, archive_name, names=()): """Return absolute location in cache for `archive_name` and `names` The parent directory of the resulting path will be created if it does @@ -1455,11 +1223,11 @@ class ResourceManager: self._warn_unsafe_extraction_path(extract_path) - self.cached_files[target_path] = True + self.cached_files[target_path] = 1 return target_path @staticmethod - def _warn_unsafe_extraction_path(path) -> None: + def _warn_unsafe_extraction_path(path): """ If the default extraction path is overridden and set to an insecure location, such as /tmp, it opens up an opportunity for an attacker to @@ -1485,7 +1253,7 @@ class ResourceManager: ).format(**locals()) warnings.warn(msg, UserWarning) - def postprocess(self, tempname: StrOrBytesPath, filename: StrOrBytesPath) -> None: + def postprocess(self, tempname, filename): """Perform any platform-specific postprocessing of `tempname` This is where Mac header rewrites should be done; other platforms don't @@ -1505,7 +1273,7 @@ class ResourceManager: mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777 os.chmod(tempname, mode) - def set_extraction_path(self, path: str) -> None: + def set_extraction_path(self, path): """Set the base path where resources will be extracted to, if needed. If you do not call this routine before any extractions take place, the @@ -1525,11 +1293,13 @@ class ResourceManager: ``cleanup_resources()``.) """ if self.cached_files: - raise ValueError("Can't change extraction path, files already extracted") + raise ValueError( + "Can't change extraction path, files already extracted" + ) self.extraction_path = path - def cleanup_resources(self, force: bool = False) -> list[str]: + def cleanup_resources(self, force=False): """ Delete all extracted resource files and directories, returning a list of the file and directory names that could not be successfully removed. @@ -1541,19 +1311,21 @@ class ResourceManager: directory used for extractions. """ # XXX - return [] -def get_default_cache() -> str: +def get_default_cache(): """ Return the ``PYTHON_EGG_CACHE`` environment variable or a platform-relevant user cache dir for an app named "Python-Eggs". """ - return os.environ.get('PYTHON_EGG_CACHE') or _user_cache_dir(appname='Python-Eggs') + return ( + os.environ.get('PYTHON_EGG_CACHE') + or appdirs.user_cache_dir(appname='Python-Eggs') + ) -def safe_name(name: str) -> str: +def safe_name(name): """Convert an arbitrary string to a standard distribution name Any runs of non-alphanumeric/. characters are replaced with a single '-'. @@ -1561,7 +1333,7 @@ def safe_name(name: str) -> str: return re.sub('[^A-Za-z0-9.]+', '-', name) -def safe_version(version: str) -> str: +def safe_version(version): """ Convert an arbitrary string to a standard version string """ @@ -1573,39 +1345,7 @@ def safe_version(version: str) -> str: return re.sub('[^A-Za-z0-9.]+', '-', version) -def _forgiving_version(version) -> str: - """Fallback when ``safe_version`` is not safe enough - >>> parse_version(_forgiving_version('0.23ubuntu1')) - - >>> parse_version(_forgiving_version('0.23-')) - - >>> parse_version(_forgiving_version('0.-_')) - - >>> parse_version(_forgiving_version('42.+?1')) - - >>> parse_version(_forgiving_version('hello world')) - - """ - version = version.replace(' ', '.') - match = _PEP440_FALLBACK.search(version) - if match: - safe = match["safe"] - rest = version[len(safe) :] - else: - safe = "0" - rest = version - local = f"sanitized.{_safe_segment(rest)}".strip(".") - return f"{safe}.dev0+{local}" - - -def _safe_segment(segment): - """Convert an arbitrary string into a safe segment""" - segment = re.sub('[^A-Za-z0-9.]+', '-', segment) - segment = re.sub('-[^A-Za-z0-9]+', '-', segment) - return re.sub(r'\.[^A-Za-z0-9]+', '.', segment).strip(".-") - - -def safe_extra(extra: str) -> str: +def safe_extra(extra): """Convert an arbitrary string to a standard 'extra' name Any runs of non-alphanumeric characters are replaced with a single '_', @@ -1614,7 +1354,7 @@ def safe_extra(extra: str) -> str: return re.sub('[^A-Za-z0-9.-]+', '_', extra).lower() -def to_filename(name: str) -> str: +def to_filename(name): """Convert a project or version name to its filename-escaped form Any '-' characters are currently replaced with '_'. @@ -1622,7 +1362,7 @@ def to_filename(name: str) -> str: return name.replace('-', '_') -def invalid_marker(text: str) -> SyntaxError | Literal[False]: +def invalid_marker(text): """ Validate text as a PEP 508 environment marker; return an exception if invalid or False otherwise. @@ -1636,7 +1376,7 @@ def invalid_marker(text: str) -> SyntaxError | Literal[False]: return False -def evaluate_marker(text: str, extra: str | None = None) -> bool: +def evaluate_marker(text, extra=None): """ Evaluate a PEP 508 environment marker. Return a boolean indicating the marker result in this environment. @@ -1654,43 +1394,37 @@ def evaluate_marker(text: str, extra: str | None = None) -> bool: class NullProvider: """Try to implement resources and metadata for arbitrary PEP 302 loaders""" - egg_name: str | None = None - egg_info: str | None = None - loader: LoaderProtocol | None = None + egg_name = None + egg_info = None + loader = None - def __init__(self, module: _ModuleLike) -> None: + def __init__(self, module): self.loader = getattr(module, '__loader__', None) self.module_path = os.path.dirname(getattr(module, '__file__', '')) - def get_resource_filename( - self, manager: ResourceManager, resource_name: str - ) -> str: + def get_resource_filename(self, manager, resource_name): return self._fn(self.module_path, resource_name) - def get_resource_stream( - self, manager: ResourceManager, resource_name: str - ) -> BinaryIO: + def get_resource_stream(self, manager, resource_name): return io.BytesIO(self.get_resource_string(manager, resource_name)) - def get_resource_string( - self, manager: ResourceManager, resource_name: str - ) -> bytes: + def get_resource_string(self, manager, resource_name): return self._get(self._fn(self.module_path, resource_name)) - def has_resource(self, resource_name: str) -> bool: + def has_resource(self, resource_name): return self._has(self._fn(self.module_path, resource_name)) def _get_metadata_path(self, name): return self._fn(self.egg_info, name) - def has_metadata(self, name: str) -> bool: + def has_metadata(self, name): if not self.egg_info: - return False + return self.egg_info path = self._get_metadata_path(name) return self._has(path) - def get_metadata(self, name: str) -> str: + def get_metadata(self, name): if not self.egg_info: return "" path = self._get_metadata_path(name) @@ -1700,82 +1434,73 @@ class NullProvider: except UnicodeDecodeError as exc: # Include the path in the error message to simplify # troubleshooting, and without changing the exception type. - exc.reason += f' in {name} file at path: {path}' + exc.reason += ' in {} file at path: {}'.format(name, path) raise - def get_metadata_lines(self, name: str) -> Iterator[str]: + def get_metadata_lines(self, name): return yield_lines(self.get_metadata(name)) - def resource_isdir(self, resource_name: str) -> bool: + def resource_isdir(self, resource_name): return self._isdir(self._fn(self.module_path, resource_name)) - def metadata_isdir(self, name: str) -> bool: - return bool(self.egg_info and self._isdir(self._fn(self.egg_info, name))) + def metadata_isdir(self, name): + return self.egg_info and self._isdir(self._fn(self.egg_info, name)) - def resource_listdir(self, resource_name: str) -> list[str]: + def resource_listdir(self, resource_name): return self._listdir(self._fn(self.module_path, resource_name)) - def metadata_listdir(self, name: str) -> list[str]: + def metadata_listdir(self, name): if self.egg_info: return self._listdir(self._fn(self.egg_info, name)) return [] - def run_script(self, script_name: str, namespace: dict[str, Any]) -> None: + def run_script(self, script_name, namespace): script = 'scripts/' + script_name if not self.has_metadata(script): raise ResolutionError( - "Script {script!r} not found in metadata at {self.egg_info!r}".format( - **locals() - ), + "Script {script!r} not found in metadata at {self.egg_info!r}" + .format(**locals()), ) - script_text = self.get_metadata(script).replace('\r\n', '\n') script_text = script_text.replace('\r', '\n') script_filename = self._fn(self.egg_info, script) namespace['__file__'] = script_filename if os.path.exists(script_filename): - source = _read_utf8_with_fallback(script_filename) + with open(script_filename) as fid: + source = fid.read() code = compile(source, script_filename, 'exec') exec(code, namespace, namespace) else: from linecache import cache - cache[script_filename] = ( - len(script_text), - 0, - script_text.split('\n'), - script_filename, + len(script_text), 0, script_text.split('\n'), script_filename ) script_code = compile(script_text, script_filename, 'exec') exec(script_code, namespace, namespace) - def _has(self, path) -> bool: + def _has(self, path): raise NotImplementedError( "Can't perform this operation for unregistered loader type" ) - def _isdir(self, path) -> bool: + def _isdir(self, path): raise NotImplementedError( "Can't perform this operation for unregistered loader type" ) - def _listdir(self, path) -> list[str]: + def _listdir(self, path): raise NotImplementedError( "Can't perform this operation for unregistered loader type" ) - def _fn(self, base: str | None, resource_name: str): - if base is None: - raise TypeError( - "`base` parameter in `_fn` is `None`. Either override this method or check the parameter first." - ) + def _fn(self, base, resource_name): self._validate_resource_path(resource_name) if resource_name: return os.path.join(base, *resource_name.split('/')) return base @staticmethod - def _validate_resource_path(path) -> None: + def _validate_resource_path(path): """ Validate the resource paths according to the docs. https://setuptools.pypa.io/en/latest/pkg_resources.html#basic-resource-access @@ -1828,10 +1553,9 @@ is not allowed. AttributeError: ... """ invalid = ( - os.path.pardir in path.split(posixpath.sep) - or posixpath.isabs(path) - or ntpath.isabs(path) - or path.startswith("\\") + os.path.pardir in path.split(posixpath.sep) or + posixpath.isabs(path) or + ntpath.isabs(path) ) if not invalid: return @@ -1839,20 +1563,20 @@ is not allowed. msg = "Use of .. or absolute path in a resource path is not allowed." # Aggressively disallow Windows absolute paths - if (path.startswith("\\") or ntpath.isabs(path)) and not posixpath.isabs(path): + if ntpath.isabs(path) and not posixpath.isabs(path): raise ValueError(msg) # for compatibility, warn; in future # raise ValueError(msg) - issue_warning( + warnings.warn( msg[:-1] + " and will raise exceptions in a future release.", DeprecationWarning, + stacklevel=4, ) - def _get(self, path) -> bytes: - if hasattr(self.loader, 'get_data') and self.loader: - # Already checked get_data exists - return self.loader.get_data(path) # type: ignore[attr-defined] + def _get(self, path): + if hasattr(self.loader, 'get_data'): + return self.loader.get_data(path) raise NotImplementedError( "Can't perform this operation for loaders without 'get_data()'" ) @@ -1875,7 +1599,7 @@ def _parents(path): class EggProvider(NullProvider): """Provider based on a virtual filesystem""" - def __init__(self, module: _ModuleLike) -> None: + def __init__(self, module): super().__init__(module) self._setup_prefix() @@ -1886,7 +1610,7 @@ class EggProvider(NullProvider): egg = next(eggs, None) egg and self._set_egg(egg) - def _set_egg(self, path: str) -> None: + def _set_egg(self, path): self.egg_name = os.path.basename(path) self.egg_info = os.path.join(path, 'EGG-INFO') self.egg_root = path @@ -1895,32 +1619,27 @@ class EggProvider(NullProvider): class DefaultProvider(EggProvider): """Provides access to package resources in the filesystem""" - def _has(self, path) -> bool: + def _has(self, path): return os.path.exists(path) - def _isdir(self, path) -> bool: + def _isdir(self, path): return os.path.isdir(path) def _listdir(self, path): return os.listdir(path) - def get_resource_stream( - self, manager: object, resource_name: str - ) -> io.BufferedReader: + def get_resource_stream(self, manager, resource_name): return open(self._fn(self.module_path, resource_name), 'rb') - def _get(self, path) -> bytes: + def _get(self, path): with open(path, 'rb') as stream: return stream.read() @classmethod - def _register(cls) -> None: - loader_names = ( - 'SourceFileLoader', - 'SourcelessFileLoader', - ) + def _register(cls): + loader_names = 'SourceFileLoader', 'SourcelessFileLoader', for name in loader_names: - loader_cls = getattr(importlib.machinery, name, type(None)) + loader_cls = getattr(importlib_machinery, name, type(None)) register_loader_type(loader_cls, cls) @@ -1930,32 +1649,30 @@ DefaultProvider._register() class EmptyProvider(NullProvider): """Provider that returns nothing for all requests""" - # A special case, we don't want all Providers inheriting from NullProvider to have a potentially None module_path - module_path: str | None = None # type: ignore[assignment] + module_path = None _isdir = _has = lambda self, path: False - def _get(self, path) -> bytes: - return b'' + def _get(self, path): + return '' def _listdir(self, path): return [] - def __init__(self) -> None: + def __init__(self): pass empty_provider = EmptyProvider() -class ZipManifests(dict[str, "MemoizedZipManifests.manifest_mod"]): +class ZipManifests(dict): """ zip manifest builder """ - # `path` could be `StrPath | IO[bytes]` but that violates the LSP for `MemoizedZipManifests.load` @classmethod - def build(cls, path: str) -> dict[str, zipfile.ZipInfo]: + def build(cls, path): """ Build a dictionary similar to the zipimport directory caches, except instead of tuples, store ZipInfo objects. @@ -1980,12 +1697,9 @@ class MemoizedZipManifests(ZipManifests): """ Memoized zipfile manifests. """ + manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime') - class manifest_mod(NamedTuple): - manifest: dict[str, zipfile.ZipInfo] - mtime: float - - def load(self, path: str) -> dict[str, zipfile.ZipInfo]: # type: ignore[override] # ZipManifests.load is a classmethod + def load(self, path): """ Load a manifest at path or return a suitable manifest already loaded. """ @@ -2002,12 +1716,10 @@ class MemoizedZipManifests(ZipManifests): class ZipProvider(EggProvider): """Resource support for zips and eggs""" - eagers: list[str] | None = None + eagers = None _zip_manifests = MemoizedZipManifests() - # ZipProvider's loader should always be a zipimporter or equivalent - loader: zipimport.zipimporter - def __init__(self, module: _ZipLoaderModule) -> None: + def __init__(self, module): super().__init__(module) self.zip_pre = self.loader.archive + os.sep @@ -2018,24 +1730,26 @@ class ZipProvider(EggProvider): if fspath == self.loader.archive: return '' if fspath.startswith(self.zip_pre): - return fspath[len(self.zip_pre) :] - raise AssertionError(f"{fspath} is not a subpath of {self.zip_pre}") + return fspath[len(self.zip_pre):] + raise AssertionError( + "%s is not a subpath of %s" % (fspath, self.zip_pre) + ) def _parts(self, zip_path): # Convert a zipfile subpath into an egg-relative path part list. # pseudo-fs path fspath = self.zip_pre + zip_path if fspath.startswith(self.egg_root + os.sep): - return fspath[len(self.egg_root) + 1 :].split(os.sep) - raise AssertionError(f"{fspath} is not a subpath of {self.egg_root}") + return fspath[len(self.egg_root) + 1:].split(os.sep) + raise AssertionError( + "%s is not a subpath of %s" % (fspath, self.egg_root) + ) @property def zipinfo(self): return self._zip_manifests.load(self.loader.archive) - def get_resource_filename( - self, manager: ResourceManager, resource_name: str - ) -> str: + def get_resource_filename(self, manager, resource_name): if not self.egg_name: raise NotImplementedError( "resource_filename() only supported for .egg, not .zip" @@ -2058,25 +1772,26 @@ class ZipProvider(EggProvider): return timestamp, size # FIXME: 'ZipProvider._extract_resource' is too complex (12) - def _extract_resource(self, manager: ResourceManager, zip_path) -> str: # noqa: C901 + def _extract_resource(self, manager, zip_path): # noqa: C901 + if zip_path in self._index(): for name in self._index()[zip_path]: - last = self._extract_resource(manager, os.path.join(zip_path, name)) + last = self._extract_resource( + manager, os.path.join(zip_path, name) + ) # return the extracted directory name return os.path.dirname(last) - timestamp, _size = self._get_date_and_size(self.zipinfo[zip_path]) + timestamp, size = self._get_date_and_size(self.zipinfo[zip_path]) if not WRITE_SUPPORT: - raise OSError( - '"os.rename" and "os.unlink" are not supported on this platform' - ) + raise IOError('"os.rename" and "os.unlink" are not supported ' + 'on this platform') try: - if not self.egg_name: - raise OSError( - '"egg_name" is empty. This likely means no egg could be found from the "module_path".' - ) - real_path = manager.get_cache_path(self.egg_name, self._parts(zip_path)) + + real_path = manager.get_cache_path( + self.egg_name, self._parts(zip_path) + ) if self._is_current(real_path, zip_path): return real_path @@ -2093,7 +1808,7 @@ class ZipProvider(EggProvider): try: rename(tmpnam, real_path) - except OSError: + except os.error: if os.path.isfile(real_path): if self._is_current(real_path, zip_path): # the file became current since it was checked above, @@ -2106,7 +1821,7 @@ class ZipProvider(EggProvider): return real_path raise - except OSError: + except os.error: # report a user-friendly error manager.extraction_error() @@ -2154,20 +1869,20 @@ class ZipProvider(EggProvider): self._dirindex = ind return ind - def _has(self, fspath) -> bool: + def _has(self, fspath): zip_path = self._zipinfo_name(fspath) return zip_path in self.zipinfo or zip_path in self._index() - def _isdir(self, fspath) -> bool: + def _isdir(self, fspath): return self._zipinfo_name(fspath) in self._index() def _listdir(self, fspath): return list(self._index().get(self._zipinfo_name(fspath), ())) - def _eager_to_zip(self, resource_name: str): + def _eager_to_zip(self, resource_name): return self._zipinfo_name(self._fn(self.egg_root, resource_name)) - def _resource_to_zip(self, resource_name: str): + def _resource_to_zip(self, resource_name): return self._zipinfo_name(self._fn(self.module_path, resource_name)) @@ -2186,32 +1901,32 @@ class FileMetadata(EmptyProvider): the provided location. """ - def __init__(self, path: StrPath) -> None: + def __init__(self, path): self.path = path def _get_metadata_path(self, name): return self.path - def has_metadata(self, name: str) -> bool: + def has_metadata(self, name): return name == 'PKG-INFO' and os.path.isfile(self.path) - def get_metadata(self, name: str) -> str: + def get_metadata(self, name): if name != 'PKG-INFO': raise KeyError("No metadata except PKG-INFO is available") - with open(self.path, encoding='utf-8', errors="replace") as f: + with io.open(self.path, encoding='utf-8', errors="replace") as f: metadata = f.read() self._warn_on_replacement(metadata) return metadata - def _warn_on_replacement(self, metadata) -> None: + def _warn_on_replacement(self, metadata): replacement_char = '�' if replacement_char in metadata: tmpl = "{self.path} could not be properly decoded in UTF-8" msg = tmpl.format(**locals()) warnings.warn(msg) - def get_metadata_lines(self, name: str) -> Iterator[str]: + def get_metadata_lines(self, name): return yield_lines(self.get_metadata(name)) @@ -2235,7 +1950,7 @@ class PathMetadata(DefaultProvider): dist = Distribution.from_filename(egg_path, metadata=metadata) """ - def __init__(self, path: str, egg_info: str) -> None: + def __init__(self, path, egg_info): self.module_path = path self.egg_info = egg_info @@ -2243,7 +1958,7 @@ class PathMetadata(DefaultProvider): class EggMetadata(ZipProvider): """Metadata provider for .egg files""" - def __init__(self, importer: zipimport.zipimporter) -> None: + def __init__(self, importer): """Create a metadata provider from a zipimporter""" self.zip_pre = importer.archive + os.sep @@ -2255,14 +1970,10 @@ class EggMetadata(ZipProvider): self._setup_prefix() -_distribution_finders: dict[type, _DistFinderType[Any]] = _declare_state( - 'dict', '_distribution_finders', {} -) +_declare_state('dict', _distribution_finders={}) -def register_finder( - importer_type: type[_T], distribution_finder: _DistFinderType[_T] -) -> None: +def register_finder(importer_type, distribution_finder): """Register `distribution_finder` to find distributions in sys.path items `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item @@ -2272,16 +1983,14 @@ def register_finder( _distribution_finders[importer_type] = distribution_finder -def find_distributions(path_item: str, only: bool = False) -> Iterable[Distribution]: +def find_distributions(path_item, only=False): """Yield distributions accessible via `path_item`""" importer = get_importer(path_item) finder = _find_adapter(_distribution_finders, importer) return finder(importer, path_item, only) -def find_eggs_in_zip( - importer: zipimport.zipimporter, path_item: str, only: bool = False -) -> Iterator[Distribution]: +def find_eggs_in_zip(importer, path_item, only=False): """ Find eggs in zip files; possibly multiple nested eggs. """ @@ -2299,7 +2008,8 @@ def find_eggs_in_zip( if _is_egg_path(subitem): subpath = os.path.join(path_item, subitem) dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath) - yield from dists + for dist in dists: + yield dist elif subitem.lower().endswith(('.dist-info', '.egg-info')): subpath = os.path.join(path_item, subitem) submeta = EggMetadata(zipimport.zipimporter(subpath)) @@ -2310,51 +2020,100 @@ def find_eggs_in_zip( register_finder(zipimport.zipimporter, find_eggs_in_zip) -def find_nothing( - importer: object | None, path_item: str | None, only: bool | None = False -): +def find_nothing(importer, path_item, only=False): return () register_finder(object, find_nothing) -def find_on_path(importer: object | None, path_item, only=False): +def _by_version_descending(names): + """ + Given a list of filenames, return them in descending order + by version number. + + >>> names = 'bar', 'foo', 'Python-2.7.10.egg', 'Python-2.7.2.egg' + >>> _by_version_descending(names) + ['Python-2.7.10.egg', 'Python-2.7.2.egg', 'bar', 'foo'] + >>> names = 'Setuptools-1.2.3b1.egg', 'Setuptools-1.2.3.egg' + >>> _by_version_descending(names) + ['Setuptools-1.2.3.egg', 'Setuptools-1.2.3b1.egg'] + >>> names = 'Setuptools-1.2.3b1.egg', 'Setuptools-1.2.3.post1.egg' + >>> _by_version_descending(names) + ['Setuptools-1.2.3.post1.egg', 'Setuptools-1.2.3b1.egg'] + """ + def try_parse(name): + """ + Attempt to parse as a version or return a null version. + """ + try: + return packaging.version.Version(name) + except Exception: + return packaging.version.Version('0') + + def _by_version(name): + """ + Parse each component of the filename + """ + name, ext = os.path.splitext(name) + parts = itertools.chain(name.split('-'), [ext]) + return [try_parse(part) for part in parts] + + return sorted(names, key=_by_version, reverse=True) + + +def find_on_path(importer, path_item, only=False): """Yield distributions accessible on a sys.path directory""" path_item = _normalize_cached(path_item) if _is_unpacked_egg(path_item): yield Distribution.from_filename( - path_item, - metadata=PathMetadata(path_item, os.path.join(path_item, 'EGG-INFO')), + path_item, metadata=PathMetadata( + path_item, os.path.join(path_item, 'EGG-INFO') + ) ) return - entries = (os.path.join(path_item, child) for child in safe_listdir(path_item)) + entries = ( + os.path.join(path_item, child) + for child in safe_listdir(path_item) + ) + + # for performance, before sorting by version, + # screen entries for only those that will yield + # distributions + filtered = ( + entry + for entry in entries + if dist_factory(path_item, entry, only) + ) # scan for .egg and .egg-info in directory - for entry in sorted(entries): + path_item_entries = _by_version_descending(filtered) + for entry in path_item_entries: fullpath = os.path.join(path_item, entry) factory = dist_factory(path_item, entry, only) - yield from factory(fullpath) + for dist in factory(fullpath): + yield dist def dist_factory(path_item, entry, only): """Return a dist_factory for the given entry.""" lower = entry.lower() is_egg_info = lower.endswith('.egg-info') - is_dist_info = lower.endswith('.dist-info') and os.path.isdir( - os.path.join(path_item, entry) + is_dist_info = ( + lower.endswith('.dist-info') and + os.path.isdir(os.path.join(path_item, entry)) ) is_meta = is_egg_info or is_dist_info return ( distributions_from_metadata - if is_meta - else find_distributions - if not only and _is_egg_path(entry) - else resolve_egg_link - if not only and lower.endswith('.egg-link') - else NoDists() + if is_meta else + find_distributions + if not only and _is_egg_path(entry) else + resolve_egg_link + if not only and lower.endswith('.egg-link') else + NoDists() ) @@ -2366,15 +2125,14 @@ class NoDists: >>> list(NoDists()('anything')) [] """ - - def __bool__(self) -> Literal[False]: + def __bool__(self): return False - def __call__(self, fullpath: object): + def __call__(self, fullpath): return iter(()) -def safe_listdir(path: StrOrBytesPath): +def safe_listdir(path): """ Attempt to list contents of path, but suppress some exceptions. """ @@ -2390,21 +2148,18 @@ def safe_listdir(path: StrOrBytesPath): return () -def distributions_from_metadata(path: str): +def distributions_from_metadata(path): root = os.path.dirname(path) if os.path.isdir(path): if len(os.listdir(path)) == 0: # empty metadata dir; skip return - metadata: _MetadataType = PathMetadata(root, path) + metadata = PathMetadata(root, path) else: metadata = FileMetadata(path) entry = os.path.basename(path) yield Distribution.from_location( - root, - entry, - metadata, - precedence=DEVELOP_DIST, + root, entry, metadata, precedence=DEVELOP_DIST, ) @@ -2412,10 +2167,11 @@ def non_empty_lines(path): """ Yield non-empty lines from file at path """ - for line in _read_utf8_with_fallback(path).splitlines(): - line = line.strip() - if line: - yield line + with open(path) as f: + for line in f: + line = line.strip() + if line: + yield line def resolve_egg_link(path): @@ -2425,28 +2181,23 @@ def resolve_egg_link(path): """ referenced_paths = non_empty_lines(path) resolved_paths = ( - os.path.join(os.path.dirname(path), ref) for ref in referenced_paths + os.path.join(os.path.dirname(path), ref) + for ref in referenced_paths ) dist_groups = map(find_distributions, resolved_paths) return next(dist_groups, ()) -if hasattr(pkgutil, 'ImpImporter'): - register_finder(pkgutil.ImpImporter, find_on_path) +register_finder(pkgutil.ImpImporter, find_on_path) -register_finder(importlib.machinery.FileFinder, find_on_path) +if hasattr(importlib_machinery, 'FileFinder'): + register_finder(importlib_machinery.FileFinder, find_on_path) -_namespace_handlers: dict[type, _NSHandlerType[Any]] = _declare_state( - 'dict', '_namespace_handlers', {} -) -_namespace_packages: dict[str | None, list[str]] = _declare_state( - 'dict', '_namespace_packages', {} -) +_declare_state('dict', _namespace_handlers={}) +_declare_state('dict', _namespace_packages={}) -def register_namespace_handler( - importer_type: type[_T], namespace_handler: _NSHandlerType[_T] -) -> None: +def register_namespace_handler(importer_type, namespace_handler): """Register `namespace_handler` to declare namespace packages `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item @@ -2501,7 +2252,7 @@ def _handle_ns(packageName, path_item): return subpath -def _rebuild_mod_path(orig_path, package_name, module: types.ModuleType) -> None: +def _rebuild_mod_path(orig_path, package_name, module): """ Rebuild module.__path__ ensuring that all entries are ordered corresponding to their sys.path order @@ -2535,24 +2286,15 @@ def _rebuild_mod_path(orig_path, package_name, module: types.ModuleType) -> None module.__path__ = new_path -def declare_namespace(packageName: str) -> None: +def declare_namespace(packageName): """Declare that package 'packageName' is a namespace package""" - msg = ( - f"Deprecated call to `pkg_resources.declare_namespace({packageName!r})`.\n" - "Implementing implicit namespace packages (as specified in PEP 420) " - "is preferred to `pkg_resources.declare_namespace`. " - "See https://setuptools.pypa.io/en/latest/references/" - "keywords.html#keyword-namespace-packages" - ) - warnings.warn(msg, DeprecationWarning, stacklevel=2) - _imp.acquire_lock() try: if packageName in _namespace_packages: return - path: MutableSequence[str] = sys.path + path = sys.path parent, _, _ = packageName.rpartition('.') if parent: @@ -2578,7 +2320,7 @@ def declare_namespace(packageName: str) -> None: _imp.release_lock() -def fixup_namespace_packages(path_item: str, parent: str | None = None) -> None: +def fixup_namespace_packages(path_item, parent=None): """Ensure that previously-declared namespace packages include path_item""" _imp.acquire_lock() try: @@ -2590,12 +2332,7 @@ def fixup_namespace_packages(path_item: str, parent: str | None = None) -> None: _imp.release_lock() -def file_ns_handler( - importer: object, - path_item: StrPath, - packageName: str, - module: types.ModuleType, -): +def file_ns_handler(importer, path_item, packageName, module): """Compute an ns-package subpath for a filesystem or zipfile importer""" subpath = os.path.join(path_item, packageName.split('.')[-1]) @@ -2608,35 +2345,27 @@ def file_ns_handler( return subpath -if hasattr(pkgutil, 'ImpImporter'): - register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) - +register_namespace_handler(pkgutil.ImpImporter, file_ns_handler) register_namespace_handler(zipimport.zipimporter, file_ns_handler) -register_namespace_handler(importlib.machinery.FileFinder, file_ns_handler) + +if hasattr(importlib_machinery, 'FileFinder'): + register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler) -def null_ns_handler( - importer: object, - path_item: str | None, - packageName: str | None, - module: _ModuleLike | None, -) -> None: +def null_ns_handler(importer, path_item, packageName, module): return None register_namespace_handler(object, null_ns_handler) -@overload -def normalize_path(filename: StrPath) -> str: ... -@overload -def normalize_path(filename: BytesPath) -> bytes: ... -def normalize_path(filename: StrOrBytesPath) -> str | bytes: +def normalize_path(filename): """Normalize a file/dir name for comparison purposes""" - return os.path.normcase(os.path.realpath(os.path.normpath(_cygwin_patch(filename)))) + return os.path.normcase(os.path.realpath(os.path.normpath( + _cygwin_patch(filename)))) -def _cygwin_patch(filename: StrOrBytesPath): # pragma: nocover +def _cygwin_patch(filename): # pragma: nocover """ Contrary to POSIX 2008, on Cygwin, getcwd (3) contains symlink components. Using @@ -2647,20 +2376,12 @@ def _cygwin_patch(filename: StrOrBytesPath): # pragma: nocover return os.path.abspath(filename) if sys.platform == 'cygwin' else filename -if TYPE_CHECKING: - # https://github.com/python/mypy/issues/16261 - # https://github.com/python/typeshed/issues/6347 - @overload - def _normalize_cached(filename: StrPath) -> str: ... - @overload - def _normalize_cached(filename: BytesPath) -> bytes: ... - def _normalize_cached(filename: StrOrBytesPath) -> str | bytes: ... - -else: - - @functools.cache - def _normalize_cached(filename): - return normalize_path(filename) +def _normalize_cached(filename, _cache={}): + try: + return _cache[filename] + except KeyError: + _cache[filename] = result = normalize_path(filename) + return result def _is_egg_path(path): @@ -2672,9 +2393,9 @@ def _is_egg_path(path): def _is_zip_egg(path): return ( - path.lower().endswith('.egg') - and os.path.isfile(path) - and zipfile.is_zipfile(path) + path.lower().endswith('.egg') and + os.path.isfile(path) and + zipfile.is_zipfile(path) ) @@ -2682,12 +2403,13 @@ def _is_unpacked_egg(path): """ Determine if given path appears to be an unpacked egg. """ - return path.lower().endswith('.egg') and os.path.isfile( - os.path.join(path, 'EGG-INFO', 'PKG-INFO') + return ( + path.lower().endswith('.egg') and + os.path.isfile(os.path.join(path, 'EGG-INFO', 'PKG-INFO')) ) -def _set_parent_ns(packageName) -> None: +def _set_parent_ns(packageName): parts = packageName.split('.') name = parts.pop() if parts: @@ -2713,14 +2435,7 @@ EGG_NAME = re.compile( class EntryPoint: """Object representing an advertised importable object""" - def __init__( - self, - name: str, - module_name: str, - attrs: Iterable[str] = (), - extras: Iterable[str] = (), - dist: Distribution | None = None, - ) -> None: + def __init__(self, name, module_name, attrs=(), extras=(), dist=None): if not MODULE(module_name): raise ValueError("Invalid module name", module_name) self.name = name @@ -2729,38 +2444,18 @@ class EntryPoint: self.extras = tuple(extras) self.dist = dist - def __str__(self) -> str: - s = f"{self.name} = {self.module_name}" + def __str__(self): + s = "%s = %s" % (self.name, self.module_name) if self.attrs: s += ':' + '.'.join(self.attrs) if self.extras: - extras = ','.join(self.extras) - s += f' [{extras}]' + s += ' [%s]' % ','.join(self.extras) return s - def __repr__(self) -> str: - return f"EntryPoint.parse({str(self)!r})" + def __repr__(self): + return "EntryPoint.parse(%r)" % str(self) - @overload - def load( - self, - require: Literal[True] = True, - env: Environment | None = None, - installer: _InstallerType | None = None, - ) -> _ResolvedEntryPoint: ... - @overload - def load( - self, - require: Literal[False], - *args: Any, - **kwargs: Any, - ) -> _ResolvedEntryPoint: ... - def load( - self, - require: bool = True, - *args: Environment | _InstallerType | None, - **kwargs: Environment | _InstallerType | None, - ) -> _ResolvedEntryPoint: + def load(self, require=True, *args, **kwargs): """ Require packages for this EntryPoint, then resolve it. """ @@ -2772,12 +2467,10 @@ class EntryPoint: stacklevel=2, ) if require: - # We could pass `env` and `installer` directly, - # but keeping `*args` and `**kwargs` for backwards compatibility - self.require(*args, **kwargs) # type: ignore[arg-type] + self.require(*args, **kwargs) return self.resolve() - def resolve(self) -> _ResolvedEntryPoint: + def resolve(self): """ Resolve the entry point from its module and attrs. """ @@ -2787,14 +2480,9 @@ class EntryPoint: except AttributeError as exc: raise ImportError(str(exc)) from exc - def require( - self, - env: Environment | None = None, - installer: _InstallerType | None = None, - ) -> None: - if not self.dist: - error_cls = UnknownExtra if self.extras else AttributeError - raise error_cls("Can't require() without a distribution", self) + def require(self, env=None, installer=None): + if self.extras and not self.dist: + raise UnknownExtra("Can't require() without a distribution", self) # Get the requirements for this entry point with all its extras and # then resolve them. We have to pass `extras` along when resolving so @@ -2815,7 +2503,7 @@ class EntryPoint: ) @classmethod - def parse(cls, src: str, dist: Distribution | None = None) -> Self: + def parse(cls, src, dist=None): """Parse a single entry point from string `src` Entry point syntax follows the form:: @@ -2840,20 +2528,15 @@ class EntryPoint: return () req = Requirement.parse('x' + extras_spec) if req.specs: - raise ValueError + raise ValueError() return req.extras @classmethod - def parse_group( - cls, - group: str, - lines: _NestedStr, - dist: Distribution | None = None, - ) -> dict[str, Self]: + def parse_group(cls, group, lines, dist=None): """Parse an entry point group""" if not MODULE(group): raise ValueError("Invalid group name", group) - this: dict[str, Self] = {} + this = {} for line in yield_lines(lines): ep = cls.parse(line, dist) if ep.name in this: @@ -2862,19 +2545,14 @@ class EntryPoint: return this @classmethod - def parse_map( - cls, - data: str | Iterable[str] | dict[str, str | Iterable[str]], - dist: Distribution | None = None, - ) -> dict[str, dict[str, Self]]: + def parse_map(cls, data, dist=None): """Parse a map of entry point groups""" - _data: Iterable[tuple[str | None, str | Iterable[str]]] if isinstance(data, dict): - _data = data.items() + data = data.items() else: - _data = split_sections(data) - maps: dict[str, dict[str, Self]] = {} - for group, lines in _data: + data = split_sections(data) + maps = {} + for group, lines in data: if group is None: if not lines: continue @@ -2891,10 +2569,8 @@ def _version_from_file(lines): Given an iterable of lines from a Metadata file, return the value of the Version field, if present, or None otherwise. """ - def is_version_line(line): return line.lower().startswith('version:') - version_lines = filter(is_version_line, lines) line = next(iter(version_lines), '') _, _, value = line.partition(':') @@ -2903,19 +2579,12 @@ def _version_from_file(lines): class Distribution: """Wrap an actual or potential sys.path entry w/metadata""" - PKG_INFO = 'PKG-INFO' def __init__( - self, - location: str | None = None, - metadata: _MetadataType = None, - project_name: str | None = None, - version: str | None = None, - py_version: str | None = PY_MAJOR, - platform: str | None = None, - precedence: int = EGG_DIST, - ) -> None: + self, location=None, metadata=None, project_name=None, + version=None, py_version=PY_MAJOR, platform=None, + precedence=EGG_DIST): self.project_name = safe_name(project_name or 'Unknown') if version is not None: self._version = safe_version(version) @@ -2926,13 +2595,7 @@ class Distribution: self._provider = metadata or empty_provider @classmethod - def from_location( - cls, - location: str, - basename: StrPath, - metadata: _MetadataType = None, - **kw: int, # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility - ) -> Distribution: + def from_location(cls, location, basename, metadata=None, **kw): project_name, version, py_version, platform = [None] * 4 basename, ext = os.path.splitext(basename) if ext.lower() in _distributionImpl: @@ -2944,13 +2607,8 @@ class Distribution: 'name', 'ver', 'pyver', 'plat' ) return cls( - location, - metadata, - project_name=project_name, - version=version, - py_version=py_version, - platform=platform, - **kw, + location, metadata, project_name=project_name, version=version, + py_version=py_version, platform=platform, **kw )._reload_version() def _reload_version(self): @@ -2959,7 +2617,7 @@ class Distribution: @property def hashcmp(self): return ( - self._forgiving_parsed_version, + self.parsed_version, self.precedence, self.key, self.location, @@ -2967,28 +2625,28 @@ class Distribution: self.platform or '', ) - def __hash__(self) -> int: + def __hash__(self): return hash(self.hashcmp) - def __lt__(self, other: Distribution) -> bool: + def __lt__(self, other): return self.hashcmp < other.hashcmp - def __le__(self, other: Distribution) -> bool: + def __le__(self, other): return self.hashcmp <= other.hashcmp - def __gt__(self, other: Distribution) -> bool: + def __gt__(self, other): return self.hashcmp > other.hashcmp - def __ge__(self, other: Distribution) -> bool: + def __ge__(self, other): return self.hashcmp >= other.hashcmp - def __eq__(self, other: object) -> bool: + def __eq__(self, other): if not isinstance(other, self.__class__): # It's not a Distribution, so they are not equal return False return self.hashcmp == other.hashcmp - def __ne__(self, other: object) -> bool: + def __ne__(self, other): return not self == other # These properties have to be lazy so that we don't have to load any @@ -3006,42 +2664,35 @@ class Distribution: @property def parsed_version(self): if not hasattr(self, "_parsed_version"): - try: - self._parsed_version = parse_version(self.version) - except packaging.version.InvalidVersion as ex: - info = f"(package: {self.project_name})" - if hasattr(ex, "add_note"): - ex.add_note(info) # PEP 678 - raise - raise packaging.version.InvalidVersion(f"{str(ex)} {info}") from None + self._parsed_version = parse_version(self.version) return self._parsed_version - @property - def _forgiving_parsed_version(self): - try: - return self.parsed_version - except packaging.version.InvalidVersion as ex: - self._parsed_version = parse_version(_forgiving_version(self.version)) + def _warn_legacy_version(self): + LV = packaging.version.LegacyVersion + is_legacy = isinstance(self._parsed_version, LV) + if not is_legacy: + return - notes = "\n".join(getattr(ex, "__notes__", [])) # PEP 678 - msg = f"""!!\n\n - ************************************************************************* - {str(ex)}\n{notes} + # While an empty version is technically a legacy version and + # is not a valid PEP 440 version, it's also unlikely to + # actually come from someone and instead it is more likely that + # it comes from setuptools attempting to parse a filename and + # including it in the list. So for that we'll gate this warning + # on if the version is anything at all or not. + if not self.version: + return - This is a long overdue deprecation. - For the time being, `pkg_resources` will use `{self._parsed_version}` - as a replacement to avoid breaking existing environments, - but no future compatibility is guaranteed. + tmpl = textwrap.dedent(""" + '{project_name} ({version})' is being parsed as a legacy, + non PEP 440, + version. You may find odd behavior and sort order. + In particular it will be sorted as less than 0.0. It + is recommended to migrate to PEP 440 compatible + versions. + """).strip().replace('\n', ' ') - If you maintain package {self.project_name} you should implement - the relevant changes to adequate the project to PEP 440 immediately. - ************************************************************************* - \n\n!! - """ - warnings.warn(msg, DeprecationWarning) - - return self._parsed_version + warnings.warn(tmpl.format(**vars(self)), PEP440Warning) @property def version(self): @@ -3051,7 +2702,9 @@ class Distribution: version = self._get_version() if version is None: path = self._get_metadata_path_for_display(self.PKG_INFO) - msg = f"Missing 'Version:' header and/or {self.PKG_INFO} file at path: {path}" + msg = ( + "Missing 'Version:' header and/or {} file at path: {}" + ).format(self.PKG_INFO, path) raise ValueError(msg, self) from e return version @@ -3069,20 +2722,19 @@ class Distribution: return self.__dep_map @staticmethod - def _filter_extras( - dm: dict[str | None, list[Requirement]], - ) -> dict[str | None, list[Requirement]]: + def _filter_extras(dm): """ Given a mapping of extras to dependencies, strip off environment markers and filter out any dependencies not matching the markers. """ for extra in list(filter(None, dm)): - new_extra: str | None = extra + new_extra = extra reqs = dm.pop(extra) new_extra, _, marker = extra.partition(':') fails_marker = marker and ( - invalid_marker(marker) or not evaluate_marker(marker) + invalid_marker(marker) + or not evaluate_marker(marker) ) if fails_marker: reqs = [] @@ -3098,16 +2750,18 @@ class Distribution: dm.setdefault(extra, []).extend(parse_requirements(reqs)) return dm - def requires(self, extras: Iterable[str] = ()) -> list[Requirement]: + def requires(self, extras=()): """List of Requirements needed for this distro if `extras` are used""" dm = self._dep_map - deps: list[Requirement] = [] + deps = [] deps.extend(dm.get(None, ())) for ext in extras: try: deps.extend(dm[safe_extra(ext)]) except KeyError as e: - raise UnknownExtra(f"{self} has no such extra feature {ext!r}") from e + raise UnknownExtra( + "%s has no such extra feature %r" % (self, ext) + ) from e return deps def _get_metadata_path_for_display(self, name): @@ -3129,18 +2783,21 @@ class Distribution: def _get_metadata(self, name): if self.has_metadata(name): - yield from self.get_metadata_lines(name) + for line in self.get_metadata_lines(name): + yield line def _get_version(self): lines = self._get_metadata(self.PKG_INFO) - return _version_from_file(lines) + version = _version_from_file(lines) - def activate(self, path: list[str] | None = None, replace: bool = False) -> None: + return version + + def activate(self, path=None, replace=False): """Ensure distribution is importable on `path` (default=sys.path)""" if path is None: path = sys.path self.insert_on(path, replace=replace) - if path is sys.path and self.location is not None: + if path is sys.path: fixup_namespace_packages(self.location) for pkg in self._get_metadata('namespace_packages.txt'): if pkg in sys.modules: @@ -3148,27 +2805,30 @@ class Distribution: def egg_name(self): """Return what this distribution's standard .egg filename should be""" - filename = f"{to_filename(self.project_name)}-{to_filename(self.version)}-py{self.py_version or PY_MAJOR}" + filename = "%s-%s-py%s" % ( + to_filename(self.project_name), to_filename(self.version), + self.py_version or PY_MAJOR + ) if self.platform: filename += '-' + self.platform return filename - def __repr__(self) -> str: + def __repr__(self): if self.location: - return f"{self} ({self.location})" + return "%s (%s)" % (self, self.location) else: return str(self) - def __str__(self) -> str: + def __str__(self): try: version = getattr(self, 'version', None) except ValueError: version = None version = version or "[unknown version]" - return f"{self.project_name} {version}" + return "%s %s" % (self.project_name, version) - def __getattr__(self, attr: str): + def __getattr__(self, attr): """Delegate all unrecognized public attributes to .metadata provider""" if attr.startswith('_'): raise AttributeError(attr) @@ -3176,62 +2836,54 @@ class Distribution: def __dir__(self): return list( - set(super().__dir__()) - | set(attr for attr in self._provider.__dir__() if not attr.startswith('_')) + set(super(Distribution, self).__dir__()) + | set( + attr for attr in self._provider.__dir__() + if not attr.startswith('_') + ) ) @classmethod - def from_filename( - cls, - filename: StrPath, - metadata: _MetadataType = None, - **kw: int, # We could set `precedence` explicitly, but keeping this as `**kw` for full backwards and subclassing compatibility - ) -> Distribution: + def from_filename(cls, filename, metadata=None, **kw): return cls.from_location( - _normalize_cached(filename), os.path.basename(filename), metadata, **kw + _normalize_cached(filename), os.path.basename(filename), metadata, + **kw ) def as_requirement(self): """Return a ``Requirement`` that matches this distribution exactly""" if isinstance(self.parsed_version, packaging.version.Version): - spec = f"{self.project_name}=={self.parsed_version}" + spec = "%s==%s" % (self.project_name, self.parsed_version) else: - spec = f"{self.project_name}==={self.parsed_version}" + spec = "%s===%s" % (self.project_name, self.parsed_version) return Requirement.parse(spec) - def load_entry_point(self, group: str, name: str) -> _ResolvedEntryPoint: + def load_entry_point(self, group, name): """Return the `name` entry point of `group` or raise ImportError""" ep = self.get_entry_info(group, name) if ep is None: - raise ImportError(f"Entry point {(group, name)!r} not found") + raise ImportError("Entry point %r not found" % ((group, name),)) return ep.load() - @overload - def get_entry_map(self, group: None = None) -> dict[str, dict[str, EntryPoint]]: ... - @overload - def get_entry_map(self, group: str) -> dict[str, EntryPoint]: ... - def get_entry_map(self, group: str | None = None): + def get_entry_map(self, group=None): """Return the entry point map for `group`, or the full entry map""" - if not hasattr(self, "_ep_map"): - self._ep_map = EntryPoint.parse_map( + try: + ep_map = self._ep_map + except AttributeError: + ep_map = self._ep_map = EntryPoint.parse_map( self._get_metadata('entry_points.txt'), self ) if group is not None: - return self._ep_map.get(group, {}) - return self._ep_map + return ep_map.get(group, {}) + return ep_map - def get_entry_info(self, group: str, name: str) -> EntryPoint | None: + def get_entry_info(self, group, name): """Return the EntryPoint object for `group`+`name`, or ``None``""" return self.get_entry_map(group).get(name) # FIXME: 'Distribution.insert_on' is too complex (13) - def insert_on( # noqa: C901 - self, - path: list[str], - loc=None, - replace: bool = False, - ) -> None: + def insert_on(self, path, loc=None, replace=False): # noqa: C901 """Ensure self.location is on path If replace=False (default): @@ -3307,43 +2959,35 @@ class Distribution: nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt')) loc = normalize_path(self.location) for modname in self._get_metadata('top_level.txt'): - if ( - modname not in sys.modules - or modname in nsp - or modname in _namespace_packages - ): + if (modname not in sys.modules or modname in nsp + or modname in _namespace_packages): continue if modname in ('pkg_resources', 'setuptools', 'site'): continue fn = getattr(sys.modules[modname], '__file__', None) - if fn and ( - normalize_path(fn).startswith(loc) or fn.startswith(self.location) - ): + if fn and (normalize_path(fn).startswith(loc) or + fn.startswith(self.location)): continue issue_warning( - f"Module {modname} was already imported from {fn}, " - f"but {self.location} is being added to sys.path", + "Module %s was already imported from %s, but %s is being added" + " to sys.path" % (modname, fn, self.location), ) - def has_version(self) -> bool: + def has_version(self): try: self.version except ValueError: issue_warning("Unbuilt egg for " + repr(self)) return False - except SystemError: - # TODO: remove this except clause when python/cpython#103632 is fixed. - return False return True - def clone(self, **kw: str | int | IResourceProvider | None) -> Self: + def clone(self, **kw): """Copy this distribution, substituting in any changed keyword args""" names = 'project_name version py_version platform location precedence' for attr in names.split(): kw.setdefault(attr, getattr(self, attr, None)) kw.setdefault('metadata', self._provider) - # Unsafely unpacking. But keeping **kw for backwards and subclassing compatibility - return self.__class__(**kw) # type:ignore[arg-type] + return self.__class__(**kw) @property def extras(self): @@ -3374,7 +3018,6 @@ class DistInfoDistribution(Distribution): Wrap an actual or potential sys.path entry w/metadata, .dist-info style. """ - PKG_INFO = 'METADATA' EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])") @@ -3396,11 +3039,11 @@ class DistInfoDistribution(Distribution): self.__dep_map = self._compute_dependencies() return self.__dep_map - def _compute_dependencies(self) -> dict[str | None, list[Requirement]]: + def _compute_dependencies(self): """Recompute this distribution's dependencies.""" - self.__dep_map: dict[str | None, list[Requirement]] = {None: []} + dm = self.__dep_map = {None: []} - reqs: list[Requirement] = [] + reqs = [] # Including any condition expressions for req in self._parsed_pkg_info.get_all('Requires-Dist') or []: reqs.extend(parse_requirements(req)) @@ -3411,15 +3054,13 @@ class DistInfoDistribution(Distribution): yield req common = types.MappingProxyType(dict.fromkeys(reqs_for_extra(None))) - self.__dep_map[None].extend(common) + dm[None].extend(common) for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []: s_extra = safe_extra(extra.strip()) - self.__dep_map[s_extra] = [ - r for r in reqs_for_extra(extra) if r not in common - ] + dm[s_extra] = [r for r in reqs_for_extra(extra) if r not in common] - return self.__dep_map + return dm _distributionImpl = { @@ -3442,7 +3083,7 @@ def issue_warning(*args, **kw): warnings.warn(stacklevel=level + 1, *args, **kw) -def parse_requirements(strs: _NestedStr) -> map[Requirement]: +def parse_requirements(strs): """ Yield ``Requirement`` objects for each specification in `strs`. @@ -3456,17 +3097,14 @@ class RequirementParseError(packaging.requirements.InvalidRequirement): class Requirement(packaging.requirements.Requirement): - # prefer variable length tuple to set (as found in - # packaging.requirements.Requirement) - extras: tuple[str, ...] # type: ignore[assignment] - - def __init__(self, requirement_string: str) -> None: + def __init__(self, requirement_string): """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" - super().__init__(requirement_string) + super(Requirement, self).__init__(requirement_string) self.unsafe_name = self.name project_name = safe_name(self.name) self.project_name, self.key = project_name, project_name.lower() - self.specs = [(spec.operator, spec.version) for spec in self.specifier] + self.specs = [ + (spec.operator, spec.version) for spec in self.specifier] self.extras = tuple(map(safe_extra, self.extras)) self.hashCmp = ( self.key, @@ -3477,40 +3115,36 @@ class Requirement(packaging.requirements.Requirement): ) self.__hash = hash(self.hashCmp) - def __eq__(self, other: object) -> bool: - return isinstance(other, Requirement) and self.hashCmp == other.hashCmp + def __eq__(self, other): + return ( + isinstance(other, Requirement) and + self.hashCmp == other.hashCmp + ) - def __ne__(self, other: object) -> bool: + def __ne__(self, other): return not self == other - def __contains__( - self, item: Distribution | packaging.specifiers.UnparsedVersion - ) -> bool: + def __contains__(self, item): if isinstance(item, Distribution): if item.key != self.key: return False - version = item.version - else: - version = item + item = item.version # Allow prereleases always in order to match the previous behavior of # this method. In the future this should be smarter and follow PEP 440 # more accurately. - return self.specifier.contains( - version, - prereleases=True, - ) + return self.specifier.contains(item, prereleases=True) - def __hash__(self) -> int: + def __hash__(self): return self.__hash - def __repr__(self) -> str: - return f"Requirement.parse({str(self)!r})" + def __repr__(self): + return "Requirement.parse(%r)" % str(self) @staticmethod - def parse(s: str | Iterable[str]) -> Requirement: - (req,) = parse_requirements(s) + def parse(s): + req, = parse_requirements(s) return req @@ -3524,27 +3158,24 @@ def _always_object(classes): return classes -def _find_adapter(registry: Mapping[type, _AdapterT], ob: object) -> _AdapterT: +def _find_adapter(registry, ob): """Return an adapter factory for `ob` from `registry`""" types = _always_object(inspect.getmro(getattr(ob, '__class__', type(ob)))) for t in types: if t in registry: return registry[t] - # _find_adapter would previously return None, and immediately be called. - # So we're raising a TypeError to keep backward compatibility if anyone depended on that behaviour. - raise TypeError(f"Could not find adapter for {registry} and {ob}") -def ensure_directory(path: StrOrBytesPath) -> None: +def ensure_directory(path): """Ensure that the parent directory of `path` exists""" dirname = os.path.dirname(path) os.makedirs(dirname, exist_ok=True) -def _bypass_ensure_directory(path) -> None: +def _bypass_ensure_directory(path): """Sandbox-bypassing version of ensure_directory()""" if not WRITE_SUPPORT: - raise OSError('"os.mkdir" not supported on this platform.') + raise IOError('"os.mkdir" not supported on this platform.') dirname, filename = split(path) if dirname and filename and not isdir(dirname): _bypass_ensure_directory(dirname) @@ -3554,7 +3185,7 @@ def _bypass_ensure_directory(path) -> None: pass -def split_sections(s: _NestedStr) -> Iterator[tuple[str | None, list[str]]]: +def split_sections(s): """Split a string or iterable thereof into (section, content) pairs Each ``section`` is a stripped version of the section header ("[section]") @@ -3563,7 +3194,7 @@ def split_sections(s: _NestedStr) -> Iterator[tuple[str | None, list[str]]]: header, they're returned in a first ``section`` of ``None``. """ section = None - content: list[str] = [] + content = [] for line in yield_lines(s): if line.startswith("["): if line.endswith("]"): @@ -3598,48 +3229,6 @@ def _mkstemp(*args, **kw): warnings.filterwarnings("ignore", category=PEP440Warning, append=True) -class PkgResourcesDeprecationWarning(Warning): - """ - Base class for warning about deprecations in ``pkg_resources`` - - This class is not derived from ``DeprecationWarning``, and as such is - visible by default. - """ - - -# Ported from ``setuptools`` to avoid introducing an import inter-dependency: -_LOCALE_ENCODING = "locale" if sys.version_info >= (3, 10) else None - - -# This must go before calls to `_call_aside`. See https://github.com/pypa/setuptools/pull/4422 -def _read_utf8_with_fallback(file: str, fallback_encoding=_LOCALE_ENCODING) -> str: - """See setuptools.unicode_utils._read_utf8_with_fallback""" - try: - with open(file, "r", encoding="utf-8") as f: - return f.read() - except UnicodeDecodeError: # pragma: no cover - msg = f"""\ - ******************************************************************************** - `encoding="utf-8"` fails with {file!r}, trying `encoding={fallback_encoding!r}`. - - This fallback behaviour is considered **deprecated** and future versions of - `setuptools/pkg_resources` may not implement it. - - Please encode {file!r} with "utf-8" to ensure future builds will succeed. - - If this file was produced by `setuptools` itself, cleaning up the cached files - and re-building/re-installing the package with a newer version of `setuptools` - (e.g. by updating `build-system.requires` in its `pyproject.toml`) - might solve the problem. - ******************************************************************************** - """ - # TODO: Add a deadline? - # See comment in setuptools.unicode_utils._Utf8EncodingNeeded - warnings.warn(msg, PkgResourcesDeprecationWarning, stacklevel=2) - with open(file, "r", encoding=fallback_encoding) as f: - return f.read() - - # from jaraco.functools 1.3 def _call_aside(f, *args, **kwargs): f(*args, **kwargs) @@ -3647,7 +3236,7 @@ def _call_aside(f, *args, **kwargs): @_call_aside -def _initialize(g=globals()) -> None: +def _initialize(g=globals()): "Set up global resource manager (deliberately not state-saved)" manager = ResourceManager() g['_manager'] = manager @@ -3658,8 +3247,17 @@ def _initialize(g=globals()) -> None: ) +class PkgResourcesDeprecationWarning(Warning): + """ + Base class for warning about deprecations in ``pkg_resources`` + + This class is not derived from ``DeprecationWarning``, and as such is + visible by default. + """ + + @_call_aside -def _initialize_master_working_set() -> None: +def _initialize_master_working_set(): """ Prepare the master working set and make the ``require()`` API available. @@ -3671,7 +3269,8 @@ def _initialize_master_working_set() -> None: Invocation by other packages is unsupported and done at their own risk. """ - working_set = _declare_state('object', 'working_set', WorkingSet._build_master()) + working_set = WorkingSet._build_master() + _declare_state('object', working_set=working_set) require = working_set.require iter_entry_points = working_set.iter_entry_points @@ -3683,7 +3282,10 @@ def _initialize_master_working_set() -> None: # ensure that all distributions added to the working set in the future # (e.g. by calling ``require()``) will get activated as well, # with higher priority (replace=True). - tuple(dist.activate(replace=False) for dist in working_set) + tuple( + dist.activate(replace=False) + for dist in working_set + ) add_activation_listener( lambda dist: dist.activate(replace=True), existing=False, @@ -3692,23 +3294,3 @@ def _initialize_master_working_set() -> None: # match order list(map(working_set.add_entry, sys.path)) globals().update(locals()) - - -if TYPE_CHECKING: - # All of these are set by the @_call_aside methods above - __resource_manager = ResourceManager() # Won't exist at runtime - resource_exists = __resource_manager.resource_exists - resource_isdir = __resource_manager.resource_isdir - resource_filename = __resource_manager.resource_filename - resource_stream = __resource_manager.resource_stream - resource_string = __resource_manager.resource_string - resource_listdir = __resource_manager.resource_listdir - set_extraction_path = __resource_manager.set_extraction_path - cleanup_resources = __resource_manager.cleanup_resources - - working_set = WorkingSet() - require = working_set.require - iter_entry_points = working_set.iter_entry_points - add_activation_listener = working_set.subscribe - run_script = working_set.run_script - run_main = run_script diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/__pycache__/__init__.cpython-311.pyc index 1805ab1..4a6eebc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pkg_resources/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/api_tests.txt b/server/.venv/lib/python3.11/site-packages/pkg_resources/api_tests.txt deleted file mode 100644 index d72b85a..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/api_tests.txt +++ /dev/null @@ -1,424 +0,0 @@ -Pluggable Distributions of Python Software -========================================== - -Distributions -------------- - -A "Distribution" is a collection of files that represent a "Release" of a -"Project" as of a particular point in time, denoted by a -"Version":: - - >>> import sys, pkg_resources - >>> from pkg_resources import Distribution - >>> Distribution(project_name="Foo", version="1.2") - Foo 1.2 - -Distributions have a location, which can be a filename, URL, or really anything -else you care to use:: - - >>> dist = Distribution( - ... location="http://example.com/something", - ... project_name="Bar", version="0.9" - ... ) - - >>> dist - Bar 0.9 (http://example.com/something) - - -Distributions have various introspectable attributes:: - - >>> dist.location - 'http://example.com/something' - - >>> dist.project_name - 'Bar' - - >>> dist.version - '0.9' - - >>> dist.py_version == '{}.{}'.format(*sys.version_info) - True - - >>> print(dist.platform) - None - -Including various computed attributes:: - - >>> from pkg_resources import parse_version - >>> dist.parsed_version == parse_version(dist.version) - True - - >>> dist.key # case-insensitive form of the project name - 'bar' - -Distributions are compared (and hashed) by version first:: - - >>> Distribution(version='1.0') == Distribution(version='1.0') - True - >>> Distribution(version='1.0') == Distribution(version='1.1') - False - >>> Distribution(version='1.0') < Distribution(version='1.1') - True - -but also by project name (case-insensitive), platform, Python version, -location, etc.:: - - >>> Distribution(project_name="Foo",version="1.0") == \ - ... Distribution(project_name="Foo",version="1.0") - True - - >>> Distribution(project_name="Foo",version="1.0") == \ - ... Distribution(project_name="foo",version="1.0") - True - - >>> Distribution(project_name="Foo",version="1.0") == \ - ... Distribution(project_name="Foo",version="1.1") - False - - >>> Distribution(project_name="Foo",py_version="2.3",version="1.0") == \ - ... Distribution(project_name="Foo",py_version="2.4",version="1.0") - False - - >>> Distribution(location="spam",version="1.0") == \ - ... Distribution(location="spam",version="1.0") - True - - >>> Distribution(location="spam",version="1.0") == \ - ... Distribution(location="baz",version="1.0") - False - - - -Hash and compare distribution by prio/plat - -Get version from metadata -provider capabilities -egg_name() -as_requirement() -from_location, from_filename (w/path normalization) - -Releases may have zero or more "Requirements", which indicate -what releases of another project the release requires in order to -function. A Requirement names the other project, expresses some criteria -as to what releases of that project are acceptable, and lists any "Extras" -that the requiring release may need from that project. (An Extra is an -optional feature of a Release, that can only be used if its additional -Requirements are satisfied.) - - - -The Working Set ---------------- - -A collection of active distributions is called a Working Set. Note that a -Working Set can contain any importable distribution, not just pluggable ones. -For example, the Python standard library is an importable distribution that -will usually be part of the Working Set, even though it is not pluggable. -Similarly, when you are doing development work on a project, the files you are -editing are also a Distribution. (And, with a little attention to the -directory names used, and including some additional metadata, such a -"development distribution" can be made pluggable as well.) - - >>> from pkg_resources import WorkingSet - -A working set's entries are the sys.path entries that correspond to the active -distributions. By default, the working set's entries are the items on -``sys.path``:: - - >>> ws = WorkingSet() - >>> ws.entries == sys.path - True - -But you can also create an empty working set explicitly, and add distributions -to it:: - - >>> ws = WorkingSet([]) - >>> ws.add(dist) - >>> ws.entries - ['http://example.com/something'] - >>> dist in ws - True - >>> Distribution('foo',version="") in ws - False - -And you can iterate over its distributions:: - - >>> list(ws) - [Bar 0.9 (http://example.com/something)] - -Adding the same distribution more than once is a no-op:: - - >>> ws.add(dist) - >>> list(ws) - [Bar 0.9 (http://example.com/something)] - -For that matter, adding multiple distributions for the same project also does -nothing, because a working set can only hold one active distribution per -project -- the first one added to it:: - - >>> ws.add( - ... Distribution( - ... 'http://example.com/something', project_name="Bar", - ... version="7.2" - ... ) - ... ) - >>> list(ws) - [Bar 0.9 (http://example.com/something)] - -You can append a path entry to a working set using ``add_entry()``:: - - >>> ws.entries - ['http://example.com/something'] - >>> ws.add_entry(pkg_resources.__file__) - >>> ws.entries - ['http://example.com/something', '...pkg_resources...'] - -Multiple additions result in multiple entries, even if the entry is already in -the working set (because ``sys.path`` can contain the same entry more than -once):: - - >>> ws.add_entry(pkg_resources.__file__) - >>> ws.entries - ['...example.com...', '...pkg_resources...', '...pkg_resources...'] - -And you can specify the path entry a distribution was found under, using the -optional second parameter to ``add()``:: - - >>> ws = WorkingSet([]) - >>> ws.add(dist,"foo") - >>> ws.entries - ['foo'] - -But even if a distribution is found under multiple path entries, it still only -shows up once when iterating the working set: - - >>> ws.add_entry(ws.entries[0]) - >>> list(ws) - [Bar 0.9 (http://example.com/something)] - -You can ask a WorkingSet to ``find()`` a distribution matching a requirement:: - - >>> from pkg_resources import Requirement - >>> print(ws.find(Requirement.parse("Foo==1.0"))) # no match, return None - None - - >>> ws.find(Requirement.parse("Bar==0.9")) # match, return distribution - Bar 0.9 (http://example.com/something) - -Note that asking for a conflicting version of a distribution already in a -working set triggers a ``pkg_resources.VersionConflict`` error: - - >>> try: - ... ws.find(Requirement.parse("Bar==1.0")) - ... except pkg_resources.VersionConflict as exc: - ... print(str(exc)) - ... else: - ... raise AssertionError("VersionConflict was not raised") - (Bar 0.9 (http://example.com/something), Requirement.parse('Bar==1.0')) - -You can subscribe a callback function to receive notifications whenever a new -distribution is added to a working set. The callback is immediately invoked -once for each existing distribution in the working set, and then is called -again for new distributions added thereafter:: - - >>> def added(dist): print("Added %s" % dist) - >>> ws.subscribe(added) - Added Bar 0.9 - >>> foo12 = Distribution(project_name="Foo", version="1.2", location="f12") - >>> ws.add(foo12) - Added Foo 1.2 - -Note, however, that only the first distribution added for a given project name -will trigger a callback, even during the initial ``subscribe()`` callback:: - - >>> foo14 = Distribution(project_name="Foo", version="1.4", location="f14") - >>> ws.add(foo14) # no callback, because Foo 1.2 is already active - - >>> ws = WorkingSet([]) - >>> ws.add(foo12) - >>> ws.add(foo14) - >>> ws.subscribe(added) - Added Foo 1.2 - -And adding a callback more than once has no effect, either:: - - >>> ws.subscribe(added) # no callbacks - - # and no double-callbacks on subsequent additions, either - >>> just_a_test = Distribution(project_name="JustATest", version="0.99") - >>> ws.add(just_a_test) - Added JustATest 0.99 - - -Finding Plugins ---------------- - -``WorkingSet`` objects can be used to figure out what plugins in an -``Environment`` can be loaded without any resolution errors:: - - >>> from pkg_resources import Environment - - >>> plugins = Environment([]) # normally, a list of plugin directories - >>> plugins.add(foo12) - >>> plugins.add(foo14) - >>> plugins.add(just_a_test) - -In the simplest case, we just get the newest version of each distribution in -the plugin environment:: - - >>> ws = WorkingSet([]) - >>> ws.find_plugins(plugins) - ([JustATest 0.99, Foo 1.4 (f14)], {}) - -But if there's a problem with a version conflict or missing requirements, the -method falls back to older versions, and the error info dict will contain an -exception instance for each unloadable plugin:: - - >>> ws.add(foo12) # this will conflict with Foo 1.4 - >>> ws.find_plugins(plugins) - ([JustATest 0.99, Foo 1.2 (f12)], {Foo 1.4 (f14): VersionConflict(...)}) - -But if you disallow fallbacks, the failed plugin will be skipped instead of -trying older versions:: - - >>> ws.find_plugins(plugins, fallback=False) - ([JustATest 0.99], {Foo 1.4 (f14): VersionConflict(...)}) - - - -Platform Compatibility Rules ----------------------------- - -On the Mac, there are potential compatibility issues for modules compiled -on newer versions of macOS than what the user is running. Additionally, -macOS will soon have two platforms to contend with: Intel and PowerPC. - -Basic equality works as on other platforms:: - - >>> from pkg_resources import compatible_platforms as cp - >>> reqd = 'macosx-10.4-ppc' - >>> cp(reqd, reqd) - True - >>> cp("win32", reqd) - False - -Distributions made on other machine types are not compatible:: - - >>> cp("macosx-10.4-i386", reqd) - False - -Distributions made on earlier versions of the OS are compatible, as -long as they are from the same top-level version. The patchlevel version -number does not matter:: - - >>> cp("macosx-10.4-ppc", reqd) - True - >>> cp("macosx-10.3-ppc", reqd) - True - >>> cp("macosx-10.5-ppc", reqd) - False - >>> cp("macosx-9.5-ppc", reqd) - False - -Backwards compatibility for packages made via earlier versions of -setuptools is provided as well:: - - >>> cp("darwin-8.2.0-Power_Macintosh", reqd) - True - >>> cp("darwin-7.2.0-Power_Macintosh", reqd) - True - >>> cp("darwin-8.2.0-Power_Macintosh", "macosx-10.3-ppc") - False - - -Environment Markers -------------------- - - >>> from pkg_resources import invalid_marker as im, evaluate_marker as em - >>> import os - - >>> print(im("sys_platform")) - Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in - sys_platform - ^ - - >>> print(im("sys_platform==")) - Expected a marker variable or quoted string - sys_platform== - ^ - - >>> print(im("sys_platform=='win32'")) - False - - >>> print(im("sys=='x'")) - Expected a marker variable or quoted string - sys=='x' - ^ - - >>> print(im("(extra)")) - Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in - (extra) - ^ - - >>> print(im("(extra")) - Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in - (extra - ^ - - >>> print(im("os.open('foo')=='y'")) - Expected a marker variable or quoted string - os.open('foo')=='y' - ^ - - >>> print(im("'x'=='y' and os.open('foo')=='y'")) # no short-circuit! - Expected a marker variable or quoted string - 'x'=='y' and os.open('foo')=='y' - ^ - - >>> print(im("'x'=='x' or os.open('foo')=='y'")) # no short-circuit! - Expected a marker variable or quoted string - 'x'=='x' or os.open('foo')=='y' - ^ - - >>> print(im("r'x'=='x'")) - Expected a marker variable or quoted string - r'x'=='x' - ^ - - >>> print(im("'''x'''=='x'")) - Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in - '''x'''=='x' - ^ - - >>> print(im('"""x"""=="x"')) - Expected marker operator, one of <=, <, !=, ==, >=, >, ~=, ===, in, not in - """x"""=="x" - ^ - - >>> print(im(r"x\n=='x'")) - Expected a marker variable or quoted string - x\n=='x' - ^ - - >>> print(im("os.open=='y'")) - Expected a marker variable or quoted string - os.open=='y' - ^ - - >>> em("sys_platform=='win32'") == (sys.platform=='win32') - True - - >>> em("python_version >= '2.7'") - True - - >>> em("python_version > '2.6'") - True - - >>> im("implementation_name=='cpython'") - False - - >>> im("platform_python_implementation=='CPython'") - False - - >>> im("implementation_version=='3.5.1'") - False diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/py.typed b/server/.venv/lib/python3.11/site-packages/pkg_resources/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__init__.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 28f4313..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_find_distributions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_find_distributions.cpython-311.pyc deleted file mode 100644 index 75f6223..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_find_distributions.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_integration_zope_interface.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_integration_zope_interface.cpython-311.pyc deleted file mode 100644 index dda7698..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_integration_zope_interface.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_markers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_markers.cpython-311.pyc deleted file mode 100644 index 098f97f..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_markers.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_pkg_resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_pkg_resources.cpython-311.pyc deleted file mode 100644 index 4faf2b5..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_pkg_resources.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_resources.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_resources.cpython-311.pyc deleted file mode 100644 index 20c7003..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_resources.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_working_set.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_working_set.cpython-311.pyc deleted file mode 100644 index 935c621..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/__pycache__/test_working_set.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/__pycache__/setup.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/__pycache__/setup.cpython-311.pyc deleted file mode 100644 index 3c33ff3..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/__pycache__/setup.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/setup.cfg b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/setup.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/setup.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/setup.py deleted file mode 100644 index ce90806..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-source/setup.py +++ /dev/null @@ -1,7 +0,0 @@ -import setuptools - -setuptools.setup( - name="my-test-package", - version="1.0", - zip_safe=True, -) diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-zip/my-test-package.zip b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-zip/my-test-package.zip deleted file mode 100644 index 81f9a01..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package-zip/my-test-package.zip and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO deleted file mode 100644 index 7328e3f..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO +++ /dev/null @@ -1,10 +0,0 @@ -Metadata-Version: 1.0 -Name: my-test-package -Version: 1.0 -Summary: UNKNOWN -Home-page: UNKNOWN -Author: UNKNOWN -Author-email: UNKNOWN -License: UNKNOWN -Description: UNKNOWN -Platform: UNKNOWN diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt deleted file mode 100644 index 3c4ee16..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt +++ /dev/null @@ -1,7 +0,0 @@ -setup.cfg -setup.py -my_test_package.egg-info/PKG-INFO -my_test_package.egg-info/SOURCES.txt -my_test_package.egg-info/dependency_links.txt -my_test_package.egg-info/top_level.txt -my_test_package.egg-info/zip-safe \ No newline at end of file diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt deleted file mode 100644 index 8b13789..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe deleted file mode 100644 index 8b13789..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg deleted file mode 100644 index 5115b89..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_find_distributions.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_find_distributions.py deleted file mode 100644 index 301b36d..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_find_distributions.py +++ /dev/null @@ -1,56 +0,0 @@ -import shutil -from pathlib import Path - -import pytest - -import pkg_resources - -TESTS_DATA_DIR = Path(__file__).parent / 'data' - - -class TestFindDistributions: - @pytest.fixture - def target_dir(self, tmpdir): - target_dir = tmpdir.mkdir('target') - # place a .egg named directory in the target that is not an egg: - target_dir.mkdir('not.an.egg') - return target_dir - - def test_non_egg_dir_named_egg(self, target_dir): - dists = pkg_resources.find_distributions(str(target_dir)) - assert not list(dists) - - def test_standalone_egg_directory(self, target_dir): - shutil.copytree( - TESTS_DATA_DIR / 'my-test-package_unpacked-egg', - target_dir, - dirs_exist_ok=True, - ) - dists = pkg_resources.find_distributions(str(target_dir)) - assert [dist.project_name for dist in dists] == ['my-test-package'] - dists = pkg_resources.find_distributions(str(target_dir), only=True) - assert not list(dists) - - def test_zipped_egg(self, target_dir): - shutil.copytree( - TESTS_DATA_DIR / 'my-test-package_zipped-egg', - target_dir, - dirs_exist_ok=True, - ) - dists = pkg_resources.find_distributions(str(target_dir)) - assert [dist.project_name for dist in dists] == ['my-test-package'] - dists = pkg_resources.find_distributions(str(target_dir), only=True) - assert not list(dists) - - def test_zipped_sdist_one_level_removed(self, target_dir): - shutil.copytree( - TESTS_DATA_DIR / 'my-test-package-zip', target_dir, dirs_exist_ok=True - ) - dists = pkg_resources.find_distributions( - str(target_dir / "my-test-package.zip") - ) - assert [dist.project_name for dist in dists] == ['my-test-package'] - dists = pkg_resources.find_distributions( - str(target_dir / "my-test-package.zip"), only=True - ) - assert not list(dists) diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_integration_zope_interface.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_integration_zope_interface.py deleted file mode 100644 index 4e37c34..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_integration_zope_interface.py +++ /dev/null @@ -1,54 +0,0 @@ -import platform -from inspect import cleandoc - -import jaraco.path -import pytest - -pytestmark = pytest.mark.integration - - -# For the sake of simplicity this test uses fixtures defined in -# `setuptools.test.fixtures`, -# and it also exercise conditions considered deprecated... -# So if needed this test can be deleted. -@pytest.mark.skipif( - platform.system() != "Linux", - reason="only demonstrated to fail on Linux in #4399", -) -def test_interop_pkg_resources_iter_entry_points(tmp_path, venv): - """ - Importing pkg_resources.iter_entry_points on console_scripts - seems to cause trouble with zope-interface, when deprecates installation method - is used. See #4399. - """ - project = { - "pkg": { - "foo.py": cleandoc( - """ - from pkg_resources import iter_entry_points - - def bar(): - print("Print me if you can") - """ - ), - "setup.py": cleandoc( - """ - from setuptools import setup, find_packages - - setup( - install_requires=["zope-interface==6.4.post2"], - entry_points={ - "console_scripts": [ - "foo=foo:bar", - ], - }, - ) - """ - ), - } - } - jaraco.path.build(project, prefix=tmp_path) - cmd = ["pip", "install", "-e", ".", "--no-use-pep517"] - venv.run(cmd, cwd=tmp_path / "pkg") # Needs this version of pkg_resources installed - out = venv.run(["foo"]) - assert "Print me if you can" in out diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_markers.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_markers.py deleted file mode 100644 index 9306d5b..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_markers.py +++ /dev/null @@ -1,8 +0,0 @@ -from unittest import mock - -from pkg_resources import evaluate_marker - - -@mock.patch('platform.python_version', return_value='2.7.10') -def test_ordering(python_version_mock): - assert evaluate_marker("python_full_version > '2.7.3'") is True diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_pkg_resources.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_pkg_resources.py deleted file mode 100644 index cfc9b16..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_pkg_resources.py +++ /dev/null @@ -1,485 +0,0 @@ -from __future__ import annotations - -import builtins -import datetime -import inspect -import os -import plistlib -import stat -import subprocess -import sys -import tempfile -import zipfile -from unittest import mock - -import pytest - -import pkg_resources -from pkg_resources import DistInfoDistribution, Distribution, EggInfoDistribution - -import distutils.command.install_egg_info -import distutils.dist - - -class EggRemover(str): - def __call__(self): - if self in sys.path: - sys.path.remove(self) - if os.path.exists(self): - os.remove(self) - - -class TestZipProvider: - finalizers: list[EggRemover] = [] - - ref_time = datetime.datetime(2013, 5, 12, 13, 25, 0) - "A reference time for a file modification" - - @classmethod - def setup_class(cls): - "create a zip egg and add it to sys.path" - egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False) - zip_egg = zipfile.ZipFile(egg, 'w') - zip_info = zipfile.ZipInfo() - zip_info.filename = 'mod.py' - zip_info.date_time = cls.ref_time.timetuple() - zip_egg.writestr(zip_info, 'x = 3\n') - zip_info = zipfile.ZipInfo() - zip_info.filename = 'data.dat' - zip_info.date_time = cls.ref_time.timetuple() - zip_egg.writestr(zip_info, 'hello, world!') - zip_info = zipfile.ZipInfo() - zip_info.filename = 'subdir/mod2.py' - zip_info.date_time = cls.ref_time.timetuple() - zip_egg.writestr(zip_info, 'x = 6\n') - zip_info = zipfile.ZipInfo() - zip_info.filename = 'subdir/data2.dat' - zip_info.date_time = cls.ref_time.timetuple() - zip_egg.writestr(zip_info, 'goodbye, world!') - zip_egg.close() - egg.close() - - sys.path.append(egg.name) - subdir = os.path.join(egg.name, 'subdir') - sys.path.append(subdir) - cls.finalizers.append(EggRemover(subdir)) - cls.finalizers.append(EggRemover(egg.name)) - - @classmethod - def teardown_class(cls): - for finalizer in cls.finalizers: - finalizer() - - def test_resource_listdir(self): - import mod # pyright: ignore[reportMissingImports] # Temporary package for test - - zp = pkg_resources.ZipProvider(mod) - - expected_root = ['data.dat', 'mod.py', 'subdir'] - assert sorted(zp.resource_listdir('')) == expected_root - - expected_subdir = ['data2.dat', 'mod2.py'] - assert sorted(zp.resource_listdir('subdir')) == expected_subdir - assert sorted(zp.resource_listdir('subdir/')) == expected_subdir - - assert zp.resource_listdir('nonexistent') == [] - assert zp.resource_listdir('nonexistent/') == [] - - import mod2 # pyright: ignore[reportMissingImports] # Temporary package for test - - zp2 = pkg_resources.ZipProvider(mod2) - - assert sorted(zp2.resource_listdir('')) == expected_subdir - - assert zp2.resource_listdir('subdir') == [] - assert zp2.resource_listdir('subdir/') == [] - - def test_resource_filename_rewrites_on_change(self): - """ - If a previous call to get_resource_filename has saved the file, but - the file has been subsequently mutated with different file of the - same size and modification time, it should not be overwritten on a - subsequent call to get_resource_filename. - """ - import mod # pyright: ignore[reportMissingImports] # Temporary package for test - - manager = pkg_resources.ResourceManager() - zp = pkg_resources.ZipProvider(mod) - filename = zp.get_resource_filename(manager, 'data.dat') - actual = datetime.datetime.fromtimestamp(os.stat(filename).st_mtime) - assert actual == self.ref_time - f = open(filename, 'w', encoding="utf-8") - f.write('hello, world?') - f.close() - ts = self.ref_time.timestamp() - os.utime(filename, (ts, ts)) - filename = zp.get_resource_filename(manager, 'data.dat') - with open(filename, encoding="utf-8") as f: - assert f.read() == 'hello, world!' - manager.cleanup_resources() - - -class TestResourceManager: - def test_get_cache_path(self): - mgr = pkg_resources.ResourceManager() - path = mgr.get_cache_path('foo') - type_ = str(type(path)) - message = "Unexpected type from get_cache_path: " + type_ - assert isinstance(path, str), message - - def test_get_cache_path_race(self, tmpdir): - # Patch to os.path.isdir to create a race condition - def patched_isdir(dirname, unpatched_isdir=pkg_resources.isdir): - patched_isdir.dirnames.append(dirname) - - was_dir = unpatched_isdir(dirname) - if not was_dir: - os.makedirs(dirname) - return was_dir - - patched_isdir.dirnames = [] - - # Get a cache path with a "race condition" - mgr = pkg_resources.ResourceManager() - mgr.set_extraction_path(str(tmpdir)) - - archive_name = os.sep.join(('foo', 'bar', 'baz')) - with mock.patch.object(pkg_resources, 'isdir', new=patched_isdir): - mgr.get_cache_path(archive_name) - - # Because this test relies on the implementation details of this - # function, these assertions are a sentinel to ensure that the - # test suite will not fail silently if the implementation changes. - called_dirnames = patched_isdir.dirnames - assert len(called_dirnames) == 2 - assert called_dirnames[0].split(os.sep)[-2:] == ['foo', 'bar'] - assert called_dirnames[1].split(os.sep)[-1:] == ['foo'] - - """ - Tests to ensure that pkg_resources runs independently from setuptools. - """ - - def test_setuptools_not_imported(self): - """ - In a separate Python environment, import pkg_resources and assert - that action doesn't cause setuptools to be imported. - """ - lines = ( - 'import pkg_resources', - 'import sys', - ('assert "setuptools" not in sys.modules, "setuptools was imported"'), - ) - cmd = [sys.executable, '-c', '; '.join(lines)] - subprocess.check_call(cmd) - - -def make_test_distribution(metadata_path, metadata): - """ - Make a test Distribution object, and return it. - - :param metadata_path: the path to the metadata file that should be - created. This should be inside a distribution directory that should - also be created. For example, an argument value might end with - ".dist-info/METADATA". - :param metadata: the desired contents of the metadata file, as bytes. - """ - dist_dir = os.path.dirname(metadata_path) - os.mkdir(dist_dir) - with open(metadata_path, 'wb') as f: - f.write(metadata) - dists = list(pkg_resources.distributions_from_metadata(dist_dir)) - (dist,) = dists - - return dist - - -def test_get_metadata__bad_utf8(tmpdir): - """ - Test a metadata file with bytes that can't be decoded as utf-8. - """ - filename = 'METADATA' - # Convert the tmpdir LocalPath object to a string before joining. - metadata_path = os.path.join(str(tmpdir), 'foo.dist-info', filename) - # Encode a non-ascii string with the wrong encoding (not utf-8). - metadata = 'née'.encode('iso-8859-1') - dist = make_test_distribution(metadata_path, metadata=metadata) - - with pytest.raises(UnicodeDecodeError) as excinfo: - dist.get_metadata(filename) - - exc = excinfo.value - actual = str(exc) - expected = ( - # The error message starts with "'utf-8' codec ..." However, the - # spelling of "utf-8" can vary (e.g. "utf8") so we don't include it - "codec can't decode byte 0xe9 in position 1: " - 'invalid continuation byte in METADATA file at path: ' - ) - assert expected in actual, f'actual: {actual}' - assert actual.endswith(metadata_path), f'actual: {actual}' - - -def make_distribution_no_version(tmpdir, basename): - """ - Create a distribution directory with no file containing the version. - """ - dist_dir = tmpdir / basename - dist_dir.ensure_dir() - # Make the directory non-empty so distributions_from_metadata() - # will detect it and yield it. - dist_dir.join('temp.txt').ensure() - - dists = list(pkg_resources.distributions_from_metadata(dist_dir)) - assert len(dists) == 1 - (dist,) = dists - - return dist, dist_dir - - -@pytest.mark.parametrize( - ("suffix", "expected_filename", "expected_dist_type"), - [ - ('egg-info', 'PKG-INFO', EggInfoDistribution), - ('dist-info', 'METADATA', DistInfoDistribution), - ], -) -@pytest.mark.xfail( - sys.version_info[:2] == (3, 12) and sys.version_info.releaselevel != 'final', - reason="https://github.com/python/cpython/issues/103632", -) -def test_distribution_version_missing( - tmpdir, suffix, expected_filename, expected_dist_type -): - """ - Test Distribution.version when the "Version" header is missing. - """ - basename = f'foo.{suffix}' - dist, dist_dir = make_distribution_no_version(tmpdir, basename) - - expected_text = ( - f"Missing 'Version:' header and/or {expected_filename} file at path: " - ) - metadata_path = os.path.join(dist_dir, expected_filename) - - # Now check the exception raised when the "version" attribute is accessed. - with pytest.raises(ValueError) as excinfo: - dist.version - - err = str(excinfo.value) - # Include a string expression after the assert so the full strings - # will be visible for inspection on failure. - assert expected_text in err, str((expected_text, err)) - - # Also check the args passed to the ValueError. - msg, dist = excinfo.value.args - assert expected_text in msg - # Check that the message portion contains the path. - assert metadata_path in msg, str((metadata_path, msg)) - assert type(dist) is expected_dist_type - - -@pytest.mark.xfail( - sys.version_info[:2] == (3, 12) and sys.version_info.releaselevel != 'final', - reason="https://github.com/python/cpython/issues/103632", -) -def test_distribution_version_missing_undetected_path(): - """ - Test Distribution.version when the "Version" header is missing and - the path can't be detected. - """ - # Create a Distribution object with no metadata argument, which results - # in an empty metadata provider. - dist = Distribution('/foo') - with pytest.raises(ValueError) as excinfo: - dist.version - - msg, dist = excinfo.value.args - expected = ( - "Missing 'Version:' header and/or PKG-INFO file at path: [could not detect]" - ) - assert msg == expected - - -@pytest.mark.parametrize('only', [False, True]) -def test_dist_info_is_not_dir(tmp_path, only): - """Test path containing a file with dist-info extension.""" - dist_info = tmp_path / 'foobar.dist-info' - dist_info.touch() - assert not pkg_resources.dist_factory(str(tmp_path), str(dist_info), only) - - -def test_macos_vers_fallback(monkeypatch, tmp_path): - """Regression test for pkg_resources._macos_vers""" - orig_open = builtins.open - - # Pretend we need to use the plist file - monkeypatch.setattr('platform.mac_ver', mock.Mock(return_value=('', (), ''))) - - # Create fake content for the fake plist file - with open(tmp_path / 'fake.plist', 'wb') as fake_file: - plistlib.dump({"ProductVersion": "11.4"}, fake_file) - - # Pretend the fake file exists - monkeypatch.setattr('os.path.exists', mock.Mock(return_value=True)) - - def fake_open(file, *args, **kwargs): - return orig_open(tmp_path / 'fake.plist', *args, **kwargs) - - # Ensure that the _macos_vers works correctly - with mock.patch('builtins.open', mock.Mock(side_effect=fake_open)) as m: - pkg_resources._macos_vers.cache_clear() - assert pkg_resources._macos_vers() == ["11", "4"] - pkg_resources._macos_vers.cache_clear() - - m.assert_called() - - -class TestDeepVersionLookupDistutils: - @pytest.fixture - def env(self, tmpdir): - """ - Create a package environment, similar to a virtualenv, - in which packages are installed. - """ - - class Environment(str): - pass - - env = Environment(tmpdir) - tmpdir.chmod(stat.S_IRWXU) - subs = 'home', 'lib', 'scripts', 'data', 'egg-base' - env.paths = dict((dirname, str(tmpdir / dirname)) for dirname in subs) - list(map(os.mkdir, env.paths.values())) - return env - - def create_foo_pkg(self, env, version): - """ - Create a foo package installed (distutils-style) to env.paths['lib'] - as version. - """ - ld = "This package has unicode metadata! ❄" - attrs = dict(name='foo', version=version, long_description=ld) - dist = distutils.dist.Distribution(attrs) - iei_cmd = distutils.command.install_egg_info.install_egg_info(dist) - iei_cmd.initialize_options() - iei_cmd.install_dir = env.paths['lib'] - iei_cmd.finalize_options() - iei_cmd.run() - - def test_version_resolved_from_egg_info(self, env): - version = '1.11.0.dev0+2329eae' - self.create_foo_pkg(env, version) - - # this requirement parsing will raise a VersionConflict unless the - # .egg-info file is parsed (see #419 on BitBucket) - req = pkg_resources.Requirement.parse('foo>=1.9') - dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req) - assert dist.version == version - - @pytest.mark.parametrize( - ("unnormalized", "normalized"), - [ - ('foo', 'foo'), - ('foo/', 'foo'), - ('foo/bar', 'foo/bar'), - ('foo/bar/', 'foo/bar'), - ], - ) - def test_normalize_path_trailing_sep(self, unnormalized, normalized): - """Ensure the trailing slash is cleaned for path comparison. - - See pypa/setuptools#1519. - """ - result_from_unnormalized = pkg_resources.normalize_path(unnormalized) - result_from_normalized = pkg_resources.normalize_path(normalized) - assert result_from_unnormalized == result_from_normalized - - @pytest.mark.skipif( - os.path.normcase('A') != os.path.normcase('a'), - reason='Testing case-insensitive filesystems.', - ) - @pytest.mark.parametrize( - ("unnormalized", "normalized"), - [ - ('MiXeD/CasE', 'mixed/case'), - ], - ) - def test_normalize_path_normcase(self, unnormalized, normalized): - """Ensure mixed case is normalized on case-insensitive filesystems.""" - result_from_unnormalized = pkg_resources.normalize_path(unnormalized) - result_from_normalized = pkg_resources.normalize_path(normalized) - assert result_from_unnormalized == result_from_normalized - - @pytest.mark.skipif( - os.path.sep != '\\', - reason='Testing systems using backslashes as path separators.', - ) - @pytest.mark.parametrize( - ("unnormalized", "expected"), - [ - ('forward/slash', 'forward\\slash'), - ('forward/slash/', 'forward\\slash'), - ('backward\\slash\\', 'backward\\slash'), - ], - ) - def test_normalize_path_backslash_sep(self, unnormalized, expected): - """Ensure path seps are cleaned on backslash path sep systems.""" - result = pkg_resources.normalize_path(unnormalized) - assert result.endswith(expected) - - -class TestWorkdirRequire: - def fake_site_packages(self, tmp_path, monkeypatch, dist_files): - site_packages = tmp_path / "site-packages" - site_packages.mkdir() - for file, content in self.FILES.items(): - path = site_packages / file - path.parent.mkdir(exist_ok=True, parents=True) - path.write_text(inspect.cleandoc(content), encoding="utf-8") - - monkeypatch.setattr(sys, "path", [site_packages]) - return os.fspath(site_packages) - - FILES = { - "pkg1_mod-1.2.3.dist-info/METADATA": """ - Metadata-Version: 2.4 - Name: pkg1.mod - Version: 1.2.3 - """, - "pkg2.mod-0.42.dist-info/METADATA": """ - Metadata-Version: 2.1 - Name: pkg2.mod - Version: 0.42 - """, - "pkg3_mod.egg-info/PKG-INFO": """ - Name: pkg3.mod - Version: 1.2.3.4 - """, - "pkg4.mod.egg-info/PKG-INFO": """ - Name: pkg4.mod - Version: 0.42.1 - """, - } - - @pytest.mark.parametrize( - ("version", "requirement"), - [ - ("1.2.3", "pkg1.mod>=1"), - ("0.42", "pkg2.mod>=0.4"), - ("1.2.3.4", "pkg3.mod<=2"), - ("0.42.1", "pkg4.mod>0.2,<1"), - ], - ) - def test_require_non_normalised_name( - self, tmp_path, monkeypatch, version, requirement - ): - # https://github.com/pypa/setuptools/issues/4853 - site_packages = self.fake_site_packages(tmp_path, monkeypatch, self.FILES) - ws = pkg_resources.WorkingSet([site_packages]) - - for req in [requirement, requirement.replace(".", "-")]: - [dist] = ws.require(req) - assert dist.version == version - assert os.path.samefile( - os.path.commonpath([dist.location, site_packages]), site_packages - ) diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_resources.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_resources.py deleted file mode 100644 index 70436c0..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_resources.py +++ /dev/null @@ -1,869 +0,0 @@ -import itertools -import os -import platform -import string -import sys - -import pytest -from packaging.specifiers import SpecifierSet - -import pkg_resources -from pkg_resources import ( - Distribution, - EntryPoint, - Requirement, - VersionConflict, - WorkingSet, - parse_requirements, - parse_version, - safe_name, - safe_version, -) - - -# from Python 3.6 docs. Available from itertools on Python 3.10 -def pairwise(iterable): - "s -> (s0,s1), (s1,s2), (s2, s3), ..." - a, b = itertools.tee(iterable) - next(b, None) - return zip(a, b) - - -class Metadata(pkg_resources.EmptyProvider): - """Mock object to return metadata as if from an on-disk distribution""" - - def __init__(self, *pairs) -> None: - self.metadata = dict(pairs) - - def has_metadata(self, name) -> bool: - return name in self.metadata - - def get_metadata(self, name): - return self.metadata[name] - - def get_metadata_lines(self, name): - return pkg_resources.yield_lines(self.get_metadata(name)) - - -dist_from_fn = pkg_resources.Distribution.from_filename - - -class TestDistro: - def testCollection(self): - # empty path should produce no distributions - ad = pkg_resources.Environment([], platform=None, python=None) - assert list(ad) == [] - assert ad['FooPkg'] == [] - ad.add(dist_from_fn("FooPkg-1.3_1.egg")) - ad.add(dist_from_fn("FooPkg-1.4-py2.4-win32.egg")) - ad.add(dist_from_fn("FooPkg-1.2-py2.4.egg")) - - # Name is in there now - assert ad['FooPkg'] - # But only 1 package - assert list(ad) == ['foopkg'] - - # Distributions sort by version - expected = ['1.4', '1.3-1', '1.2'] - assert [dist.version for dist in ad['FooPkg']] == expected - - # Removing a distribution leaves sequence alone - ad.remove(ad['FooPkg'][1]) - assert [dist.version for dist in ad['FooPkg']] == ['1.4', '1.2'] - - # And inserting adds them in order - ad.add(dist_from_fn("FooPkg-1.9.egg")) - assert [dist.version for dist in ad['FooPkg']] == ['1.9', '1.4', '1.2'] - - ws = WorkingSet([]) - foo12 = dist_from_fn("FooPkg-1.2-py2.4.egg") - foo14 = dist_from_fn("FooPkg-1.4-py2.4-win32.egg") - (req,) = parse_requirements("FooPkg>=1.3") - - # Nominal case: no distros on path, should yield all applicable - assert ad.best_match(req, ws).version == '1.9' - # If a matching distro is already installed, should return only that - ws.add(foo14) - assert ad.best_match(req, ws).version == '1.4' - - # If the first matching distro is unsuitable, it's a version conflict - ws = WorkingSet([]) - ws.add(foo12) - ws.add(foo14) - with pytest.raises(VersionConflict): - ad.best_match(req, ws) - - # If more than one match on the path, the first one takes precedence - ws = WorkingSet([]) - ws.add(foo14) - ws.add(foo12) - ws.add(foo14) - assert ad.best_match(req, ws).version == '1.4' - - def checkFooPkg(self, d): - assert d.project_name == "FooPkg" - assert d.key == "foopkg" - assert d.version == "1.3.post1" - assert d.py_version == "2.4" - assert d.platform == "win32" - assert d.parsed_version == parse_version("1.3-1") - - def testDistroBasics(self): - d = Distribution( - "/some/path", - project_name="FooPkg", - version="1.3-1", - py_version="2.4", - platform="win32", - ) - self.checkFooPkg(d) - - d = Distribution("/some/path") - assert d.py_version == f'{sys.version_info.major}.{sys.version_info.minor}' - assert d.platform is None - - def testDistroParse(self): - d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg") - self.checkFooPkg(d) - d = dist_from_fn("FooPkg-1.3.post1-py2.4-win32.egg-info") - self.checkFooPkg(d) - - def testDistroMetadata(self): - d = Distribution( - "/some/path", - project_name="FooPkg", - py_version="2.4", - platform="win32", - metadata=Metadata(('PKG-INFO', "Metadata-Version: 1.0\nVersion: 1.3-1\n")), - ) - self.checkFooPkg(d) - - def distRequires(self, txt): - return Distribution("/foo", metadata=Metadata(('depends.txt', txt))) - - def checkRequires(self, dist, txt, extras=()): - assert list(dist.requires(extras)) == list(parse_requirements(txt)) - - def testDistroDependsSimple(self): - for v in "Twisted>=1.5", "Twisted>=1.5\nZConfig>=2.0": - self.checkRequires(self.distRequires(v), v) - - needs_object_dir = pytest.mark.skipif( - not hasattr(object, '__dir__'), - reason='object.__dir__ necessary for self.__dir__ implementation', - ) - - def test_distribution_dir(self): - d = pkg_resources.Distribution() - dir(d) - - @needs_object_dir - def test_distribution_dir_includes_provider_dir(self): - d = pkg_resources.Distribution() - before = d.__dir__() - assert 'test_attr' not in before - d._provider.test_attr = None - after = d.__dir__() - assert len(after) == len(before) + 1 - assert 'test_attr' in after - - @needs_object_dir - def test_distribution_dir_ignores_provider_dir_leading_underscore(self): - d = pkg_resources.Distribution() - before = d.__dir__() - assert '_test_attr' not in before - d._provider._test_attr = None - after = d.__dir__() - assert len(after) == len(before) - assert '_test_attr' not in after - - def testResolve(self): - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - # Resolving no requirements -> nothing to install - assert list(ws.resolve([], ad)) == [] - # Request something not in the collection -> DistributionNotFound - with pytest.raises(pkg_resources.DistributionNotFound): - ws.resolve(parse_requirements("Foo"), ad) - - Foo = Distribution.from_filename( - "/foo_dir/Foo-1.2.egg", - metadata=Metadata(('depends.txt', "[bar]\nBaz>=2.0")), - ) - ad.add(Foo) - ad.add(Distribution.from_filename("Foo-0.9.egg")) - - # Request thing(s) that are available -> list to activate - for i in range(3): - targets = list(ws.resolve(parse_requirements("Foo"), ad)) - assert targets == [Foo] - list(map(ws.add, targets)) - with pytest.raises(VersionConflict): - ws.resolve(parse_requirements("Foo==0.9"), ad) - ws = WorkingSet([]) # reset - - # Request an extra that causes an unresolved dependency for "Baz" - with pytest.raises(pkg_resources.DistributionNotFound): - ws.resolve(parse_requirements("Foo[bar]"), ad) - Baz = Distribution.from_filename( - "/foo_dir/Baz-2.1.egg", metadata=Metadata(('depends.txt', "Foo")) - ) - ad.add(Baz) - - # Activation list now includes resolved dependency - assert list(ws.resolve(parse_requirements("Foo[bar]"), ad)) == [Foo, Baz] - # Requests for conflicting versions produce VersionConflict - with pytest.raises(VersionConflict) as vc: - ws.resolve(parse_requirements("Foo==1.2\nFoo!=1.2"), ad) - - msg = 'Foo 0.9 is installed but Foo==1.2 is required' - assert vc.value.report() == msg - - def test_environment_marker_evaluation_negative(self): - """Environment markers are evaluated at resolution time.""" - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - res = ws.resolve(parse_requirements("Foo;python_version<'2'"), ad) - assert list(res) == [] - - def test_environment_marker_evaluation_positive(self): - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - Foo = Distribution.from_filename("/foo_dir/Foo-1.2.dist-info") - ad.add(Foo) - res = ws.resolve(parse_requirements("Foo;python_version>='2'"), ad) - assert list(res) == [Foo] - - def test_environment_marker_evaluation_called(self): - """ - If one package foo requires bar without any extras, - markers should pass for bar without extras. - """ - (parent_req,) = parse_requirements("foo") - (req,) = parse_requirements("bar;python_version>='2'") - req_extras = pkg_resources._ReqExtras({req: parent_req.extras}) - assert req_extras.markers_pass(req) - - (parent_req,) = parse_requirements("foo[]") - (req,) = parse_requirements("bar;python_version>='2'") - req_extras = pkg_resources._ReqExtras({req: parent_req.extras}) - assert req_extras.markers_pass(req) - - def test_marker_evaluation_with_extras(self): - """Extras are also evaluated as markers at resolution time.""" - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - Foo = Distribution.from_filename( - "/foo_dir/Foo-1.2.dist-info", - metadata=Metadata(( - "METADATA", - "Provides-Extra: baz\nRequires-Dist: quux; extra=='baz'", - )), - ) - ad.add(Foo) - assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo] - quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info") - ad.add(quux) - res = list(ws.resolve(parse_requirements("Foo[baz]"), ad)) - assert res == [Foo, quux] - - def test_marker_evaluation_with_extras_normlized(self): - """Extras are also evaluated as markers at resolution time.""" - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - Foo = Distribution.from_filename( - "/foo_dir/Foo-1.2.dist-info", - metadata=Metadata(( - "METADATA", - "Provides-Extra: baz-lightyear\n" - "Requires-Dist: quux; extra=='baz-lightyear'", - )), - ) - ad.add(Foo) - assert list(ws.resolve(parse_requirements("Foo"), ad)) == [Foo] - quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info") - ad.add(quux) - res = list(ws.resolve(parse_requirements("Foo[baz-lightyear]"), ad)) - assert res == [Foo, quux] - - def test_marker_evaluation_with_multiple_extras(self): - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - Foo = Distribution.from_filename( - "/foo_dir/Foo-1.2.dist-info", - metadata=Metadata(( - "METADATA", - "Provides-Extra: baz\n" - "Requires-Dist: quux; extra=='baz'\n" - "Provides-Extra: bar\n" - "Requires-Dist: fred; extra=='bar'\n", - )), - ) - ad.add(Foo) - quux = Distribution.from_filename("/foo_dir/quux-1.0.dist-info") - ad.add(quux) - fred = Distribution.from_filename("/foo_dir/fred-0.1.dist-info") - ad.add(fred) - res = list(ws.resolve(parse_requirements("Foo[baz,bar]"), ad)) - assert sorted(res) == [fred, quux, Foo] - - def test_marker_evaluation_with_extras_loop(self): - ad = pkg_resources.Environment([]) - ws = WorkingSet([]) - a = Distribution.from_filename( - "/foo_dir/a-0.2.dist-info", - metadata=Metadata(("METADATA", "Requires-Dist: c[a]")), - ) - b = Distribution.from_filename( - "/foo_dir/b-0.3.dist-info", - metadata=Metadata(("METADATA", "Requires-Dist: c[b]")), - ) - c = Distribution.from_filename( - "/foo_dir/c-1.0.dist-info", - metadata=Metadata(( - "METADATA", - "Provides-Extra: a\n" - "Requires-Dist: b;extra=='a'\n" - "Provides-Extra: b\n" - "Requires-Dist: foo;extra=='b'", - )), - ) - foo = Distribution.from_filename("/foo_dir/foo-0.1.dist-info") - for dist in (a, b, c, foo): - ad.add(dist) - res = list(ws.resolve(parse_requirements("a"), ad)) - assert res == [a, c, b, foo] - - @pytest.mark.xfail( - sys.version_info[:2] == (3, 12) and sys.version_info.releaselevel != 'final', - reason="https://github.com/python/cpython/issues/103632", - ) - def testDistroDependsOptions(self): - d = self.distRequires( - """ - Twisted>=1.5 - [docgen] - ZConfig>=2.0 - docutils>=0.3 - [fastcgi] - fcgiapp>=0.1""" - ) - self.checkRequires(d, "Twisted>=1.5") - self.checkRequires( - d, "Twisted>=1.5 ZConfig>=2.0 docutils>=0.3".split(), ["docgen"] - ) - self.checkRequires(d, "Twisted>=1.5 fcgiapp>=0.1".split(), ["fastcgi"]) - self.checkRequires( - d, - "Twisted>=1.5 ZConfig>=2.0 docutils>=0.3 fcgiapp>=0.1".split(), - ["docgen", "fastcgi"], - ) - self.checkRequires( - d, - "Twisted>=1.5 fcgiapp>=0.1 ZConfig>=2.0 docutils>=0.3".split(), - ["fastcgi", "docgen"], - ) - with pytest.raises(pkg_resources.UnknownExtra): - d.requires(["foo"]) - - -class TestWorkingSet: - def test_find_conflicting(self): - ws = WorkingSet([]) - Foo = Distribution.from_filename("/foo_dir/Foo-1.2.egg") - ws.add(Foo) - - # create a requirement that conflicts with Foo 1.2 - req = next(parse_requirements("Foo<1.2")) - - with pytest.raises(VersionConflict) as vc: - ws.find(req) - - msg = 'Foo 1.2 is installed but Foo<1.2 is required' - assert vc.value.report() == msg - - def test_resolve_conflicts_with_prior(self): - """ - A ContextualVersionConflict should be raised when a requirement - conflicts with a prior requirement for a different package. - """ - # Create installation where Foo depends on Baz 1.0 and Bar depends on - # Baz 2.0. - ws = WorkingSet([]) - md = Metadata(('depends.txt', "Baz==1.0")) - Foo = Distribution.from_filename("/foo_dir/Foo-1.0.egg", metadata=md) - ws.add(Foo) - md = Metadata(('depends.txt', "Baz==2.0")) - Bar = Distribution.from_filename("/foo_dir/Bar-1.0.egg", metadata=md) - ws.add(Bar) - Baz = Distribution.from_filename("/foo_dir/Baz-1.0.egg") - ws.add(Baz) - Baz = Distribution.from_filename("/foo_dir/Baz-2.0.egg") - ws.add(Baz) - - with pytest.raises(VersionConflict) as vc: - ws.resolve(parse_requirements("Foo\nBar\n")) - - msg = "Baz 1.0 is installed but Baz==2.0 is required by " - msg += repr(set(['Bar'])) - assert vc.value.report() == msg - - -class TestEntryPoints: - def assertfields(self, ep): - assert ep.name == "foo" - assert ep.module_name == "pkg_resources.tests.test_resources" - assert ep.attrs == ("TestEntryPoints",) - assert ep.extras == ("x",) - assert ep.load() is TestEntryPoints - expect = "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]" - assert str(ep) == expect - - def setup_method(self, method): - self.dist = Distribution.from_filename( - "FooPkg-1.2-py2.4.egg", metadata=Metadata(('requires.txt', '[x]')) - ) - - def testBasics(self): - ep = EntryPoint( - "foo", - "pkg_resources.tests.test_resources", - ["TestEntryPoints"], - ["x"], - self.dist, - ) - self.assertfields(ep) - - def testParse(self): - s = "foo = pkg_resources.tests.test_resources:TestEntryPoints [x]" - ep = EntryPoint.parse(s, self.dist) - self.assertfields(ep) - - ep = EntryPoint.parse("bar baz= spammity[PING]") - assert ep.name == "bar baz" - assert ep.module_name == "spammity" - assert ep.attrs == () - assert ep.extras == ("ping",) - - ep = EntryPoint.parse(" fizzly = wocka:foo") - assert ep.name == "fizzly" - assert ep.module_name == "wocka" - assert ep.attrs == ("foo",) - assert ep.extras == () - - # plus in the name - spec = "html+mako = mako.ext.pygmentplugin:MakoHtmlLexer" - ep = EntryPoint.parse(spec) - assert ep.name == 'html+mako' - - reject_specs = "foo", "x=a:b:c", "q=x/na", "fez=pish:tush-z", "x=f[a]>2" - - @pytest.mark.parametrize("reject_spec", reject_specs) - def test_reject_spec(self, reject_spec): - with pytest.raises(ValueError): - EntryPoint.parse(reject_spec) - - def test_printable_name(self): - """ - Allow any printable character in the name. - """ - # Create a name with all printable characters; strip the whitespace. - name = string.printable.strip() - spec = "{name} = module:attr".format(**locals()) - ep = EntryPoint.parse(spec) - assert ep.name == name - - def checkSubMap(self, m): - assert len(m) == len(self.submap_expect) - for key, ep in self.submap_expect.items(): - assert m.get(key).name == ep.name - assert m.get(key).module_name == ep.module_name - assert sorted(m.get(key).attrs) == sorted(ep.attrs) - assert sorted(m.get(key).extras) == sorted(ep.extras) - - submap_expect = dict( - feature1=EntryPoint('feature1', 'somemodule', ['somefunction']), - feature2=EntryPoint( - 'feature2', 'another.module', ['SomeClass'], ['extra1', 'extra2'] - ), - feature3=EntryPoint('feature3', 'this.module', extras=['something']), - ) - submap_str = """ - # define features for blah blah - feature1 = somemodule:somefunction - feature2 = another.module:SomeClass [extra1,extra2] - feature3 = this.module [something] - """ - - def testParseList(self): - self.checkSubMap(EntryPoint.parse_group("xyz", self.submap_str)) - with pytest.raises(ValueError): - EntryPoint.parse_group("x a", "foo=bar") - with pytest.raises(ValueError): - EntryPoint.parse_group("x", ["foo=baz", "foo=bar"]) - - def testParseMap(self): - m = EntryPoint.parse_map({'xyz': self.submap_str}) - self.checkSubMap(m['xyz']) - assert list(m.keys()) == ['xyz'] - m = EntryPoint.parse_map("[xyz]\n" + self.submap_str) - self.checkSubMap(m['xyz']) - assert list(m.keys()) == ['xyz'] - with pytest.raises(ValueError): - EntryPoint.parse_map(["[xyz]", "[xyz]"]) - with pytest.raises(ValueError): - EntryPoint.parse_map(self.submap_str) - - def testDeprecationWarnings(self): - ep = EntryPoint( - "foo", "pkg_resources.tests.test_resources", ["TestEntryPoints"], ["x"] - ) - with pytest.warns(pkg_resources.PkgResourcesDeprecationWarning): - ep.load(require=False) - - -class TestRequirements: - def testBasics(self): - r = Requirement.parse("Twisted>=1.2") - assert str(r) == "Twisted>=1.2" - assert repr(r) == "Requirement.parse('Twisted>=1.2')" - assert r == Requirement("Twisted>=1.2") - assert r == Requirement("twisTed>=1.2") - assert r != Requirement("Twisted>=2.0") - assert r != Requirement("Zope>=1.2") - assert r != Requirement("Zope>=3.0") - assert r != Requirement("Twisted[extras]>=1.2") - - def testOrdering(self): - r1 = Requirement("Twisted==1.2c1,>=1.2") - r2 = Requirement("Twisted>=1.2,==1.2c1") - assert r1 == r2 - assert str(r1) == str(r2) - assert str(r2) == "Twisted==1.2c1,>=1.2" - assert Requirement("Twisted") != Requirement( - "Twisted @ https://localhost/twisted.zip" - ) - - def testBasicContains(self): - r = Requirement("Twisted>=1.2") - foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg") - twist11 = Distribution.from_filename("Twisted-1.1.egg") - twist12 = Distribution.from_filename("Twisted-1.2.egg") - assert parse_version('1.2') in r - assert parse_version('1.1') not in r - assert '1.2' in r - assert '1.1' not in r - assert foo_dist not in r - assert twist11 not in r - assert twist12 in r - - def testOptionsAndHashing(self): - r1 = Requirement.parse("Twisted[foo,bar]>=1.2") - r2 = Requirement.parse("Twisted[bar,FOO]>=1.2") - assert r1 == r2 - assert set(r1.extras) == set(("foo", "bar")) - assert set(r2.extras) == set(("foo", "bar")) - assert hash(r1) == hash(r2) - assert hash(r1) == hash(( - "twisted", - None, - SpecifierSet(">=1.2"), - frozenset(["foo", "bar"]), - None, - )) - assert hash( - Requirement.parse("Twisted @ https://localhost/twisted.zip") - ) == hash(( - "twisted", - "https://localhost/twisted.zip", - SpecifierSet(), - frozenset(), - None, - )) - - def testVersionEquality(self): - r1 = Requirement.parse("foo==0.3a2") - r2 = Requirement.parse("foo!=0.3a4") - d = Distribution.from_filename - - assert d("foo-0.3a4.egg") not in r1 - assert d("foo-0.3a1.egg") not in r1 - assert d("foo-0.3a4.egg") not in r2 - - assert d("foo-0.3a2.egg") in r1 - assert d("foo-0.3a2.egg") in r2 - assert d("foo-0.3a3.egg") in r2 - assert d("foo-0.3a5.egg") in r2 - - def testSetuptoolsProjectName(self): - """ - The setuptools project should implement the setuptools package. - """ - - assert Requirement.parse('setuptools').project_name == 'setuptools' - # setuptools 0.7 and higher means setuptools. - assert Requirement.parse('setuptools == 0.7').project_name == 'setuptools' - assert Requirement.parse('setuptools == 0.7a1').project_name == 'setuptools' - assert Requirement.parse('setuptools >= 0.7').project_name == 'setuptools' - - -class TestParsing: - def testEmptyParse(self): - assert list(parse_requirements('')) == [] - - def testYielding(self): - for inp, out in [ - ([], []), - ('x', ['x']), - ([[]], []), - (' x\n y', ['x', 'y']), - (['x\n\n', 'y'], ['x', 'y']), - ]: - assert list(pkg_resources.yield_lines(inp)) == out - - def testSplitting(self): - sample = """ - x - [Y] - z - - a - [b ] - # foo - c - [ d] - [q] - v - """ - assert list(pkg_resources.split_sections(sample)) == [ - (None, ["x"]), - ("Y", ["z", "a"]), - ("b", ["c"]), - ("d", []), - ("q", ["v"]), - ] - with pytest.raises(ValueError): - list(pkg_resources.split_sections("[foo")) - - def testSafeName(self): - assert safe_name("adns-python") == "adns-python" - assert safe_name("WSGI Utils") == "WSGI-Utils" - assert safe_name("WSGI Utils") == "WSGI-Utils" - assert safe_name("Money$$$Maker") == "Money-Maker" - assert safe_name("peak.web") != "peak-web" - - def testSafeVersion(self): - assert safe_version("1.2-1") == "1.2.post1" - assert safe_version("1.2 alpha") == "1.2.alpha" - assert safe_version("2.3.4 20050521") == "2.3.4.20050521" - assert safe_version("Money$$$Maker") == "Money-Maker" - assert safe_version("peak.web") == "peak.web" - - def testSimpleRequirements(self): - assert list(parse_requirements('Twis-Ted>=1.2-1')) == [ - Requirement('Twis-Ted>=1.2-1') - ] - assert list(parse_requirements('Twisted >=1.2, \\ # more\n<2.0')) == [ - Requirement('Twisted>=1.2,<2.0') - ] - assert Requirement.parse("FooBar==1.99a3") == Requirement("FooBar==1.99a3") - with pytest.raises(ValueError): - Requirement.parse(">=2.3") - with pytest.raises(ValueError): - Requirement.parse("x\\") - with pytest.raises(ValueError): - Requirement.parse("x==2 q") - with pytest.raises(ValueError): - Requirement.parse("X==1\nY==2") - with pytest.raises(ValueError): - Requirement.parse("#") - - def test_requirements_with_markers(self): - assert Requirement.parse("foobar;os_name=='a'") == Requirement.parse( - "foobar;os_name=='a'" - ) - assert Requirement.parse( - "name==1.1;python_version=='2.7'" - ) != Requirement.parse("name==1.1;python_version=='3.6'") - assert Requirement.parse( - "name==1.0;python_version=='2.7'" - ) != Requirement.parse("name==1.2;python_version=='2.7'") - assert Requirement.parse( - "name[foo]==1.0;python_version=='3.6'" - ) != Requirement.parse("name[foo,bar]==1.0;python_version=='3.6'") - - def test_local_version(self): - parse_requirements('foo==1.0+org1') - - def test_spaces_between_multiple_versions(self): - parse_requirements('foo>=1.0, <3') - parse_requirements('foo >= 1.0, < 3') - - @pytest.mark.parametrize( - ("lower", "upper"), - [ - ('1.2-rc1', '1.2rc1'), - ('0.4', '0.4.0'), - ('0.4.0.0', '0.4.0'), - ('0.4.0-0', '0.4-0'), - ('0post1', '0.0post1'), - ('0pre1', '0.0c1'), - ('0.0.0preview1', '0c1'), - ('0.0c1', '0-rc1'), - ('1.2a1', '1.2.a.1'), - ('1.2.a', '1.2a'), - ], - ) - def testVersionEquality(self, lower, upper): - assert parse_version(lower) == parse_version(upper) - - torture = """ - 0.80.1-3 0.80.1-2 0.80.1-1 0.79.9999+0.80.0pre4-1 - 0.79.9999+0.80.0pre2-3 0.79.9999+0.80.0pre2-2 - 0.77.2-1 0.77.1-1 0.77.0-1 - """ - - @pytest.mark.parametrize( - ("lower", "upper"), - [ - ('2.1', '2.1.1'), - ('2a1', '2b0'), - ('2a1', '2.1'), - ('2.3a1', '2.3'), - ('2.1-1', '2.1-2'), - ('2.1-1', '2.1.1'), - ('2.1', '2.1post4'), - ('2.1a0-20040501', '2.1'), - ('1.1', '02.1'), - ('3.2', '3.2.post0'), - ('3.2post1', '3.2post2'), - ('0.4', '4.0'), - ('0.0.4', '0.4.0'), - ('0post1', '0.4post1'), - ('2.1.0-rc1', '2.1.0'), - ('2.1dev', '2.1a0'), - ] - + list(pairwise(reversed(torture.split()))), - ) - def testVersionOrdering(self, lower, upper): - assert parse_version(lower) < parse_version(upper) - - def testVersionHashable(self): - """ - Ensure that our versions stay hashable even though we've subclassed - them and added some shim code to them. - """ - assert hash(parse_version("1.0")) == hash(parse_version("1.0")) - - -class TestNamespaces: - ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n" - - @pytest.fixture - def symlinked_tmpdir(self, tmpdir): - """ - Where available, return the tempdir as a symlink, - which as revealed in #231 is more fragile than - a natural tempdir. - """ - if not hasattr(os, 'symlink'): - yield str(tmpdir) - return - - link_name = str(tmpdir) + '-linked' - os.symlink(str(tmpdir), link_name) - try: - yield type(tmpdir)(link_name) - finally: - os.unlink(link_name) - - @pytest.fixture(autouse=True) - def patched_path(self, tmpdir): - """ - Patch sys.path to include the 'site-pkgs' dir. Also - restore pkg_resources._namespace_packages to its - former state. - """ - saved_ns_pkgs = pkg_resources._namespace_packages.copy() - saved_sys_path = sys.path[:] - site_pkgs = tmpdir.mkdir('site-pkgs') - sys.path.append(str(site_pkgs)) - try: - yield - finally: - pkg_resources._namespace_packages = saved_ns_pkgs - sys.path = saved_sys_path - - issue591 = pytest.mark.xfail(platform.system() == 'Windows', reason="#591") - - @issue591 - def test_two_levels_deep(self, symlinked_tmpdir): - """ - Test nested namespace packages - Create namespace packages in the following tree : - site-packages-1/pkg1/pkg2 - site-packages-2/pkg1/pkg2 - Check both are in the _namespace_packages dict and that their __path__ - is correct - """ - real_tmpdir = symlinked_tmpdir.realpath() - tmpdir = symlinked_tmpdir - sys.path.append(str(tmpdir / 'site-pkgs2')) - site_dirs = tmpdir / 'site-pkgs', tmpdir / 'site-pkgs2' - for site in site_dirs: - pkg1 = site / 'pkg1' - pkg2 = pkg1 / 'pkg2' - pkg2.ensure_dir() - (pkg1 / '__init__.py').write_text(self.ns_str, encoding='utf-8') - (pkg2 / '__init__.py').write_text(self.ns_str, encoding='utf-8') - with pytest.warns(DeprecationWarning, match="pkg_resources.declare_namespace"): - import pkg1 # pyright: ignore[reportMissingImports] # Temporary package for test - assert "pkg1" in pkg_resources._namespace_packages - # attempt to import pkg2 from site-pkgs2 - with pytest.warns(DeprecationWarning, match="pkg_resources.declare_namespace"): - import pkg1.pkg2 # pyright: ignore[reportMissingImports] # Temporary package for test - # check the _namespace_packages dict - assert "pkg1.pkg2" in pkg_resources._namespace_packages - assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"] - # check the __path__ attribute contains both paths - expected = [ - str(real_tmpdir / "site-pkgs" / "pkg1" / "pkg2"), - str(real_tmpdir / "site-pkgs2" / "pkg1" / "pkg2"), - ] - assert pkg1.pkg2.__path__ == expected - - @issue591 - def test_path_order(self, symlinked_tmpdir): - """ - Test that if multiple versions of the same namespace package subpackage - are on different sys.path entries, that only the one earliest on - sys.path is imported, and that the namespace package's __path__ is in - the correct order. - - Regression test for https://github.com/pypa/setuptools/issues/207 - """ - - tmpdir = symlinked_tmpdir - site_dirs = ( - tmpdir / "site-pkgs", - tmpdir / "site-pkgs2", - tmpdir / "site-pkgs3", - ) - - vers_str = "__version__ = %r" - - for number, site in enumerate(site_dirs, 1): - if number > 1: - sys.path.append(str(site)) - nspkg = site / 'nspkg' - subpkg = nspkg / 'subpkg' - subpkg.ensure_dir() - (nspkg / '__init__.py').write_text(self.ns_str, encoding='utf-8') - (subpkg / '__init__.py').write_text(vers_str % number, encoding='utf-8') - - with pytest.warns(DeprecationWarning, match="pkg_resources.declare_namespace"): - import nspkg # pyright: ignore[reportMissingImports] # Temporary package for test - import nspkg.subpkg # pyright: ignore[reportMissingImports] # Temporary package for test - expected = [str(site.realpath() / 'nspkg') for site in site_dirs] - assert nspkg.__path__ == expected - assert nspkg.subpkg.__version__ == 1 diff --git a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_working_set.py b/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_working_set.py deleted file mode 100644 index ed20c59..0000000 --- a/server/.venv/lib/python3.11/site-packages/pkg_resources/tests/test_working_set.py +++ /dev/null @@ -1,505 +0,0 @@ -import functools -import inspect -import re -import textwrap - -import pytest - -import pkg_resources - -from .test_resources import Metadata - - -def strip_comments(s): - return '\n'.join( - line - for line in s.split('\n') - if line.strip() and not line.strip().startswith('#') - ) - - -def parse_distributions(s): - """ - Parse a series of distribution specs of the form: - {project_name}-{version} - [optional, indented requirements specification] - - Example: - - foo-0.2 - bar-1.0 - foo>=3.0 - [feature] - baz - - yield 2 distributions: - - project_name=foo, version=0.2 - - project_name=bar, version=1.0, - requires=['foo>=3.0', 'baz; extra=="feature"'] - """ - s = s.strip() - for spec in re.split(r'\n(?=[^\s])', s): - if not spec: - continue - fields = spec.split('\n', 1) - assert 1 <= len(fields) <= 2 - name, version = fields.pop(0).rsplit('-', 1) - if fields: - requires = textwrap.dedent(fields.pop(0)) - metadata = Metadata(('requires.txt', requires)) - else: - metadata = None - dist = pkg_resources.Distribution( - project_name=name, version=version, metadata=metadata - ) - yield dist - - -class FakeInstaller: - def __init__(self, installable_dists) -> None: - self._installable_dists = installable_dists - - def __call__(self, req): - return next( - iter(filter(lambda dist: dist in req, self._installable_dists)), None - ) - - -def parametrize_test_working_set_resolve(*test_list): - idlist = [] - argvalues = [] - for test in test_list: - ( - name, - installed_dists, - installable_dists, - requirements, - expected1, - expected2, - ) = ( - strip_comments(s.lstrip()) - for s in textwrap.dedent(test).lstrip().split('\n\n', 5) - ) - installed_dists = list(parse_distributions(installed_dists)) - installable_dists = list(parse_distributions(installable_dists)) - requirements = list(pkg_resources.parse_requirements(requirements)) - for id_, replace_conflicting, expected in ( - (name, False, expected1), - (name + '_replace_conflicting', True, expected2), - ): - idlist.append(id_) - expected = strip_comments(expected.strip()) - if re.match(r'\w+$', expected): - expected = getattr(pkg_resources, expected) - assert issubclass(expected, Exception) - else: - expected = list(parse_distributions(expected)) - argvalues.append( - pytest.param( - installed_dists, - installable_dists, - requirements, - replace_conflicting, - expected, - ) - ) - return pytest.mark.parametrize( - ( - "installed_dists", - "installable_dists", - "requirements", - "replace_conflicting", - "resolved_dists_or_exception", - ), - argvalues, - ids=idlist, - ) - - -@parametrize_test_working_set_resolve( - """ - # id - noop - - # installed - - # installable - - # wanted - - # resolved - - # resolved [replace conflicting] - """, - """ - # id - already_installed - - # installed - foo-3.0 - - # installable - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - foo-3.0 - - # resolved [replace conflicting] - foo-3.0 - """, - """ - # id - installable_not_installed - - # installed - - # installable - foo-3.0 - foo-4.0 - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - foo-3.0 - - # resolved [replace conflicting] - foo-3.0 - """, - """ - # id - not_installable - - # installed - - # installable - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - DistributionNotFound - - # resolved [replace conflicting] - DistributionNotFound - """, - """ - # id - no_matching_version - - # installed - - # installable - foo-3.1 - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - DistributionNotFound - - # resolved [replace conflicting] - DistributionNotFound - """, - """ - # id - installable_with_installed_conflict - - # installed - foo-3.1 - - # installable - foo-3.5 - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - VersionConflict - - # resolved [replace conflicting] - foo-3.5 - """, - """ - # id - not_installable_with_installed_conflict - - # installed - foo-3.1 - - # installable - - # wanted - foo>=2.1,!=3.1,<4 - - # resolved - VersionConflict - - # resolved [replace conflicting] - DistributionNotFound - """, - """ - # id - installed_with_installed_require - - # installed - foo-3.9 - baz-0.1 - foo>=2.1,!=3.1,<4 - - # installable - - # wanted - baz - - # resolved - foo-3.9 - baz-0.1 - - # resolved [replace conflicting] - foo-3.9 - baz-0.1 - """, - """ - # id - installed_with_conflicting_installed_require - - # installed - foo-5 - baz-0.1 - foo>=2.1,!=3.1,<4 - - # installable - - # wanted - baz - - # resolved - VersionConflict - - # resolved [replace conflicting] - DistributionNotFound - """, - """ - # id - installed_with_installable_conflicting_require - - # installed - foo-5 - baz-0.1 - foo>=2.1,!=3.1,<4 - - # installable - foo-2.9 - - # wanted - baz - - # resolved - VersionConflict - - # resolved [replace conflicting] - baz-0.1 - foo-2.9 - """, - """ - # id - installed_with_installable_require - - # installed - baz-0.1 - foo>=2.1,!=3.1,<4 - - # installable - foo-3.9 - - # wanted - baz - - # resolved - foo-3.9 - baz-0.1 - - # resolved [replace conflicting] - foo-3.9 - baz-0.1 - """, - """ - # id - installable_with_installed_require - - # installed - foo-3.9 - - # installable - baz-0.1 - foo>=2.1,!=3.1,<4 - - # wanted - baz - - # resolved - foo-3.9 - baz-0.1 - - # resolved [replace conflicting] - foo-3.9 - baz-0.1 - """, - """ - # id - installable_with_installable_require - - # installed - - # installable - foo-3.9 - baz-0.1 - foo>=2.1,!=3.1,<4 - - # wanted - baz - - # resolved - foo-3.9 - baz-0.1 - - # resolved [replace conflicting] - foo-3.9 - baz-0.1 - """, - """ - # id - installable_with_conflicting_installable_require - - # installed - foo-5 - - # installable - foo-2.9 - baz-0.1 - foo>=2.1,!=3.1,<4 - - # wanted - baz - - # resolved - VersionConflict - - # resolved [replace conflicting] - baz-0.1 - foo-2.9 - """, - """ - # id - conflicting_installables - - # installed - - # installable - foo-2.9 - foo-5.0 - - # wanted - foo>=2.1,!=3.1,<4 - foo>=4 - - # resolved - VersionConflict - - # resolved [replace conflicting] - VersionConflict - """, - """ - # id - installables_with_conflicting_requires - - # installed - - # installable - foo-2.9 - dep==1.0 - baz-5.0 - dep==2.0 - dep-1.0 - dep-2.0 - - # wanted - foo - baz - - # resolved - VersionConflict - - # resolved [replace conflicting] - VersionConflict - """, - """ - # id - installables_with_conflicting_nested_requires - - # installed - - # installable - foo-2.9 - dep1 - dep1-1.0 - subdep<1.0 - baz-5.0 - dep2 - dep2-1.0 - subdep>1.0 - subdep-0.9 - subdep-1.1 - - # wanted - foo - baz - - # resolved - VersionConflict - - # resolved [replace conflicting] - VersionConflict - """, - """ - # id - wanted_normalized_name_installed_canonical - - # installed - foo.bar-3.6 - - # installable - - # wanted - foo-bar==3.6 - - # resolved - foo.bar-3.6 - - # resolved [replace conflicting] - foo.bar-3.6 - """, -) -def test_working_set_resolve( - installed_dists, - installable_dists, - requirements, - replace_conflicting, - resolved_dists_or_exception, -): - ws = pkg_resources.WorkingSet([]) - list(map(ws.add, installed_dists)) - resolve_call = functools.partial( - ws.resolve, - requirements, - installer=FakeInstaller(installable_dists), - replace_conflicting=replace_conflicting, - ) - if inspect.isclass(resolved_dists_or_exception): - with pytest.raises(resolved_dists_or_exception): - resolve_call() - else: - assert sorted(resolve_call()) == sorted(resolved_dists_or_exception) diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/__init__.cpython-311.pyc index 93f72b4..54513cd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/auto_suggest.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/auto_suggest.cpython-311.pyc index b78c0b2..ae6eee8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/auto_suggest.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/auto_suggest.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/buffer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/buffer.cpython-311.pyc index 12207b1..9812710 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/buffer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/buffer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cache.cpython-311.pyc index cc55a8c..0a5e6ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cursor_shapes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cursor_shapes.cpython-311.pyc index 7bc21cf..4677d11 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cursor_shapes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/cursor_shapes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/data_structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/data_structures.cpython-311.pyc index 63cd36e..e039ef1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/data_structures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/data_structures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/document.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/document.cpython-311.pyc index 6802d41..295656b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/document.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/document.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/enums.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/enums.cpython-311.pyc index 6438aab..94b312a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/enums.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/enums.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/history.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/history.cpython-311.pyc index ef0ca81..1359ece 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/history.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/history.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/keys.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/keys.cpython-311.pyc index 1096c67..f2fd04a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/keys.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/keys.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/log.cpython-311.pyc index 7b87322..457208e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/mouse_events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/mouse_events.cpython-311.pyc index acc6b84..a523f8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/mouse_events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/mouse_events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/patch_stdout.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/patch_stdout.cpython-311.pyc index b4319e9..bc8ed2c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/patch_stdout.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/patch_stdout.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/renderer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/renderer.cpython-311.pyc index 292067b..1c39b85 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/renderer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/renderer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/search.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/search.cpython-311.pyc index 90f1c1e..eb93516 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/search.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/search.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/selection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/selection.cpython-311.pyc index 94b3db5..0e7f7b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/selection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/selection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/token.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/token.cpython-311.pyc index f649857..cdf357b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/token.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/token.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/utils.cpython-311.pyc index 6a7e041..359e47b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/validation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/validation.cpython-311.pyc index 4d7f38b..862576a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/validation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/validation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/win32_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/win32_types.cpython-311.pyc index 99edbd7..9d08103 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/win32_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/__pycache__/win32_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/__init__.cpython-311.pyc index 9040d11..28a45d8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/application.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/application.cpython-311.pyc index 3be4d2a..2daa433 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/application.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/application.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/current.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/current.cpython-311.pyc index edb0d35..7ecac01 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/current.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/current.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/dummy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/dummy.cpython-311.pyc index fbef4ff..aa1f02c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/dummy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/dummy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/run_in_terminal.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/run_in_terminal.cpython-311.pyc index 5ceb479..3d0cfa5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/run_in_terminal.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/application/__pycache__/run_in_terminal.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/__init__.cpython-311.pyc index f448627..a71445c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/base.cpython-311.pyc index 67049a0..7bd701f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/in_memory.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/in_memory.cpython-311.pyc index d8e9f56..9079d99 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/in_memory.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/in_memory.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/pyperclip.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/pyperclip.cpython-311.pyc index 1310c54..f866e2a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/pyperclip.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/clipboard/__pycache__/pyperclip.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/__init__.cpython-311.pyc index f0ff890..3246158 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/base.cpython-311.pyc index 1d0ea0f..3e310e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/deduplicate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/deduplicate.cpython-311.pyc index 6a459c9..38cafc3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/deduplicate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/deduplicate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/filesystem.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/filesystem.cpython-311.pyc index 834ba81..0e85107 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/filesystem.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/filesystem.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/fuzzy_completer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/fuzzy_completer.cpython-311.pyc index 3b84bfe..8190d5b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/fuzzy_completer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/fuzzy_completer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/nested.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/nested.cpython-311.pyc index b1d49b4..2a4fd8e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/nested.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/nested.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/word_completer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/word_completer.cpython-311.pyc index 1297a8c..b16cdeb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/word_completer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/completion/__pycache__/word_completer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/__pycache__/__init__.cpython-311.pyc index 7f35093..a07e6e5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/__init__.cpython-311.pyc index 327a48b..d539eba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/system.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/system.cpython-311.pyc index 07da6c7..9a6a641 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/system.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/completers/__pycache__/system.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/__init__.cpython-311.pyc index 1ddf14c..8694069 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/compiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/compiler.cpython-311.pyc index 332b1fa..fc1afa4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/compiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/compiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/completion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/completion.cpython-311.pyc index 0c659dc..1af6176 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/completion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/completion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/lexer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/lexer.cpython-311.pyc index 55b8a82..cfb74d6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/lexer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/lexer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/regex_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/regex_parser.cpython-311.pyc index e6aec3d..339ea01 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/regex_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/regex_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/validation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/validation.cpython-311.pyc index 07b5d75..88a2a8e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/validation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/regular_languages/__pycache__/validation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/__init__.cpython-311.pyc index 15dc215..97c502f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/server.cpython-311.pyc index 1fcf7ae..eb8f71d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/ssh/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/__init__.cpython-311.pyc index 163ffbe..5c7ba6d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/log.cpython-311.pyc index 7f13cbb..9010adf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/protocol.cpython-311.pyc index 59e012c..2f8aef0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/server.cpython-311.pyc index 065b0ec..66f1fee 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/contrib/telnet/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/__init__.cpython-311.pyc index ba123b3..464660a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/async_generator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/async_generator.cpython-311.pyc index 4497725..174a8c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/async_generator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/async_generator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/inputhook.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/inputhook.cpython-311.pyc index 1a8fb3f..be844df 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/inputhook.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/inputhook.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/utils.cpython-311.pyc index 92d0e69..2ee05ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/win32.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/win32.cpython-311.pyc index e3b1efa..14abbcc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/win32.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/eventloop/__pycache__/win32.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/__init__.cpython-311.pyc index d05e7a2..016f3fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/app.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/app.cpython-311.pyc index d359b83..bf552cc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/app.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/app.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/base.cpython-311.pyc index b733630..5b14e80 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/cli.cpython-311.pyc index c5f010b..38eccdb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/utils.cpython-311.pyc index b939734..ddca4d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/filters/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/__init__.cpython-311.pyc index a0ab982..4de12c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/ansi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/ansi.cpython-311.pyc index b89e1a6..6b528af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/ansi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/ansi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/base.cpython-311.pyc index 5d93727..5558723 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/html.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/html.cpython-311.pyc index 0315dcc..40fc6db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/html.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/html.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/pygments.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/pygments.cpython-311.pyc index 6c5388b..4d037ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/pygments.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/pygments.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/utils.cpython-311.pyc index 4dafe1d..6dffad8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/formatted_text/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/__init__.cpython-311.pyc index 76484da..c4f936c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/ansi_escape_sequences.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/ansi_escape_sequences.cpython-311.pyc index af032a9..f2c33f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/ansi_escape_sequences.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/ansi_escape_sequences.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/base.cpython-311.pyc index 1c2406e..27fa232 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/defaults.cpython-311.pyc index c370b95..d590694 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_pipe.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_pipe.cpython-311.pyc index 473f29b..6f57a5e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_pipe.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_pipe.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_utils.cpython-311.pyc index 7aeadd3..6faaf29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/posix_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/typeahead.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/typeahead.cpython-311.pyc index f924b2d..c14538c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/typeahead.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/typeahead.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100.cpython-311.pyc index 2dd8465..eb77f99 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100_parser.cpython-311.pyc index 8e2db78..e35a311 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/vt100_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32.cpython-311.pyc index e4f6720..0d30438 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32_pipe.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32_pipe.cpython-311.pyc index d9c00f2..43f003b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32_pipe.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/input/__pycache__/win32_pipe.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/__init__.cpython-311.pyc index 8927af2..6601ea1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/defaults.cpython-311.pyc index ed1d20d..daa6473 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/digraphs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/digraphs.cpython-311.pyc index 0e3a001..9839af6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/digraphs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/digraphs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/emacs_state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/emacs_state.cpython-311.pyc index 4f7faa8..ae3216d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/emacs_state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/emacs_state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_bindings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_bindings.cpython-311.pyc index a8743f4..eb1a7d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_bindings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_bindings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_processor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_processor.cpython-311.pyc index b62d19f..c52102a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_processor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/key_processor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/vi_state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/vi_state.cpython-311.pyc index 5339474..fc8a5b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/vi_state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/__pycache__/vi_state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/__init__.cpython-311.pyc index ba3f9cf..fb2e4c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/auto_suggest.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/auto_suggest.cpython-311.pyc index c25f239..51d82a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/auto_suggest.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/auto_suggest.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/basic.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/basic.cpython-311.pyc index 1270673..26fe0c4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/basic.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/basic.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/completion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/completion.cpython-311.pyc index 7cd1b98..bb8a29f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/completion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/completion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/cpr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/cpr.cpython-311.pyc index e4bafe8..1fb53b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/cpr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/cpr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/emacs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/emacs.cpython-311.pyc index 9a3034e..5872d45 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/emacs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/emacs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/focus.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/focus.cpython-311.pyc index 59a5ea3..5c73a56 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/focus.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/focus.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/mouse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/mouse.cpython-311.pyc index 85471eb..d533a8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/mouse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/mouse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/named_commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/named_commands.cpython-311.pyc index 9dc620a..d434ffb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/named_commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/named_commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/open_in_editor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/open_in_editor.cpython-311.pyc index 3cc9848..e3af184 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/open_in_editor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/open_in_editor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/page_navigation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/page_navigation.cpython-311.pyc index 672a1d8..30b3e75 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/page_navigation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/page_navigation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/scroll.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/scroll.cpython-311.pyc index ede941e..6e101f4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/scroll.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/scroll.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/search.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/search.cpython-311.pyc index 3505bd6..86a0cab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/search.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/search.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/vi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/vi.cpython-311.pyc index d39274b..d444b49 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/vi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/key_binding/bindings/__pycache__/vi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/__init__.cpython-311.pyc index 1452488..2f3c856 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/containers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/containers.cpython-311.pyc index fba93ac..9f7a137 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/containers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/containers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/controls.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/controls.cpython-311.pyc index ebe2747..7443c40 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/controls.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/controls.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dimension.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dimension.cpython-311.pyc index 2706c5f..76f675a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dimension.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dimension.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dummy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dummy.cpython-311.pyc index 137362b..5ed7edd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dummy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/dummy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/layout.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/layout.cpython-311.pyc index c50e1ea..20659ee 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/layout.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/layout.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/margins.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/margins.cpython-311.pyc index 34209a9..bca6870 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/margins.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/margins.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/menus.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/menus.cpython-311.pyc index 0fc623c..bf58782 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/menus.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/menus.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/mouse_handlers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/mouse_handlers.cpython-311.pyc index bec5898..cdc35f3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/mouse_handlers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/mouse_handlers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/processors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/processors.cpython-311.pyc index 1d1cdaa..17288ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/processors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/processors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/screen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/screen.cpython-311.pyc index 617b954..2c87b95 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/screen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/screen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/scrollable_pane.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/scrollable_pane.cpython-311.pyc index 20740bc..5404977 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/scrollable_pane.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/scrollable_pane.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/utils.cpython-311.pyc index 357349c..eee8099 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/layout/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/__init__.cpython-311.pyc index 79ecd7b..20a8859 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/base.cpython-311.pyc index d6295e3..0c2f701 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/pygments.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/pygments.cpython-311.pyc index e5e3346..9051ba6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/pygments.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/lexers/__pycache__/pygments.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/__init__.cpython-311.pyc index d4c862b..7791c47 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/base.cpython-311.pyc index c01e499..35d186e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/color_depth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/color_depth.cpython-311.pyc index f22c1c4..4e37b72 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/color_depth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/color_depth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/conemu.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/conemu.cpython-311.pyc index 1b7667f..bf466c2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/conemu.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/conemu.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/defaults.cpython-311.pyc index 5229ea7..7eb7737 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/flush_stdout.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/flush_stdout.cpython-311.pyc index 54adadc..ec5dfac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/flush_stdout.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/flush_stdout.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/plain_text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/plain_text.cpython-311.pyc index b4c2b07..d6a27da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/plain_text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/plain_text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/vt100.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/vt100.cpython-311.pyc index d7eecf2..43630b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/vt100.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/vt100.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/win32.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/win32.cpython-311.pyc index 8f06a86..8bc240f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/win32.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/win32.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/windows10.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/windows10.cpython-311.pyc index 4f16af8..c8ba9be 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/windows10.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/output/__pycache__/windows10.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/__init__.cpython-311.pyc index 9243b92..58b12a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/choice_input.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/choice_input.cpython-311.pyc index ce1e1e2..06f34ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/choice_input.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/choice_input.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/dialogs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/dialogs.cpython-311.pyc index 92bee3c..89a8c01 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/dialogs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/dialogs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/prompt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/prompt.cpython-311.pyc index 48744cd..c49b6bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/prompt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/prompt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/utils.cpython-311.pyc index 3a30f7b..125a96d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/__init__.cpython-311.pyc index 2e6165b..fed2b00 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/base.cpython-311.pyc index 27889d9..c11c70f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/formatters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/formatters.cpython-311.pyc index cc998c9..0bd563b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/formatters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/shortcuts/progress_bar/__pycache__/formatters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/__init__.cpython-311.pyc index 68e231f..2d32ecd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/base.cpython-311.pyc index b51a03e..6a06526 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/defaults.cpython-311.pyc index 6bfd95b..c8eb5ec 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/named_colors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/named_colors.cpython-311.pyc index 7b4f7d9..5c0eb81 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/named_colors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/named_colors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/pygments.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/pygments.cpython-311.pyc index 7f79444..8ae6b6e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/pygments.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/pygments.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style.cpython-311.pyc index 6683413..70e23db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style_transformation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style_transformation.cpython-311.pyc index 37a263f..6de6ec0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style_transformation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/styles/__pycache__/style_transformation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/__init__.cpython-311.pyc index 7f51df0..2ec1cf4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/base.cpython-311.pyc index b3031cf..a677dba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/dialogs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/dialogs.cpython-311.pyc index d0a38e4..b69592a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/dialogs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/dialogs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/menus.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/menus.cpython-311.pyc index 22f26ff..6572fc8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/menus.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/menus.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/toolbars.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/toolbars.cpython-311.pyc index e0f3cb4..a5cacc1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/toolbars.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/prompt_toolkit/widgets/__pycache__/toolbars.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/__init__.cpython-311.pyc index 1ed6936..bfa3903 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/_ast_gen.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/_ast_gen.cpython-311.pyc index aa6fb9b..e9e5aff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/_ast_gen.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/_ast_gen.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/ast_transforms.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/ast_transforms.cpython-311.pyc index cba06bb..76e4e50 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/ast_transforms.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/ast_transforms.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_ast.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_ast.cpython-311.pyc index 17644c1..7d85d7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_ast.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_ast.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_generator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_generator.cpython-311.pyc index 1ade38e..6d7abb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_generator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_generator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_lexer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_lexer.cpython-311.pyc index ba0c1c7..a55fbbf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_lexer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_lexer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_parser.cpython-311.pyc index bcff439..bd984b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pycparser/__pycache__/c_parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/__init__.cpython-311.pyc index 3239b32..07c5de4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/_migration.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/_migration.cpython-311.pyc index 2511b13..b053cf3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/_migration.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/_migration.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/alias_generators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/alias_generators.cpython-311.pyc index 45c9fe4..aee5298 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/alias_generators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/alias_generators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/aliases.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/aliases.cpython-311.pyc index 45db6f9..0295a73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/aliases.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/aliases.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/annotated_handlers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/annotated_handlers.cpython-311.pyc index 71544f5..5fb309b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/annotated_handlers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/annotated_handlers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/class_validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/class_validators.cpython-311.pyc index 1989aaa..6e2c85a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/class_validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/class_validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/color.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/color.cpython-311.pyc index 6201825..799693c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/color.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/color.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/config.cpython-311.pyc index 9e4e938..4d8093c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/dataclasses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/dataclasses.cpython-311.pyc index 7d7c22a..57831cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/dataclasses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/dataclasses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/datetime_parse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/datetime_parse.cpython-311.pyc index e9117a0..6d9c7f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/datetime_parse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/datetime_parse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/decorator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/decorator.cpython-311.pyc index 7fdf932..e79b6fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/decorator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/decorator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/env_settings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/env_settings.cpython-311.pyc index bc19137..50a5952 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/env_settings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/env_settings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/error_wrappers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/error_wrappers.cpython-311.pyc index dfad7a9..4964374 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/error_wrappers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/error_wrappers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/errors.cpython-311.pyc index 0ffc95a..4a56aa4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/fields.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/fields.cpython-311.pyc index 205266c..0c395a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/fields.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/fields.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_serializers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_serializers.cpython-311.pyc index 5e1a352..055213c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_serializers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_serializers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_validators.cpython-311.pyc index c221270..bbb0886 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/functional_validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/generics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/generics.cpython-311.pyc index d9e8c91..2fedf88 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/generics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/generics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json.cpython-311.pyc index b307d91..a814948 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json_schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json_schema.cpython-311.pyc index 6a076d4..9501ceb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json_schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/json_schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/main.cpython-311.pyc index 08054e7..30a203e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/mypy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/mypy.cpython-311.pyc index 1358ac3..2d1466c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/mypy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/mypy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/networks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/networks.cpython-311.pyc index 2b3ab74..e1a8157 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/networks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/networks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/parse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/parse.cpython-311.pyc index 14a237b..4a0bfc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/parse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/parse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/root_model.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/root_model.cpython-311.pyc index dbc0d87..38b8a3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/root_model.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/root_model.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/schema.cpython-311.pyc index c232fe5..bbf3545 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/tools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/tools.cpython-311.pyc index 592c14e..066f91e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/tools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/tools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/type_adapter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/type_adapter.cpython-311.pyc index 57a7e10..ebf2fa1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/type_adapter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/type_adapter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/types.cpython-311.pyc index 894c744..3d87516 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/typing.cpython-311.pyc index 6b98d17..da2a380 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/utils.cpython-311.pyc index 5034722..04134e0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validate_call_decorator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validate_call_decorator.cpython-311.pyc index 79a0487..652c56b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validate_call_decorator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validate_call_decorator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validators.cpython-311.pyc index e0f0401..2f388c6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/version.cpython-311.pyc index 0c95dce..c94ea8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/warnings.cpython-311.pyc index e7ebf12..21d9704 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/warnings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/__pycache__/warnings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/__init__.cpython-311.pyc index 74479d3..e2c0c2b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_config.cpython-311.pyc index 25c8c87..9c7e2c8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_metadata.cpython-311.pyc index 93d1d77..50d83f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_utils.cpython-311.pyc index 79c2371..f54e952 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_core_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_dataclasses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_dataclasses.cpython-311.pyc index 26910d7..cbd01b0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_dataclasses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_dataclasses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators.cpython-311.pyc index 39f441b..dea54f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators_v1.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators_v1.cpython-311.pyc index ae7e5fb..8bfdb5a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators_v1.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_decorators_v1.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_discriminated_union.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_discriminated_union.cpython-311.pyc index 8477b43..b0ee88f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_discriminated_union.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_discriminated_union.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_docs_extraction.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_docs_extraction.cpython-311.pyc index d75c4a5..3fabf4c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_docs_extraction.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_docs_extraction.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_fields.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_fields.cpython-311.pyc index ed44b64..a6dad27 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_fields.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_fields.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_forward_ref.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_forward_ref.cpython-311.pyc index bf71a79..3383981 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_forward_ref.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_forward_ref.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generate_schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generate_schema.cpython-311.pyc index 529a9bc..72e5375 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generate_schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generate_schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generics.cpython-311.pyc index 28c16e7..a8d771d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_generics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_git.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_git.cpython-311.pyc index 1ff3203..de86aa7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_git.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_git.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_import_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_import_utils.cpython-311.pyc index 89c9b34..c2c7fb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_import_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_import_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_known_annotated_metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_known_annotated_metadata.cpython-311.pyc index 7e42621..e280db1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_known_annotated_metadata.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_known_annotated_metadata.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_mock_val_ser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_mock_val_ser.cpython-311.pyc index bdd1d6d..45d51c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_mock_val_ser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_mock_val_ser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_model_construction.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_model_construction.cpython-311.pyc index c11d7f9..0c3dc66 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_model_construction.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_model_construction.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_namespace_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_namespace_utils.cpython-311.pyc index 6b2fb60..b3a77a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_namespace_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_namespace_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_repr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_repr.cpython-311.pyc index 1fe7bed..8c1f78a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_repr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_repr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_gather.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_gather.cpython-311.pyc index 7deda57..7685567 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_gather.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_gather.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_generation_shared.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_generation_shared.cpython-311.pyc index e6c783f..384bd39 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_generation_shared.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_schema_generation_shared.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_serializers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_serializers.cpython-311.pyc index 19830bc..b87ef98 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_serializers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_serializers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_signature.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_signature.cpython-311.pyc index 48e1b0c..85d9c13 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_signature.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_signature.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_type_refs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_type_refs.cpython-311.pyc index bd2e949..7873c19 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_type_refs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_type_refs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_typing_extra.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_typing_extra.cpython-311.pyc index 8b307e2..808115f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_typing_extra.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_typing_extra.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_utils.cpython-311.pyc index d3f23f5..2e32a8e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validate_call.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validate_call.cpython-311.pyc index ae994bc..a90ae23 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validate_call.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validate_call.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validators.cpython-311.pyc index d52303b..3858a34 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/_internal/__pycache__/_validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/__init__.cpython-311.pyc index 47d2a31..3672967 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/class_validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/class_validators.cpython-311.pyc index c8cf6ed..be0817f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/class_validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/class_validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/config.cpython-311.pyc index 86938cf..85d8d8f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/copy_internals.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/copy_internals.cpython-311.pyc index acb89b0..3389aa6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/copy_internals.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/copy_internals.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/decorator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/decorator.cpython-311.pyc index d4422a9..0ad5bb0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/decorator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/decorator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/json.cpython-311.pyc index a3ee365..43e5a4c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/parse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/parse.cpython-311.pyc index e676e59..3d6523e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/parse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/parse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/tools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/tools.cpython-311.pyc index d372650..ad88ac5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/tools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/deprecated/__pycache__/tools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/__init__.cpython-311.pyc index 9f16ac5..77f7972 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/arguments_schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/arguments_schema.cpython-311.pyc index 94a42b6..e9aed56 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/arguments_schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/arguments_schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/missing_sentinel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/missing_sentinel.cpython-311.pyc index e11ba76..5ad29d2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/missing_sentinel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/missing_sentinel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/pipeline.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/pipeline.cpython-311.pyc index 821d404..d65e07c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/pipeline.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/experimental/__pycache__/pipeline.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/__init__.cpython-311.pyc index d9daa9a..7509708 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_loader.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_loader.cpython-311.pyc index 4c233fe..ef3d47e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_loader.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_loader.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_schema_validator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_schema_validator.cpython-311.pyc index 1ebd01b..ddd99f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_schema_validator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/plugin/__pycache__/_schema_validator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/__init__.cpython-311.pyc index 53996da..599aef4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/_hypothesis_plugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/_hypothesis_plugin.cpython-311.pyc index 79f8fce..6f0315c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/_hypothesis_plugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/_hypothesis_plugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/annotated_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/annotated_types.cpython-311.pyc index 8f4b5ca..9503323 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/annotated_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/annotated_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/class_validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/class_validators.cpython-311.pyc index 34e4cbb..cd317b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/class_validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/class_validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/color.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/color.cpython-311.pyc index 616ee06..4dacbd1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/color.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/color.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/config.cpython-311.pyc index a9ea56f..8af5d28 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/dataclasses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/dataclasses.cpython-311.pyc index fa63ec1..fc208f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/dataclasses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/dataclasses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/datetime_parse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/datetime_parse.cpython-311.pyc index b7ee8e4..6af7379 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/datetime_parse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/datetime_parse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/decorator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/decorator.cpython-311.pyc index e4f5881..5c7500d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/decorator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/decorator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/env_settings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/env_settings.cpython-311.pyc index 720a684..054d605 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/env_settings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/env_settings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/error_wrappers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/error_wrappers.cpython-311.pyc index 48370e9..1f0f5a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/error_wrappers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/error_wrappers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/errors.cpython-311.pyc index f6b34bd..507fca6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/fields.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/fields.cpython-311.pyc index e28f802..634f25b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/fields.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/fields.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/generics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/generics.cpython-311.pyc index c9bac8b..9311fc6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/generics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/generics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/json.cpython-311.pyc index 4b2de14..1237a26 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/main.cpython-311.pyc index dd27003..34945c4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/mypy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/mypy.cpython-311.pyc index abcfde4..0eeae96 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/mypy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/mypy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/networks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/networks.cpython-311.pyc index e5497e8..24d5d87 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/networks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/networks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/parse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/parse.cpython-311.pyc index 43cfb18..71e2221 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/parse.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/parse.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/schema.cpython-311.pyc index 42f76df..47d2e27 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/tools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/tools.cpython-311.pyc index 7cffc44..79fa361 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/tools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/tools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/types.cpython-311.pyc index a383c0a..e4dafe2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/typing.cpython-311.pyc index a27d757..1b134ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/utils.cpython-311.pyc index b653143..0205f06 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/validators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/validators.cpython-311.pyc index 3e9d1a5..ab6ee64 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/validators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/validators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/version.cpython-311.pyc index 239a234..49d0797 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic/v1/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/__init__.cpython-311.pyc index d96dc2f..9d0a5b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/core_schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/core_schema.cpython-311.pyc index bd04cc9..7a18ac0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/core_schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_core/__pycache__/core_schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/__init__.cpython-311.pyc index 9f04147..28484d2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/exceptions.cpython-311.pyc index ff15a8f..105a8a8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/main.cpython-311.pyc index 8efb486..a7970d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/utils.cpython-311.pyc index 367eb10..1b03ce2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/version.cpython-311.pyc index c511365..1eacee2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/__init__.cpython-311.pyc index 384ac69..6a121d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/base.cpython-311.pyc index 1244eab..9c00f81 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/types.cpython-311.pyc index 41ab26d..f0e447c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/utils.cpython-311.pyc index 50998c9..7e41140 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/__init__.cpython-311.pyc index 49673e3..7dce756 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/aws.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/aws.cpython-311.pyc index 35cd5d9..455aa80 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/aws.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/aws.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/azure.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/azure.cpython-311.pyc index 269b0b6..1dc760f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/azure.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/azure.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/cli.cpython-311.pyc index 183d427..75223f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/dotenv.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/dotenv.cpython-311.pyc index 6aaade3..9d63d22 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/dotenv.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/dotenv.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/env.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/env.cpython-311.pyc index 617cc56..b518eb7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/env.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/env.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/gcp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/gcp.cpython-311.pyc index bdefdbf..61438d8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/gcp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/gcp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/json.cpython-311.pyc index 42f7ddf..f2db318 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/nested_secrets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/nested_secrets.cpython-311.pyc index 90fdb42..3188efa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/nested_secrets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/nested_secrets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/pyproject.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/pyproject.cpython-311.pyc index 8890bf0..2438d7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/pyproject.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/pyproject.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/secrets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/secrets.cpython-311.pyc index ae06812..29ee01a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/secrets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/secrets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/toml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/toml.cpython-311.pyc index 092dbe3..d8767af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/toml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/toml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/yaml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/yaml.cpython-311.pyc index e23af16..d87e84b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/yaml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pydantic_settings/sources/providers/__pycache__/yaml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/__init__.cpython-311.pyc index 9d40f44..4b9e5fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/_auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/_auth.cpython-311.pyc index 806720d..143c582 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/_auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/_auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/charset.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/charset.cpython-311.pyc index 3b920a4..a84f108 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/charset.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/charset.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/connections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/connections.cpython-311.pyc index 4512eb0..89b3e44 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/connections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/connections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/converters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/converters.cpython-311.pyc index a81b90a..1bda298 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/converters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/converters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/cursors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/cursors.cpython-311.pyc index 6fbe067..cff54b7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/cursors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/cursors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/err.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/err.cpython-311.pyc index d8851e2..440ce1a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/err.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/err.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/optionfile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/optionfile.cpython-311.pyc index 4565dfc..9cc2acd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/optionfile.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/optionfile.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/protocol.cpython-311.pyc index b188acb..cc6089f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/times.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/times.cpython-311.pyc index 10ff3c2..10b324b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/times.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/__pycache__/times.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CLIENT.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CLIENT.cpython-311.pyc index eebfa60..320ebb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CLIENT.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CLIENT.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/COMMAND.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/COMMAND.cpython-311.pyc index 52f93fa..815ab5c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/COMMAND.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/COMMAND.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CR.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CR.cpython-311.pyc index 58fea90..dc351b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CR.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/CR.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/ER.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/ER.cpython-311.pyc index 907e5ae..136b6fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/ER.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/ER.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FIELD_TYPE.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FIELD_TYPE.cpython-311.pyc index 7c99c53..d447bf0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FIELD_TYPE.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FIELD_TYPE.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FLAG.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FLAG.cpython-311.pyc index 7be9c99..f1cc190 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FLAG.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/FLAG.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/SERVER_STATUS.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/SERVER_STATUS.cpython-311.pyc index ba3aeb5..e9d375f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/SERVER_STATUS.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/SERVER_STATUS.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/__init__.cpython-311.pyc index 0b7d4f7..3064423 100644 Binary files a/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/pymysql/constants/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/python_dotenv-1.2.4.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/python_dotenv-1.2.4.dist-info/RECORD index e091bb3..7a8ae0c 100644 --- a/server/.venv/lib/python3.11/site-packages/python_dotenv-1.2.4.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/python_dotenv-1.2.4.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/dotenv,sha256=-0TgskUcsuQRIhqDCLIRQM5mSoMt-1EiWsW0kwhZQo4,187 +../../../bin/dotenv,sha256=lOnMdNUjjv0LweQ69N_tuZmdSVEIaaiQn0E0IzaAYSs,191 dotenv/__init__.py,sha256=bhY-iK6wwHZamWII6eSCuCAWXUNdn2TQFmEOuXSU7SM,1230 dotenv/__main__.py,sha256=N0RhLG7nHIqtlJHwwepIo-zbJPNx9sewCCRGY528h_4,129 dotenv/__pycache__/__init__.cpython-311.pyc,, diff --git a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/__init__.cpython-311.pyc index 1bd4daf..aaeb249 100644 Binary files a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/decoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/decoders.cpython-311.pyc index 46648fc..cdb4840 100644 Binary files a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/decoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/decoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/exceptions.cpython-311.pyc index ab471d5..c99f306 100644 Binary files a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/multipart.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/multipart.cpython-311.pyc index c6bde07..ca37e1b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/multipart.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/python_multipart/__pycache__/multipart.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/__init__.cpython-311.pyc index a7aad98..7e7a667 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_defaults.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_defaults.cpython-311.pyc index 0af1ce2..99be5a0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_defaults.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_defaults.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_himport_exec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_himport_exec.cpython-311.pyc index f54616b..f06ef97 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_himport_exec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/_himport_exec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/background.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/background.cpython-311.pyc index 327fb4b..080f647 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/background.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/background.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/backoff.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/backoff.cpython-311.pyc index 9dad020..1026f57 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/backoff.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/backoff.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cache.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cache.cpython-311.pyc index b459c58..5c7bdc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cache.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cache.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/client.cpython-311.pyc index 49193a0..768097e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cluster.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cluster.cpython-311.pyc index 288b18e..d7fd787 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cluster.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/cluster.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/connection.cpython-311.pyc index 561faf2..cb37cd4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/crc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/crc.cpython-311.pyc index d8a6694..fbde2bc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/crc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/crc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/credentials.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/credentials.cpython-311.pyc index 48bc49e..6ac7743 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/credentials.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/credentials.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/data_structure.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/data_structure.cpython-311.pyc index 272631e..cc9cab5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/data_structure.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/data_structure.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/driver_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/driver_info.cpython-311.pyc index 4d42b04..cc4a2f2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/driver_info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/driver_info.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/event.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/event.cpython-311.pyc index a84ddf8..61ee377 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/event.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/event.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/exceptions.cpython-311.pyc index 0030b77..adfb1dd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/himport.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/himport.cpython-311.pyc index 649648c..5830cad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/himport.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/himport.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/keyspace_notifications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/keyspace_notifications.cpython-311.pyc index eaeaada..b0dac10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/keyspace_notifications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/keyspace_notifications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/lock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/lock.cpython-311.pyc index a4a5f62..f6ee539 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/lock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/lock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/maint_notifications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/maint_notifications.cpython-311.pyc index b22268b..494e95c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/maint_notifications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/maint_notifications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/ocsp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/ocsp.cpython-311.pyc index 0b8c903..e61cff9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/ocsp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/ocsp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/retry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/retry.cpython-311.pyc index 19cb50c..313325d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/retry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/retry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/sentinel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/sentinel.cpython-311.pyc index fbaf65c..0f579b2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/sentinel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/sentinel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/typing.cpython-311.pyc index b21dce6..64b967b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/utils.cpython-311.pyc index f13c246..303153b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/__init__.cpython-311.pyc index 14b98ac..b547fe6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/base.cpython-311.pyc index 1caacaf..69fc651 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/commands.cpython-311.pyc index 53fd301..a6acd2d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/encoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/encoders.cpython-311.pyc index 041af21..7e93ad7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/encoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/encoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/helpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/helpers.cpython-311.pyc index 755008b..793921c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/helpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/helpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/hiredis.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/hiredis.cpython-311.pyc index f78f7de..48240fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/hiredis.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/hiredis.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp2.cpython-311.pyc index 991f41b..83b6b69 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp3.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp3.cpython-311.pyc index b5a246f..f800bf1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp3.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/resp3.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/response_callbacks.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/response_callbacks.cpython-311.pyc index 83f2683..6d5b3f3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/response_callbacks.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/response_callbacks.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/socket.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/socket.cpython-311.pyc index 2a4b14a..4047653 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/socket.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/_parsers/__pycache__/socket.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/__init__.cpython-311.pyc index 76dfe03..8656eb7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/_himport_exec.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/_himport_exec.cpython-311.pyc index 0c5cab1..35f5534 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/_himport_exec.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/_himport_exec.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/client.cpython-311.pyc index abb4c1e..d3b2d7e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/cluster.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/cluster.cpython-311.pyc index 54f3e18..6cd7f6b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/cluster.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/cluster.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/connection.cpython-311.pyc index d48632a..d7f71e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/keyspace_notifications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/keyspace_notifications.cpython-311.pyc index 4d00933..88d90f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/keyspace_notifications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/keyspace_notifications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/lock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/lock.cpython-311.pyc index a614971..f414fa8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/lock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/lock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/maint_notifications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/maint_notifications.cpython-311.pyc index 9a9953f..6b12570 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/maint_notifications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/maint_notifications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/retry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/retry.cpython-311.pyc index 1ebcc2d..6197ea0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/retry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/retry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/sentinel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/sentinel.cpython-311.pyc index f9fbf22..03a685e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/sentinel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/sentinel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/utils.cpython-311.pyc index b78b0e1..378e193 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/__init__.cpython-311.pyc index b96e7a0..7837944 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/http_client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/http_client.cpython-311.pyc index 4b3644a..245d272 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/http_client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/http/__pycache__/http_client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/__init__.cpython-311.pyc index 0141308..8e038f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/client.cpython-311.pyc index 3baba0a..387a239 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/command_executor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/command_executor.cpython-311.pyc index ba884a4..22c80ed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/command_executor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/command_executor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/config.cpython-311.pyc index a2b170b..7b34e15 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/database.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/database.cpython-311.pyc index 9851f9b..d3407d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/database.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/database.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/event.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/event.cpython-311.pyc index 6060fe5..e826d4d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/event.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/event.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failover.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failover.cpython-311.pyc index 8fed27e..34f4e5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failover.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failover.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failure_detector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failure_detector.cpython-311.pyc index 4c915f9..73055a5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failure_detector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/failure_detector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/healthcheck.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/healthcheck.cpython-311.pyc index 08c31e9..8e1256c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/healthcheck.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/multidb/__pycache__/healthcheck.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/__init__.cpython-311.pyc index d73f772..b29673a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/recorder.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/recorder.cpython-311.pyc index 2de613e..9a03b77 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/recorder.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/asyncio/observability/__pycache__/recorder.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/__init__.cpython-311.pyc index 6a0ae2a..7f3e9c6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/err.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/err.cpython-311.pyc index 2c895ac..d42efb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/err.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/err.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/idp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/idp.cpython-311.pyc index 36d5ad7..cfb1b09 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/idp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/idp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token.cpython-311.pyc index 64c6ce3..dda4605 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token_manager.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token_manager.cpython-311.pyc index 47a1ea7..8dd7eb1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token_manager.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/auth/__pycache__/token_manager.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/__init__.cpython-311.pyc index 9d9b114..190cc75 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/cluster.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/cluster.cpython-311.pyc index 3fc4479..0bcf8e0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/cluster.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/cluster.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/core.cpython-311.pyc index e484fa9..1f432dd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/helpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/helpers.cpython-311.pyc index fe42307..1ab6a36 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/helpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/helpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/policies.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/policies.cpython-311.pyc index 157a63a..0589782 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/policies.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/policies.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/redismodules.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/redismodules.cpython-311.pyc index 6e293dd..85941ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/redismodules.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/redismodules.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/sentinel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/sentinel.cpython-311.pyc index 59bb37a..b45bbfd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/sentinel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/__pycache__/sentinel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/__init__.cpython-311.pyc index 5045a44..34fa5a5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/commands.cpython-311.pyc index 1dc2a4b..0fa5e7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/info.cpython-311.pyc index 14bbbff..6a9f29f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/bf/__pycache__/info.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/__init__.cpython-311.pyc index 48a531c..8790c1f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/_util.cpython-311.pyc index b074267..d097088 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/commands.cpython-311.pyc index 33f2fb9..cf0a86b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/decoders.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/decoders.cpython-311.pyc index 923990f..ce5e207 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/decoders.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/decoders.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/path.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/path.cpython-311.pyc index e56ea7a..260ae88 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/path.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/json/__pycache__/path.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/__init__.cpython-311.pyc index edbe5c6..91652d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/_util.cpython-311.pyc index dc9fb15..2711df8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/aggregation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/aggregation.cpython-311.pyc index 4bfdfa3..8522080 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/aggregation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/aggregation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/commands.cpython-311.pyc index d85e7c6..169e3b8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/dialect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/dialect.cpython-311.pyc index 508feae..61ad1a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/dialect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/dialect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/document.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/document.cpython-311.pyc index 87e9e3c..6bf1e8a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/document.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/document.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/field.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/field.cpython-311.pyc index a148fde..fe54aa1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/field.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/field.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_query.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_query.cpython-311.pyc index 6be402f..f53a65f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_query.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_query.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_result.cpython-311.pyc index d907bd3..83e0e68 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/hybrid_result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/index_definition.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/index_definition.cpython-311.pyc index 953207f..1fb68cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/index_definition.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/index_definition.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/profile_information.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/profile_information.cpython-311.pyc index e586a3a..712d342 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/profile_information.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/profile_information.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/query.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/query.cpython-311.pyc index 8ae56fc..fe39d26 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/query.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/query.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/querystring.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/querystring.cpython-311.pyc index 3f882cd..4f7ef1c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/querystring.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/querystring.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/reducers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/reducers.cpython-311.pyc index 0a5f281..b86d9e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/reducers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/reducers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/result.cpython-311.pyc index 213a048..f292e50 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/suggestion.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/suggestion.cpython-311.pyc index 9626152..ba7bac6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/suggestion.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/search/__pycache__/suggestion.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/__init__.cpython-311.pyc index 58f84b5..50d1531 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/commands.cpython-311.pyc index 88e7cbb..7a47338 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/info.cpython-311.pyc index 459ba46..1313028 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/info.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/utils.cpython-311.pyc index fee210f..30d1b91 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/timeseries/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/__init__.cpython-311.pyc index a6c480d..f406db9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/commands.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/commands.cpython-311.pyc index d10325f..6a43320 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/commands.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/commands.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/utils.cpython-311.pyc index aec0c9a..482e487 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/commands/vectorset/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/__init__.cpython-311.pyc index 03fafc7..7e2fc35 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/http_client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/http_client.cpython-311.pyc index b6f1942..f3881a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/http_client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/http/__pycache__/http_client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/__init__.cpython-311.pyc index 4c70f59..c2b5d36 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/circuit.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/circuit.cpython-311.pyc index 269abb5..8813ebd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/circuit.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/circuit.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/client.cpython-311.pyc index 69c0704..92aa3f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/command_executor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/command_executor.cpython-311.pyc index 9690723..155cdf8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/command_executor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/command_executor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/config.cpython-311.pyc index a8eb6a1..440b182 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/database.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/database.cpython-311.pyc index 697f63b..5fcbfd8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/database.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/database.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/event.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/event.cpython-311.pyc index 9879017..1eee42a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/event.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/event.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/exception.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/exception.cpython-311.pyc index 385415d..f5bd1fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/exception.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/exception.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failover.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failover.cpython-311.pyc index b8f66af..9c1656e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failover.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failover.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failure_detector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failure_detector.cpython-311.pyc index ece6018..f8f77f7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failure_detector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/multidb/__pycache__/failure_detector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/__init__.cpython-311.pyc index 4c03ebd..fb1cf4a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/attributes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/attributes.cpython-311.pyc index eb932b5..26ac1d6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/attributes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/attributes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/config.cpython-311.pyc index ac61501..6bc6fb8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/metrics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/metrics.cpython-311.pyc index a66f5e7..1653531 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/metrics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/metrics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/providers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/providers.cpython-311.pyc index 2f70768..33d1ffa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/providers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/providers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/recorder.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/recorder.cpython-311.pyc index 0a8e010..324ddbd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/recorder.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/recorder.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/registry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/registry.cpython-311.pyc index f2ee04f..6f28927 100644 Binary files a/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/registry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/redis/observability/__pycache__/registry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/METADATA deleted file mode 100644 index 8d42d12..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/METADATA +++ /dev/null @@ -1,140 +0,0 @@ -Metadata-Version: 2.4 -Name: setuptools -Version: 79.0.1 -Summary: Easily download, build, install, upgrade, and uninstall Python packages -Author-email: Python Packaging Authority -Project-URL: Source, https://github.com/pypa/setuptools -Project-URL: Documentation, https://setuptools.pypa.io/ -Project-URL: Changelog, https://setuptools.pypa.io/en/stable/history.html -Keywords: CPAN PyPI distutils eggs package management -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: System :: Archiving :: Packaging -Classifier: Topic :: System :: Systems Administration -Classifier: Topic :: Utilities -Requires-Python: >=3.9 -Description-Content-Type: text/x-rst -License-File: LICENSE -Provides-Extra: test -Requires-Dist: pytest!=8.1.*,>=6; extra == "test" -Requires-Dist: virtualenv>=13.0.0; extra == "test" -Requires-Dist: wheel>=0.44.0; extra == "test" -Requires-Dist: pip>=19.1; extra == "test" -Requires-Dist: packaging>=24.2; extra == "test" -Requires-Dist: jaraco.envs>=2.2; extra == "test" -Requires-Dist: pytest-xdist>=3; extra == "test" -Requires-Dist: jaraco.path>=3.7.2; extra == "test" -Requires-Dist: build[virtualenv]>=1.0.3; extra == "test" -Requires-Dist: filelock>=3.4.0; extra == "test" -Requires-Dist: ini2toml[lite]>=0.14; extra == "test" -Requires-Dist: tomli-w>=1.0.0; extra == "test" -Requires-Dist: pytest-timeout; extra == "test" -Requires-Dist: pytest-perf; sys_platform != "cygwin" and extra == "test" -Requires-Dist: jaraco.develop>=7.21; (python_version >= "3.9" and sys_platform != "cygwin") and extra == "test" -Requires-Dist: pytest-home>=0.5; extra == "test" -Requires-Dist: pytest-subprocess; extra == "test" -Requires-Dist: pyproject-hooks!=1.1; extra == "test" -Requires-Dist: jaraco.test>=5.5; extra == "test" -Provides-Extra: doc -Requires-Dist: sphinx>=3.5; extra == "doc" -Requires-Dist: jaraco.packaging>=9.3; extra == "doc" -Requires-Dist: rst.linker>=1.9; extra == "doc" -Requires-Dist: furo; extra == "doc" -Requires-Dist: sphinx-lint; extra == "doc" -Requires-Dist: jaraco.tidelift>=1.4; extra == "doc" -Requires-Dist: pygments-github-lexers==0.0.5; extra == "doc" -Requires-Dist: sphinx-favicon; extra == "doc" -Requires-Dist: sphinx-inline-tabs; extra == "doc" -Requires-Dist: sphinx-reredirects; extra == "doc" -Requires-Dist: sphinxcontrib-towncrier; extra == "doc" -Requires-Dist: sphinx-notfound-page<2,>=1; extra == "doc" -Requires-Dist: pyproject-hooks!=1.1; extra == "doc" -Requires-Dist: towncrier<24.7; extra == "doc" -Provides-Extra: ssl -Provides-Extra: certs -Provides-Extra: core -Requires-Dist: packaging>=24.2; extra == "core" -Requires-Dist: more_itertools>=8.8; extra == "core" -Requires-Dist: jaraco.text>=3.7; extra == "core" -Requires-Dist: importlib_metadata>=6; python_version < "3.10" and extra == "core" -Requires-Dist: tomli>=2.0.1; python_version < "3.11" and extra == "core" -Requires-Dist: wheel>=0.43.0; extra == "core" -Requires-Dist: platformdirs>=4.2.2; extra == "core" -Requires-Dist: jaraco.functools>=4; extra == "core" -Requires-Dist: more_itertools; extra == "core" -Provides-Extra: check -Requires-Dist: pytest-checkdocs>=2.4; extra == "check" -Requires-Dist: pytest-ruff>=0.2.1; sys_platform != "cygwin" and extra == "check" -Requires-Dist: ruff>=0.8.0; sys_platform != "cygwin" and extra == "check" -Provides-Extra: cover -Requires-Dist: pytest-cov; extra == "cover" -Provides-Extra: enabler -Requires-Dist: pytest-enabler>=2.2; extra == "enabler" -Provides-Extra: type -Requires-Dist: pytest-mypy; extra == "type" -Requires-Dist: mypy==1.14.*; extra == "type" -Requires-Dist: importlib_metadata>=7.0.2; python_version < "3.10" and extra == "type" -Requires-Dist: jaraco.develop>=7.21; sys_platform != "cygwin" and extra == "type" -Dynamic: license-file - -.. |pypi-version| image:: https://img.shields.io/pypi/v/setuptools.svg - :target: https://pypi.org/project/setuptools - -.. |py-version| image:: https://img.shields.io/pypi/pyversions/setuptools.svg - -.. |test-badge| image:: https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg - :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. |ruff-badge| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg - :target: https://setuptools.pypa.io - -.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2025-informational - :target: https://blog.jaraco.com/skeleton - -.. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white - :target: https://codecov.io/gh/pypa/setuptools - -.. |tidelift-badge| image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat - :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme - -.. |discord-badge| image:: https://img.shields.io/discord/803025117553754132 - :target: https://discord.com/channels/803025117553754132/815945031150993468 - :alt: Discord - -|pypi-version| |py-version| |test-badge| |ruff-badge| |docs-badge| |skeleton-badge| |codecov-badge| |discord-badge| - -See the `Quickstart `_ -and the `User's Guide `_ for -instructions on how to use Setuptools. - -Questions and comments should be directed to `GitHub Discussions -`_. -Bug reports and especially tested patches may be -submitted directly to the `bug tracker -`_. - - -Code of Conduct -=============== - -Everyone interacting in the setuptools project's codebases, issue trackers, -chat rooms, and fora is expected to follow the -`PSF Code of Conduct `_. - - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -Setuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/RECORD deleted file mode 100644 index bbb18e9..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/RECORD +++ /dev/null @@ -1,873 +0,0 @@ -_distutils_hack/__init__.py,sha256=34HmvLo07j45Uvd2VR-2aRQ7lJD91sTK6zJgn5fphbQ,6755 -_distutils_hack/__pycache__/__init__.cpython-311.pyc,, -_distutils_hack/__pycache__/override.cpython-311.pyc,, -_distutils_hack/override.py,sha256=Eu_s-NF6VIZ4Cqd0tbbA5wtWky2IZPNd8et6GLt1mzo,44 -distutils-precedence.pth,sha256=JjjOniUA5XKl4N5_rtZmHrVp0baW_LoHsN0iPaX10iQ,151 -pkg_resources/__init__.py,sha256=-rh7XOnTxdGuC-_9FAyu5D6s8BL1UsBehxUtj7a-IVo,126203 -pkg_resources/__pycache__/__init__.cpython-311.pyc,, -pkg_resources/api_tests.txt,sha256=XEdvy4igHHrq2qNHNMHnlfO6XSQKNqOyLHbl6QcpfAI,12595 -pkg_resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -pkg_resources/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -pkg_resources/tests/__pycache__/__init__.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_find_distributions.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_integration_zope_interface.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_markers.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_pkg_resources.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_resources.cpython-311.pyc,, -pkg_resources/tests/__pycache__/test_working_set.cpython-311.pyc,, -pkg_resources/tests/data/my-test-package-source/__pycache__/setup.cpython-311.pyc,, -pkg_resources/tests/data/my-test-package-source/setup.cfg,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -pkg_resources/tests/data/my-test-package-source/setup.py,sha256=1VobhAZbMb7M9mfhb_NE8PwDsvukoWLs9aUAS0pYhe8,105 -pkg_resources/tests/data/my-test-package-zip/my-test-package.zip,sha256=AYRcQ39GVePPnMT8TknP1gdDHyJnXhthESmpAjnzSCI,1809 -pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/PKG-INFO,sha256=JvWv9Io2PAuYwEEw2fBW4Qc5YvdbkscpKX1kmLzsoHk,187 -pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/SOURCES.txt,sha256=4ClkH8eTovZrdVrJFsVuxdbMEF--lBVSuKonDAPE5Jc,208 -pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1 -pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1 -pkg_resources/tests/data/my-test-package_unpacked-egg/my_test_package-1.0-py3.7.egg/EGG-INFO/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1 -pkg_resources/tests/data/my-test-package_zipped-egg/my_test_package-1.0-py3.7.egg,sha256=ZTlMGxjRGiKDNkiA2c75jbQH2TWIteP00irF9gvczbo,843 -pkg_resources/tests/test_find_distributions.py,sha256=U91cov5L1COAIWLNq3Xy4plU7_MnOE1WtXMu6iV2waM,1972 -pkg_resources/tests/test_integration_zope_interface.py,sha256=nzVoK557KZQN0V3DIQ1sVeaCOgt4Kpl-CODAWsO7pmc,1652 -pkg_resources/tests/test_markers.py,sha256=0orKg7UMDf7fnuNQvRMOc-EF9EAP_JTQnk4mtGgbW50,241 -pkg_resources/tests/test_pkg_resources.py,sha256=5Mt4bJQhLCL8j8cC46Uv32Np2Xc1TTxLGawIfET55Fk,17111 -pkg_resources/tests/test_resources.py,sha256=K0LqMAUGpRQ9pUb9K0vyI7GesvtlQvTH074m-E2VQlo,31252 -pkg_resources/tests/test_working_set.py,sha256=lRtGJWIixSwSMSbjHgRxeJEQiLMRXcz3xzJL2qL7eXY,8602 -setuptools-79.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools-79.0.1.dist-info/METADATA,sha256=0xUsrrFIbRQ7MLHUH_-q3bfqlf3JVHrhE1zml7GkILU,6548 -setuptools-79.0.1.dist-info/RECORD,, -setuptools-79.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools-79.0.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91 -setuptools-79.0.1.dist-info/entry_points.txt,sha256=zkgthpf_Fa9NVE9p6FKT3Xk9DR1faAcRU4coggsV7jA,2449 -setuptools-79.0.1.dist-info/licenses/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools-79.0.1.dist-info/top_level.txt,sha256=d9yL39v_W7qmKDDSH6sT4bE0j_Ls1M3P161OGgdsm4g,41 -setuptools/__init__.py,sha256=AQsMeRFWz9CQ9aBtcSkbB4Dn8t2w86-GPriklpoAjew,10406 -setuptools/__pycache__/__init__.cpython-311.pyc,, -setuptools/__pycache__/_core_metadata.cpython-311.pyc,, -setuptools/__pycache__/_entry_points.cpython-311.pyc,, -setuptools/__pycache__/_imp.cpython-311.pyc,, -setuptools/__pycache__/_importlib.cpython-311.pyc,, -setuptools/__pycache__/_itertools.cpython-311.pyc,, -setuptools/__pycache__/_normalization.cpython-311.pyc,, -setuptools/__pycache__/_path.cpython-311.pyc,, -setuptools/__pycache__/_reqs.cpython-311.pyc,, -setuptools/__pycache__/_shutil.cpython-311.pyc,, -setuptools/__pycache__/_static.cpython-311.pyc,, -setuptools/__pycache__/archive_util.cpython-311.pyc,, -setuptools/__pycache__/build_meta.cpython-311.pyc,, -setuptools/__pycache__/depends.cpython-311.pyc,, -setuptools/__pycache__/discovery.cpython-311.pyc,, -setuptools/__pycache__/dist.cpython-311.pyc,, -setuptools/__pycache__/errors.cpython-311.pyc,, -setuptools/__pycache__/extension.cpython-311.pyc,, -setuptools/__pycache__/glob.cpython-311.pyc,, -setuptools/__pycache__/installer.cpython-311.pyc,, -setuptools/__pycache__/launch.cpython-311.pyc,, -setuptools/__pycache__/logging.cpython-311.pyc,, -setuptools/__pycache__/modified.cpython-311.pyc,, -setuptools/__pycache__/monkey.cpython-311.pyc,, -setuptools/__pycache__/msvc.cpython-311.pyc,, -setuptools/__pycache__/namespaces.cpython-311.pyc,, -setuptools/__pycache__/package_index.cpython-311.pyc,, -setuptools/__pycache__/sandbox.cpython-311.pyc,, -setuptools/__pycache__/unicode_utils.cpython-311.pyc,, -setuptools/__pycache__/version.cpython-311.pyc,, -setuptools/__pycache__/warnings.cpython-311.pyc,, -setuptools/__pycache__/wheel.cpython-311.pyc,, -setuptools/__pycache__/windows_support.cpython-311.pyc,, -setuptools/_core_metadata.py,sha256=T7Tjp-WSoN881adev3R1wzXCPnkDHqbC2MgylN1yjS8,11978 -setuptools/_distutils/__init__.py,sha256=xGYuhWwLG07J0Q49BVnEjPy6wyDcd6veJMDJX7ljlyM,359 -setuptools/_distutils/__pycache__/__init__.cpython-311.pyc,, -setuptools/_distutils/__pycache__/_log.cpython-311.pyc,, -setuptools/_distutils/__pycache__/_macos_compat.cpython-311.pyc,, -setuptools/_distutils/__pycache__/_modified.cpython-311.pyc,, -setuptools/_distutils/__pycache__/_msvccompiler.cpython-311.pyc,, -setuptools/_distutils/__pycache__/archive_util.cpython-311.pyc,, -setuptools/_distutils/__pycache__/ccompiler.cpython-311.pyc,, -setuptools/_distutils/__pycache__/cmd.cpython-311.pyc,, -setuptools/_distutils/__pycache__/core.cpython-311.pyc,, -setuptools/_distutils/__pycache__/cygwinccompiler.cpython-311.pyc,, -setuptools/_distutils/__pycache__/debug.cpython-311.pyc,, -setuptools/_distutils/__pycache__/dep_util.cpython-311.pyc,, -setuptools/_distutils/__pycache__/dir_util.cpython-311.pyc,, -setuptools/_distutils/__pycache__/dist.cpython-311.pyc,, -setuptools/_distutils/__pycache__/errors.cpython-311.pyc,, -setuptools/_distutils/__pycache__/extension.cpython-311.pyc,, -setuptools/_distutils/__pycache__/fancy_getopt.cpython-311.pyc,, -setuptools/_distutils/__pycache__/file_util.cpython-311.pyc,, -setuptools/_distutils/__pycache__/filelist.cpython-311.pyc,, -setuptools/_distutils/__pycache__/log.cpython-311.pyc,, -setuptools/_distutils/__pycache__/spawn.cpython-311.pyc,, -setuptools/_distutils/__pycache__/sysconfig.cpython-311.pyc,, -setuptools/_distutils/__pycache__/text_file.cpython-311.pyc,, -setuptools/_distutils/__pycache__/unixccompiler.cpython-311.pyc,, -setuptools/_distutils/__pycache__/util.cpython-311.pyc,, -setuptools/_distutils/__pycache__/version.cpython-311.pyc,, -setuptools/_distutils/__pycache__/versionpredicate.cpython-311.pyc,, -setuptools/_distutils/__pycache__/zosccompiler.cpython-311.pyc,, -setuptools/_distutils/_log.py,sha256=i-lNTTcXS8TmWITJ6DODGvtW5z5tMattJQ76h8rZxQU,42 -setuptools/_distutils/_macos_compat.py,sha256=JzUGhF4E5yIITHbUaPobZEWjGHdrrcNV63z86S4RjBc,239 -setuptools/_distutils/_modified.py,sha256=RF1n1CexyDYV3lvGbeXS0s-XCJVboDOIUbA8wEQqYTY,3211 -setuptools/_distutils/_msvccompiler.py,sha256=9PSfSHxvJnHnQL6Sqz4Xcz7iaBIT62p6BheQzGsSlwo,335 -setuptools/_distutils/archive_util.py,sha256=Qw2z-Pt-NV8lNUQrzjs3XDGWCWHMPnqHLyt8TiD2XEA,8884 -setuptools/_distutils/ccompiler.py,sha256=FKVjqzGJ7c-FtouNjhLiaMPm5LKMZHHAruXf8LU216c,524 -setuptools/_distutils/cmd.py,sha256=hXtaRaH7QBnfNOIqEvCt47iwZzD9MVvBdhhdQctHsxM,22186 -setuptools/_distutils/command/__init__.py,sha256=GfFAzbBqk1qxSH4BdaKioKS4hRRnD44BAmwEN85C4u8,386 -setuptools/_distutils/command/__pycache__/__init__.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/_framework_compat.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/bdist.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/bdist_dumb.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/bdist_rpm.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/build.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/build_clib.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/build_ext.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/build_py.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/build_scripts.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/check.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/clean.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/config.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install_data.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install_egg_info.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install_headers.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install_lib.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/install_scripts.cpython-311.pyc,, -setuptools/_distutils/command/__pycache__/sdist.cpython-311.pyc,, -setuptools/_distutils/command/_framework_compat.py,sha256=0iZdSJYzGRWCCvzRDKE-R0-_yaAYvFMd1ylXb2eYXug,1609 -setuptools/_distutils/command/bdist.py,sha256=jWtk61R7fWNUUNxJV0thTZzU5n80L3Ay1waSiP9kiLA,5854 -setuptools/_distutils/command/bdist_dumb.py,sha256=Hx1jAqoZNxYIy4N5TLzUp6J5fi8Ls18py7UlLNFhO2E,4631 -setuptools/_distutils/command/bdist_rpm.py,sha256=nxcXXv5a7B-1ntWu4DbGmCtES4EBINrJaBQcRNAYCJI,21785 -setuptools/_distutils/command/build.py,sha256=SpHlagf0iNaKVyIhxDfhPFZ8X1-LAWOCQACy-yt2K0w,5923 -setuptools/_distutils/command/build_clib.py,sha256=aMqZcUfCbOAu_xr-A9iW-Q9YZHzpDGLRTezOgMQJmSQ,7777 -setuptools/_distutils/command/build_ext.py,sha256=zrrsu9HXnzV6bXYbJuZCK4SwVZMjKnl4pG1o3bNcxtc,32710 -setuptools/_distutils/command/build_py.py,sha256=Vfq-INemoMbg6f003BTy_Ufp8bjOZhmFIhpKMcfXLgs,16696 -setuptools/_distutils/command/build_scripts.py,sha256=tUpEzwTsnrP8qrNory3ldPB240QDCFkMp-pdYPs2wTk,5118 -setuptools/_distutils/command/check.py,sha256=yoNe2MPY4JcTM7rwoIQdfZ75q5Ri058I2coi-Gq9CjM,4946 -setuptools/_distutils/command/clean.py,sha256=dQAacOabwBXU9JoZ-1GFusq3eFltDaeXJFSYncqGbvE,2644 -setuptools/_distutils/command/config.py,sha256=qrrfz6NEQORmbqiY2XlvCDWYhsbLyxZXJsURKfYN_kw,12724 -setuptools/_distutils/command/install.py,sha256=-JenB-mua4hc2RI_-W8F9PnP_J-OaFO7E0PJGKxLo1o,30072 -setuptools/_distutils/command/install_data.py,sha256=GzBlUWWKubTYJlP-L0auUriq9cL-5RKOcoyHTttKj0Q,2875 -setuptools/_distutils/command/install_egg_info.py,sha256=ffiLoU1ivQJ8q2_WL7ZygZbUcOsgdFLKL7otEIJWWkI,2868 -setuptools/_distutils/command/install_headers.py,sha256=5ciKCj8c3XKsYNKdkdMvnypaUCKcoWCDeeZij3fD-Z4,1272 -setuptools/_distutils/command/install_lib.py,sha256=2s9-m5-b1qKm51F28lB5L39Z6vv_GHMlv9dNBSupok0,8588 -setuptools/_distutils/command/install_scripts.py,sha256=M0pPdiaqB7TGmqTMujpGGeiL0Iq_CTeGjMFtrmDmwzM,2002 -setuptools/_distutils/command/sdist.py,sha256=cRIF6Ht1hJ6ayOOFVycMFBUNxjo94e_rFYPx4Hi8Ahc,19151 -setuptools/_distutils/compat/__init__.py,sha256=J20aXGjJ86Rg41xFLIWlcWCgZ9edMdJ9vvdNEQ87vPQ,522 -setuptools/_distutils/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_distutils/compat/__pycache__/numpy.cpython-311.pyc,, -setuptools/_distutils/compat/__pycache__/py39.cpython-311.pyc,, -setuptools/_distutils/compat/numpy.py,sha256=UFgneZw9w97g4c-yGoAIOyLxUOWQ-fPRIhhfMs7_Ouc,167 -setuptools/_distutils/compat/py39.py,sha256=hOsD6lwZLqZoMnacNJ3P6nUA-LJQhEpVtYTzVH0o96M,1964 -setuptools/_distutils/compilers/C/__pycache__/base.cpython-311.pyc,, -setuptools/_distutils/compilers/C/__pycache__/cygwin.cpython-311.pyc,, -setuptools/_distutils/compilers/C/__pycache__/errors.cpython-311.pyc,, -setuptools/_distutils/compilers/C/__pycache__/msvc.cpython-311.pyc,, -setuptools/_distutils/compilers/C/__pycache__/unix.cpython-311.pyc,, -setuptools/_distutils/compilers/C/__pycache__/zos.cpython-311.pyc,, -setuptools/_distutils/compilers/C/base.py,sha256=XR1rBCStCquqm7QOYXD41-LfvsFcPpGxrwxeXzJyn_w,54876 -setuptools/_distutils/compilers/C/cygwin.py,sha256=DUlwQSb55aj7OdcmcddrmCmVEjEaxIiJ5hHUO3GBPNs,11844 -setuptools/_distutils/compilers/C/errors.py,sha256=sKOVzJajMUmNdfywo9UM_QQGsKFcclDhtI5TlCiXMLc,573 -setuptools/_distutils/compilers/C/msvc.py,sha256=elzG8v9jN5QytLMwLCdUdSuZ3eZ3R98VUvnm9Y2PBCA,21404 -setuptools/_distutils/compilers/C/tests/__pycache__/test_base.cpython-311.pyc,, -setuptools/_distutils/compilers/C/tests/__pycache__/test_cygwin.cpython-311.pyc,, -setuptools/_distutils/compilers/C/tests/__pycache__/test_mingw.cpython-311.pyc,, -setuptools/_distutils/compilers/C/tests/__pycache__/test_msvc.cpython-311.pyc,, -setuptools/_distutils/compilers/C/tests/__pycache__/test_unix.cpython-311.pyc,, -setuptools/_distutils/compilers/C/tests/test_base.py,sha256=rdhHc56bhXtm5NnN9BSHwr6c69UqzMItZQzlw2AsdMc,2706 -setuptools/_distutils/compilers/C/tests/test_cygwin.py,sha256=UgV2VgUXj3VulcbDc0UBWfEyJDx42tgSwS4LzHix3mY,2701 -setuptools/_distutils/compilers/C/tests/test_mingw.py,sha256=hCmwyywISpRoyOySbFHBL4TprWRV0mUWDKmOLO8XBXE,1900 -setuptools/_distutils/compilers/C/tests/test_msvc.py,sha256=DlGjmZ1mBSMXIgmlu80BKc7V-EJOZuYucwJwFh5dn28,4151 -setuptools/_distutils/compilers/C/tests/test_unix.py,sha256=AyadWw1fR-UeDl2TvIbYBzOJVHkpE_oRRQ3JTJWqaEA,14642 -setuptools/_distutils/compilers/C/unix.py,sha256=YH-y9g_pjBFjaJyHJQkDEBQ7q4D20I2-cWJNdgw-Yho,16531 -setuptools/_distutils/compilers/C/zos.py,sha256=vnNeWLRZkdIkdZ-YyBnL8idTUfcCOn0tLMW5OBJ0ScU,6586 -setuptools/_distutils/core.py,sha256=GEHKaFC48T3o-_SmH4864GvKyx1IgbVC6ISIPVlx7a4,9364 -setuptools/_distutils/cygwinccompiler.py,sha256=mG_cU8SVZ4amD_VtF5vH6BXP0-kghGsDPbDSXrQ963c,594 -setuptools/_distutils/debug.py,sha256=N6MrTAqK6l9SVk6tWweR108PM8Ol7qNlfyV-nHcLhsY,139 -setuptools/_distutils/dep_util.py,sha256=xN75p6ZpHhMiHEc-rpL2XilJQynHnDNiafHteaZ4tjU,349 -setuptools/_distutils/dir_util.py,sha256=DXPUlfVVGsg9B-Jgg4At_j9T7vM60OgwNXkQHqTo7-I,7236 -setuptools/_distutils/dist.py,sha256=gW598UE0WMkzXQQ31Nr-8L7MPw0oIOz5OSSRzYZlwrM,55794 -setuptools/_distutils/errors.py,sha256=PPE2oDRh5y9Q1beKK9rhdvDaCzQhi4HCXs4KcqfqgZY,3092 -setuptools/_distutils/extension.py,sha256=Foyu4gULcPqm1_U9zrYYHxNk4NqglXv1rbsOk_QrSds,11155 -setuptools/_distutils/fancy_getopt.py,sha256=PjdO-bWCW0imV_UN-MGEw9R2GP2OiE8pHjITgmTAY3Q,17895 -setuptools/_distutils/file_util.py,sha256=YFQL_pD3hLuER9II_H6-hDC_YIGEookdd4wedLuiTW0,7978 -setuptools/_distutils/filelist.py,sha256=MBeSRJmPcKmDv8ooZgSU4BiQPZ0Khwv8l_jhD50XycI,15337 -setuptools/_distutils/log.py,sha256=VyBs5j7z4-K6XTEEBThUc9HyMpoPLGtQpERqbz5ylww,1200 -setuptools/_distutils/spawn.py,sha256=zseCh9sEifyp0I5Vg719JNIASlROJ2ehXqQnHlpt89Q,4086 -setuptools/_distutils/sysconfig.py,sha256=KeI8OHbMuEzHJ8Q0cBez9KZny8iRy6Z6Y0AkMz1jlsU,19728 -setuptools/_distutils/tests/__init__.py,sha256=j-IoPZEtQv3EOPuqNTwalr6GLyRjzCC-OOaNvZzmHsI,1485 -setuptools/_distutils/tests/__pycache__/__init__.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/support.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_archive_util.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_bdist.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_bdist_dumb.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_bdist_rpm.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_build.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_build_clib.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_build_ext.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_build_py.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_build_scripts.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_check.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_clean.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_cmd.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_config_cmd.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_core.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_dir_util.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_dist.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_extension.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_file_util.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_filelist.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_install.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_install_data.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_install_headers.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_install_lib.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_install_scripts.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_log.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_modified.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_sdist.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_spawn.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_sysconfig.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_text_file.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_util.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_version.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/test_versionpredicate.cpython-311.pyc,, -setuptools/_distutils/tests/__pycache__/unix_compat.cpython-311.pyc,, -setuptools/_distutils/tests/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_distutils/tests/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_distutils/tests/compat/__pycache__/py39.cpython-311.pyc,, -setuptools/_distutils/tests/compat/py39.py,sha256=t0GBTM-30jX-9zCfkwlNBFtzzabemx6065mJ0d9_VRw,1026 -setuptools/_distutils/tests/support.py,sha256=tjsYsyxvpTK4NrkCseh2ujvDIGV0Mf_b5SI5fP2T0yM,4099 -setuptools/_distutils/tests/test_archive_util.py,sha256=jozimSwPBF-JoJfN_vDaiVGZp66BNcWZGh34FlW57DQ,11787 -setuptools/_distutils/tests/test_bdist.py,sha256=xNHxUsLlHsZQRwkzLb_iSD24s-9Mk-NX2ffBWwOyPyc,1396 -setuptools/_distutils/tests/test_bdist_dumb.py,sha256=QF05MHNhPOdZyh88Xpw8KsO64s7pRFkl8KL-RoV4XK0,2247 -setuptools/_distutils/tests/test_bdist_rpm.py,sha256=Hdm-pwWgyaoGdGbEcGZa8cRhGU45y8gHK8umOanTjik,3932 -setuptools/_distutils/tests/test_build.py,sha256=JJY5XpOZco25ZY0pstxl-iI8mHsWP0ujf5o8aOtuZYY,1742 -setuptools/_distutils/tests/test_build_clib.py,sha256=Mo1ZFb4C1VXBYOGvnallwN7YCnTtr24akLDO8Zi4CsY,4331 -setuptools/_distutils/tests/test_build_ext.py,sha256=QFO9qYVhWWdJu17HXc4x9RMnLZlhk0lAHi9HVppbuX4,22545 -setuptools/_distutils/tests/test_build_py.py,sha256=NsfmRrojOHBXNMqWR_mp5g4PLTgjhD7iZFUffGZFIdw,6882 -setuptools/_distutils/tests/test_build_scripts.py,sha256=cD-FRy-oX55sXRX5Ez5xQCaeHrWajyKc4Xuwv2fe48w,2880 -setuptools/_distutils/tests/test_check.py,sha256=hHSV07qf7YoSxGsTbbsUQ9tssZz5RRNdbrY1s2SwaFI,6226 -setuptools/_distutils/tests/test_clean.py,sha256=hPH6jfIpGFUrvWbF1txkiNVSNaAxt2wq5XjV499zO4E,1240 -setuptools/_distutils/tests/test_cmd.py,sha256=bgRB79mitoOKR1OiyZHnCogvGxt3pWkxeTqIC04lQWQ,3254 -setuptools/_distutils/tests/test_config_cmd.py,sha256=Zs6WX0IfxDvmuC19XzuVNnYCnTr9Y-hl73TAmDSBN4Y,2664 -setuptools/_distutils/tests/test_core.py,sha256=L7XKVAxa-MGoAZeANopnuK9fRKneYhkSQpgw8XQvcF8,3829 -setuptools/_distutils/tests/test_dir_util.py,sha256=E84lC-k4riVUwURyWaQ0Jqx2ui2-io-0RuJa3M7qkJs,4500 -setuptools/_distutils/tests/test_dist.py,sha256=a6wlc5fQJd5qQ6HOndzcupNhjTxvj6-_JLtpuYvaP1M,18793 -setuptools/_distutils/tests/test_extension.py,sha256=-YejLgZCuycFrOBd64pVH0JvwMc9NwhzHvQxvvjXHqk,3670 -setuptools/_distutils/tests/test_file_util.py,sha256=livjnl3FkilQlrB2rFdFQq9nvjEVZHynNya0bfzv_b4,3522 -setuptools/_distutils/tests/test_filelist.py,sha256=rJwkqCUfkGDgWlD22TozsT8ycbupMHB8DXqThzwT1T4,10766 -setuptools/_distutils/tests/test_install.py,sha256=TfCB0ykhIxydIC2Q4SuTAZzSHvteMHgrBL9whoSgK9Q,8618 -setuptools/_distutils/tests/test_install_data.py,sha256=vKq3K97k0hBAnOg38nmwEdf7cEDVr9rTVyCeJolgb4A,2464 -setuptools/_distutils/tests/test_install_headers.py,sha256=PVAYpo_tYl980Qf64DPOmmSvyefIHdU06f7VsJeZykE,936 -setuptools/_distutils/tests/test_install_lib.py,sha256=qri6Rl-maNTQrNDV8DbeXNl0hjsfRIKiI4rfZLrmWBI,3612 -setuptools/_distutils/tests/test_install_scripts.py,sha256=KE3v0cDkFW-90IOID-OmZZGM2mhy-ZkEuuW7UXS2SHw,1600 -setuptools/_distutils/tests/test_log.py,sha256=isFtOufloCyEdZaQOV7cVUr46GwtdVMj43mGBB5XH7k,323 -setuptools/_distutils/tests/test_modified.py,sha256=h1--bOWmtJo1bpVV6uRhdnS9br71CBiNDM1MDwSGpug,4221 -setuptools/_distutils/tests/test_sdist.py,sha256=cfzUhlCA418-1vH9ta3IBs26c_jUBbkJoFOK5GnAyNk,15062 -setuptools/_distutils/tests/test_spawn.py,sha256=eS8w9D7bTxyFLSyRahJWeuh8Kc1F8RWWiY_dSG5B5Bc,4803 -setuptools/_distutils/tests/test_sysconfig.py,sha256=lxM8LsUi1TomjDV4HoYK8u5nUoBkeNL60Uq8PY1DcwU,11986 -setuptools/_distutils/tests/test_text_file.py,sha256=WQWSB5AfdBDZaMA8BFgipJPnsJb_2SKMfL90fSkRVtw,3460 -setuptools/_distutils/tests/test_util.py,sha256=H9zlZ4z4Vh4TfjNYDBsxP7wguQLpxCfJYyOcm1yZU3c,7988 -setuptools/_distutils/tests/test_version.py,sha256=ahfg_mP8wRy1sgwY-_Px5hrjgf6_upTIpnCgpR4yWRk,2750 -setuptools/_distutils/tests/test_versionpredicate.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_distutils/tests/unix_compat.py,sha256=z-op6C2iVdX1aq5BIBR7cqOxijKE97alNwJqHNdLpoI,386 -setuptools/_distutils/text_file.py,sha256=z4dkOJBr9Bo2LG0TNqm8sD63LEEaKSSP0J0bWBrFG3c,12101 -setuptools/_distutils/unixccompiler.py,sha256=1bXJWH4fiu_A2WfriHzf88xjllQTXnnjUkZdRKs9cWU,212 -setuptools/_distutils/util.py,sha256=Njfnqk60zMdkiAjRnGcTWX3t49-obHapOlbNvyIl02I,18094 -setuptools/_distutils/version.py,sha256=vImT5-ECXkQ21oKL0XYFiTqK6NyM09cpzBNoA_34CQU,12619 -setuptools/_distutils/versionpredicate.py,sha256=qBWQ6wTj12ODytoTmIydefIY2jb4uY1sdbgbuLn-IJM,5205 -setuptools/_distutils/zosccompiler.py,sha256=svdiXZ2kdcwKrJKfhUhib03y8gz7aGZKukXH3I7YkBc,58 -setuptools/_entry_points.py,sha256=Y3QUE9JKFW_YyquDnpffNWSs6f3jKEt1e-dnx--9-Kw,2310 -setuptools/_imp.py,sha256=YY1EjZEN-0zYci1cxO10B_adAEOr7i8eK8JoCc9Ierc,2435 -setuptools/_importlib.py,sha256=aKIjcK0HKXNz2D-XTrxaixGn_juTkONwmu3dcheMOF0,223 -setuptools/_itertools.py,sha256=jWRfsIrpC7myooz3hDURj9GtvpswZeKXg2HakmEhNjo,657 -setuptools/_normalization.py,sha256=kAmGfrwjF5djydEfLLyKgjkXCbL_0_ZxUPO-DlLlmIY,5824 -setuptools/_path.py,sha256=cPv41v03HD7uEYqCIo-E_cGRfpPVr4lywBCiK-HSrCg,2685 -setuptools/_reqs.py,sha256=QI3C9uOBSNRccu208qPnixHx51nxCry7_nPTIJaSYxM,1438 -setuptools/_shutil.py,sha256=cAOllcoyMTXs5JLoybQi29yI5gABk82hepJyOBv2bMw,1496 -setuptools/_static.py,sha256=GTR79gESF1_JaK4trLkpDrEuCeEtPlwQW0MRv7VNQX4,4855 -setuptools/_vendor/__pycache__/typing_extensions.cpython-311.pyc,, -setuptools/_vendor/autocommand-2.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/autocommand-2.2.2.dist-info/LICENSE,sha256=reeNBJgtaZctREqOFKlPh6IzTdOFXMgDSOqOJAqg3y0,7634 -setuptools/_vendor/autocommand-2.2.2.dist-info/METADATA,sha256=OADZuR3O6iBlpu1ieTgzYul6w4uOVrk0P0BO5TGGAJk,15006 -setuptools/_vendor/autocommand-2.2.2.dist-info/RECORD,sha256=giu6ZrQVJvpUcYa4AiH4XaUNZSvuVJPb_l0UCFES8MM,1308 -setuptools/_vendor/autocommand-2.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92 -setuptools/_vendor/autocommand-2.2.2.dist-info/top_level.txt,sha256=AzfhgKKS8EdAwWUTSF8mgeVQbXOY9kokHB6kSqwwqu0,12 -setuptools/_vendor/autocommand/__init__.py,sha256=zko5Rnvolvb-UXjCx_2ArPTGBWwUK5QY4LIQIKYR7As,1037 -setuptools/_vendor/autocommand/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/autocommand/__pycache__/autoasync.cpython-311.pyc,, -setuptools/_vendor/autocommand/__pycache__/autocommand.cpython-311.pyc,, -setuptools/_vendor/autocommand/__pycache__/automain.cpython-311.pyc,, -setuptools/_vendor/autocommand/__pycache__/autoparse.cpython-311.pyc,, -setuptools/_vendor/autocommand/__pycache__/errors.cpython-311.pyc,, -setuptools/_vendor/autocommand/autoasync.py,sha256=AMdyrxNS4pqWJfP_xuoOcImOHWD-qT7x06wmKN1Vp-U,5680 -setuptools/_vendor/autocommand/autocommand.py,sha256=hmkEmQ72HtL55gnURVjDOnsfYlGd5lLXbvT4KG496Qw,2505 -setuptools/_vendor/autocommand/automain.py,sha256=A2b8i754Mxc_DjU9WFr6vqYDWlhz0cn8miu8d8EsxV8,2076 -setuptools/_vendor/autocommand/autoparse.py,sha256=WVWmZJPcbzUKXP40raQw_0HD8qPJ2V9VG1eFFmmnFxw,11642 -setuptools/_vendor/autocommand/errors.py,sha256=7aa3roh9Herd6nIKpQHNWEslWE8oq7GiHYVUuRqORnA,886 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/METADATA,sha256=ghXFTq132dxaEIolxr3HK1mZqm9iyUmaRANZQSr6WlE,2020 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/RECORD,sha256=JYofHISeEXUGmlWl1s41ev3QTjTNXeJwk-Ss7HqdLOE,1360 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/backports.tarfile-1.2.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10 -setuptools/_vendor/backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81 -setuptools/_vendor/backports/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/backports/tarfile/__init__.py,sha256=Pwf2qUIfB0SolJPCKcx3vz3UEu_aids4g4sAfxy94qg,108491 -setuptools/_vendor/backports/tarfile/__main__.py,sha256=Yw2oGT1afrz2eBskzdPYL8ReB_3liApmhFkN2EbDmc4,59 -setuptools/_vendor/backports/tarfile/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/backports/tarfile/__pycache__/__main__.cpython-311.pyc,, -setuptools/_vendor/backports/tarfile/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/backports/tarfile/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/backports/tarfile/compat/__pycache__/py38.cpython-311.pyc,, -setuptools/_vendor/backports/tarfile/compat/py38.py,sha256=iYkyt_gvWjLzGUTJD9TuTfMMjOk-ersXZmRlvQYN2qE,568 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/METADATA,sha256=anuQ7_7h4J1bSEzfcjIBakPi2cyVQ7y7jklLHsBeH1k,4648 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/RECORD,sha256=DY08buueu-hsrH1ghhVSQzwynanqUSSLYdAr4uXmQDA,2518 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91 -setuptools/_vendor/importlib_metadata-8.0.0.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19 -setuptools/_vendor/importlib_metadata/__init__.py,sha256=tZNB-23h8Bixi9uCrQqj9Yf0aeC--Josdy3IZRIQeB0,33798 -setuptools/_vendor/importlib_metadata/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_adapters.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_collections.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_compat.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_functools.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_itertools.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_meta.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/_text.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/__pycache__/diagnose.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/_adapters.py,sha256=rIhWTwBvYA1bV7i-5FfVX38qEXDTXFeS5cb5xJtP3ks,2317 -setuptools/_vendor/importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743 -setuptools/_vendor/importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314 -setuptools/_vendor/importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895 -setuptools/_vendor/importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068 -setuptools/_vendor/importlib_metadata/_meta.py,sha256=nxZ7C8GVlcBFAKWyVOn_dn7ot_twBcbm1NmvjIetBHI,1801 -setuptools/_vendor/importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166 -setuptools/_vendor/importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/importlib_metadata/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/compat/__pycache__/py311.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/compat/__pycache__/py39.cpython-311.pyc,, -setuptools/_vendor/importlib_metadata/compat/py311.py,sha256=uqm-K-uohyj1042TH4a9Er_I5o7667DvulcD-gC_fSA,608 -setuptools/_vendor/importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102 -setuptools/_vendor/importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379 -setuptools/_vendor/importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/inflect-7.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/inflect-7.3.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/inflect-7.3.1.dist-info/METADATA,sha256=ZgMNY0WAZRs-U8wZiV2SMfjSKqBrMngXyDMs_CAwMwg,21079 -setuptools/_vendor/inflect-7.3.1.dist-info/RECORD,sha256=XXg0rBuiYSxoAQUP3lenuYsPNqz4jDwtTzdv2JEbMJE,943 -setuptools/_vendor/inflect-7.3.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91 -setuptools/_vendor/inflect-7.3.1.dist-info/top_level.txt,sha256=m52ujdp10CqT6jh1XQxZT6kEntcnv-7Tl7UiGNTzWZA,8 -setuptools/_vendor/inflect/__init__.py,sha256=Jxy1HJXZiZ85kHeLAhkmvz6EMTdFqBe-duvt34R6IOc,103796 -setuptools/_vendor/inflect/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/inflect/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/inflect/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/inflect/compat/__pycache__/py38.cpython-311.pyc,, -setuptools/_vendor/inflect/compat/py38.py,sha256=oObVfVnWX9_OpnOuEJn1mFbJxVhwyR5epbiTNXDDaso,160 -setuptools/_vendor/inflect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/METADATA,sha256=IMUaliNsA5X1Ox9MXUWOagch5R4Wwb_3M7erp29dBtg,3933 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/RECORD,sha256=HptivXDkpfom6VlMu4CGD_7KPev-6Hc9rvp3TNJZygY,873 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91 -setuptools/_vendor/jaraco.collections-5.1.0.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/METADATA,sha256=xDtguJej0tN9iEXCUvxEJh2a7xceIRVBEakBLSr__tY,4020 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/RECORD,sha256=VRl7iKeEQyl7stgnp1uq50CzOJYlHYcoNdS0x17C9X4,641 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/jaraco.context-5.3.0.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/METADATA,sha256=i4aUaQDX-jjdEQK5wevhegyx8JyLfin2HyvaSk3FHso,2891 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/RECORD,sha256=YyqnwE98S8wBwCevW5vHb-iVj0oYEDW5V6O9MBS6JIs,843 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/jaraco.functools-4.0.1.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/METADATA,sha256=AzWdm6ViMfDOPoQMfLWn2zgBQSGJScyqeN29TcuWXVI,3658 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/RECORD,sha256=gW2UV0HcokYJk4jKPu10_AZnrLqjb3C1WbJJTDl5sfY,1500 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/jaraco.text-3.12.1.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -setuptools/_vendor/jaraco/__pycache__/context.cpython-311.pyc,, -setuptools/_vendor/jaraco/collections/__init__.py,sha256=Pc1-SqjWm81ad1P0-GttpkwO_LWlnaY6gUq8gcKh2v0,26640 -setuptools/_vendor/jaraco/collections/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/jaraco/collections/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/jaraco/context.py,sha256=REoLIxDkO5MfEYowt_WoupNCRoxBS5v7YX2PbW8lIcs,9552 -setuptools/_vendor/jaraco/functools/__init__.py,sha256=hEAJaS2uSZRuF_JY4CxCHIYh79ZpxaPp9OiHyr9EJ1w,16642 -setuptools/_vendor/jaraco/functools/__init__.pyi,sha256=gk3dsgHzo5F_U74HzAvpNivFAPCkPJ1b2-yCd62dfnw,3878 -setuptools/_vendor/jaraco/functools/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/jaraco/functools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/jaraco/text/Lorem ipsum.txt,sha256=N_7c_79zxOufBY9HZ3yzMgOkNv-TkOTTio4BydrSjgs,1335 -setuptools/_vendor/jaraco/text/__init__.py,sha256=Y2YUqXR_orUoDaY4SkPRe6ZZhb5HUHB_Ah9RCNsVyho,16250 -setuptools/_vendor/jaraco/text/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/__pycache__/layouts.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/__pycache__/show-newlines.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/__pycache__/strip-prefix.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/__pycache__/to-dvorak.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/__pycache__/to-qwerty.cpython-311.pyc,, -setuptools/_vendor/jaraco/text/layouts.py,sha256=HTC8aSTLZ7uXipyOXapRMC158juecjK6RVwitfmZ9_w,643 -setuptools/_vendor/jaraco/text/show-newlines.py,sha256=WGQa65e8lyhb92LUOLqVn6KaCtoeVgVws6WtSRmLk6w,904 -setuptools/_vendor/jaraco/text/strip-prefix.py,sha256=NfVXV8JVNo6nqcuYASfMV7_y4Eo8zMQqlCOGvAnRIVw,412 -setuptools/_vendor/jaraco/text/to-dvorak.py,sha256=1SNcbSsvISpXXg-LnybIHHY-RUFOQr36zcHkY1pWFqw,119 -setuptools/_vendor/jaraco/text/to-qwerty.py,sha256=s4UMQUnPwFn_dB5uZC27BurHOQcYondBfzIpVL5pEzw,119 -setuptools/_vendor/more_itertools-10.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/more_itertools-10.3.0.dist-info/LICENSE,sha256=CfHIyelBrz5YTVlkHqm4fYPAyw_QB-te85Gn4mQ8GkY,1053 -setuptools/_vendor/more_itertools-10.3.0.dist-info/METADATA,sha256=BFO90O-fLNiVQMpj7oIS5ztzgJUUQZ3TA32P5HH3N-A,36293 -setuptools/_vendor/more_itertools-10.3.0.dist-info/RECORD,sha256=d8jnPgGNwP1-ntbICwWkQEVF9kH7CFIgzkKzaLWao9M,1259 -setuptools/_vendor/more_itertools-10.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/more_itertools-10.3.0.dist-info/WHEEL,sha256=rSgq_JpHF9fHR1lx53qwg_1-2LypZE_qmcuXbVUq948,81 -setuptools/_vendor/more_itertools/__init__.py,sha256=dtAbGjTDmn_ghiU5YXfhyDy0phAlXVdt5klZA5fUa-Q,149 -setuptools/_vendor/more_itertools/__init__.pyi,sha256=5B3eTzON1BBuOLob1vCflyEb2lSd6usXQQ-Cv-hXkeA,43 -setuptools/_vendor/more_itertools/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/more_itertools/__pycache__/more.cpython-311.pyc,, -setuptools/_vendor/more_itertools/__pycache__/recipes.cpython-311.pyc,, -setuptools/_vendor/more_itertools/more.py,sha256=1E5kzFncRKTDw0cYv1yRXMgDdunstLQd1QStcnL6U90,148370 -setuptools/_vendor/more_itertools/more.pyi,sha256=iXXeqt48Nxe8VGmIWpkVXuKpR2FYNuu2DU8nQLWCCu0,21484 -setuptools/_vendor/more_itertools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/more_itertools/recipes.py,sha256=WedhhfhGVgr6zii8fIbGJVmRTw0ZKRiLKnYBDGJv4nY,28591 -setuptools/_vendor/more_itertools/recipes.pyi,sha256=T_mdGpcFdfrP3JSWbwzYP9JyNV-Go-7RPfpxfftAWlA,4617 -setuptools/_vendor/packaging-24.2.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2 -setuptools/_vendor/packaging-24.2.dist-info/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197 -setuptools/_vendor/packaging-24.2.dist-info/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174 -setuptools/_vendor/packaging-24.2.dist-info/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344 -setuptools/_vendor/packaging-24.2.dist-info/METADATA,sha256=ohH86s6k5mIfQxY2TS0LcSfADeOFa4BiCC-bxZV-pNs,3204 -setuptools/_vendor/packaging-24.2.dist-info/RECORD,sha256=Y4DrXM0KY0ArfzhbAEa1LYFPwW3WEgEeL4iCqXe-A-M,2009 -setuptools/_vendor/packaging-24.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/packaging-24.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82 -setuptools/_vendor/packaging/__init__.py,sha256=dk4Ta_vmdVJxYHDcfyhvQNw8V3PgSBomKNXqg-D2JDY,494 -setuptools/_vendor/packaging/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_parser.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_structures.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/markers.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/metadata.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/requirements.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/tags.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/utils.cpython-311.pyc,, -setuptools/_vendor/packaging/__pycache__/version.cpython-311.pyc,, -setuptools/_vendor/packaging/_elffile.py,sha256=cflAQAkE25tzhYmq_aCi72QfbT_tn891tPzfpbeHOwE,3306 -setuptools/_vendor/packaging/_manylinux.py,sha256=vl5OCoz4kx80H5rwXKeXWjl9WNISGmr4ZgTpTP9lU9c,9612 -setuptools/_vendor/packaging/_musllinux.py,sha256=p9ZqNYiOItGee8KcZFeHF_YcdhVwGHdK6r-8lgixvGQ,2694 -setuptools/_vendor/packaging/_parser.py,sha256=s_TvTvDNK0NrM2QB3VKThdWFM4Nc0P6JnkObkl3MjpM,10236 -setuptools/_vendor/packaging/_structures.py,sha256=q3eVNmbWJGG_S0Dit_S3Ao8qQqz_5PYTXFAKBZe5yr4,1431 -setuptools/_vendor/packaging/_tokenizer.py,sha256=J6v5H7Jzvb-g81xp_2QACKwO7LxHQA6ikryMU7zXwN8,5273 -setuptools/_vendor/packaging/licenses/__init__.py,sha256=1x5M1nEYjcgwEbLt0dXwz2ukjr18DiCzC0sraQqJ-Ww,5715 -setuptools/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc,, -setuptools/_vendor/packaging/licenses/_spdx.py,sha256=oAm1ztPFwlsmCKe7lAAsv_OIOfS1cWDu9bNBkeu-2ns,48398 -setuptools/_vendor/packaging/markers.py,sha256=c89TNzB7ZdGYhkovm6PYmqGyHxXlYVaLW591PHUNKD8,10561 -setuptools/_vendor/packaging/metadata.py,sha256=YJibM7GYe4re8-0a3OlXmGS-XDgTEoO4tlBt2q25Bng,34762 -setuptools/_vendor/packaging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/packaging/requirements.py,sha256=gYyRSAdbrIyKDY66ugIDUQjRMvxkH2ALioTmX3tnL6o,2947 -setuptools/_vendor/packaging/specifiers.py,sha256=GG1wPNMcL0fMJO68vF53wKMdwnfehDcaI-r9NpTfilA,40074 -setuptools/_vendor/packaging/tags.py,sha256=CFqrJzAzc2XNGexerH__T-Y5Iwq7WbsYXsiLERLWxY0,21014 -setuptools/_vendor/packaging/utils.py,sha256=0F3Hh9OFuRgrhTgGZUl5K22Fv1YP2tZl1z_2gO6kJiA,5050 -setuptools/_vendor/packaging/version.py,sha256=olfyuk_DPbflNkJ4wBWetXQ17c74x3DB501degUv7DY,16676 -setuptools/_vendor/platformdirs-4.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/platformdirs-4.2.2.dist-info/METADATA,sha256=zmsie01G1MtXR0wgIv5XpVeTO7idr0WWvfmxKsKWuGk,11429 -setuptools/_vendor/platformdirs-4.2.2.dist-info/RECORD,sha256=TCEddtQu1A78Os_Mhm2JEqcYr7yit-UYSUQjZtbpn-g,1642 -setuptools/_vendor/platformdirs-4.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/platformdirs-4.2.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87 -setuptools/_vendor/platformdirs-4.2.2.dist-info/licenses/LICENSE,sha256=KeD9YukphQ6G6yjD_czwzv30-pSHkBHP-z0NS-1tTbY,1089 -setuptools/_vendor/platformdirs/__init__.py,sha256=EMGE8qeHRR9CzDFr8kL3tA8hdZZniYjXBVZd0UGTWK0,22225 -setuptools/_vendor/platformdirs/__main__.py,sha256=HnsUQHpiBaiTxwcmwVw-nFaPdVNZtQIdi1eWDtI-MzI,1493 -setuptools/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/android.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/api.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/version.cpython-311.pyc,, -setuptools/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc,, -setuptools/_vendor/platformdirs/android.py,sha256=xZXY9Jd46WOsxT2U6-5HsNtDZ-IQqxcEUrBLl3hYk4o,9016 -setuptools/_vendor/platformdirs/api.py,sha256=QBYdUac2eC521ek_y53uD1Dcq-lJX8IgSRVd4InC6uc,8996 -setuptools/_vendor/platformdirs/macos.py,sha256=wftsbsvq6nZ0WORXSiCrZNkRHz_WKuktl0a6mC7MFkI,5580 -setuptools/_vendor/platformdirs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/platformdirs/unix.py,sha256=Cci9Wqt35dAMsg6HT9nRGHSBW5obb0pR3AE1JJnsCXg,10643 -setuptools/_vendor/platformdirs/version.py,sha256=r7F76tZRjgQKzrpx_I0_ZMQOMU-PS7eGnHD7zEK3KB0,411 -setuptools/_vendor/platformdirs/windows.py,sha256=IFpiohUBwxPtCzlyKwNtxyW4Jk8haa6W8o59mfrDXVo,10125 -setuptools/_vendor/tomli-2.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/tomli-2.0.1.dist-info/LICENSE,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072 -setuptools/_vendor/tomli-2.0.1.dist-info/METADATA,sha256=zPDceKmPwJGLWtZykrHixL7WVXWmJGzZ1jyRT5lCoPI,8875 -setuptools/_vendor/tomli-2.0.1.dist-info/RECORD,sha256=DLn5pFGh42WsVLTIhmLh2gy1SnLRalJY-wq_-dPhwCI,999 -setuptools/_vendor/tomli-2.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/tomli-2.0.1.dist-info/WHEEL,sha256=jPMR_Dzkc4X4icQtmz81lnNY_kAsfog7ry7qoRvYLXw,81 -setuptools/_vendor/tomli/__init__.py,sha256=JhUwV66DB1g4Hvt1UQCVMdfCu-IgAV8FXmvDU9onxd4,396 -setuptools/_vendor/tomli/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/tomli/__pycache__/_parser.cpython-311.pyc,, -setuptools/_vendor/tomli/__pycache__/_re.cpython-311.pyc,, -setuptools/_vendor/tomli/__pycache__/_types.cpython-311.pyc,, -setuptools/_vendor/tomli/_parser.py,sha256=g9-ENaALS-B8dokYpCuzUFalWlog7T-SIYMjLZSWrtM,22633 -setuptools/_vendor/tomli/_re.py,sha256=dbjg5ChZT23Ka9z9DHOXfdtSpPwUfdgMXnj8NOoly-w,2943 -setuptools/_vendor/tomli/_types.py,sha256=-GTG2VUqkpxwMqzmVO4F7ybKddIbAnuAHXfmWQcTi3Q,254 -setuptools/_vendor/tomli/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26 -setuptools/_vendor/typeguard-4.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/typeguard-4.3.0.dist-info/LICENSE,sha256=YWP3mH37ONa8MgzitwsvArhivEESZRbVUu8c1DJH51g,1130 -setuptools/_vendor/typeguard-4.3.0.dist-info/METADATA,sha256=z2dcHAp0TwhYCFU5Deh8x31nazElgujUz9tbuP0pjSE,3717 -setuptools/_vendor/typeguard-4.3.0.dist-info/RECORD,sha256=SKUZWVgkeDUidUKM7s1473fXmsna55bjmi6vJUAoJVI,2402 -setuptools/_vendor/typeguard-4.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/typeguard-4.3.0.dist-info/entry_points.txt,sha256=qp7NQ1aLtiSgMQqo6gWlfGpy0IIXzoMJmeQTLpzqFZQ,48 -setuptools/_vendor/typeguard-4.3.0.dist-info/top_level.txt,sha256=4z28AhuDodwRS_c1J_l8H51t5QuwfTseskYzlxp6grs,10 -setuptools/_vendor/typeguard/__init__.py,sha256=Onh4w38elPCjtlcU3JY9k3h70NjsxXIkAflmQn-Z0FY,2071 -setuptools/_vendor/typeguard/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_checkers.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_config.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_decorators.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_exceptions.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_functions.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_importhook.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_memo.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_pytest_plugin.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_suppression.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_transformer.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_union_transformer.cpython-311.pyc,, -setuptools/_vendor/typeguard/__pycache__/_utils.cpython-311.pyc,, -setuptools/_vendor/typeguard/_checkers.py,sha256=JRrgKicdOEfIBoNEtegYCEIlhpad-a1u1Em7GCj0WCI,31360 -setuptools/_vendor/typeguard/_config.py,sha256=nIz8QwDa-oFO3L9O8_6srzlmd99pSby2wOM4Wb7F_B0,2846 -setuptools/_vendor/typeguard/_decorators.py,sha256=v6dsIeWvPhExGLP_wXF-RmDUyjZf_Ak28g7gBJ_v0-0,9033 -setuptools/_vendor/typeguard/_exceptions.py,sha256=ZIPeiV-FBd5Emw2EaWd2Fvlsrwi4ocwT2fVGBIAtHcQ,1121 -setuptools/_vendor/typeguard/_functions.py,sha256=ibgSAKa5ptIm1eR9ARG0BSozAFJPFNASZqhPVyQeqig,10393 -setuptools/_vendor/typeguard/_importhook.py,sha256=ugjCDvFcdWMU7UugqlJG91IpVNpEIxtRr-99s0h1k7M,6389 -setuptools/_vendor/typeguard/_memo.py,sha256=1juQV_vxnD2JYKbSrebiQuj4oKHz6n67v9pYA-CCISg,1303 -setuptools/_vendor/typeguard/_pytest_plugin.py,sha256=-fcSqkv54rIfIF8pDavY5YQPkj4OX8GMt_lL7CQSD4I,4416 -setuptools/_vendor/typeguard/_suppression.py,sha256=VQfzxcwIbu3if0f7VBkKM7hkYOA7tNFw9a7jMBsmMg4,2266 -setuptools/_vendor/typeguard/_transformer.py,sha256=9Ha7_QhdwoUni_6hvdY-hZbuEergowHrNL2vzHIakFY,44937 -setuptools/_vendor/typeguard/_union_transformer.py,sha256=v_42r7-6HuRX2SoFwnyJ-E5PlxXpVeUJPJR1-HU9qSo,1354 -setuptools/_vendor/typeguard/_utils.py,sha256=5HhO1rPn5f1M6ymkVAEv7Xmlz1cX-j0OnTMlyHqqrR8,5270 -setuptools/_vendor/typeguard/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/typing_extensions-4.12.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/typing_extensions-4.12.2.dist-info/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936 -setuptools/_vendor/typing_extensions-4.12.2.dist-info/METADATA,sha256=BeUQIa8cnYbrjWx-N8TOznM9UGW5Gm2DicVpDtRA8W0,3018 -setuptools/_vendor/typing_extensions-4.12.2.dist-info/RECORD,sha256=dxAALYGXHmMqpqL8M9xddKr118quIgQKZdPjFQOwXuk,571 -setuptools/_vendor/typing_extensions-4.12.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81 -setuptools/_vendor/typing_extensions.py,sha256=gwekpyG9DVG3lxWKX4ni8u7nk3We5slG98mA9F3DJQw,134451 -setuptools/_vendor/wheel-0.45.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/wheel-0.45.1.dist-info/LICENSE.txt,sha256=MMI2GGeRCPPo6h0qZYx8pBe9_IkcmO8aifpP8MmChlQ,1107 -setuptools/_vendor/wheel-0.45.1.dist-info/METADATA,sha256=mKz84H7m7jsxJyzeIcTVORiTb0NPMV39KvOIYhGgmjA,2313 -setuptools/_vendor/wheel-0.45.1.dist-info/RECORD,sha256=1jnxrHyZPDcVvULyfGFhiba4Z5L9_RsXr9dxcNbhaYQ,4900 -setuptools/_vendor/wheel-0.45.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/wheel-0.45.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82 -setuptools/_vendor/wheel-0.45.1.dist-info/entry_points.txt,sha256=rTY1BbkPHhkGMm4Q3F0pIzJBzW2kMxoG1oriffvGdA0,104 -setuptools/_vendor/wheel/__init__.py,sha256=mrxMnvdXACur_LWegbUfh5g5ysWZrd63UJn890wvGNk,59 -setuptools/_vendor/wheel/__main__.py,sha256=NkMUnuTCGcOkgY0IBLgBCVC_BGGcWORx2K8jYGS12UE,455 -setuptools/_vendor/wheel/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/__main__.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/_bdist_wheel.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/_setuptools_logging.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/bdist_wheel.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/macosx_libfile.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/metadata.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/util.cpython-311.pyc,, -setuptools/_vendor/wheel/__pycache__/wheelfile.cpython-311.pyc,, -setuptools/_vendor/wheel/_bdist_wheel.py,sha256=UghCQjSH_pVfcZh6oRjzSw_TQhcf3anSx1OkiLSL82M,21694 -setuptools/_vendor/wheel/_setuptools_logging.py,sha256=-5KC-lne0ilOUWIDfOkqapUWGMFZhuKYDIavIZiB5kM,781 -setuptools/_vendor/wheel/bdist_wheel.py,sha256=tpf9WufiSO1RuEMg5oPhIfSG8DMziCZ_4muCKF69Cqo,1107 -setuptools/_vendor/wheel/cli/__init__.py,sha256=Npq6_jKi03dhIcRnmbuFhwviVJxwO0tYEnEhWMv9cJo,4402 -setuptools/_vendor/wheel/cli/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/wheel/cli/__pycache__/convert.cpython-311.pyc,, -setuptools/_vendor/wheel/cli/__pycache__/pack.cpython-311.pyc,, -setuptools/_vendor/wheel/cli/__pycache__/tags.cpython-311.pyc,, -setuptools/_vendor/wheel/cli/__pycache__/unpack.cpython-311.pyc,, -setuptools/_vendor/wheel/cli/convert.py,sha256=Bi0ntEXb9nTllCxWeTRQ4j-nPs3szWSEKipG_GgnMkQ,12634 -setuptools/_vendor/wheel/cli/pack.py,sha256=CAFcHdBVulvsHYJlndKVO7KMI9JqBTZz5ii0PKxxCOs,3103 -setuptools/_vendor/wheel/cli/tags.py,sha256=lHw-LaWrkS5Jy_qWcw-6pSjeNM6yAjDnqKI3E5JTTCU,4760 -setuptools/_vendor/wheel/cli/unpack.py,sha256=Y_J7ynxPSoFFTT7H0fMgbBlVErwyDGcObgme5MBuz58,1021 -setuptools/_vendor/wheel/macosx_libfile.py,sha256=k1x7CE3LPtOVGqj6NXQ1nTGYVPaeRrhVzUG_KPq3zDs,16572 -setuptools/_vendor/wheel/metadata.py,sha256=JC4p7jlQZu2bUTAQ2fevkqLjg_X6gnNyRhLn6OUO1tc,6171 -setuptools/_vendor/wheel/util.py,sha256=aL7aibHwYUgfc8WlolL5tXdkV4DatbJxZHb1kwHFJAU,423 -setuptools/_vendor/wheel/vendored/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/wheel/vendored/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197 -setuptools/_vendor/wheel/vendored/packaging/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174 -setuptools/_vendor/wheel/vendored/packaging/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344 -setuptools/_vendor/wheel/vendored/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/wheel/vendored/packaging/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_elffile.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_manylinux.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_musllinux.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_parser.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_structures.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/_tokenizer.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/markers.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/requirements.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/specifiers.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/tags.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/utils.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/__pycache__/version.cpython-311.pyc,, -setuptools/_vendor/wheel/vendored/packaging/_elffile.py,sha256=hbmK8OD6Z7fY6hwinHEUcD1by7czkGiNYu7ShnFEk2k,3266 -setuptools/_vendor/wheel/vendored/packaging/_manylinux.py,sha256=P7sdR5_7XBY09LVYYPhHmydMJIIwPXWsh4olk74Uuj4,9588 -setuptools/_vendor/wheel/vendored/packaging/_musllinux.py,sha256=z1s8To2hQ0vpn_d-O2i5qxGwEK8WmGlLt3d_26V7NeY,2674 -setuptools/_vendor/wheel/vendored/packaging/_parser.py,sha256=4tT4emSl2qTaU7VTQE1Xa9o1jMPCsBezsYBxyNMUN-s,10347 -setuptools/_vendor/wheel/vendored/packaging/_structures.py,sha256=q3eVNmbWJGG_S0Dit_S3Ao8qQqz_5PYTXFAKBZe5yr4,1431 -setuptools/_vendor/wheel/vendored/packaging/_tokenizer.py,sha256=alCtbwXhOFAmFGZ6BQ-wCTSFoRAJ2z-ysIf7__MTJ_k,5292 -setuptools/_vendor/wheel/vendored/packaging/markers.py,sha256=_TSPI1BhJYO7Bp9AzTmHQxIqHEVXaTjmDh9G-w8qzPA,8232 -setuptools/_vendor/wheel/vendored/packaging/requirements.py,sha256=dgoBeVprPu2YE6Q8nGfwOPTjATHbRa_ZGLyXhFEln6Q,2933 -setuptools/_vendor/wheel/vendored/packaging/specifiers.py,sha256=IWSt0SrLSP72heWhAC8UL0eGvas7XIQHjqiViVfmPKE,39778 -setuptools/_vendor/wheel/vendored/packaging/tags.py,sha256=fedHXiOHkBxNZTXotXv8uXPmMFU9ae-TKBujgYHigcA,18950 -setuptools/_vendor/wheel/vendored/packaging/utils.py,sha256=XgdmP3yx9-wQEFjO7OvMj9RjEf5JlR5HFFR69v7SQ9E,5268 -setuptools/_vendor/wheel/vendored/packaging/version.py,sha256=PFJaYZDxBgyxkfYhH3SQw4qfE9ICCWrTmitvq14y3bs,16234 -setuptools/_vendor/wheel/vendored/vendor.txt,sha256=Z2ENjB1i5prfez8CdM1Sdr3c6Zxv2rRRolMpLmBncAE,16 -setuptools/_vendor/wheel/wheelfile.py,sha256=USCttNlJwafxt51YYFFKG7jnxz8dfhbyqAZL6jMTA9s,8411 -setuptools/_vendor/zipp-3.19.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -setuptools/_vendor/zipp-3.19.2.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -setuptools/_vendor/zipp-3.19.2.dist-info/METADATA,sha256=UIrk_kMIHGSwsKKChYizqMw0MMZpPRZ2ZiVpQAsN_bE,3575 -setuptools/_vendor/zipp-3.19.2.dist-info/RECORD,sha256=8xby4D_ZrefrvAsVRwaEjiu4_VaLkJNRCfDY484rm_4,1039 -setuptools/_vendor/zipp-3.19.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/zipp-3.19.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -setuptools/_vendor/zipp-3.19.2.dist-info/top_level.txt,sha256=iAbdoSHfaGqBfVb2XuR9JqSQHCoOsOtG6y9C_LSpqFw,5 -setuptools/_vendor/zipp/__init__.py,sha256=QuI1g00G4fRAcGt-HqbV0oWIkmSgedCGGYsHHYzNa8A,13412 -setuptools/_vendor/zipp/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/zipp/__pycache__/glob.cpython-311.pyc,, -setuptools/_vendor/zipp/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/_vendor/zipp/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/_vendor/zipp/compat/__pycache__/py310.cpython-311.pyc,, -setuptools/_vendor/zipp/compat/py310.py,sha256=eZpkW0zRtunkhEh8jjX3gCGe22emoKCBJw72Zt4RkhA,219 -setuptools/_vendor/zipp/glob.py,sha256=etWpnfEoRyfUvrUsi6sTiGmErvPwe6HzY6pT8jg_lUI,3082 -setuptools/archive_util.py,sha256=Tl_64hSTtc4y8x7xa98rFVUbG24oArpjzLAYGYP2_sI,7356 -setuptools/build_meta.py,sha256=3cHAWucJaLA9DU5OfCbKkkteTDiQ5bB4LokfTRMgJT4,19968 -setuptools/cli-32.exe,sha256=MqzBvFQxFsviz_EMuGd3LfLyVP8mNMhwrvC0bEtpb9s,11776 -setuptools/cli-64.exe,sha256=u7PeVwdinmpgoMI4zUd7KPB_AGaYL9qVP6b87DkHOko,14336 -setuptools/cli-arm64.exe,sha256=uafQjaiA36yLz1SOuksG-1m28JsX0zFIoPZhgyiSbGE,13824 -setuptools/cli.exe,sha256=MqzBvFQxFsviz_EMuGd3LfLyVP8mNMhwrvC0bEtpb9s,11776 -setuptools/command/__init__.py,sha256=wdSrlNR0P6nCz9_oFtCAiAkeFJMsZa1jPcpXT53f0SM,803 -setuptools/command/__pycache__/__init__.cpython-311.pyc,, -setuptools/command/__pycache__/_requirestxt.cpython-311.pyc,, -setuptools/command/__pycache__/alias.cpython-311.pyc,, -setuptools/command/__pycache__/bdist_egg.cpython-311.pyc,, -setuptools/command/__pycache__/bdist_rpm.cpython-311.pyc,, -setuptools/command/__pycache__/bdist_wheel.cpython-311.pyc,, -setuptools/command/__pycache__/build.cpython-311.pyc,, -setuptools/command/__pycache__/build_clib.cpython-311.pyc,, -setuptools/command/__pycache__/build_ext.cpython-311.pyc,, -setuptools/command/__pycache__/build_py.cpython-311.pyc,, -setuptools/command/__pycache__/develop.cpython-311.pyc,, -setuptools/command/__pycache__/dist_info.cpython-311.pyc,, -setuptools/command/__pycache__/easy_install.cpython-311.pyc,, -setuptools/command/__pycache__/editable_wheel.cpython-311.pyc,, -setuptools/command/__pycache__/egg_info.cpython-311.pyc,, -setuptools/command/__pycache__/install.cpython-311.pyc,, -setuptools/command/__pycache__/install_egg_info.cpython-311.pyc,, -setuptools/command/__pycache__/install_lib.cpython-311.pyc,, -setuptools/command/__pycache__/install_scripts.cpython-311.pyc,, -setuptools/command/__pycache__/rotate.cpython-311.pyc,, -setuptools/command/__pycache__/saveopts.cpython-311.pyc,, -setuptools/command/__pycache__/sdist.cpython-311.pyc,, -setuptools/command/__pycache__/setopt.cpython-311.pyc,, -setuptools/command/__pycache__/test.cpython-311.pyc,, -setuptools/command/_requirestxt.py,sha256=ItYMTJGh_i5TlQstX_nFopqEhkC4PJFadBL2Zd3V670,4228 -setuptools/command/alias.py,sha256=rDdrMt32DS6qf3K7tjZZyHD_dMKrm77AXcAtx-nBQ0I,2380 -setuptools/command/bdist_egg.py,sha256=3eDucQ4fdeYMsLO9PhBfY1JkcMLhZXgnAI_9FdFNsEE,16972 -setuptools/command/bdist_rpm.py,sha256=LyqI49w48SKk0FmuHsE9MLzX1SuXjL7YMNbZMFZqFII,1435 -setuptools/command/bdist_wheel.py,sha256=_LfGHB7CV_uyncqlOTSETEi2gjVCoPKuAXcyRFoq7Cs,22246 -setuptools/command/build.py,sha256=eI7STMERGGZEpzk1tvJN8p9IOjAAXMcGLzljv2mwI3M,6052 -setuptools/command/build_clib.py,sha256=AbgpPIF_3qL8fZr3JIebI-WHTMTBiMfrFkVQz8K40G4,4528 -setuptools/command/build_ext.py,sha256=bUH4M0NizaJJrv10wK-ZD3uY0TxCSZlYQDhiwwzHslM,18377 -setuptools/command/build_py.py,sha256=DCbjvB18kkL-xUK5rvlzm0C6twTeOxNhyvJDxxa7fII,15539 -setuptools/command/develop.py,sha256=zX22119sI1G1gfJ1gNCE4hkg2zbLKx0uUwvNmC5bIu8,6886 -setuptools/command/dist_info.py,sha256=HU752iLLmmYMHbsDBgz2ubRjkgJobugOp8H71LzzDys,3450 -setuptools/command/easy_install.py,sha256=0Z4kFlE78Ae2AfHXYTxZFUa2t3qlNqXCtQu4J1Nx8iA,87870 -setuptools/command/editable_wheel.py,sha256=3bBipRZA3E4poQ8LEWhMYEjHjCzqU_pIdO86C3t7oNY,35624 -setuptools/command/egg_info.py,sha256=WWUozR3DZCrWsTQhHXOygMiEUcrjLWphET0-Zsocsm4,25982 -setuptools/command/install.py,sha256=MmTGb8m1R8fJ0cc5FTWCF6uq-s1ZJmvpYm-N_CtqEaI,7046 -setuptools/command/install_egg_info.py,sha256=3I9IPCH7D59Sh-6aVYz-h6wwyxq-wkxrKwKg3nDdJqs,2075 -setuptools/command/install_lib.py,sha256=9n1_U83eHcERL_a_rv_LhHCkhXlLdqyZ4SdBow-9qcE,4319 -setuptools/command/install_scripts.py,sha256=tVOCj3e8OTIrkoL_bGbT5pOksdxZfQblH_bdI4DtVV4,2637 -setuptools/command/launcher manifest.xml,sha256=xlLbjWrB01tKC0-hlVkOKkiSPbzMml2eOPtJ_ucCnbE,628 -setuptools/command/rotate.py,sha256=XNd_BEEOWAJHW1FcLTMUWWl4QB6zAuk7b8VWQg3FHos,2187 -setuptools/command/saveopts.py,sha256=Np0PVb7SD7oTbu9Z9sosS7D-CkkIkU7x4glu5Es1tjA,692 -setuptools/command/sdist.py,sha256=JaQm2-ebXI2kvyrBjJKP8yNLPa5eMbMeis88CXBMYlk,7374 -setuptools/command/setopt.py,sha256=xZF2RCc4ABvE9eHHAzF50-fkQg3au8fcRUVVGd58k3U,5100 -setuptools/command/test.py,sha256=k7xcq7D7bEehgxarbw-dW3AtmGZORqz8HjKR6FGJ3jk,1343 -setuptools/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/compat/__pycache__/py310.cpython-311.pyc,, -setuptools/compat/__pycache__/py311.cpython-311.pyc,, -setuptools/compat/__pycache__/py312.cpython-311.pyc,, -setuptools/compat/__pycache__/py39.cpython-311.pyc,, -setuptools/compat/py310.py,sha256=8sqwWczIcrkzeAbhaim4pKVd4tXZdcqmebgdvzji0rc,141 -setuptools/compat/py311.py,sha256=e6tJAFwZEP82hmMBl10HYeSypelo_Ti2wTjKZVKLwOE,790 -setuptools/compat/py312.py,sha256=vYKVtdrdOTsO_R90dJkEXsFwfMJFuIFJflhIgHrjJ-Y,366 -setuptools/compat/py39.py,sha256=BJMtnkfcqyTfccqjYQxfoRtU2nTnWaEESBVkshTiXqY,493 -setuptools/config/NOTICE,sha256=Ld3wiBgpejuJ1D2V_2WdjahXQRCMkTbfo6TYVsBiO9g,493 -setuptools/config/__init__.py,sha256=aiPnL9BJn1O6MfmuNXyn8W2Lp8u9qizRVqwPiOdPIjY,1499 -setuptools/config/__pycache__/__init__.cpython-311.pyc,, -setuptools/config/__pycache__/_apply_pyprojecttoml.cpython-311.pyc,, -setuptools/config/__pycache__/expand.cpython-311.pyc,, -setuptools/config/__pycache__/pyprojecttoml.cpython-311.pyc,, -setuptools/config/__pycache__/setupcfg.cpython-311.pyc,, -setuptools/config/_apply_pyprojecttoml.py,sha256=SUyTw7A2btZ1lBuWKN5o42-Diyv95eGTiYJ3rZOnGSc,19120 -setuptools/config/_validate_pyproject/NOTICE,sha256=XTANv6ZDE4sBO3WsnK7uWR-VG4sO4kKIw0zNkmxHgMg,18737 -setuptools/config/_validate_pyproject/__init__.py,sha256=dnp6T7ePP1R5z4OuC7Fd2dkFlIrtIfizUfvpGJP6nz0,1042 -setuptools/config/_validate_pyproject/__pycache__/__init__.cpython-311.pyc,, -setuptools/config/_validate_pyproject/__pycache__/error_reporting.cpython-311.pyc,, -setuptools/config/_validate_pyproject/__pycache__/extra_validations.cpython-311.pyc,, -setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_exceptions.cpython-311.pyc,, -setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_validations.cpython-311.pyc,, -setuptools/config/_validate_pyproject/__pycache__/formats.cpython-311.pyc,, -setuptools/config/_validate_pyproject/error_reporting.py,sha256=meldD7nBQdolQhvG-43r1Ue-gU1n7ORAJR86vh3Rrvk,11813 -setuptools/config/_validate_pyproject/extra_validations.py,sha256=-GUG5S--ijY8WfXbdXPoHl6ywGsyEF9dtDpenSoJPHg,2858 -setuptools/config/_validate_pyproject/fastjsonschema_exceptions.py,sha256=w749JgqKi8clBFcObdcbZVqsmF4oJ_QByhZ1SGbUFNw,1612 -setuptools/config/_validate_pyproject/fastjsonschema_validations.py,sha256=FihD5ZcM6p77BPZ04CGqh3BEwVNoPMKJZJAyuJpkAU0,354682 -setuptools/config/_validate_pyproject/formats.py,sha256=TETokJBK9hjl-cVg1olsojkJwLxfP7_chgJQNmzAB98,13564 -setuptools/config/distutils.schema.json,sha256=Tcp32kRnhwORGw_9p6GEi08lj2h15tQRzOYBbzGmcBU,972 -setuptools/config/expand.py,sha256=JNAktRCsyyRB-rQodbPnCucmLWqcYvzCDC8Ebn2Z7xM,16041 -setuptools/config/pyprojecttoml.py,sha256=YMu5PdbJJI5azp6kR_boM1mflf5nqOA-InF4s6LnLgw,18320 -setuptools/config/setupcfg.py,sha256=VZDkwE7DYv45SbadJD8CwKrDtiXvjgllL8PYSvoRCyg,26575 -setuptools/config/setuptools.schema.json,sha256=dZBRuSEnZkatoVlt1kVwG8ocTeRdO7BD0xvOWKH54PY,16071 -setuptools/depends.py,sha256=jKYfjmt_2ZQYVghb8L9bU7LJ6erHJ5ze-K_fKV1BMXk,5965 -setuptools/discovery.py,sha256=-42c3XhwzkfodDKKP50C2YBzr11fncAgmUzBdBRb0-Q,21258 -setuptools/dist.py,sha256=RZz7aj9RxqSYriqgFoZOu-7KIV82cmlaMFx9owZrApQ,44897 -setuptools/errors.py,sha256=gY2x2PIaIgy01yRANRC-zcCwxDCqCScgJoCOZFe0yio,3024 -setuptools/extension.py,sha256=KCnv9p3tgm0ZVqtgE451fyILsm4hCyvOiUtOu787D-4,6683 -setuptools/glob.py,sha256=AC_B33DY8g-CHELxDsJrtwFrpiucSAZsakPFdSOQzhc,6062 -setuptools/gui-32.exe,sha256=hdrh6V13hF8stZvKw9Sv50u-TJGpvMW_SnHNQxBNvnw,11776 -setuptools/gui-64.exe,sha256=NHG2FA6txkEid9u-_j_vjDRaDxpZd2CGuAo2GMOoPjs,14336 -setuptools/gui-arm64.exe,sha256=5pT0dDQFyLWSb_RX22_n8aEt7HwWqcOGR4TT9OB64Jc,13824 -setuptools/gui.exe,sha256=hdrh6V13hF8stZvKw9Sv50u-TJGpvMW_SnHNQxBNvnw,11776 -setuptools/installer.py,sha256=_4Wegx4r3L05sMo3-IlqFp-OuxnWyBqjyMZ7LWQXmh8,5110 -setuptools/launch.py,sha256=IBb5lEv69CyuZ9ewIrmKlXh154kdLmP29LKfTMkximE,820 -setuptools/logging.py,sha256=W16iHJ1HcCXYQ0RxyrEfJ83FT4175tCtoYg-E6uSpVI,1261 -setuptools/modified.py,sha256=ZwbfBfCFP88ltvbv_dJDz-t1LsQjnM-JUpgZnnQZjjM,568 -setuptools/monkey.py,sha256=FwMWl2n1v2bHbeqBy-o9g8yUNaAkYFbszCbXe9d5Za8,3717 -setuptools/msvc.py,sha256=vmM0qL4rIzrtD9pia9ZEwtqZ4LbbrgL0dU0EANVYRm8,41631 -setuptools/namespaces.py,sha256=2GGqYY1BNDEhMtBc1rHTv7klgmNVRdksJeW-L1f--ys,3171 -setuptools/package_index.py,sha256=V5hnQtbDy1R6l3dSBNTuMUBvtrQxNPxgmYyXfpSq79U,40299 -setuptools/sandbox.py,sha256=fMqtcOuipHO6RKPh1YB5o7d985dLKo76Whp3vrIei2E,14906 -setuptools/script (dev).tmpl,sha256=RUzQzCQUaXtwdLtYHWYbIQmOaES5Brqq1FvUA_tu-5I,218 -setuptools/script.tmpl,sha256=WGTt5piezO27c-Dbx6l5Q4T3Ff20A5z7872hv3aAhYY,138 -setuptools/tests/__init__.py,sha256=AnBfls2iJbTDQzmMKeLRt-9lxhaOHUVOZEgXv89Uwvs,335 -setuptools/tests/__pycache__/__init__.cpython-311.pyc,, -setuptools/tests/__pycache__/contexts.cpython-311.pyc,, -setuptools/tests/__pycache__/environment.cpython-311.pyc,, -setuptools/tests/__pycache__/fixtures.cpython-311.pyc,, -setuptools/tests/__pycache__/mod_with_constant.cpython-311.pyc,, -setuptools/tests/__pycache__/namespaces.cpython-311.pyc,, -setuptools/tests/__pycache__/script-with-bom.cpython-311.pyc,, -setuptools/tests/__pycache__/server.cpython-311.pyc,, -setuptools/tests/__pycache__/test_archive_util.cpython-311.pyc,, -setuptools/tests/__pycache__/test_bdist_deprecations.cpython-311.pyc,, -setuptools/tests/__pycache__/test_bdist_egg.cpython-311.pyc,, -setuptools/tests/__pycache__/test_bdist_wheel.cpython-311.pyc,, -setuptools/tests/__pycache__/test_build.cpython-311.pyc,, -setuptools/tests/__pycache__/test_build_clib.cpython-311.pyc,, -setuptools/tests/__pycache__/test_build_ext.cpython-311.pyc,, -setuptools/tests/__pycache__/test_build_meta.cpython-311.pyc,, -setuptools/tests/__pycache__/test_build_py.cpython-311.pyc,, -setuptools/tests/__pycache__/test_config_discovery.cpython-311.pyc,, -setuptools/tests/__pycache__/test_core_metadata.cpython-311.pyc,, -setuptools/tests/__pycache__/test_depends.cpython-311.pyc,, -setuptools/tests/__pycache__/test_develop.cpython-311.pyc,, -setuptools/tests/__pycache__/test_dist.cpython-311.pyc,, -setuptools/tests/__pycache__/test_dist_info.cpython-311.pyc,, -setuptools/tests/__pycache__/test_distutils_adoption.cpython-311.pyc,, -setuptools/tests/__pycache__/test_easy_install.cpython-311.pyc,, -setuptools/tests/__pycache__/test_editable_install.cpython-311.pyc,, -setuptools/tests/__pycache__/test_egg_info.cpython-311.pyc,, -setuptools/tests/__pycache__/test_extern.cpython-311.pyc,, -setuptools/tests/__pycache__/test_find_packages.cpython-311.pyc,, -setuptools/tests/__pycache__/test_find_py_modules.cpython-311.pyc,, -setuptools/tests/__pycache__/test_glob.cpython-311.pyc,, -setuptools/tests/__pycache__/test_install_scripts.cpython-311.pyc,, -setuptools/tests/__pycache__/test_logging.cpython-311.pyc,, -setuptools/tests/__pycache__/test_manifest.cpython-311.pyc,, -setuptools/tests/__pycache__/test_namespaces.cpython-311.pyc,, -setuptools/tests/__pycache__/test_packageindex.cpython-311.pyc,, -setuptools/tests/__pycache__/test_sandbox.cpython-311.pyc,, -setuptools/tests/__pycache__/test_sdist.cpython-311.pyc,, -setuptools/tests/__pycache__/test_setopt.cpython-311.pyc,, -setuptools/tests/__pycache__/test_setuptools.cpython-311.pyc,, -setuptools/tests/__pycache__/test_shutil_wrapper.cpython-311.pyc,, -setuptools/tests/__pycache__/test_unicode_utils.cpython-311.pyc,, -setuptools/tests/__pycache__/test_virtualenv.cpython-311.pyc,, -setuptools/tests/__pycache__/test_warnings.cpython-311.pyc,, -setuptools/tests/__pycache__/test_wheel.cpython-311.pyc,, -setuptools/tests/__pycache__/test_windows_wrappers.cpython-311.pyc,, -setuptools/tests/__pycache__/text.cpython-311.pyc,, -setuptools/tests/__pycache__/textwrap.cpython-311.pyc,, -setuptools/tests/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/tests/compat/__pycache__/__init__.cpython-311.pyc,, -setuptools/tests/compat/__pycache__/py39.cpython-311.pyc,, -setuptools/tests/compat/py39.py,sha256=eUy7_F-6KRTOIKl-veshUu6I0EdTSdBZMh0EV0lZ1-g,135 -setuptools/tests/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/tests/config/__pycache__/__init__.cpython-311.pyc,, -setuptools/tests/config/__pycache__/test_apply_pyprojecttoml.cpython-311.pyc,, -setuptools/tests/config/__pycache__/test_expand.cpython-311.pyc,, -setuptools/tests/config/__pycache__/test_pyprojecttoml.cpython-311.pyc,, -setuptools/tests/config/__pycache__/test_pyprojecttoml_dynamic_deps.cpython-311.pyc,, -setuptools/tests/config/__pycache__/test_setupcfg.cpython-311.pyc,, -setuptools/tests/config/downloads/__init__.py,sha256=9ixnDEdyL_arKbUzfuiJftAj9bGxKz8M9alOFZMjx9Y,1827 -setuptools/tests/config/downloads/__pycache__/__init__.cpython-311.pyc,, -setuptools/tests/config/downloads/__pycache__/preload.cpython-311.pyc,, -setuptools/tests/config/downloads/preload.py,sha256=sIGGZpY3cmMpMwiJYYYYHG2ifZJkvJgEotRFtiulV1I,450 -setuptools/tests/config/setupcfg_examples.txt,sha256=cAbVvCbkFZuTUL6xRRzRgqyB0rLvJTfvw3D30glo2OE,1912 -setuptools/tests/config/test_apply_pyprojecttoml.py,sha256=l6nE4d8WLU_eSWRic7VSoqeKv9Bi7CZGHcEuB2ehk2w,28807 -setuptools/tests/config/test_expand.py,sha256=S0oT6JvgA_oujR4YS4RUuf5gmOt1CTQV66RQDzV8xd4,8933 -setuptools/tests/config/test_pyprojecttoml.py,sha256=0LefSljUhA6MqtJ5AVzLhomqZcYiFKdu_1ckDeMT1LY,12406 -setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py,sha256=9W73-yLhZJmvCiO4rTiQoBpZT5wNA90Xbd5n2HCshd4,3271 -setuptools/tests/config/test_setupcfg.py,sha256=ZvN-O-2Dgon1adp6oM6il8JWdgT9y196fRvqESU5ELI,33427 -setuptools/tests/contexts.py,sha256=TAdZKxmmodx1ExMVo01o4QpRjpIpo4X3IWKq_BnjxpU,3480 -setuptools/tests/environment.py,sha256=95_UtTaRiuvwYC9eXKEHbn02kDtZysvZq3UZJmPUj1I,3102 -setuptools/tests/fixtures.py,sha256=-V7iD6BeE2E0Rw6dVvTOCm36JG8ZTTnrXhN0GISlgrg,5197 -setuptools/tests/indexes/test_links_priority/external.html,sha256=eL9euOuE93JKZdqlXxBOlHbKwIuNuIdq7GBRpsaPMcU,92 -setuptools/tests/indexes/test_links_priority/simple/foobar/index.html,sha256=DD-TKr7UU4zAjHHz4VexYDNSAzR27levSh1c-k3ZdLE,174 -setuptools/tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -setuptools/tests/integration/__pycache__/__init__.cpython-311.pyc,, -setuptools/tests/integration/__pycache__/helpers.cpython-311.pyc,, -setuptools/tests/integration/__pycache__/test_pip_install_sdist.cpython-311.pyc,, -setuptools/tests/integration/helpers.py,sha256=3PHcS9SCA-fwVJmUP2ad5NQOttJAETI5Nnoc_xroO5k,2522 -setuptools/tests/integration/test_pip_install_sdist.py,sha256=SFbvuYF_hDzt6OtsQ5GjFNnxmoJ_eElfvpYsiyyGJ-g,8256 -setuptools/tests/mod_with_constant.py,sha256=X_Kj80M55w1tmQ4f7uZY91ZTALo4hKVT6EHxgYocUMQ,22 -setuptools/tests/namespaces.py,sha256=HPcI3nR5MCFWXpaADIJ1fwKxymcQgBkuw87Ic5PUSAQ,2774 -setuptools/tests/script-with-bom.py,sha256=hRRgIizEULGiG_ZTNoMY46HhKhxpWfy5FGcD6Qbh5fc,18 -setuptools/tests/server.py,sha256=0FDZf0cSInCP5n1haK7AxHo3jD261RK7D3-RjP-F53k,2397 -setuptools/tests/test_archive_util.py,sha256=buuKdY8XkW26Pe3IKAoBRGHG0MDumnuNoPg2WsAQzIg,845 -setuptools/tests/test_bdist_deprecations.py,sha256=75Xq3gYn79LIIyusEltbHan0bEgAt2e_CaL7KLS8-KQ,775 -setuptools/tests/test_bdist_egg.py,sha256=6PaYN1F3JDbIh1uK0urv7yJFcx98z5dn9SOJ8Mv91l8,1957 -setuptools/tests/test_bdist_wheel.py,sha256=dZ9a7OT_UyRvLnoCi2KGEIbtzhEQjM3YutYMA6ZCezs,23083 -setuptools/tests/test_build.py,sha256=wJgMz2hwHADcLFg-nXrwRVhus7hjmAeEGgrpIQwCGnA,798 -setuptools/tests/test_build_clib.py,sha256=bX51XRAf4uO7IuHFpjePnoK8mE74N2gsoeEqF-ofgws,3123 -setuptools/tests/test_build_ext.py,sha256=e4ZSxsYPB5zq1KSqGEuATZ0t0PJQzMhjjkKJ-hIjcgc,10099 -setuptools/tests/test_build_meta.py,sha256=kvi0Bn4p9DBVme3zyWQsn3QgB9oPdq8S15agj1m69L0,33289 -setuptools/tests/test_build_py.py,sha256=gobME_Cvzf6Ugxq70iWfXekb_xyyT61khwjFq8zkwfw,14186 -setuptools/tests/test_config_discovery.py,sha256=FqV-lOtkqaI-ayzU2zocSdD5TaRAgCZnixNDilKA6FQ,22580 -setuptools/tests/test_core_metadata.py,sha256=vbVJ5_Lsx_hsO_GdB6nQEXJRjA2ydx6_qSbr5LpheAA,20881 -setuptools/tests/test_depends.py,sha256=yQBXoQbNQlJit6mbRVoz6Bb553f3sNrq02lZimNz5XY,424 -setuptools/tests/test_develop.py,sha256=CLzXZ8-b5-VFTuau4P4yXEdLx1UdyTFcOfrV0qyUIdE,5142 -setuptools/tests/test_dist.py,sha256=GFjyL2etAxvVM3q7NhFEGcXS5gyKj8VzbqcbKzpqbOk,8901 -setuptools/tests/test_dist_info.py,sha256=5kBRj9tuBsVreBsY22H2feMO_JQZsSoOZMU_MJfUevY,7077 -setuptools/tests/test_distutils_adoption.py,sha256=_eynrOfyEqXFEmjUJhzpe8GXPyTUPvNSObs4qAAmBy8,5987 -setuptools/tests/test_easy_install.py,sha256=jx4lpFyee0G432cdnwBow3AkL4ibw-0QILwldwv5SCI,53534 -setuptools/tests/test_editable_install.py,sha256=7eTEtpT0k7QeVyZg64eh3kZn-SjckuB9LcokOuV37DI,43383 -setuptools/tests/test_egg_info.py,sha256=QCzoUOkFocmbkwS6XU7F8WNzKE8CGEMRxYBqKLgfUrc,44866 -setuptools/tests/test_extern.py,sha256=rpKU6oCcksumLwf5TeKlDluFQ0TUfbPwTLQbpxcFrCU,296 -setuptools/tests/test_find_packages.py,sha256=CTLAcTzWGWBLCcd2aAsUVkvO3ibrlqexFBdDKOWPoq8,7819 -setuptools/tests/test_find_py_modules.py,sha256=zQjuhIG5TQN2SJPix9ARo4DL_w84Ln8QsHDUjjbrtAQ,2404 -setuptools/tests/test_glob.py,sha256=P3JvpH-kXQ4BZ3zvRF-zKxOgwyWzwIaQIz0WHdxS0kk,887 -setuptools/tests/test_install_scripts.py,sha256=scIrJ6a_ssKqg4vIBNaUjmAKHEYLUUZ9WKnPeKnE6gc,3433 -setuptools/tests/test_logging.py,sha256=zlE5DlldukC7Jc54FNvDV_7ux3ErAkrfrN5CSsnNOUQ,2099 -setuptools/tests/test_manifest.py,sha256=eMg65pIA52DizB6mpktSU-b8CjwaNCS5MSgL_V1LrFI,18562 -setuptools/tests/test_namespaces.py,sha256=Y6utoe5PHHqL_DlgawqB9F8XpsUDPvvw1sQMenK04e0,4515 -setuptools/tests/test_packageindex.py,sha256=qEjLHpSu2gAkegwEstzHQT-Om1uQIYjA8zeNzEX79uo,8775 -setuptools/tests/test_sandbox.py,sha256=shUWE7fLTWe7Jzdfi6NheBWauG3oUukbUV46cArD0u0,4330 -setuptools/tests/test_sdist.py,sha256=RYLvPa_nfyC1ZmoinzqMzJynTDG4RtPYC19_0LU6pvs,32872 -setuptools/tests/test_setopt.py,sha256=3VxxM4ATfP-P4AGnDjoWCnHr5-i9CSEQTFYU1-FTnvI,1365 -setuptools/tests/test_setuptools.py,sha256=_eIhqKf45-OtHqxRf20KndOZJlJdS0PuFLXBO3M-LN8,9008 -setuptools/tests/test_shutil_wrapper.py,sha256=g15E11PtZxG-InB2BWNFyH-svObXx2XcMhgMLJPuFnc,641 -setuptools/tests/test_unicode_utils.py,sha256=xWfEEl8jkQCt9othUTXJfFmdyATAFggJs2tTxjbumbw,316 -setuptools/tests/test_virtualenv.py,sha256=g-njC_9JTAs1YVx_1dGJ_Q6RlInO4qKVu9-XAgNb6TY,3730 -setuptools/tests/test_warnings.py,sha256=zwR2zcnCeCeDqILZlJOPAcuyPHoDvGu1OtOVYiLMk74,3347 -setuptools/tests/test_wheel.py,sha256=J-83W1KdXTgAjFZE3H-ytohhvDE1iqdbE5YF5jLQlGQ,19370 -setuptools/tests/test_windows_wrappers.py,sha256=aF6UTowN3yzCgdBh9nDQVvYIfSYogrTK776TEyXEBqg,7881 -setuptools/tests/text.py,sha256=a12197pMVTvB6FAWQ0ujT8fIQiLIWJlFAl1UCaDUDfg,123 -setuptools/tests/textwrap.py,sha256=FNNNq_MiaEJx88PnsbJQIRxmj1qmgcAOCXXRsODPJN4,98 -setuptools/unicode_utils.py,sha256=ukMGh8pEAw6F_Ezb-K5D3c-078RgA_GcF0oW6lg4lSs,3189 -setuptools/version.py,sha256=WJCeUuyq74Aok2TeK9-OexZOu8XrlQy7-y0BEuWNovQ,161 -setuptools/warnings.py,sha256=oY0Se5eOqje_FEyjTgonUc0XGwgsrI5cgm1kkwulz_w,3796 -setuptools/wheel.py,sha256=xkAtvgm7uPTyYV2zqVmQ0wA8kLwOyRT2Jes1zAy07Ks,8624 -setuptools/windows_support.py,sha256=wW4IYLM1Bv7Z1MaauP2xmPjyy-wkmQnXdyvXscAf9fw,726 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/WHEEL deleted file mode 100644 index 8acb955..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: setuptools (79.0.1) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/entry_points.txt b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/entry_points.txt deleted file mode 100644 index 0db0a6c..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/entry_points.txt +++ /dev/null @@ -1,51 +0,0 @@ -[distutils.commands] -alias = setuptools.command.alias:alias -bdist_egg = setuptools.command.bdist_egg:bdist_egg -bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm -bdist_wheel = setuptools.command.bdist_wheel:bdist_wheel -build = setuptools.command.build:build -build_clib = setuptools.command.build_clib:build_clib -build_ext = setuptools.command.build_ext:build_ext -build_py = setuptools.command.build_py:build_py -develop = setuptools.command.develop:develop -dist_info = setuptools.command.dist_info:dist_info -easy_install = setuptools.command.easy_install:easy_install -editable_wheel = setuptools.command.editable_wheel:editable_wheel -egg_info = setuptools.command.egg_info:egg_info -install = setuptools.command.install:install -install_egg_info = setuptools.command.install_egg_info:install_egg_info -install_lib = setuptools.command.install_lib:install_lib -install_scripts = setuptools.command.install_scripts:install_scripts -rotate = setuptools.command.rotate:rotate -saveopts = setuptools.command.saveopts:saveopts -sdist = setuptools.command.sdist:sdist -setopt = setuptools.command.setopt:setopt - -[distutils.setup_keywords] -dependency_links = setuptools.dist:assert_string_list -eager_resources = setuptools.dist:assert_string_list -entry_points = setuptools.dist:check_entry_points -exclude_package_data = setuptools.dist:check_package_data -extras_require = setuptools.dist:check_extras -include_package_data = setuptools.dist:assert_bool -install_requires = setuptools.dist:check_requirements -namespace_packages = setuptools.dist:check_nsp -package_data = setuptools.dist:check_package_data -packages = setuptools.dist:check_packages -python_requires = setuptools.dist:check_specifier -setup_requires = setuptools.dist:check_requirements -use_2to3 = setuptools.dist:invalid_unless_false -zip_safe = setuptools.dist:assert_bool - -[egg_info.writers] -PKG-INFO = setuptools.command.egg_info:write_pkg_info -dependency_links.txt = setuptools.command.egg_info:overwrite_arg -eager_resources.txt = setuptools.command.egg_info:overwrite_arg -entry_points.txt = setuptools.command.egg_info:write_entries -namespace_packages.txt = setuptools.command.egg_info:overwrite_arg -requires.txt = setuptools.command.egg_info:write_requirements -top_level.txt = setuptools.command.egg_info:write_toplevel_names - -[setuptools.finalize_distribution_options] -keywords = setuptools.dist:Distribution._finalize_setup_keywords -parent_finalize = setuptools.dist:_Distribution.finalize_options diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/licenses/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/licenses/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/licenses/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/top_level.txt deleted file mode 100644 index b5ac107..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools-79.0.1.dist-info/top_level.txt +++ /dev/null @@ -1,3 +0,0 @@ -_distutils_hack -pkg_resources -setuptools diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/__init__.py index 64464df..6c24cc2 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/__init__.py @@ -1,36 +1,26 @@ """Extensions to the 'distutils' for large or complex distributions""" -# mypy: disable_error_code=override -# Command.reinitialize_command has an extra **kw param that distutils doesn't have -# Can't disable on the exact line because distutils doesn't exists on Python 3.12 -# and mypy isn't aware of distutils_hack, causing distutils.core.Command to be Any, -# and a [unused-ignore] to be raised on 3.12+ - -from __future__ import annotations import functools import os import re -import sys -from abc import abstractmethod -from collections.abc import Mapping -from typing import TYPE_CHECKING, TypeVar, overload - -sys.path.extend(((vendor_path := os.path.join(os.path.dirname(os.path.dirname(__file__)), 'setuptools', '_vendor')) not in sys.path) * [vendor_path]) # fmt: skip -# workaround for #4476 -sys.modules.pop('backports', None) +import warnings import _distutils_hack.override # noqa: F401 -from . import logging, monkey -from .depends import Require -from .discovery import PackageFinder, PEP420PackageFinder -from .dist import Distribution -from .extension import Extension -from .version import __version__ as __version__ -from .warnings import SetuptoolsDeprecationWarning - import distutils.core from distutils.errors import DistutilsOptionError +from distutils.util import convert_path as _convert_path + +from ._deprecation_warning import SetuptoolsDeprecationWarning + +import setuptools.version +from setuptools.extension import Extension +from setuptools.dist import Distribution +from setuptools.depends import Require +from setuptools.discovery import PackageFinder, PEP420PackageFinder +from . import monkey +from . import logging + __all__ = [ 'setup', @@ -43,10 +33,11 @@ __all__ = [ 'find_namespace_packages', ] -_CommandT = TypeVar("_CommandT", bound="_Command") +__version__ = setuptools.version.__version__ bootstrap_install_from = None + find_packages = PackageFinder.find find_namespace_packages = PEP420PackageFinder.find @@ -60,7 +51,7 @@ def _install_setup_requires(attrs): fetch_build_eggs interface. """ - def __init__(self, attrs: Mapping[str, object]) -> None: + def __init__(self, attrs): _incl = 'dependency_links', 'setup_requires' filtered = {k: attrs[k] for k in set(_incl) & set(attrs)} super().__init__(filtered) @@ -70,10 +61,10 @@ def _install_setup_requires(attrs): def _get_project_config_files(self, filenames=None): """Ignore ``pyproject.toml``, they are not related to setup_requires""" try: - cfg, _toml = super()._split_standard_project_metadata(filenames) + cfg, toml = super()._split_standard_project_metadata(filenames) + return cfg, () except Exception: return filenames, () - return cfg, () def finalize_options(self): """ @@ -86,44 +77,20 @@ def _install_setup_requires(attrs): # Honor setup.cfg's options. dist.parse_config_files(ignore_option_errors=True) if dist.setup_requires: - _fetch_build_eggs(dist) - - -def _fetch_build_eggs(dist: Distribution): - try: dist.fetch_build_eggs(dist.setup_requires) - except Exception as ex: - msg = """ - It is possible a package already installed in your system - contains an version that is invalid according to PEP 440. - You can try `pip install --use-pep517` as a workaround for this problem, - or rely on a new virtual environment. - - If the problem refers to a package that is not installed yet, - please contact that package's maintainers or distributors. - """ - if "InvalidVersion" in ex.__class__.__name__: - if hasattr(ex, "add_note"): - ex.add_note(msg) # PEP 678 - else: - dist.announce(f"\n{msg}\n") - raise def setup(**attrs): - logging.configure() # Make sure we have any requirements needed to interpret 'attrs'. + logging.configure() _install_setup_requires(attrs) return distutils.core.setup(**attrs) setup.__doc__ = distutils.core.setup.__doc__ -if TYPE_CHECKING: - # Work around a mypy issue where type[T] can't be used as a base: https://github.com/python/mypy/issues/10962 - from distutils.core import Command as _Command -else: - _Command = monkey.get_unpatched(distutils.core.Command) + +_Command = monkey.get_unpatched(distutils.core.Command) class Command(_Command): @@ -139,25 +106,42 @@ class Command(_Command): When creating a new command from scratch, custom defined classes **SHOULD** inherit from ``setuptools.Command`` and implement a few mandatory methods. Between these mandatory methods, are listed: - :meth:`initialize_options`, :meth:`finalize_options` and :meth:`run`. + + .. method:: initialize_options(self) + + Set or (reset) all options/attributes/caches used by the command + to their default values. Note that these values may be overwritten during + the build. + + .. method:: finalize_options(self) + + Set final values for all options/attributes used by the command. + Most of the time, each option/attribute/cache should only be set if it does not + have any value yet (e.g. ``if self.attr is None: self.attr = val``). + + .. method:: run(self) + + Execute the actions intended by the command. + (Side effects **SHOULD** only take place when ``run`` is executed, + for example, creating new files or writing to the terminal output). A useful analogy for command classes is to think of them as subroutines with local - variables called "options". The options are "declared" in :meth:`initialize_options` - and "defined" (given their final values, aka "finalized") in :meth:`finalize_options`, + variables called "options". The options are "declared" in ``initialize_options()`` + and "defined" (given their final values, aka "finalized") in ``finalize_options()``, both of which must be defined by every command class. The "body" of the subroutine, - (where it does all the work) is the :meth:`run` method. - Between :meth:`initialize_options` and :meth:`finalize_options`, ``setuptools`` may set + (where it does all the work) is the ``run()`` method. + Between ``initialize_options()`` and ``finalize_options()``, ``setuptools`` may set the values for options/attributes based on user's input (or circumstance), which means that the implementation should be careful to not overwrite values in - :meth:`finalize_options` unless necessary. + ``finalize_options`` unless necessary. Please note that other commands (or other parts of setuptools) may also overwrite the values of the command's options/attributes multiple times during the build process. - Therefore it is important to consistently implement :meth:`initialize_options` and - :meth:`finalize_options`. For example, all derived attributes (or attributes that + Therefore it is important to consistently implement ``initialize_options()`` and + ``finalize_options()``. For example, all derived attributes (or attributes that depend on the value of other attributes) **SHOULD** be recomputed in - :meth:`finalize_options`. + ``finalize_options``. When overwriting existing commands, custom defined classes **MUST** abide by the same APIs implemented by the original class. They also **SHOULD** inherit from the @@ -165,9 +149,8 @@ class Command(_Command): """ command_consumes_arguments = False - distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution - def __init__(self, dist: Distribution, **kw) -> None: + def __init__(self, dist, **kw): """ Construct the command for dist, updating vars(self) with any keyword parameters. @@ -181,10 +164,12 @@ class Command(_Command): setattr(self, option, default) return default elif not isinstance(val, str): - raise DistutilsOptionError(f"'{option}' must be a {what} (got `{val}`)") + raise DistutilsOptionError( + "'%s' must be a %s (got `%s`)" % (option, what, val) + ) return val - def ensure_string_list(self, option: str) -> None: + def ensure_string_list(self, option): r"""Ensure that 'option' is a list of strings. If 'option' is currently a string, we split it either on /,\s*/ or /\s+/, so "foo bar baz", "foo,bar,baz", and "foo, bar baz" all become @@ -208,50 +193,13 @@ class Command(_Command): ok = False if not ok: raise DistutilsOptionError( - f"'{option}' must be a list of strings (got {val!r})" + "'%s' must be a list of strings (got %r)" % (option, val) ) - @overload - def reinitialize_command( - self, command: str, reinit_subcommands: bool = False, **kw - ) -> _Command: ... - @overload - def reinitialize_command( - self, command: _CommandT, reinit_subcommands: bool = False, **kw - ) -> _CommandT: ... - def reinitialize_command( - self, command: str | _Command, reinit_subcommands: bool = False, **kw - ) -> _Command: + def reinitialize_command(self, command, reinit_subcommands=0, **kw): cmd = _Command.reinitialize_command(self, command, reinit_subcommands) vars(cmd).update(kw) - return cmd # pyright: ignore[reportReturnType] # pypa/distutils#307 - - @abstractmethod - def initialize_options(self) -> None: - """ - Set or (reset) all options/attributes/caches used by the command - to their default values. Note that these values may be overwritten during - the build. - """ - raise NotImplementedError - - @abstractmethod - def finalize_options(self) -> None: - """ - Set final values for all options/attributes used by the command. - Most of the time, each option/attribute/cache should only be set if it does not - have any value yet (e.g. ``if self.attr is None: self.attr = val``). - """ - raise NotImplementedError - - @abstractmethod - def run(self) -> None: - """ - Execute the actions intended by the command. - (Side effects **SHOULD** only take place when :meth:`run` is executed, - for example, creating new files or writing to the terminal output). - """ - raise NotImplementedError + return cmd def _find_all_simple(path): @@ -278,6 +226,19 @@ def findall(dir=os.curdir): return list(files) +@functools.wraps(_convert_path) +def convert_path(pathname): + from inspect import cleandoc + + msg = """ + The function `convert_path` is considered internal and not part of the public API. + Its direct usage by 3rd-party packages is considered deprecated and the function + may be removed in the future. + """ + warnings.warn(cleandoc(msg), SetuptoolsDeprecationWarning) + return _convert_path(pathname) + + class sic(str): """Treat this string as-is (https://en.wikipedia.org/wiki/Sic)""" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/__init__.cpython-311.pyc index 89d1946..494d383 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_core_metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_core_metadata.cpython-311.pyc deleted file mode 100644 index 91f0ce8..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_core_metadata.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_entry_points.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_entry_points.cpython-311.pyc index f3c614b..bf64a0a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_entry_points.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_entry_points.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_imp.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_imp.cpython-311.pyc index 0fc7f9e..cd77953 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_imp.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_imp.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_importlib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_importlib.cpython-311.pyc index 9ca0d60..72724e1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_importlib.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_importlib.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_itertools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_itertools.cpython-311.pyc index e6a05a0..4c5003a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_itertools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_itertools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_normalization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_normalization.cpython-311.pyc deleted file mode 100644 index c9b85c6..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_normalization.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_path.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_path.cpython-311.pyc index 531c2c9..2d2dc60 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_path.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_path.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_reqs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_reqs.cpython-311.pyc index 12c8194..81ce69f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_reqs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_reqs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_shutil.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_shutil.cpython-311.pyc deleted file mode 100644 index 562d182..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_shutil.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_static.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_static.cpython-311.pyc deleted file mode 100644 index 3ad4213..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/_static.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/archive_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/archive_util.cpython-311.pyc index 3cac572..edaf7cd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/archive_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/archive_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/build_meta.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/build_meta.cpython-311.pyc index c84b895..8daf29d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/build_meta.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/build_meta.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/depends.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/depends.cpython-311.pyc index 5df7a37..d497d31 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/depends.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/depends.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/discovery.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/discovery.cpython-311.pyc index 484ff75..7873286 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/discovery.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/discovery.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/dist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/dist.cpython-311.pyc index 2ba81e5..0030525 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/dist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/dist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/errors.cpython-311.pyc index ecad9bf..57e914b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/extension.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/extension.cpython-311.pyc index 0c9b747..082c76b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/extension.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/extension.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/glob.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/glob.cpython-311.pyc index 1e02b8a..193c042 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/glob.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/glob.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/installer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/installer.cpython-311.pyc index 5398977..307bb47 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/installer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/installer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/launch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/launch.cpython-311.pyc index 39b18b5..80653f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/launch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/launch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/logging.cpython-311.pyc index c2c0ff7..be98fc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/logging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/logging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/modified.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/modified.cpython-311.pyc deleted file mode 100644 index 9d1c737..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/modified.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/monkey.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/monkey.cpython-311.pyc index a28ec7c..d1fd97a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/monkey.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/monkey.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/msvc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/msvc.cpython-311.pyc index 5338b3b..87201d0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/msvc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/msvc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/namespaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/namespaces.cpython-311.pyc index e560633..827d3fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/namespaces.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/namespaces.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/package_index.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/package_index.cpython-311.pyc index 8b65c1f..739bcde 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/package_index.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/package_index.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/sandbox.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/sandbox.cpython-311.pyc index fdd004c..3c8a525 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/sandbox.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/sandbox.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/unicode_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/unicode_utils.cpython-311.pyc index afbee51..5b5f114 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/unicode_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/unicode_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/version.cpython-311.pyc index fdf4bcc..912d672 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/warnings.cpython-311.pyc deleted file mode 100644 index 1ade292..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/warnings.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/wheel.cpython-311.pyc index 9eb1c69..74276d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/wheel.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/windows_support.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/windows_support.cpython-311.pyc index fa504ab..dba89d0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/windows_support.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/__pycache__/windows_support.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_core_metadata.py b/server/.venv/lib/python3.11/site-packages/setuptools/_core_metadata.py deleted file mode 100644 index a52d5cf..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_core_metadata.py +++ /dev/null @@ -1,337 +0,0 @@ -""" -Handling of Core Metadata for Python packages (including reading and writing). - -See: https://packaging.python.org/en/latest/specifications/core-metadata/ -""" - -from __future__ import annotations - -import os -import stat -import textwrap -from email import message_from_file -from email.message import Message -from tempfile import NamedTemporaryFile - -from packaging.markers import Marker -from packaging.requirements import Requirement -from packaging.utils import canonicalize_name, canonicalize_version -from packaging.version import Version - -from . import _normalization, _reqs -from ._static import is_static -from .warnings import SetuptoolsDeprecationWarning - -from distutils.util import rfc822_escape - - -def get_metadata_version(self): - mv = getattr(self, 'metadata_version', None) - if mv is None: - mv = Version('2.4') - self.metadata_version = mv - return mv - - -def rfc822_unescape(content: str) -> str: - """Reverse RFC-822 escaping by removing leading whitespaces from content.""" - lines = content.splitlines() - if len(lines) == 1: - return lines[0].lstrip() - return '\n'.join((lines[0].lstrip(), textwrap.dedent('\n'.join(lines[1:])))) - - -def _read_field_from_msg(msg: Message, field: str) -> str | None: - """Read Message header field.""" - value = msg[field] - if value == 'UNKNOWN': - return None - return value - - -def _read_field_unescaped_from_msg(msg: Message, field: str) -> str | None: - """Read Message header field and apply rfc822_unescape.""" - value = _read_field_from_msg(msg, field) - if value is None: - return value - return rfc822_unescape(value) - - -def _read_list_from_msg(msg: Message, field: str) -> list[str] | None: - """Read Message header field and return all results as list.""" - values = msg.get_all(field, None) - if values == []: - return None - return values - - -def _read_payload_from_msg(msg: Message) -> str | None: - value = str(msg.get_payload()).strip() - if value == 'UNKNOWN' or not value: - return None - return value - - -def read_pkg_file(self, file): - """Reads the metadata values from a file object.""" - msg = message_from_file(file) - - self.metadata_version = Version(msg['metadata-version']) - self.name = _read_field_from_msg(msg, 'name') - self.version = _read_field_from_msg(msg, 'version') - self.description = _read_field_from_msg(msg, 'summary') - # we are filling author only. - self.author = _read_field_from_msg(msg, 'author') - self.maintainer = None - self.author_email = _read_field_from_msg(msg, 'author-email') - self.maintainer_email = None - self.url = _read_field_from_msg(msg, 'home-page') - self.download_url = _read_field_from_msg(msg, 'download-url') - self.license = _read_field_unescaped_from_msg(msg, 'license') - self.license_expression = _read_field_unescaped_from_msg(msg, 'license-expression') - - self.long_description = _read_field_unescaped_from_msg(msg, 'description') - if self.long_description is None and self.metadata_version >= Version('2.1'): - self.long_description = _read_payload_from_msg(msg) - self.description = _read_field_from_msg(msg, 'summary') - - if 'keywords' in msg: - self.keywords = _read_field_from_msg(msg, 'keywords').split(',') - - self.platforms = _read_list_from_msg(msg, 'platform') - self.classifiers = _read_list_from_msg(msg, 'classifier') - - # PEP 314 - these fields only exist in 1.1 - if self.metadata_version == Version('1.1'): - self.requires = _read_list_from_msg(msg, 'requires') - self.provides = _read_list_from_msg(msg, 'provides') - self.obsoletes = _read_list_from_msg(msg, 'obsoletes') - else: - self.requires = None - self.provides = None - self.obsoletes = None - - self.license_files = _read_list_from_msg(msg, 'license-file') - - -def single_line(val): - """ - Quick and dirty validation for Summary pypa/setuptools#1390. - """ - if '\n' in val: - # TODO: Replace with `raise ValueError("newlines not allowed")` - # after reviewing #2893. - msg = "newlines are not allowed in `summary` and will break in the future" - SetuptoolsDeprecationWarning.emit("Invalid config.", msg) - # due_date is undefined. Controversial change, there was a lot of push back. - val = val.strip().split('\n')[0] - return val - - -def write_pkg_info(self, base_dir): - """Write the PKG-INFO file into the release tree.""" - temp = "" - final = os.path.join(base_dir, 'PKG-INFO') - try: - # Use a temporary file while writing to avoid race conditions - # (e.g. `importlib.metadata` reading `.egg-info/PKG-INFO`): - with NamedTemporaryFile("w", encoding="utf-8", dir=base_dir, delete=False) as f: - temp = f.name - self.write_pkg_file(f) - permissions = stat.S_IMODE(os.lstat(temp).st_mode) - os.chmod(temp, permissions | stat.S_IRGRP | stat.S_IROTH) - os.replace(temp, final) # atomic operation. - finally: - if temp and os.path.exists(temp): - os.remove(temp) - - -# Based on Python 3.5 version -def write_pkg_file(self, file): # noqa: C901 # is too complex (14) # FIXME - """Write the PKG-INFO format data to a file object.""" - version = self.get_metadata_version() - - def write_field(key, value): - file.write(f"{key}: {value}\n") - - write_field('Metadata-Version', str(version)) - write_field('Name', self.get_name()) - write_field('Version', self.get_version()) - - summary = self.get_description() - if summary: - write_field('Summary', single_line(summary)) - - optional_fields = ( - ('Home-page', 'url'), - ('Download-URL', 'download_url'), - ('Author', 'author'), - ('Author-email', 'author_email'), - ('Maintainer', 'maintainer'), - ('Maintainer-email', 'maintainer_email'), - ) - - for field, attr in optional_fields: - attr_val = getattr(self, attr, None) - if attr_val is not None: - write_field(field, attr_val) - - if license_expression := self.license_expression: - write_field('License-Expression', license_expression) - elif license := self.get_license(): - write_field('License', rfc822_escape(license)) - - for label, url in self.project_urls.items(): - write_field('Project-URL', f'{label}, {url}') - - keywords = ','.join(self.get_keywords()) - if keywords: - write_field('Keywords', keywords) - - platforms = self.get_platforms() or [] - for platform in platforms: - write_field('Platform', platform) - - self._write_list(file, 'Classifier', self.get_classifiers()) - - # PEP 314 - self._write_list(file, 'Requires', self.get_requires()) - self._write_list(file, 'Provides', self.get_provides()) - self._write_list(file, 'Obsoletes', self.get_obsoletes()) - - # Setuptools specific for PEP 345 - if hasattr(self, 'python_requires'): - write_field('Requires-Python', self.python_requires) - - # PEP 566 - if self.long_description_content_type: - write_field('Description-Content-Type', self.long_description_content_type) - - safe_license_files = map(_safe_license_file, self.license_files or []) - self._write_list(file, 'License-File', safe_license_files) - _write_requirements(self, file) - - for field, attr in _POSSIBLE_DYNAMIC_FIELDS.items(): - if (val := getattr(self, attr, None)) and not is_static(val): - write_field('Dynamic', field) - - long_description = self.get_long_description() - if long_description: - file.write(f"\n{long_description}") - if not long_description.endswith("\n"): - file.write("\n") - - -def _write_requirements(self, file): - for req in _reqs.parse(self.install_requires): - file.write(f"Requires-Dist: {req}\n") - - processed_extras = {} - for augmented_extra, reqs in self.extras_require.items(): - # Historically, setuptools allows "augmented extras": `:` - unsafe_extra, _, condition = augmented_extra.partition(":") - unsafe_extra = unsafe_extra.strip() - extra = _normalization.safe_extra(unsafe_extra) - - if extra: - _write_provides_extra(file, processed_extras, extra, unsafe_extra) - for req in _reqs.parse_strings(reqs): - r = _include_extra(req, extra, condition.strip()) - file.write(f"Requires-Dist: {r}\n") - - return processed_extras - - -def _include_extra(req: str, extra: str, condition: str) -> Requirement: - r = Requirement(req) # create a fresh object that can be modified - parts = ( - f"({r.marker})" if r.marker else None, - f"({condition})" if condition else None, - f"extra == {extra!r}" if extra else None, - ) - r.marker = Marker(" and ".join(x for x in parts if x)) - return r - - -def _write_provides_extra(file, processed_extras, safe, unsafe): - previous = processed_extras.get(safe) - if previous == unsafe: - SetuptoolsDeprecationWarning.emit( - 'Ambiguity during "extra" normalization for dependencies.', - f""" - {previous!r} and {unsafe!r} normalize to the same value:\n - {safe!r}\n - In future versions, setuptools might halt the build process. - """, - see_url="https://peps.python.org/pep-0685/", - ) - else: - processed_extras[safe] = unsafe - file.write(f"Provides-Extra: {safe}\n") - - -# from pypa/distutils#244; needed only until that logic is always available -def get_fullname(self): - return _distribution_fullname(self.get_name(), self.get_version()) - - -def _distribution_fullname(name: str, version: str) -> str: - """ - >>> _distribution_fullname('setup.tools', '1.0-2') - 'setup_tools-1.0.post2' - >>> _distribution_fullname('setup-tools', '1.2post2') - 'setup_tools-1.2.post2' - >>> _distribution_fullname('setup-tools', '1.0-r2') - 'setup_tools-1.0.post2' - >>> _distribution_fullname('setup.tools', '1.0.post') - 'setup_tools-1.0.post0' - >>> _distribution_fullname('setup.tools', '1.0+ubuntu-1') - 'setup_tools-1.0+ubuntu.1' - """ - return "{}-{}".format( - canonicalize_name(name).replace('-', '_'), - canonicalize_version(version, strip_trailing_zero=False), - ) - - -def _safe_license_file(file): - # XXX: Do we need this after the deprecation discussed in #4892, #4896?? - normalized = os.path.normpath(file).replace(os.sep, "/") - if "../" in normalized: - return os.path.basename(normalized) # Temporarily restore pre PEP639 behaviour - return normalized - - -_POSSIBLE_DYNAMIC_FIELDS = { - # Core Metadata Field x related Distribution attribute - "author": "author", - "author-email": "author_email", - "classifier": "classifiers", - "description": "long_description", - "description-content-type": "long_description_content_type", - "download-url": "download_url", - "home-page": "url", - "keywords": "keywords", - "license": "license", - # XXX: License-File is complicated because the user gives globs that are expanded - # during the build. Without special handling it is likely always - # marked as Dynamic, which is an acceptable outcome according to: - # https://github.com/pypa/setuptools/issues/4629#issuecomment-2331233677 - "license-file": "license_files", - "license-expression": "license_expression", # PEP 639 - "maintainer": "maintainer", - "maintainer-email": "maintainer_email", - "obsoletes": "obsoletes", - # "obsoletes-dist": "obsoletes_dist", # NOT USED - "platform": "platforms", - "project-url": "project_urls", - "provides": "provides", - # "provides-dist": "provides_dist", # NOT USED - "provides-extra": "extras_require", - "requires": "requires", - "requires-dist": "install_requires", - # "requires-external": "requires_external", # NOT USED - "requires-python": "python_requires", - "summary": "description", - # "supported-platform": "supported_platforms", # NOT USED -} diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__init__.py index e374d5c..b3ac014 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__init__.py @@ -1,7 +1,17 @@ -import importlib -import sys +"""distutils -__version__, _, _ = sys.version.partition(' ') +The main package for the Python Module Distribution Utilities. Normally +used from a setup script as + + from distutils.core import setup + + setup (...) +""" + +import sys +import importlib + +__version__ = sys.version[: sys.version.index(' ')] try: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/__init__.cpython-311.pyc index de57b0e..4eae473 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_log.cpython-311.pyc deleted file mode 100644 index 8d09b9b..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_log.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_macos_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_macos_compat.cpython-311.pyc index 3bb0426..7ce0cb5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_macos_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_macos_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_modified.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_modified.cpython-311.pyc deleted file mode 100644 index a159d03..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_modified.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_msvccompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_msvccompiler.cpython-311.pyc index b68e943..369560e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_msvccompiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/_msvccompiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/archive_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/archive_util.cpython-311.pyc index 75b88e9..7fd868a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/archive_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/archive_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/ccompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/ccompiler.cpython-311.pyc index 770cdd4..34539d6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/ccompiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/ccompiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cmd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cmd.cpython-311.pyc index fc47ad9..4ee7cae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cmd.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cmd.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/core.cpython-311.pyc index c442b89..45e0b0e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/core.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/core.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cygwinccompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cygwinccompiler.cpython-311.pyc index d9a55cb..16c7d11 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cygwinccompiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/cygwinccompiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/debug.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/debug.cpython-311.pyc index 30c3229..0f1723f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/debug.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/debug.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dep_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dep_util.cpython-311.pyc index 2b5bf14..9d178d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dep_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dep_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dir_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dir_util.cpython-311.pyc index 6c9bc37..f417785 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dir_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dir_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dist.cpython-311.pyc index 3eb6562..91b6feb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/dist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/errors.cpython-311.pyc index e3289d2..2bedbc4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/extension.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/extension.cpython-311.pyc index d32832d..163d878 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/extension.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/extension.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/fancy_getopt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/fancy_getopt.cpython-311.pyc index feafa54..a0a71b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/fancy_getopt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/fancy_getopt.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/file_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/file_util.cpython-311.pyc index c78f583..865acea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/file_util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/file_util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/filelist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/filelist.cpython-311.pyc index d791961..3f77ce2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/filelist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/filelist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/log.cpython-311.pyc index 1e30713..2bc5bb5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/spawn.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/spawn.cpython-311.pyc index 94f78c0..6af1b73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/spawn.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/spawn.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/sysconfig.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/sysconfig.cpython-311.pyc index eb8a3ab..439c075 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/sysconfig.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/sysconfig.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/text_file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/text_file.cpython-311.pyc index d20b1ed..ab8d9b3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/text_file.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/text_file.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/unixccompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/unixccompiler.cpython-311.pyc index ce4b120..bed66e2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/unixccompiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/unixccompiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/util.cpython-311.pyc index d0ac839..d56cb5c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/version.cpython-311.pyc index d402019..6cddf04 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/versionpredicate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/versionpredicate.cpython-311.pyc index 6fddea8..b94ed29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/versionpredicate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/versionpredicate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/zosccompiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/zosccompiler.cpython-311.pyc deleted file mode 100644 index e629c41..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/__pycache__/zosccompiler.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_log.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_log.py deleted file mode 100644 index 0148f15..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_log.py +++ /dev/null @@ -1,3 +0,0 @@ -import logging - -log = logging.getLogger() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_macos_compat.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_macos_compat.py index 76ecb96..17769e9 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_macos_compat.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_macos_compat.py @@ -1,5 +1,5 @@ -import importlib import sys +import importlib def bypass_compiler_fixup(cmd, args): diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_modified.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_modified.py deleted file mode 100644 index f64cab7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_modified.py +++ /dev/null @@ -1,95 +0,0 @@ -"""Timestamp comparison of files and groups of files.""" - -from __future__ import annotations - -import functools -import os.path -from collections.abc import Callable, Iterable -from typing import Literal, TypeVar - -from jaraco.functools import splat - -from .compat.py39 import zip_strict -from .errors import DistutilsFileError - -_SourcesT = TypeVar( - "_SourcesT", bound="str | bytes | os.PathLike[str] | os.PathLike[bytes]" -) -_TargetsT = TypeVar( - "_TargetsT", bound="str | bytes | os.PathLike[str] | os.PathLike[bytes]" -) - - -def _newer(source, target): - return not os.path.exists(target) or ( - os.path.getmtime(source) > os.path.getmtime(target) - ) - - -def newer( - source: str | bytes | os.PathLike[str] | os.PathLike[bytes], - target: str | bytes | os.PathLike[str] | os.PathLike[bytes], -) -> bool: - """ - Is source modified more recently than target. - - Returns True if 'source' is modified more recently than - 'target' or if 'target' does not exist. - - Raises DistutilsFileError if 'source' does not exist. - """ - if not os.path.exists(source): - raise DistutilsFileError(f"file {os.path.abspath(source)!r} does not exist") - - return _newer(source, target) - - -def newer_pairwise( - sources: Iterable[_SourcesT], - targets: Iterable[_TargetsT], - newer: Callable[[_SourcesT, _TargetsT], bool] = newer, -) -> tuple[list[_SourcesT], list[_TargetsT]]: - """ - Filter filenames where sources are newer than targets. - - Walk two filename iterables in parallel, testing if each source is newer - than its corresponding target. Returns a pair of lists (sources, - targets) where source is newer than target, according to the semantics - of 'newer()'. - """ - newer_pairs = filter(splat(newer), zip_strict(sources, targets)) - return tuple(map(list, zip(*newer_pairs))) or ([], []) - - -def newer_group( - sources: Iterable[str | bytes | os.PathLike[str] | os.PathLike[bytes]], - target: str | bytes | os.PathLike[str] | os.PathLike[bytes], - missing: Literal["error", "ignore", "newer"] = "error", -) -> bool: - """ - Is target out-of-date with respect to any file in sources. - - Return True if 'target' is out-of-date with respect to any file - listed in 'sources'. In other words, if 'target' exists and is newer - than every file in 'sources', return False; otherwise return True. - ``missing`` controls how to handle a missing source file: - - - error (default): allow the ``stat()`` call to fail. - - ignore: silently disregard any missing source files. - - newer: treat missing source files as "target out of date". This - mode is handy in "dry-run" mode: it will pretend to carry out - commands that wouldn't work because inputs are missing, but - that doesn't matter because dry-run won't run the commands. - """ - - def missing_as_newer(source): - return missing == 'newer' and not os.path.exists(source) - - ignored = os.path.exists if missing == 'ignore' else None - return not os.path.exists(target) or any( - missing_as_newer(source) or _newer(source, target) - for source in filter(ignored, sources) - ) - - -newer_pairwise_group = functools.partial(newer_pairwise, newer=newer_group) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_msvccompiler.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_msvccompiler.py index d07c86e..729c2dd 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_msvccompiler.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/_msvccompiler.py @@ -1,16 +1,572 @@ +"""distutils._msvccompiler + +Contains MSVCCompiler, an implementation of the abstract CCompiler class +for Microsoft Visual Studio 2015. + +The module is compatible with VS 2015 and later. You can find legacy support +for older versions in distutils.msvc9compiler and distutils.msvccompiler. +""" + +# Written by Perry Stoll +# hacked by Robin Becker and Thomas Heller to do a better job of +# finding DevStudio (through the registry) +# ported to VS 2005 and VS 2008 by Christian Heimes +# ported to VS 2015 by Steve Dower + +import os +import subprocess +import contextlib import warnings +import unittest.mock as mock -from .compilers.C import msvc +with contextlib.suppress(ImportError): + import winreg -__all__ = ["MSVCCompiler"] +from distutils.errors import ( + DistutilsExecError, + DistutilsPlatformError, + CompileError, + LibError, + LinkError, +) +from distutils.ccompiler import CCompiler, gen_lib_options +from distutils import log +from distutils.util import get_platform -MSVCCompiler = msvc.Compiler +from itertools import count -def __getattr__(name): - if name == '_get_vc_env': - warnings.warn( - "_get_vc_env is private; find an alternative (pypa/distutils#340)" +def _find_vc2015(): + try: + key = winreg.OpenKeyEx( + winreg.HKEY_LOCAL_MACHINE, + r"Software\Microsoft\VisualStudio\SxS\VC7", + access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY, ) - return msvc._get_vc_env - raise AttributeError(name) + except OSError: + log.debug("Visual C++ is not registered") + return None, None + + best_version = 0 + best_dir = None + with key: + for i in count(): + try: + v, vc_dir, vt = winreg.EnumValue(key, i) + except OSError: + break + if v and vt == winreg.REG_SZ and os.path.isdir(vc_dir): + try: + version = int(float(v)) + except (ValueError, TypeError): + continue + if version >= 14 and version > best_version: + best_version, best_dir = version, vc_dir + return best_version, best_dir + + +def _find_vc2017(): + """Returns "15, path" based on the result of invoking vswhere.exe + If no install is found, returns "None, None" + + The version is returned to avoid unnecessarily changing the function + result. It may be ignored when the path is not None. + + If vswhere.exe is not available, by definition, VS 2017 is not + installed. + """ + root = os.environ.get("ProgramFiles(x86)") or os.environ.get("ProgramFiles") + if not root: + return None, None + + try: + path = subprocess.check_output( + [ + os.path.join( + root, "Microsoft Visual Studio", "Installer", "vswhere.exe" + ), + "-latest", + "-prerelease", + "-requires", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "-property", + "installationPath", + "-products", + "*", + ], + encoding="mbcs", + errors="strict", + ).strip() + except (subprocess.CalledProcessError, OSError, UnicodeDecodeError): + return None, None + + path = os.path.join(path, "VC", "Auxiliary", "Build") + if os.path.isdir(path): + return 15, path + + return None, None + + +PLAT_SPEC_TO_RUNTIME = { + 'x86': 'x86', + 'x86_amd64': 'x64', + 'x86_arm': 'arm', + 'x86_arm64': 'arm64', +} + + +def _find_vcvarsall(plat_spec): + # bpo-38597: Removed vcruntime return value + _, best_dir = _find_vc2017() + + if not best_dir: + best_version, best_dir = _find_vc2015() + + if not best_dir: + log.debug("No suitable Visual C++ version found") + return None, None + + vcvarsall = os.path.join(best_dir, "vcvarsall.bat") + if not os.path.isfile(vcvarsall): + log.debug("%s cannot be found", vcvarsall) + return None, None + + return vcvarsall, None + + +def _get_vc_env(plat_spec): + if os.getenv("DISTUTILS_USE_SDK"): + return {key.lower(): value for key, value in os.environ.items()} + + vcvarsall, _ = _find_vcvarsall(plat_spec) + if not vcvarsall: + raise DistutilsPlatformError("Unable to find vcvarsall.bat") + + try: + out = subprocess.check_output( + f'cmd /u /c "{vcvarsall}" {plat_spec} && set', + stderr=subprocess.STDOUT, + ).decode('utf-16le', errors='replace') + except subprocess.CalledProcessError as exc: + log.error(exc.output) + raise DistutilsPlatformError(f"Error executing {exc.cmd}") + + env = { + key.lower(): value + for key, _, value in (line.partition('=') for line in out.splitlines()) + if key and value + } + + return env + + +def _find_exe(exe, paths=None): + """Return path to an MSVC executable program. + + Tries to find the program in several places: first, one of the + MSVC program search paths from the registry; next, the directories + in the PATH environment variable. If any of those work, return an + absolute path that is known to exist. If none of them work, just + return the original program name, 'exe'. + """ + if not paths: + paths = os.getenv('path').split(os.pathsep) + for p in paths: + fn = os.path.join(os.path.abspath(p), exe) + if os.path.isfile(fn): + return fn + return exe + + +# A map keyed by get_platform() return values to values accepted by +# 'vcvarsall.bat'. Always cross-compile from x86 to work with the +# lighter-weight MSVC installs that do not include native 64-bit tools. +PLAT_TO_VCVARS = { + 'win32': 'x86', + 'win-amd64': 'x86_amd64', + 'win-arm32': 'x86_arm', + 'win-arm64': 'x86_arm64', +} + + +class MSVCCompiler(CCompiler): + """Concrete class that implements an interface to Microsoft Visual C++, + as defined by the CCompiler abstract class.""" + + compiler_type = 'msvc' + + # Just set this so CCompiler's constructor doesn't barf. We currently + # don't use the 'set_executables()' bureaucracy provided by CCompiler, + # as it really isn't necessary for this sort of single-compiler class. + # Would be nice to have a consistent interface with UnixCCompiler, + # though, so it's worth thinking about. + executables = {} + + # Private class data (need to distinguish C from C++ source for compiler) + _c_extensions = ['.c'] + _cpp_extensions = ['.cc', '.cpp', '.cxx'] + _rc_extensions = ['.rc'] + _mc_extensions = ['.mc'] + + # Needed for the filename generation methods provided by the + # base class, CCompiler. + src_extensions = _c_extensions + _cpp_extensions + _rc_extensions + _mc_extensions + res_extension = '.res' + obj_extension = '.obj' + static_lib_extension = '.lib' + shared_lib_extension = '.dll' + static_lib_format = shared_lib_format = '%s%s' + exe_extension = '.exe' + + def __init__(self, verbose=0, dry_run=0, force=0): + super().__init__(verbose, dry_run, force) + # target platform (.plat_name is consistent with 'bdist') + self.plat_name = None + self.initialized = False + + @classmethod + def _configure(cls, vc_env): + """ + Set class-level include/lib dirs. + """ + cls.include_dirs = cls._parse_path(vc_env.get('include', '')) + cls.library_dirs = cls._parse_path(vc_env.get('lib', '')) + + @staticmethod + def _parse_path(val): + return [dir.rstrip(os.sep) for dir in val.split(os.pathsep) if dir] + + def initialize(self, plat_name=None): + # multi-init means we would need to check platform same each time... + assert not self.initialized, "don't init multiple times" + if plat_name is None: + plat_name = get_platform() + # sanity check for platforms to prevent obscure errors later. + if plat_name not in PLAT_TO_VCVARS: + raise DistutilsPlatformError( + f"--plat-name must be one of {tuple(PLAT_TO_VCVARS)}" + ) + + # Get the vcvarsall.bat spec for the requested platform. + plat_spec = PLAT_TO_VCVARS[plat_name] + + vc_env = _get_vc_env(plat_spec) + if not vc_env: + raise DistutilsPlatformError( + "Unable to find a compatible " "Visual Studio installation." + ) + self._configure(vc_env) + + self._paths = vc_env.get('path', '') + paths = self._paths.split(os.pathsep) + self.cc = _find_exe("cl.exe", paths) + self.linker = _find_exe("link.exe", paths) + self.lib = _find_exe("lib.exe", paths) + self.rc = _find_exe("rc.exe", paths) # resource compiler + self.mc = _find_exe("mc.exe", paths) # message compiler + self.mt = _find_exe("mt.exe", paths) # message compiler + + self.preprocess_options = None + # bpo-38597: Always compile with dynamic linking + # Future releases of Python 3.x will include all past + # versions of vcruntime*.dll for compatibility. + self.compile_options = ['/nologo', '/O2', '/W3', '/GL', '/DNDEBUG', '/MD'] + + self.compile_options_debug = [ + '/nologo', + '/Od', + '/MDd', + '/Zi', + '/W3', + '/D_DEBUG', + ] + + ldflags = ['/nologo', '/INCREMENTAL:NO', '/LTCG'] + + ldflags_debug = ['/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'] + + self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1'] + self.ldflags_exe_debug = [*ldflags_debug, '/MANIFEST:EMBED,ID=1'] + self.ldflags_shared = [ + *ldflags, + '/DLL', + '/MANIFEST:EMBED,ID=2', + '/MANIFESTUAC:NO', + ] + self.ldflags_shared_debug = [ + *ldflags_debug, + '/DLL', + '/MANIFEST:EMBED,ID=2', + '/MANIFESTUAC:NO', + ] + self.ldflags_static = [*ldflags] + self.ldflags_static_debug = [*ldflags_debug] + + self._ldflags = { + (CCompiler.EXECUTABLE, None): self.ldflags_exe, + (CCompiler.EXECUTABLE, False): self.ldflags_exe, + (CCompiler.EXECUTABLE, True): self.ldflags_exe_debug, + (CCompiler.SHARED_OBJECT, None): self.ldflags_shared, + (CCompiler.SHARED_OBJECT, False): self.ldflags_shared, + (CCompiler.SHARED_OBJECT, True): self.ldflags_shared_debug, + (CCompiler.SHARED_LIBRARY, None): self.ldflags_static, + (CCompiler.SHARED_LIBRARY, False): self.ldflags_static, + (CCompiler.SHARED_LIBRARY, True): self.ldflags_static_debug, + } + + self.initialized = True + + # -- Worker methods ------------------------------------------------ + + @property + def out_extensions(self): + return { + **super().out_extensions, + **{ + ext: self.res_extension + for ext in self._rc_extensions + self._mc_extensions + }, + } + + def compile( # noqa: C901 + self, + sources, + output_dir=None, + macros=None, + include_dirs=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + depends=None, + ): + + if not self.initialized: + self.initialize() + compile_info = self._setup_compile( + output_dir, macros, include_dirs, sources, depends, extra_postargs + ) + macros, objects, extra_postargs, pp_opts, build = compile_info + + compile_opts = extra_preargs or [] + compile_opts.append('/c') + if debug: + compile_opts.extend(self.compile_options_debug) + else: + compile_opts.extend(self.compile_options) + + add_cpp_opts = False + + for obj in objects: + try: + src, ext = build[obj] + except KeyError: + continue + if debug: + # pass the full pathname to MSVC in debug mode, + # this allows the debugger to find the source file + # without asking the user to browse for it + src = os.path.abspath(src) + + if ext in self._c_extensions: + input_opt = "/Tc" + src + elif ext in self._cpp_extensions: + input_opt = "/Tp" + src + add_cpp_opts = True + elif ext in self._rc_extensions: + # compile .RC to .RES file + input_opt = src + output_opt = "/fo" + obj + try: + self.spawn([self.rc] + pp_opts + [output_opt, input_opt]) + except DistutilsExecError as msg: + raise CompileError(msg) + continue + elif ext in self._mc_extensions: + # Compile .MC to .RC file to .RES file. + # * '-h dir' specifies the directory for the + # generated include file + # * '-r dir' specifies the target directory of the + # generated RC file and the binary message resource + # it includes + # + # For now (since there are no options to change this), + # we use the source-directory for the include file and + # the build directory for the RC file and message + # resources. This works at least for win32all. + h_dir = os.path.dirname(src) + rc_dir = os.path.dirname(obj) + try: + # first compile .MC to .RC and .H file + self.spawn([self.mc, '-h', h_dir, '-r', rc_dir, src]) + base, _ = os.path.splitext(os.path.basename(src)) + rc_file = os.path.join(rc_dir, base + '.rc') + # then compile .RC to .RES file + self.spawn([self.rc, "/fo" + obj, rc_file]) + + except DistutilsExecError as msg: + raise CompileError(msg) + continue + else: + # how to handle this file? + raise CompileError(f"Don't know how to compile {src} to {obj}") + + args = [self.cc] + compile_opts + pp_opts + if add_cpp_opts: + args.append('/EHsc') + args.append(input_opt) + args.append("/Fo" + obj) + args.extend(extra_postargs) + + try: + self.spawn(args) + except DistutilsExecError as msg: + raise CompileError(msg) + + return objects + + def create_static_lib( + self, objects, output_libname, output_dir=None, debug=0, target_lang=None + ): + + if not self.initialized: + self.initialize() + objects, output_dir = self._fix_object_args(objects, output_dir) + output_filename = self.library_filename(output_libname, output_dir=output_dir) + + if self._need_link(objects, output_filename): + lib_args = objects + ['/OUT:' + output_filename] + if debug: + pass # XXX what goes here? + try: + log.debug('Executing "%s" %s', self.lib, ' '.join(lib_args)) + self.spawn([self.lib] + lib_args) + except DistutilsExecError as msg: + raise LibError(msg) + else: + log.debug("skipping %s (up-to-date)", output_filename) + + def link( + self, + target_desc, + objects, + output_filename, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + + if not self.initialized: + self.initialize() + objects, output_dir = self._fix_object_args(objects, output_dir) + fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) + libraries, library_dirs, runtime_library_dirs = fixed_args + + if runtime_library_dirs: + self.warn( + "I don't know what to do with 'runtime_library_dirs': " + + str(runtime_library_dirs) + ) + + lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries) + if output_dir is not None: + output_filename = os.path.join(output_dir, output_filename) + + if self._need_link(objects, output_filename): + ldflags = self._ldflags[target_desc, debug] + + export_opts = ["/EXPORT:" + sym for sym in (export_symbols or [])] + + ld_args = ( + ldflags + lib_opts + export_opts + objects + ['/OUT:' + output_filename] + ) + + # The MSVC linker generates .lib and .exp files, which cannot be + # suppressed by any linker switches. The .lib files may even be + # needed! Make sure they are generated in the temporary build + # directory. Since they have different names for debug and release + # builds, they can go into the same directory. + build_temp = os.path.dirname(objects[0]) + if export_symbols is not None: + (dll_name, dll_ext) = os.path.splitext( + os.path.basename(output_filename) + ) + implib_file = os.path.join(build_temp, self.library_filename(dll_name)) + ld_args.append('/IMPLIB:' + implib_file) + + if extra_preargs: + ld_args[:0] = extra_preargs + if extra_postargs: + ld_args.extend(extra_postargs) + + output_dir = os.path.dirname(os.path.abspath(output_filename)) + self.mkpath(output_dir) + try: + log.debug('Executing "%s" %s', self.linker, ' '.join(ld_args)) + self.spawn([self.linker] + ld_args) + except DistutilsExecError as msg: + raise LinkError(msg) + else: + log.debug("skipping %s (up-to-date)", output_filename) + + def spawn(self, cmd): + env = dict(os.environ, PATH=self._paths) + with self._fallback_spawn(cmd, env) as fallback: + return super().spawn(cmd, env=env) + return fallback.value + + @contextlib.contextmanager + def _fallback_spawn(self, cmd, env): + """ + Discovered in pypa/distutils#15, some tools monkeypatch the compiler, + so the 'env' kwarg causes a TypeError. Detect this condition and + restore the legacy, unsafe behavior. + """ + bag = type('Bag', (), {})() + try: + yield bag + except TypeError as exc: + if "unexpected keyword argument 'env'" not in str(exc): + raise + else: + return + warnings.warn("Fallback spawn triggered. Please update distutils monkeypatch.") + with mock.patch.dict('os.environ', env): + bag.value = super().spawn(cmd) + + # -- Miscellaneous methods ----------------------------------------- + # These are all used by the 'gen_lib_options() function, in + # ccompiler.py. + + def library_dir_option(self, dir): + return "/LIBPATH:" + dir + + def runtime_library_dir_option(self, dir): + raise DistutilsPlatformError( + "don't know how to set runtime library search path for MSVC" + ) + + def library_option(self, lib): + return self.library_filename(lib) + + def find_library_file(self, dirs, lib, debug=0): + # Prefer a debugging library if found (and requested), but deal + # with it if we don't have one. + if debug: + try_names = [lib + "_d", lib] + else: + try_names = [lib] + for dir in dirs: + for name in try_names: + libfile = os.path.join(dir, self.library_filename(name)) + if os.path.isfile(libfile): + return libfile + else: + # Oops, didn't find it in *any* of 'dirs' + return None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/archive_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/archive_util.py index d860f55..5dfe2a1 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/archive_util.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/archive_util.py @@ -3,10 +3,9 @@ Utility functions for creating archive files (tarballs, zip files, that sort of thing).""" -from __future__ import annotations - import os -from typing import Literal, overload +from warnings import warn +import sys try: import zipfile @@ -14,10 +13,10 @@ except ImportError: zipfile = None -from ._log import log -from .dir_util import mkpath -from .errors import DistutilsExecError -from .spawn import spawn +from distutils.errors import DistutilsExecError +from distutils.spawn import spawn +from distutils.dir_util import mkpath +from distutils import log try: from pwd import getpwnam @@ -57,18 +56,13 @@ def _get_uid(name): def make_tarball( - base_name: str, - base_dir: str | os.PathLike[str], - compress: Literal["gzip", "bzip2", "xz"] | None = "gzip", - verbose: bool = False, - dry_run: bool = False, - owner: str | None = None, - group: str | None = None, -) -> str: + base_name, base_dir, compress="gzip", verbose=0, dry_run=0, owner=None, group=None +): """Create a (possibly compressed) tar file from all the files under 'base_dir'. - 'compress' must be "gzip" (the default), "bzip2", "xz", or None. + 'compress' must be "gzip" (the default), "bzip2", "xz", "compress", or + None. ("compress" will be deprecated in Python 3.2) 'owner' and 'group' can be used to define an owner and a group for the archive that is being built. If not provided, the current owner and group @@ -84,17 +78,20 @@ def make_tarball( 'bzip2': 'bz2', 'xz': 'xz', None: '', + 'compress': '', } - compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'xz': '.xz'} + compress_ext = {'gzip': '.gz', 'bzip2': '.bz2', 'xz': '.xz', 'compress': '.Z'} # flags for compression program, each element of list will be an argument if compress is not None and compress not in compress_ext.keys(): raise ValueError( - "bad value for 'compress': must be None, 'gzip', 'bzip2', 'xz'" + "bad value for 'compress': must be None, 'gzip', 'bzip2', " + "'xz' or 'compress'" ) archive_name = base_name + '.tar' - archive_name += compress_ext.get(compress, '') + if compress != 'compress': + archive_name += compress_ext.get(compress, '') mkpath(os.path.dirname(archive_name), dry_run=dry_run) @@ -116,21 +113,28 @@ def make_tarball( return tarinfo if not dry_run: - tar = tarfile.open(archive_name, f'w|{tar_compression[compress]}') + tar = tarfile.open(archive_name, 'w|%s' % tar_compression[compress]) try: tar.add(base_dir, filter=_set_uid_gid) finally: tar.close() + # compression using `compress` + if compress == 'compress': + warn("'compress' is deprecated.", DeprecationWarning) + # the option varies depending on the platform + compressed_name = archive_name + compress_ext[compress] + if sys.platform == 'win32': + cmd = [compress, archive_name, compressed_name] + else: + cmd = [compress, '-f', archive_name] + spawn(cmd, dry_run=dry_run) + return compressed_name + return archive_name -def make_zipfile( # noqa: C901 - base_name: str, - base_dir: str | os.PathLike[str], - verbose: bool = False, - dry_run: bool = False, -) -> str: +def make_zipfile(base_name, base_dir, verbose=0, dry_run=0): # noqa: C901 """Create a zip file from all the files under 'base_dir'. The output zip file will be named 'base_name' + ".zip". Uses either the @@ -156,9 +160,12 @@ def make_zipfile( # noqa: C901 # XXX really should distinguish between "couldn't find # external 'zip' command" and "zip failed". raise DistutilsExecError( - f"unable to create zip file '{zip_filename}': " - "could neither import the 'zipfile' module nor " - "find a standalone zip utility" + ( + "unable to create zip file '%s': " + "could neither import the 'zipfile' module nor " + "find a standalone zip utility" + ) + % zip_filename ) else: @@ -212,38 +219,16 @@ def check_archive_formats(formats): return None -@overload def make_archive( - base_name: str, - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes] | None = None, - base_dir: str | None = None, - verbose: bool = False, - dry_run: bool = False, - owner: str | None = None, - group: str | None = None, -) -> str: ... -@overload -def make_archive( - base_name: str | os.PathLike[str], - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes], - base_dir: str | None = None, - verbose: bool = False, - dry_run: bool = False, - owner: str | None = None, - group: str | None = None, -) -> str: ... -def make_archive( - base_name: str | os.PathLike[str], - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes] | None = None, - base_dir: str | None = None, - verbose: bool = False, - dry_run: bool = False, - owner: str | None = None, - group: str | None = None, -) -> str: + base_name, + format, + root_dir=None, + base_dir=None, + verbose=0, + dry_run=0, + owner=None, + group=None, +): """Create an archive file (eg. zip or tar). 'base_name' is the name of the file to create, minus any format-specific @@ -275,10 +260,11 @@ def make_archive( try: format_info = ARCHIVE_FORMATS[format] except KeyError: - raise ValueError(f"unknown archive format '{format}'") + raise ValueError("unknown archive format '%s'" % format) func = format_info[0] - kwargs.update(format_info[1]) + for arg, val in format_info[1]: + kwargs[arg] = val if format != 'zip': kwargs['owner'] = owner diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/ccompiler.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/ccompiler.py index 58bc6a5..97551c9 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/ccompiler.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/ccompiler.py @@ -1,26 +1,1220 @@ -from .compat.numpy import ( # noqa: F401 - _default_compilers, - compiler_class, +"""distutils.ccompiler + +Contains CCompiler, an abstract base class that defines the interface +for the Distutils compiler abstraction model.""" + +import sys +import os +import re + +from distutils.errors import ( + CompileError, + LinkError, + UnknownFileError, + DistutilsPlatformError, + DistutilsModuleError, ) -from .compilers.C import base -from .compilers.C.base import ( - gen_lib_options, - gen_preprocess_options, - get_default_compiler, - new_compiler, - show_compilers, +from distutils.spawn import spawn +from distutils.file_util import move_file +from distutils.dir_util import mkpath +from distutils.dep_util import newer_group +from distutils.util import split_quoted, execute +from distutils import log + + +class CCompiler: + """Abstract base class to define the interface that must be implemented + by real compiler classes. Also has some utility methods used by + several compiler classes. + + The basic idea behind a compiler abstraction class is that each + instance can be used for all the compile/link steps in building a + single project. Thus, attributes common to all of those compile and + link steps -- include directories, macros to define, libraries to link + against, etc. -- are attributes of the compiler instance. To allow for + variability in how individual files are treated, most of those + attributes may be varied on a per-compilation or per-link basis. + """ + + # 'compiler_type' is a class attribute that identifies this class. It + # keeps code that wants to know what kind of compiler it's dealing with + # from having to import all possible compiler classes just to do an + # 'isinstance'. In concrete CCompiler subclasses, 'compiler_type' + # should really, really be one of the keys of the 'compiler_class' + # dictionary (see below -- used by the 'new_compiler()' factory + # function) -- authors of new compiler interface classes are + # responsible for updating 'compiler_class'! + compiler_type = None + + # XXX things not handled by this compiler abstraction model: + # * client can't provide additional options for a compiler, + # e.g. warning, optimization, debugging flags. Perhaps this + # should be the domain of concrete compiler abstraction classes + # (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base + # class should have methods for the common ones. + # * can't completely override the include or library searchg + # path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2". + # I'm not sure how widely supported this is even by Unix + # compilers, much less on other platforms. And I'm even less + # sure how useful it is; maybe for cross-compiling, but + # support for that is a ways off. (And anyways, cross + # compilers probably have a dedicated binary with the + # right paths compiled in. I hope.) + # * can't do really freaky things with the library list/library + # dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against + # different versions of libfoo.a in different locations. I + # think this is useless without the ability to null out the + # library search path anyways. + + # Subclasses that rely on the standard filename generation methods + # implemented below should override these; see the comment near + # those methods ('object_filenames()' et. al.) for details: + src_extensions = None # list of strings + obj_extension = None # string + static_lib_extension = None + shared_lib_extension = None # string + static_lib_format = None # format string + shared_lib_format = None # prob. same as static_lib_format + exe_extension = None # string + + # Default language settings. language_map is used to detect a source + # file or Extension target language, checking source filenames. + # language_order is used to detect the language precedence, when deciding + # what language to use when mixing source types. For example, if some + # extension has two files with ".c" extension, and one with ".cpp", it + # is still linked as c++. + language_map = { + ".c": "c", + ".cc": "c++", + ".cpp": "c++", + ".cxx": "c++", + ".m": "objc", + } + language_order = ["c++", "objc", "c"] + + include_dirs = [] + """ + include dirs specific to this compiler class + """ + + library_dirs = [] + """ + library dirs specific to this compiler class + """ + + def __init__(self, verbose=0, dry_run=0, force=0): + self.dry_run = dry_run + self.force = force + self.verbose = verbose + + # 'output_dir': a common output directory for object, library, + # shared object, and shared library files + self.output_dir = None + + # 'macros': a list of macro definitions (or undefinitions). A + # macro definition is a 2-tuple (name, value), where the value is + # either a string or None (no explicit value). A macro + # undefinition is a 1-tuple (name,). + self.macros = [] + + # 'include_dirs': a list of directories to search for include files + self.include_dirs = [] + + # 'libraries': a list of libraries to include in any link + # (library names, not filenames: eg. "foo" not "libfoo.a") + self.libraries = [] + + # 'library_dirs': a list of directories to search for libraries + self.library_dirs = [] + + # 'runtime_library_dirs': a list of directories to search for + # shared libraries/objects at runtime + self.runtime_library_dirs = [] + + # 'objects': a list of object files (or similar, such as explicitly + # named library files) to include on any link + self.objects = [] + + for key in self.executables.keys(): + self.set_executable(key, self.executables[key]) + + def set_executables(self, **kwargs): + """Define the executables (and options for them) that will be run + to perform the various stages of compilation. The exact set of + executables that may be specified here depends on the compiler + class (via the 'executables' class attribute), but most will have: + compiler the C/C++ compiler + linker_so linker used to create shared objects and libraries + linker_exe linker used to create binary executables + archiver static library creator + + On platforms with a command-line (Unix, DOS/Windows), each of these + is a string that will be split into executable name and (optional) + list of arguments. (Splitting the string is done similarly to how + Unix shells operate: words are delimited by spaces, but quotes and + backslashes can override this. See + 'distutils.util.split_quoted()'.) + """ + + # Note that some CCompiler implementation classes will define class + # attributes 'cpp', 'cc', etc. with hard-coded executable names; + # this is appropriate when a compiler class is for exactly one + # compiler/OS combination (eg. MSVCCompiler). Other compiler + # classes (UnixCCompiler, in particular) are driven by information + # discovered at run-time, since there are many different ways to do + # basically the same things with Unix C compilers. + + for key in kwargs: + if key not in self.executables: + raise ValueError( + "unknown executable '%s' for class %s" + % (key, self.__class__.__name__) + ) + self.set_executable(key, kwargs[key]) + + def set_executable(self, key, value): + if isinstance(value, str): + setattr(self, key, split_quoted(value)) + else: + setattr(self, key, value) + + def _find_macro(self, name): + i = 0 + for defn in self.macros: + if defn[0] == name: + return i + i += 1 + return None + + def _check_macro_definitions(self, definitions): + """Ensures that every element of 'definitions' is a valid macro + definition, ie. either (name,value) 2-tuple or a (name,) tuple. Do + nothing if all definitions are OK, raise TypeError otherwise. + """ + for defn in definitions: + if not ( + isinstance(defn, tuple) + and ( + len(defn) in (1, 2) + and (isinstance(defn[1], str) or defn[1] is None) + ) + and isinstance(defn[0], str) + ): + raise TypeError( + ("invalid macro definition '%s': " % defn) + + "must be tuple (string,), (string, string), or " + + "(string, None)" + ) + + # -- Bookkeeping methods ------------------------------------------- + + def define_macro(self, name, value=None): + """Define a preprocessor macro for all compilations driven by this + compiler object. The optional parameter 'value' should be a + string; if it is not supplied, then the macro will be defined + without an explicit value and the exact outcome depends on the + compiler used (XXX true? does ANSI say anything about this?) + """ + # Delete from the list of macro definitions/undefinitions if + # already there (so that this one will take precedence). + i = self._find_macro(name) + if i is not None: + del self.macros[i] + + self.macros.append((name, value)) + + def undefine_macro(self, name): + """Undefine a preprocessor macro for all compilations driven by + this compiler object. If the same macro is defined by + 'define_macro()' and undefined by 'undefine_macro()' the last call + takes precedence (including multiple redefinitions or + undefinitions). If the macro is redefined/undefined on a + per-compilation basis (ie. in the call to 'compile()'), then that + takes precedence. + """ + # Delete from the list of macro definitions/undefinitions if + # already there (so that this one will take precedence). + i = self._find_macro(name) + if i is not None: + del self.macros[i] + + undefn = (name,) + self.macros.append(undefn) + + def add_include_dir(self, dir): + """Add 'dir' to the list of directories that will be searched for + header files. The compiler is instructed to search directories in + the order in which they are supplied by successive calls to + 'add_include_dir()'. + """ + self.include_dirs.append(dir) + + def set_include_dirs(self, dirs): + """Set the list of directories that will be searched to 'dirs' (a + list of strings). Overrides any preceding calls to + 'add_include_dir()'; subsequence calls to 'add_include_dir()' add + to the list passed to 'set_include_dirs()'. This does not affect + any list of standard include directories that the compiler may + search by default. + """ + self.include_dirs = dirs[:] + + def add_library(self, libname): + """Add 'libname' to the list of libraries that will be included in + all links driven by this compiler object. Note that 'libname' + should *not* be the name of a file containing a library, but the + name of the library itself: the actual filename will be inferred by + the linker, the compiler, or the compiler class (depending on the + platform). + + The linker will be instructed to link against libraries in the + order they were supplied to 'add_library()' and/or + 'set_libraries()'. It is perfectly valid to duplicate library + names; the linker will be instructed to link against libraries as + many times as they are mentioned. + """ + self.libraries.append(libname) + + def set_libraries(self, libnames): + """Set the list of libraries to be included in all links driven by + this compiler object to 'libnames' (a list of strings). This does + not affect any standard system libraries that the linker may + include by default. + """ + self.libraries = libnames[:] + + def add_library_dir(self, dir): + """Add 'dir' to the list of directories that will be searched for + libraries specified to 'add_library()' and 'set_libraries()'. The + linker will be instructed to search for libraries in the order they + are supplied to 'add_library_dir()' and/or 'set_library_dirs()'. + """ + self.library_dirs.append(dir) + + def set_library_dirs(self, dirs): + """Set the list of library search directories to 'dirs' (a list of + strings). This does not affect any standard library search path + that the linker may search by default. + """ + self.library_dirs = dirs[:] + + def add_runtime_library_dir(self, dir): + """Add 'dir' to the list of directories that will be searched for + shared libraries at runtime. + """ + self.runtime_library_dirs.append(dir) + + def set_runtime_library_dirs(self, dirs): + """Set the list of directories to search for shared libraries at + runtime to 'dirs' (a list of strings). This does not affect any + standard search path that the runtime linker may search by + default. + """ + self.runtime_library_dirs = dirs[:] + + def add_link_object(self, object): + """Add 'object' to the list of object files (or analogues, such as + explicitly named library files or the output of "resource + compilers") to be included in every link driven by this compiler + object. + """ + self.objects.append(object) + + def set_link_objects(self, objects): + """Set the list of object files (or analogues) to be included in + every link to 'objects'. This does not affect any standard object + files that the linker may include by default (such as system + libraries). + """ + self.objects = objects[:] + + # -- Private utility methods -------------------------------------- + # (here for the convenience of subclasses) + + # Helper method to prep compiler in subclass compile() methods + + def _setup_compile(self, outdir, macros, incdirs, sources, depends, extra): + """Process arguments and decide which source files to compile.""" + outdir, macros, incdirs = self._fix_compile_args(outdir, macros, incdirs) + + if extra is None: + extra = [] + + # Get the list of expected output (object) files + objects = self.object_filenames(sources, strip_dir=0, output_dir=outdir) + assert len(objects) == len(sources) + + pp_opts = gen_preprocess_options(macros, incdirs) + + build = {} + for i in range(len(sources)): + src = sources[i] + obj = objects[i] + ext = os.path.splitext(src)[1] + self.mkpath(os.path.dirname(obj)) + build[obj] = (src, ext) + + return macros, objects, extra, pp_opts, build + + def _get_cc_args(self, pp_opts, debug, before): + # works for unixccompiler, cygwinccompiler + cc_args = pp_opts + ['-c'] + if debug: + cc_args[:0] = ['-g'] + if before: + cc_args[:0] = before + return cc_args + + def _fix_compile_args(self, output_dir, macros, include_dirs): + """Typecheck and fix-up some of the arguments to the 'compile()' + method, and return fixed-up values. Specifically: if 'output_dir' + is None, replaces it with 'self.output_dir'; ensures that 'macros' + is a list, and augments it with 'self.macros'; ensures that + 'include_dirs' is a list, and augments it with 'self.include_dirs'. + Guarantees that the returned values are of the correct type, + i.e. for 'output_dir' either string or None, and for 'macros' and + 'include_dirs' either list or None. + """ + if output_dir is None: + output_dir = self.output_dir + elif not isinstance(output_dir, str): + raise TypeError("'output_dir' must be a string or None") + + if macros is None: + macros = self.macros + elif isinstance(macros, list): + macros = macros + (self.macros or []) + else: + raise TypeError("'macros' (if supplied) must be a list of tuples") + + if include_dirs is None: + include_dirs = self.include_dirs + elif isinstance(include_dirs, (list, tuple)): + include_dirs = list(include_dirs) + (self.include_dirs or []) + else: + raise TypeError("'include_dirs' (if supplied) must be a list of strings") + + # add include dirs for class + include_dirs += self.__class__.include_dirs + + return output_dir, macros, include_dirs + + def _prep_compile(self, sources, output_dir, depends=None): + """Decide which source files must be recompiled. + + Determine the list of object files corresponding to 'sources', + and figure out which ones really need to be recompiled. + Return a list of all object files and a dictionary telling + which source files can be skipped. + """ + # Get the list of expected output (object) files + objects = self.object_filenames(sources, output_dir=output_dir) + assert len(objects) == len(sources) + + # Return an empty dict for the "which source files can be skipped" + # return value to preserve API compatibility. + return objects, {} + + def _fix_object_args(self, objects, output_dir): + """Typecheck and fix up some arguments supplied to various methods. + Specifically: ensure that 'objects' is a list; if output_dir is + None, replace with self.output_dir. Return fixed versions of + 'objects' and 'output_dir'. + """ + if not isinstance(objects, (list, tuple)): + raise TypeError("'objects' must be a list or tuple of strings") + objects = list(objects) + + if output_dir is None: + output_dir = self.output_dir + elif not isinstance(output_dir, str): + raise TypeError("'output_dir' must be a string or None") + + return (objects, output_dir) + + def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs): + """Typecheck and fix up some of the arguments supplied to the + 'link_*' methods. Specifically: ensure that all arguments are + lists, and augment them with their permanent versions + (eg. 'self.libraries' augments 'libraries'). Return a tuple with + fixed versions of all arguments. + """ + if libraries is None: + libraries = self.libraries + elif isinstance(libraries, (list, tuple)): + libraries = list(libraries) + (self.libraries or []) + else: + raise TypeError("'libraries' (if supplied) must be a list of strings") + + if library_dirs is None: + library_dirs = self.library_dirs + elif isinstance(library_dirs, (list, tuple)): + library_dirs = list(library_dirs) + (self.library_dirs or []) + else: + raise TypeError("'library_dirs' (if supplied) must be a list of strings") + + # add library dirs for class + library_dirs += self.__class__.library_dirs + + if runtime_library_dirs is None: + runtime_library_dirs = self.runtime_library_dirs + elif isinstance(runtime_library_dirs, (list, tuple)): + runtime_library_dirs = list(runtime_library_dirs) + ( + self.runtime_library_dirs or [] + ) + else: + raise TypeError( + "'runtime_library_dirs' (if supplied) " "must be a list of strings" + ) + + return (libraries, library_dirs, runtime_library_dirs) + + def _need_link(self, objects, output_file): + """Return true if we need to relink the files listed in 'objects' + to recreate 'output_file'. + """ + if self.force: + return True + else: + if self.dry_run: + newer = newer_group(objects, output_file, missing='newer') + else: + newer = newer_group(objects, output_file) + return newer + + def detect_language(self, sources): + """Detect the language of a given file, or list of files. Uses + language_map, and language_order to do the job. + """ + if not isinstance(sources, list): + sources = [sources] + lang = None + index = len(self.language_order) + for source in sources: + base, ext = os.path.splitext(source) + extlang = self.language_map.get(ext) + try: + extindex = self.language_order.index(extlang) + if extindex < index: + lang = extlang + index = extindex + except ValueError: + pass + return lang + + # -- Worker methods ------------------------------------------------ + # (must be implemented by subclasses) + + def preprocess( + self, + source, + output_file=None, + macros=None, + include_dirs=None, + extra_preargs=None, + extra_postargs=None, + ): + """Preprocess a single C/C++ source file, named in 'source'. + Output will be written to file named 'output_file', or stdout if + 'output_file' not supplied. 'macros' is a list of macro + definitions as for 'compile()', which will augment the macros set + with 'define_macro()' and 'undefine_macro()'. 'include_dirs' is a + list of directory names that will be added to the default list. + + Raises PreprocessError on failure. + """ + pass + + def compile( + self, + sources, + output_dir=None, + macros=None, + include_dirs=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + depends=None, + ): + """Compile one or more source files. + + 'sources' must be a list of filenames, most likely C/C++ + files, but in reality anything that can be handled by a + particular compiler and compiler class (eg. MSVCCompiler can + handle resource files in 'sources'). Return a list of object + filenames, one per source filename in 'sources'. Depending on + the implementation, not all source files will necessarily be + compiled, but all corresponding object filenames will be + returned. + + If 'output_dir' is given, object files will be put under it, while + retaining their original path component. That is, "foo/bar.c" + normally compiles to "foo/bar.o" (for a Unix implementation); if + 'output_dir' is "build", then it would compile to + "build/foo/bar.o". + + 'macros', if given, must be a list of macro definitions. A macro + definition is either a (name, value) 2-tuple or a (name,) 1-tuple. + The former defines a macro; if the value is None, the macro is + defined without an explicit value. The 1-tuple case undefines a + macro. Later definitions/redefinitions/ undefinitions take + precedence. + + 'include_dirs', if given, must be a list of strings, the + directories to add to the default include file search path for this + compilation only. + + 'debug' is a boolean; if true, the compiler will be instructed to + output debug symbols in (or alongside) the object file(s). + + 'extra_preargs' and 'extra_postargs' are implementation- dependent. + On platforms that have the notion of a command-line (e.g. Unix, + DOS/Windows), they are most likely lists of strings: extra + command-line arguments to prepend/append to the compiler command + line. On other platforms, consult the implementation class + documentation. In any event, they are intended as an escape hatch + for those occasions when the abstract compiler framework doesn't + cut the mustard. + + 'depends', if given, is a list of filenames that all targets + depend on. If a source file is older than any file in + depends, then the source file will be recompiled. This + supports dependency tracking, but only at a coarse + granularity. + + Raises CompileError on failure. + """ + # A concrete compiler class can either override this method + # entirely or implement _compile(). + macros, objects, extra_postargs, pp_opts, build = self._setup_compile( + output_dir, macros, include_dirs, sources, depends, extra_postargs + ) + cc_args = self._get_cc_args(pp_opts, debug, extra_preargs) + + for obj in objects: + try: + src, ext = build[obj] + except KeyError: + continue + self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) + + # Return *all* object filenames, not just the ones we just built. + return objects + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + """Compile 'src' to product 'obj'.""" + # A concrete compiler class that does not override compile() + # should implement _compile(). + pass + + def create_static_lib( + self, objects, output_libname, output_dir=None, debug=0, target_lang=None + ): + """Link a bunch of stuff together to create a static library file. + The "bunch of stuff" consists of the list of object files supplied + as 'objects', the extra object files supplied to + 'add_link_object()' and/or 'set_link_objects()', the libraries + supplied to 'add_library()' and/or 'set_libraries()', and the + libraries supplied as 'libraries' (if any). + + 'output_libname' should be a library name, not a filename; the + filename will be inferred from the library name. 'output_dir' is + the directory where the library file will be put. + + 'debug' is a boolean; if true, debugging information will be + included in the library (note that on most platforms, it is the + compile step where this matters: the 'debug' flag is included here + just for consistency). + + 'target_lang' is the target language for which the given objects + are being compiled. This allows specific linkage time treatment of + certain languages. + + Raises LibError on failure. + """ + pass + + # values for target_desc parameter in link() + SHARED_OBJECT = "shared_object" + SHARED_LIBRARY = "shared_library" + EXECUTABLE = "executable" + + def link( + self, + target_desc, + objects, + output_filename, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + """Link a bunch of stuff together to create an executable or + shared library file. + + The "bunch of stuff" consists of the list of object files supplied + as 'objects'. 'output_filename' should be a filename. If + 'output_dir' is supplied, 'output_filename' is relative to it + (i.e. 'output_filename' can provide directory components if + needed). + + 'libraries' is a list of libraries to link against. These are + library names, not filenames, since they're translated into + filenames in a platform-specific way (eg. "foo" becomes "libfoo.a" + on Unix and "foo.lib" on DOS/Windows). However, they can include a + directory component, which means the linker will look in that + specific directory rather than searching all the normal locations. + + 'library_dirs', if supplied, should be a list of directories to + search for libraries that were specified as bare library names + (ie. no directory component). These are on top of the system + default and those supplied to 'add_library_dir()' and/or + 'set_library_dirs()'. 'runtime_library_dirs' is a list of + directories that will be embedded into the shared library and used + to search for other shared libraries that *it* depends on at + run-time. (This may only be relevant on Unix.) + + 'export_symbols' is a list of symbols that the shared library will + export. (This appears to be relevant only on Windows.) + + 'debug' is as for 'compile()' and 'create_static_lib()', with the + slight distinction that it actually matters on most platforms (as + opposed to 'create_static_lib()', which includes a 'debug' flag + mostly for form's sake). + + 'extra_preargs' and 'extra_postargs' are as for 'compile()' (except + of course that they supply command-line arguments for the + particular linker being used). + + 'target_lang' is the target language for which the given objects + are being compiled. This allows specific linkage time treatment of + certain languages. + + Raises LinkError on failure. + """ + raise NotImplementedError + + # Old 'link_*()' methods, rewritten to use the new 'link()' method. + + def link_shared_lib( + self, + objects, + output_libname, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + self.link( + CCompiler.SHARED_LIBRARY, + objects, + self.library_filename(output_libname, lib_type='shared'), + output_dir, + libraries, + library_dirs, + runtime_library_dirs, + export_symbols, + debug, + extra_preargs, + extra_postargs, + build_temp, + target_lang, + ) + + def link_shared_object( + self, + objects, + output_filename, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + self.link( + CCompiler.SHARED_OBJECT, + objects, + output_filename, + output_dir, + libraries, + library_dirs, + runtime_library_dirs, + export_symbols, + debug, + extra_preargs, + extra_postargs, + build_temp, + target_lang, + ) + + def link_executable( + self, + objects, + output_progname, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + target_lang=None, + ): + self.link( + CCompiler.EXECUTABLE, + objects, + self.executable_filename(output_progname), + output_dir, + libraries, + library_dirs, + runtime_library_dirs, + None, + debug, + extra_preargs, + extra_postargs, + None, + target_lang, + ) + + # -- Miscellaneous methods ----------------------------------------- + # These are all used by the 'gen_lib_options() function; there is + # no appropriate default implementation so subclasses should + # implement all of these. + + def library_dir_option(self, dir): + """Return the compiler option to add 'dir' to the list of + directories searched for libraries. + """ + raise NotImplementedError + + def runtime_library_dir_option(self, dir): + """Return the compiler option to add 'dir' to the list of + directories searched for runtime libraries. + """ + raise NotImplementedError + + def library_option(self, lib): + """Return the compiler option to add 'lib' to the list of libraries + linked into the shared library or executable. + """ + raise NotImplementedError + + def has_function( # noqa: C901 + self, + funcname, + includes=None, + include_dirs=None, + libraries=None, + library_dirs=None, + ): + """Return a boolean indicating whether funcname is supported on + the current platform. The optional arguments can be used to + augment the compilation environment. + """ + # this can't be included at module scope because it tries to + # import math which might not be available at that point - maybe + # the necessary logic should just be inlined? + import tempfile + + if includes is None: + includes = [] + if include_dirs is None: + include_dirs = [] + if libraries is None: + libraries = [] + if library_dirs is None: + library_dirs = [] + fd, fname = tempfile.mkstemp(".c", funcname, text=True) + f = os.fdopen(fd, "w") + try: + for incl in includes: + f.write("""#include "%s"\n""" % incl) + f.write( + """\ +int main (int argc, char **argv) { + %s(); + return 0; +} +""" + % funcname + ) + finally: + f.close() + try: + objects = self.compile([fname], include_dirs=include_dirs) + except CompileError: + return False + finally: + os.remove(fname) + + try: + self.link_executable( + objects, "a.out", libraries=libraries, library_dirs=library_dirs + ) + except (LinkError, TypeError): + return False + else: + os.remove(os.path.join(self.output_dir or '', "a.out")) + finally: + for fn in objects: + os.remove(fn) + return True + + def find_library_file(self, dirs, lib, debug=0): + """Search the specified list of directories for a static or shared + library file 'lib' and return the full path to that file. If + 'debug' true, look for a debugging version (if that makes sense on + the current platform). Return None if 'lib' wasn't found in any of + the specified directories. + """ + raise NotImplementedError + + # -- Filename generation methods ----------------------------------- + + # The default implementation of the filename generating methods are + # prejudiced towards the Unix/DOS/Windows view of the world: + # * object files are named by replacing the source file extension + # (eg. .c/.cpp -> .o/.obj) + # * library files (shared or static) are named by plugging the + # library name and extension into a format string, eg. + # "lib%s.%s" % (lib_name, ".a") for Unix static libraries + # * executables are named by appending an extension (possibly + # empty) to the program name: eg. progname + ".exe" for + # Windows + # + # To reduce redundant code, these methods expect to find + # several attributes in the current object (presumably defined + # as class attributes): + # * src_extensions - + # list of C/C++ source file extensions, eg. ['.c', '.cpp'] + # * obj_extension - + # object file extension, eg. '.o' or '.obj' + # * static_lib_extension - + # extension for static library files, eg. '.a' or '.lib' + # * shared_lib_extension - + # extension for shared library/object files, eg. '.so', '.dll' + # * static_lib_format - + # format string for generating static library filenames, + # eg. 'lib%s.%s' or '%s.%s' + # * shared_lib_format + # format string for generating shared library filenames + # (probably same as static_lib_format, since the extension + # is one of the intended parameters to the format string) + # * exe_extension - + # extension for executable files, eg. '' or '.exe' + + def object_filenames(self, source_filenames, strip_dir=0, output_dir=''): + if output_dir is None: + output_dir = '' + return list( + self._make_out_path(output_dir, strip_dir, src_name) + for src_name in source_filenames + ) + + @property + def out_extensions(self): + return dict.fromkeys(self.src_extensions, self.obj_extension) + + def _make_out_path(self, output_dir, strip_dir, src_name): + base, ext = os.path.splitext(src_name) + base = self._make_relative(base) + try: + new_ext = self.out_extensions[ext] + except LookupError: + raise UnknownFileError( + "unknown file type '{}' (from '{}')".format(ext, src_name) + ) + if strip_dir: + base = os.path.basename(base) + return os.path.join(output_dir, base + new_ext) + + @staticmethod + def _make_relative(base): + """ + In order to ensure that a filename always honors the + indicated output_dir, make sure it's relative. + Ref python/cpython#37775. + """ + # Chop off the drive + no_drive = os.path.splitdrive(base)[1] + # If abs, chop off leading / + return no_drive[os.path.isabs(no_drive) :] + + def shared_object_filename(self, basename, strip_dir=0, output_dir=''): + assert output_dir is not None + if strip_dir: + basename = os.path.basename(basename) + return os.path.join(output_dir, basename + self.shared_lib_extension) + + def executable_filename(self, basename, strip_dir=0, output_dir=''): + assert output_dir is not None + if strip_dir: + basename = os.path.basename(basename) + return os.path.join(output_dir, basename + (self.exe_extension or '')) + + def library_filename( + self, libname, lib_type='static', strip_dir=0, output_dir='' # or 'shared' + ): + assert output_dir is not None + expected = '"static", "shared", "dylib", "xcode_stub"' + if lib_type not in eval(expected): + raise ValueError(f"'lib_type' must be {expected}") + fmt = getattr(self, lib_type + "_lib_format") + ext = getattr(self, lib_type + "_lib_extension") + + dir, base = os.path.split(libname) + filename = fmt % (base, ext) + if strip_dir: + dir = '' + + return os.path.join(output_dir, dir, filename) + + # -- Utility methods ----------------------------------------------- + + def announce(self, msg, level=1): + log.debug(msg) + + def debug_print(self, msg): + from distutils.debug import DEBUG + + if DEBUG: + print(msg) + + def warn(self, msg): + sys.stderr.write("warning: %s\n" % msg) + + def execute(self, func, args, msg=None, level=1): + execute(func, args, msg, self.dry_run) + + def spawn(self, cmd, **kwargs): + spawn(cmd, dry_run=self.dry_run, **kwargs) + + def move_file(self, src, dst): + return move_file(src, dst, dry_run=self.dry_run) + + def mkpath(self, name, mode=0o777): + mkpath(name, mode, dry_run=self.dry_run) + + +# Map a sys.platform/os.name ('posix', 'nt') to the default compiler +# type for that platform. Keys are interpreted as re match +# patterns. Order is important; platform mappings are preferred over +# OS names. +_default_compilers = ( + # Platform string mappings + # on a cygwin built python we can use gcc like an ordinary UNIXish + # compiler + ('cygwin.*', 'unix'), + # OS name mappings + ('posix', 'unix'), + ('nt', 'msvc'), ) -from .compilers.C.errors import CompileError, LinkError - -__all__ = [ - 'CompileError', - 'LinkError', - 'gen_lib_options', - 'gen_preprocess_options', - 'get_default_compiler', - 'new_compiler', - 'show_compilers', -] -CCompiler = base.Compiler +def get_default_compiler(osname=None, platform=None): + """Determine the default compiler to use for the given platform. + + osname should be one of the standard Python OS names (i.e. the + ones returned by os.name) and platform the common value + returned by sys.platform for the platform in question. + + The default values are os.name and sys.platform in case the + parameters are not given. + """ + if osname is None: + osname = os.name + if platform is None: + platform = sys.platform + for pattern, compiler in _default_compilers: + if ( + re.match(pattern, platform) is not None + or re.match(pattern, osname) is not None + ): + return compiler + # Default to Unix compiler + return 'unix' + + +# Map compiler types to (module_name, class_name) pairs -- ie. where to +# find the code that implements an interface to this compiler. (The module +# is assumed to be in the 'distutils' package.) +compiler_class = { + 'unix': ('unixccompiler', 'UnixCCompiler', "standard UNIX-style compiler"), + 'msvc': ('_msvccompiler', 'MSVCCompiler', "Microsoft Visual C++"), + 'cygwin': ( + 'cygwinccompiler', + 'CygwinCCompiler', + "Cygwin port of GNU C Compiler for Win32", + ), + 'mingw32': ( + 'cygwinccompiler', + 'Mingw32CCompiler', + "Mingw32 port of GNU C Compiler for Win32", + ), + 'bcpp': ('bcppcompiler', 'BCPPCompiler', "Borland C++ Compiler"), +} + + +def show_compilers(): + """Print list of available compilers (used by the "--help-compiler" + options to "build", "build_ext", "build_clib"). + """ + # XXX this "knows" that the compiler option it's describing is + # "--compiler", which just happens to be the case for the three + # commands that use it. + from distutils.fancy_getopt import FancyGetopt + + compilers = [] + for compiler in compiler_class.keys(): + compilers.append(("compiler=" + compiler, None, compiler_class[compiler][2])) + compilers.sort() + pretty_printer = FancyGetopt(compilers) + pretty_printer.print_help("List of available compilers:") + + +def new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0): + """Generate an instance of some CCompiler subclass for the supplied + platform/compiler combination. 'plat' defaults to 'os.name' + (eg. 'posix', 'nt'), and 'compiler' defaults to the default compiler + for that platform. Currently only 'posix' and 'nt' are supported, and + the default compilers are "traditional Unix interface" (UnixCCompiler + class) and Visual C++ (MSVCCompiler class). Note that it's perfectly + possible to ask for a Unix compiler object under Windows, and a + Microsoft compiler object under Unix -- if you supply a value for + 'compiler', 'plat' is ignored. + """ + if plat is None: + plat = os.name + + try: + if compiler is None: + compiler = get_default_compiler(plat) + + (module_name, class_name, long_description) = compiler_class[compiler] + except KeyError: + msg = "don't know how to compile C/C++ code on platform '%s'" % plat + if compiler is not None: + msg = msg + " with '%s' compiler" % compiler + raise DistutilsPlatformError(msg) + + try: + module_name = "distutils." + module_name + __import__(module_name) + module = sys.modules[module_name] + klass = vars(module)[class_name] + except ImportError: + raise DistutilsModuleError( + "can't compile C/C++ code: unable to load module '%s'" % module_name + ) + except KeyError: + raise DistutilsModuleError( + "can't compile C/C++ code: unable to find class '%s' " + "in module '%s'" % (class_name, module_name) + ) + + # XXX The None is necessary to preserve backwards compatibility + # with classes that expect verbose to be the first positional + # argument. + return klass(None, dry_run, force) + + +def gen_preprocess_options(macros, include_dirs): + """Generate C pre-processor options (-D, -U, -I) as used by at least + two types of compilers: the typical Unix compiler and Visual C++. + 'macros' is the usual thing, a list of 1- or 2-tuples, where (name,) + means undefine (-U) macro 'name', and (name,value) means define (-D) + macro 'name' to 'value'. 'include_dirs' is just a list of directory + names to be added to the header file search path (-I). Returns a list + of command-line options suitable for either Unix compilers or Visual + C++. + """ + # XXX it would be nice (mainly aesthetic, and so we don't generate + # stupid-looking command lines) to go over 'macros' and eliminate + # redundant definitions/undefinitions (ie. ensure that only the + # latest mention of a particular macro winds up on the command + # line). I don't think it's essential, though, since most (all?) + # Unix C compilers only pay attention to the latest -D or -U + # mention of a macro on their command line. Similar situation for + # 'include_dirs'. I'm punting on both for now. Anyways, weeding out + # redundancies like this should probably be the province of + # CCompiler, since the data structures used are inherited from it + # and therefore common to all CCompiler classes. + pp_opts = [] + for macro in macros: + if not (isinstance(macro, tuple) and 1 <= len(macro) <= 2): + raise TypeError( + "bad macro definition '%s': " + "each element of 'macros' list must be a 1- or 2-tuple" % macro + ) + + if len(macro) == 1: # undefine this macro + pp_opts.append("-U%s" % macro[0]) + elif len(macro) == 2: + if macro[1] is None: # define with no explicit value + pp_opts.append("-D%s" % macro[0]) + else: + # XXX *don't* need to be clever about quoting the + # macro value here, because we're going to avoid the + # shell at all costs when we spawn the command! + pp_opts.append("-D%s=%s" % macro) + + for dir in include_dirs: + pp_opts.append("-I%s" % dir) + return pp_opts + + +def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries): + """Generate linker options for searching library directories and + linking with specific libraries. 'libraries' and 'library_dirs' are, + respectively, lists of library names (not filenames!) and search + directories. Returns a list of command-line options suitable for use + with some compiler (depending on the two format strings passed in). + """ + lib_opts = [] + + for dir in library_dirs: + lib_opts.append(compiler.library_dir_option(dir)) + + for dir in runtime_library_dirs: + opt = compiler.runtime_library_dir_option(dir) + if isinstance(opt, list): + lib_opts = lib_opts + opt + else: + lib_opts.append(opt) + + # XXX it's important that we *not* remove redundant library mentions! + # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to + # resolve all symbols. I just hope we never have to say "-lfoo obj.o + # -lbar" to get things to work -- that's certainly a possibility, but a + # pretty nasty way to arrange your C code. + + for lib in libraries: + (lib_dir, lib_name) = os.path.split(lib) + if lib_dir: + lib_file = compiler.find_library_file([lib_dir], lib_name) + if lib_file: + lib_opts.append(lib_file) + else: + compiler.warn( + "no library file corresponding to " "'%s' found (skipping)" % lib + ) + else: + lib_opts.append(compiler.library_option(lib)) + return lib_opts diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cmd.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cmd.py index 241621b..68a9267 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cmd.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cmd.py @@ -4,31 +4,12 @@ Provides the Command class, the base class for the command classes in the distutils.command package. """ -from __future__ import annotations - -import logging +import sys import os import re -import sys -from abc import abstractmethod -from collections.abc import Callable, MutableSequence -from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, overload - -from . import _modified, archive_util, dir_util, file_util, util -from ._log import log -from .errors import DistutilsOptionError - -if TYPE_CHECKING: - # type-only import because of mutual dependence between these classes - from distutils.dist import Distribution - - from typing_extensions import TypeVarTuple, Unpack - - _Ts = TypeVarTuple("_Ts") - -_StrPathT = TypeVar("_StrPathT", bound="str | os.PathLike[str]") -_BytesPathT = TypeVar("_BytesPathT", bound="bytes | os.PathLike[bytes]") -_CommandT = TypeVar("_CommandT", bound="Command") +from distutils.errors import DistutilsOptionError +from distutils import util, dir_util, file_util, archive_util, dep_util +from distutils import log class Command: @@ -61,18 +42,11 @@ class Command: # 'sub_commands' is usually defined at the *end* of a class, because # predicates can be unbound methods, so they must already have been # defined. The canonical example is the "install" command. - sub_commands: ClassVar[ # Any to work around variance issues - list[tuple[str, Callable[[Any], bool] | None]] - ] = [] - - user_options: ClassVar[ - # Specifying both because list is invariant. Avoids mypy override assignment issues - list[tuple[str, str, str]] | list[tuple[str, str | None, str]] - ] = [] + sub_commands = [] # -- Creation/initialization methods ------------------------------- - def __init__(self, dist: Distribution) -> None: + def __init__(self, dist): """Create and initialize a new Command object. Most importantly, invokes the 'initialize_options()' method, which is the real initializer and depends on the actual command being @@ -111,13 +85,13 @@ class Command: # The 'help' flag is just used for command-line parsing, so # none of that complicated bureaucracy is needed. - self.help = False + self.help = 0 # 'finalized' records whether or not 'finalize_options()' has been # called. 'finalize_options()' itself should not pay attention to # this flag: it is the business of 'ensure_finalized()', which # always calls 'finalize_options()', to respect/update it. - self.finalized = False + self.finalized = 0 # XXX A more explicit way to customize dry_run would be better. def __getattr__(self, attr): @@ -130,10 +104,10 @@ class Command: else: raise AttributeError(attr) - def ensure_finalized(self) -> None: + def ensure_finalized(self): if not self.finalized: self.finalize_options() - self.finalized = True + self.finalized = 1 # Subclasses must define: # initialize_options() @@ -148,8 +122,7 @@ class Command: # run the command: do whatever it is we're here to do, # controlled by the command's various option values - @abstractmethod - def initialize_options(self) -> None: + def initialize_options(self): """Set default values for all the options that this command supports. Note that these defaults may be overridden by other commands, by the setup script, by config files, or by the @@ -160,11 +133,10 @@ class Command: This method must be implemented by all command classes. """ raise RuntimeError( - f"abstract method -- subclass {self.__class__} must override" + "abstract method -- subclass %s must override" % self.__class__ ) - @abstractmethod - def finalize_options(self) -> None: + def finalize_options(self): """Set final values for all the options that this command supports. This is always called as late as possible, ie. after any option assignments from the command-line or from other commands have been @@ -176,25 +148,24 @@ class Command: This method must be implemented by all command classes. """ raise RuntimeError( - f"abstract method -- subclass {self.__class__} must override" + "abstract method -- subclass %s must override" % self.__class__ ) def dump_options(self, header=None, indent=""): from distutils.fancy_getopt import longopt_xlate if header is None: - header = f"command options for '{self.get_command_name()}':" - self.announce(indent + header, level=logging.INFO) + header = "command options for '%s':" % self.get_command_name() + self.announce(indent + header, level=log.INFO) indent = indent + " " - for option, _, _ in self.user_options: + for (option, _, _) in self.user_options: option = option.translate(longopt_xlate) if option[-1] == "=": option = option[:-1] value = getattr(self, option) - self.announce(indent + f"{option} = {value}", level=logging.INFO) + self.announce(indent + "{} = {}".format(option, value), level=log.INFO) - @abstractmethod - def run(self) -> None: + def run(self): """A command's raison d'etre: carry out the action it exists to perform, controlled by the options initialized in 'initialize_options()', customized by other commands, the setup @@ -205,13 +176,16 @@ class Command: This method must be implemented by all command classes. """ raise RuntimeError( - f"abstract method -- subclass {self.__class__} must override" + "abstract method -- subclass %s must override" % self.__class__ ) - def announce(self, msg: object, level: int = logging.DEBUG) -> None: + def announce(self, msg, level=1): + """If the current verbosity level is of greater than or equal to + 'level' print 'msg' to stdout. + """ log.log(level, msg) - def debug_print(self, msg: object) -> None: + def debug_print(self, msg): """Print 'msg' to stdout if the global DEBUG (taken from the DISTUTILS_DEBUG environment variable) flag is true. """ @@ -240,16 +214,18 @@ class Command: setattr(self, option, default) return default elif not isinstance(val, str): - raise DistutilsOptionError(f"'{option}' must be a {what} (got `{val}`)") + raise DistutilsOptionError( + "'{}' must be a {} (got `{}`)".format(option, what, val) + ) return val - def ensure_string(self, option: str, default: str | None = None) -> None: + def ensure_string(self, option, default=None): """Ensure that 'option' is a string; if not defined, set it to 'default'. """ self._ensure_stringlike(option, "string", default) - def ensure_string_list(self, option: str) -> None: + def ensure_string_list(self, option): r"""Ensure that 'option' is a list of strings. If 'option' is currently a string, we split it either on /,\s*/ or /\s+/, so "foo bar baz", "foo,bar,baz", and "foo, bar baz" all become @@ -267,7 +243,7 @@ class Command: ok = False if not ok: raise DistutilsOptionError( - f"'{option}' must be a list of strings (got {val!r})" + "'{}' must be a list of strings (got {!r})".format(option, val) ) def _ensure_tested_string(self, option, tester, what, error_fmt, default=None): @@ -277,13 +253,13 @@ class Command: ("error in '%s' option: " + error_fmt) % (option, val) ) - def ensure_filename(self, option: str) -> None: + def ensure_filename(self, option): """Ensure that 'option' is the name of an existing file.""" self._ensure_tested_string( option, os.path.isfile, "filename", "'%s' does not exist or is not a file" ) - def ensure_dirname(self, option: str) -> None: + def ensure_dirname(self, option): self._ensure_tested_string( option, os.path.isdir, @@ -293,15 +269,13 @@ class Command: # -- Convenience methods for commands ------------------------------ - def get_command_name(self) -> str: + def get_command_name(self): if hasattr(self, 'command_name'): return self.command_name else: return self.__class__.__name__ - def set_undefined_options( - self, src_cmd: str, *option_pairs: tuple[str, str] - ) -> None: + def set_undefined_options(self, src_cmd, *option_pairs): """Set the values of any "undefined" options from corresponding option values in some other command object. "Undefined" here means "is None", which is the convention used to indicate that an option @@ -318,13 +292,11 @@ class Command: # Option_pairs: list of (src_option, dst_option) tuples src_cmd_obj = self.distribution.get_command_obj(src_cmd) src_cmd_obj.ensure_finalized() - for src_option, dst_option in option_pairs: + for (src_option, dst_option) in option_pairs: if getattr(self, dst_option) is None: setattr(self, dst_option, getattr(src_cmd_obj, src_option)) - # NOTE: Because distutils is private to Setuptools and not all commands are exposed here, - # not every possible command is enumerated in the signature. - def get_finalized_command(self, command: str, create: bool = True) -> Command: + def get_finalized_command(self, command, create=1): """Wrapper around Distribution's 'get_command_obj()' method: find (create if necessary and 'create' is true) the command object for 'command', call its 'ensure_finalized()' method, and return the @@ -336,27 +308,17 @@ class Command: # XXX rename to 'get_reinitialized_command()'? (should do the # same in dist.py, if so) - @overload - def reinitialize_command( - self, command: str, reinit_subcommands: bool = False - ) -> Command: ... - @overload - def reinitialize_command( - self, command: _CommandT, reinit_subcommands: bool = False - ) -> _CommandT: ... - def reinitialize_command( - self, command: str | Command, reinit_subcommands=False - ) -> Command: + def reinitialize_command(self, command, reinit_subcommands=0): return self.distribution.reinitialize_command(command, reinit_subcommands) - def run_command(self, command: str) -> None: + def run_command(self, command): """Run some other command: uses the 'run_command()' method of Distribution, which creates and finalizes the command object if necessary and then invokes its 'run()' method. """ self.distribution.run_command(command) - def get_sub_commands(self) -> list[str]: + def get_sub_commands(self): """Determine the sub-commands that are relevant in the current distribution (ie., that need to be run). This is based on the 'sub_commands' class attribute: each tuple in that list may include @@ -364,57 +326,25 @@ class Command: run for the current distribution. Return a list of command names. """ commands = [] - for cmd_name, method in self.sub_commands: + for (cmd_name, method) in self.sub_commands: if method is None or method(self): commands.append(cmd_name) return commands # -- External world manipulation ----------------------------------- - def warn(self, msg: object) -> None: - log.warning("warning: %s: %s\n", self.get_command_name(), msg) + def warn(self, msg): + log.warn("warning: %s: %s\n", self.get_command_name(), msg) - def execute( - self, - func: Callable[[Unpack[_Ts]], object], - args: tuple[Unpack[_Ts]], - msg: object = None, - level: int = 1, - ) -> None: + def execute(self, func, args, msg=None, level=1): util.execute(func, args, msg, dry_run=self.dry_run) - def mkpath(self, name: str, mode: int = 0o777) -> None: + def mkpath(self, name, mode=0o777): dir_util.mkpath(name, mode, dry_run=self.dry_run) - @overload def copy_file( - self, - infile: str | os.PathLike[str], - outfile: _StrPathT, - preserve_mode: bool = True, - preserve_times: bool = True, - link: str | None = None, - level: int = 1, - ) -> tuple[_StrPathT | str, bool]: ... - @overload - def copy_file( - self, - infile: bytes | os.PathLike[bytes], - outfile: _BytesPathT, - preserve_mode: bool = True, - preserve_times: bool = True, - link: str | None = None, - level: int = 1, - ) -> tuple[_BytesPathT | bytes, bool]: ... - def copy_file( - self, - infile: str | os.PathLike[str] | bytes | os.PathLike[bytes], - outfile: str | os.PathLike[str] | bytes | os.PathLike[bytes], - preserve_mode: bool = True, - preserve_times: bool = True, - link: str | None = None, - level: int = 1, - ) -> tuple[str | os.PathLike[str] | bytes | os.PathLike[bytes], bool]: + self, infile, outfile, preserve_mode=1, preserve_times=1, link=None, level=1 + ): """Copy a file respecting verbose, dry-run and force flags. (The former two default to whatever is in the Distribution object, and the latter defaults to false for commands that don't define it.)""" @@ -430,13 +360,13 @@ class Command: def copy_tree( self, - infile: str | os.PathLike[str], - outfile: str, - preserve_mode: bool = True, - preserve_times: bool = True, - preserve_symlinks: bool = False, - level: int = 1, - ) -> list[str]: + infile, + outfile, + preserve_mode=1, + preserve_times=1, + preserve_symlinks=0, + level=1, + ): """Copy an entire directory tree respecting verbose, dry-run, and force flags. """ @@ -450,60 +380,19 @@ class Command: dry_run=self.dry_run, ) - @overload - def move_file( - self, src: str | os.PathLike[str], dst: _StrPathT, level: int = 1 - ) -> _StrPathT | str: ... - @overload - def move_file( - self, src: bytes | os.PathLike[bytes], dst: _BytesPathT, level: int = 1 - ) -> _BytesPathT | bytes: ... - def move_file( - self, - src: str | os.PathLike[str] | bytes | os.PathLike[bytes], - dst: str | os.PathLike[str] | bytes | os.PathLike[bytes], - level: int = 1, - ) -> str | os.PathLike[str] | bytes | os.PathLike[bytes]: + def move_file(self, src, dst, level=1): """Move a file respecting dry-run flag.""" return file_util.move_file(src, dst, dry_run=self.dry_run) - def spawn( - self, cmd: MutableSequence[str], search_path: bool = True, level: int = 1 - ) -> None: + def spawn(self, cmd, search_path=1, level=1): """Spawn an external command respecting dry-run flag.""" from distutils.spawn import spawn spawn(cmd, search_path, dry_run=self.dry_run) - @overload def make_archive( - self, - base_name: str, - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes] | None = None, - base_dir: str | None = None, - owner: str | None = None, - group: str | None = None, - ) -> str: ... - @overload - def make_archive( - self, - base_name: str | os.PathLike[str], - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes], - base_dir: str | None = None, - owner: str | None = None, - group: str | None = None, - ) -> str: ... - def make_archive( - self, - base_name: str | os.PathLike[str], - format: str, - root_dir: str | os.PathLike[str] | bytes | os.PathLike[bytes] | None = None, - base_dir: str | None = None, - owner: str | None = None, - group: str | None = None, - ) -> str: + self, base_name, format, root_dir=None, base_dir=None, owner=None, group=None + ): return archive_util.make_archive( base_name, format, @@ -515,15 +404,8 @@ class Command: ) def make_file( - self, - infiles: str | list[str] | tuple[str, ...], - outfile: str | os.PathLike[str] | bytes | os.PathLike[bytes], - func: Callable[[Unpack[_Ts]], object], - args: tuple[Unpack[_Ts]], - exec_msg: object = None, - skip_msg: object = None, - level: int = 1, - ) -> None: + self, infiles, outfile, func, args, exec_msg=None, skip_msg=None, level=1 + ): """Special case of 'execute()' for operations that process one or more input files and generate one output file. Works just like 'execute()', except the operation is skipped and a different @@ -533,7 +415,7 @@ class Command: timestamp checks. """ if skip_msg is None: - skip_msg = f"skipping {outfile} (inputs unchanged)" + skip_msg = "skipping %s (inputs unchanged)" % outfile # Allow 'infiles' to be a single string if isinstance(infiles, str): @@ -547,7 +429,7 @@ class Command: # If 'outfile' must be regenerated (either because it doesn't # exist, is out-of-date, or the 'force' flag is true) then # perform the action that presumably regenerates it - if self.force or _modified.newer_group(infiles, outfile): + if self.force or dep_util.newer_group(infiles, outfile): self.execute(func, args, exec_msg, level) # Otherwise, print the "skip" message else: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__init__.py index 0f8a169..028dcfa 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__init__.py @@ -3,7 +3,7 @@ Package containing implementation of all the standard Distutils commands.""" -__all__ = [ +__all__ = [ # noqa: F822 'build', 'build_py', 'build_ext', @@ -16,8 +16,10 @@ __all__ = [ 'install_scripts', 'install_data', 'sdist', + 'register', 'bdist', 'bdist_dumb', 'bdist_rpm', 'check', + 'upload', ] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/__init__.cpython-311.pyc index 18fb7e3..f1b55a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/_framework_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/_framework_compat.cpython-311.pyc index 9b1d1ba..4bb3baa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/_framework_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/_framework_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist.cpython-311.pyc index 114b95c..a2cf9e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_dumb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_dumb.cpython-311.pyc index 15f7628..dfc82ad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_dumb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_dumb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_rpm.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_rpm.cpython-311.pyc index d2aa53f..443aa4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_rpm.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/bdist_rpm.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build.cpython-311.pyc index 69e3d5b..0b0d944 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_clib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_clib.cpython-311.pyc index d391077..abe3189 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_clib.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_clib.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_ext.cpython-311.pyc index 0ded8b0..f400cb7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_py.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_py.cpython-311.pyc index 283e68b..c6dae1f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_py.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_py.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_scripts.cpython-311.pyc index 1ca75ff..c45d606 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_scripts.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/build_scripts.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/check.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/check.cpython-311.pyc index 139fc8c..b9ee744 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/check.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/check.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/clean.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/clean.cpython-311.pyc index 73278ca..7364bf2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/clean.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/clean.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/config.cpython-311.pyc index 819154c..2f8c05b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install.cpython-311.pyc index 9e58bc0..08bc0af 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_data.cpython-311.pyc index c25e85f..51056bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_data.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_data.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_egg_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_egg_info.cpython-311.pyc index b7a900b..70b8c3b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_egg_info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_egg_info.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_headers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_headers.cpython-311.pyc index 50b2e03..1566637 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_headers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_headers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_lib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_lib.cpython-311.pyc index 25783b7..75f4611 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_lib.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_lib.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_scripts.cpython-311.pyc index eccd0e1..dd38432 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_scripts.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/install_scripts.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/sdist.cpython-311.pyc index 701ac33..a71e1fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/sdist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/__pycache__/sdist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/_framework_compat.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/_framework_compat.py index 00d34bc..cffa27c 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/_framework_compat.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/_framework_compat.py @@ -2,14 +2,15 @@ Backward compatibility for homebrew builds on macOS. """ -import functools -import os -import subprocess + import sys +import os +import functools +import subprocess import sysconfig -@functools.lru_cache +@functools.lru_cache() def enabled(): """ Only enabled for Python 3.9 framework homebrew builds @@ -37,7 +38,7 @@ schemes = dict( ) -@functools.lru_cache +@functools.lru_cache() def vars(): if not enabled(): return {} diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist.py index 07811aa..de37dae 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist.py @@ -3,49 +3,37 @@ Implements the Distutils 'bdist' command (create a built [binary] distribution).""" -from __future__ import annotations - import os import warnings -from collections.abc import Callable -from typing import TYPE_CHECKING, ClassVar -from ..core import Command -from ..errors import DistutilsOptionError, DistutilsPlatformError -from ..util import get_platform - -if TYPE_CHECKING: - from typing_extensions import deprecated -else: - - def deprecated(message): - return lambda fn: fn +from distutils.core import Command +from distutils.errors import DistutilsPlatformError, DistutilsOptionError +from distutils.util import get_platform def show_formats(): """Print list of available formats (arguments to "--format" option).""" - from ..fancy_getopt import FancyGetopt + from distutils.fancy_getopt import FancyGetopt - formats = [ - ("formats=" + format, None, bdist.format_commands[format][1]) - for format in bdist.format_commands - ] + formats = [] + for format in bdist.format_commands: + formats.append(("formats=" + format, None, bdist.format_commands[format][1])) pretty_printer = FancyGetopt(formats) pretty_printer.print_help("List of available distribution formats:") -class ListCompat(dict[str, tuple[str, str]]): +class ListCompat(dict): # adapter to allow for Setuptools compatibility in format_commands - @deprecated("format_commands is now a dict. append is deprecated.") - def append(self, item: object) -> None: + def append(self, item): warnings.warn( - "format_commands is now a dict. append is deprecated.", + """format_commands is now a dict. append is deprecated.""", DeprecationWarning, stacklevel=2, ) class bdist(Command): + description = "create a built (binary) distribution" user_options = [ @@ -54,50 +42,52 @@ class bdist(Command): 'plat-name=', 'p', "platform name to embed in generated filenames " - f"[default: {get_platform()}]", + "(default: %s)" % get_platform(), ), ('formats=', None, "formats for distribution (comma-separated list)"), ( 'dist-dir=', 'd', - "directory to put final built distributions in [default: dist]", + "directory to put final built distributions in " "[default: dist]", ), ('skip-build', None, "skip rebuilding everything (for testing/debugging)"), ( 'owner=', 'u', - "Owner name used when creating a tar file [default: current user]", + "Owner name used when creating a tar file" " [default: current user]", ), ( 'group=', 'g', - "Group name used when creating a tar file [default: current group]", + "Group name used when creating a tar file" " [default: current group]", ), ] - boolean_options: ClassVar[list[str]] = ['skip-build'] + boolean_options = ['skip-build'] - help_options: ClassVar[list[tuple[str, str | None, str, Callable[[], object]]]] = [ + help_options = [ ('help-formats', None, "lists available distribution formats", show_formats), ] # The following commands do not take a format option from bdist - no_format_option: ClassVar[tuple[str, ...]] = ('bdist_rpm',) + no_format_option = ('bdist_rpm',) # This won't do in reality: will need to distinguish RPM-ish Linux, # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS. - default_format: ClassVar[dict[str, str]] = {'posix': 'gztar', 'nt': 'zip'} + default_format = {'posix': 'gztar', 'nt': 'zip'} # Define commands in preferred order for the --help-formats option - format_commands = ListCompat({ - 'rpm': ('bdist_rpm', "RPM distribution"), - 'gztar': ('bdist_dumb', "gzip'ed tar file"), - 'bztar': ('bdist_dumb', "bzip2'ed tar file"), - 'xztar': ('bdist_dumb', "xz'ed tar file"), - 'ztar': ('bdist_dumb', "compressed tar file"), - 'tar': ('bdist_dumb', "tar file"), - 'zip': ('bdist_dumb', "ZIP file"), - }) + format_commands = ListCompat( + { + 'rpm': ('bdist_rpm', "RPM distribution"), + 'gztar': ('bdist_dumb', "gzip'ed tar file"), + 'bztar': ('bdist_dumb', "bzip2'ed tar file"), + 'xztar': ('bdist_dumb', "xz'ed tar file"), + 'ztar': ('bdist_dumb', "compressed tar file"), + 'tar': ('bdist_dumb', "tar file"), + 'zip': ('bdist_dumb', "ZIP file"), + } + ) # for compatibility until consumers only reference format_commands format_command = format_commands @@ -107,11 +97,11 @@ class bdist(Command): self.plat_name = None self.formats = None self.dist_dir = None - self.skip_build = False + self.skip_build = 0 self.group = None self.owner = None - def finalize_options(self) -> None: + def finalize_options(self): # have to finalize 'plat_name' before 'bdist_base' if self.plat_name is None: if self.skip_build: @@ -133,20 +123,20 @@ class bdist(Command): except KeyError: raise DistutilsPlatformError( "don't know how to create built distributions " - f"on platform {os.name}" + "on platform %s" % os.name ) if self.dist_dir is None: self.dist_dir = "dist" - def run(self) -> None: + def run(self): # Figure out which sub-commands we need to run. commands = [] for format in self.formats: try: commands.append(self.format_commands[format][0]) except KeyError: - raise DistutilsOptionError(f"invalid format '{format}'") + raise DistutilsOptionError("invalid format '%s'" % format) # Reinitialize and run each command. for i in range(len(self.formats)): @@ -163,5 +153,5 @@ class bdist(Command): # If we're going to need to run this command again, tell it to # keep its temporary files around so subsequent runs go faster. if cmd_name in commands[i + 1 :]: - sub_cmd.keep_temp = True + sub_cmd.keep_temp = 1 self.run_command(cmd_name) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_dumb.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_dumb.py index ccad66f..0f52330 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_dumb.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_dumb.py @@ -5,17 +5,16 @@ distribution -- i.e., just an archive to be unpacked under $prefix or $exec_prefix).""" import os -from distutils._log import log -from typing import ClassVar - -from ..core import Command -from ..dir_util import ensure_relative, remove_tree -from ..errors import DistutilsPlatformError -from ..sysconfig import get_python_version -from ..util import get_platform +from distutils.core import Command +from distutils.util import get_platform +from distutils.dir_util import remove_tree, ensure_relative +from distutils.errors import DistutilsPlatformError +from distutils.sysconfig import get_python_version +from distutils import log class bdist_dumb(Command): + description = "create a \"dumb\" built distribution" user_options = [ @@ -24,38 +23,39 @@ class bdist_dumb(Command): 'plat-name=', 'p', "platform name to embed in generated filenames " - f"[default: {get_platform()}]", + "(default: %s)" % get_platform(), ), ( 'format=', 'f', - "archive format to create (tar, gztar, bztar, xztar, ztar, zip)", + "archive format to create (tar, gztar, bztar, xztar, " "ztar, zip)", ), ( 'keep-temp', 'k', - "keep the pseudo-installation tree around after creating the distribution archive", + "keep the pseudo-installation tree around after " + + "creating the distribution archive", ), ('dist-dir=', 'd', "directory to put final built distributions in"), ('skip-build', None, "skip rebuilding everything (for testing/debugging)"), ( 'relative', None, - "build the archive using relative paths [default: false]", + "build the archive using relative paths " "(default: false)", ), ( 'owner=', 'u', - "Owner name used when creating a tar file [default: current user]", + "Owner name used when creating a tar file" " [default: current user]", ), ( 'group=', 'g', - "Group name used when creating a tar file [default: current group]", + "Group name used when creating a tar file" " [default: current group]", ), ] - boolean_options: ClassVar[list[str]] = ['keep-temp', 'skip-build', 'relative'] + boolean_options = ['keep-temp', 'skip-build', 'relative'] default_format = {'posix': 'gztar', 'nt': 'zip'} @@ -63,10 +63,10 @@ class bdist_dumb(Command): self.bdist_dir = None self.plat_name = None self.format = None - self.keep_temp = False + self.keep_temp = 0 self.dist_dir = None self.skip_build = None - self.relative = False + self.relative = 0 self.owner = None self.group = None @@ -81,7 +81,7 @@ class bdist_dumb(Command): except KeyError: raise DistutilsPlatformError( "don't know how to create dumb built distributions " - f"on platform {os.name}" + "on platform %s" % os.name ) self.set_undefined_options( @@ -95,17 +95,19 @@ class bdist_dumb(Command): if not self.skip_build: self.run_command('build') - install = self.reinitialize_command('install', reinit_subcommands=True) + install = self.reinitialize_command('install', reinit_subcommands=1) install.root = self.bdist_dir install.skip_build = self.skip_build - install.warn_dir = False + install.warn_dir = 0 log.info("installing to %s", self.bdist_dir) self.run_command('install') # And make an archive relative to the root of the # pseudo-installation tree. - archive_basename = f"{self.distribution.get_fullname()}.{self.plat_name}" + archive_basename = "{}.{}".format( + self.distribution.get_fullname(), self.plat_name + ) pseudoinstall_root = os.path.join(self.dist_dir, archive_basename) if not self.relative: @@ -116,7 +118,8 @@ class bdist_dumb(Command): ): raise DistutilsPlatformError( "can't make a dumb built distribution where " - f"base and platbase are different ({install.install_base!r}, {install.install_platbase!r})" + "base and platbase are different (%s, %s)" + % (repr(install.install_base), repr(install.install_platbase)) ) else: archive_root = os.path.join( diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_rpm.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_rpm.py index 357b4e8..6a50ef3 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_rpm.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/bdist_rpm.py @@ -3,25 +3,25 @@ Implements the Distutils 'bdist_rpm' command (create RPM source and binary distributions).""" -import os import subprocess import sys -from distutils._log import log -from typing import ClassVar +import os -from ..core import Command -from ..debug import DEBUG -from ..errors import ( - DistutilsExecError, - DistutilsFileError, +from distutils.core import Command +from distutils.debug import DEBUG +from distutils.file_util import write_file +from distutils.errors import ( DistutilsOptionError, DistutilsPlatformError, + DistutilsFileError, + DistutilsExecError, ) -from ..file_util import write_file -from ..sysconfig import get_python_version +from distutils.sysconfig import get_python_version +from distutils import log class bdist_rpm(Command): + description = "create an RPM distribution" user_options = [ @@ -35,13 +35,13 @@ class bdist_rpm(Command): ( 'dist-dir=', 'd', - "directory to put final RPM files in (and .spec files if --spec-only)", + "directory to put final RPM files in " "(and .spec files if --spec-only)", ), ( 'python=', None, "path to Python interpreter to hard-code in the .spec file " - "[default: \"python\"]", + "(default: \"python\")", ), ( 'fix-python', @@ -76,7 +76,7 @@ class bdist_rpm(Command): ( 'packager=', None, - "RPM packager (eg. \"Jane Doe \") [default: vendor]", + "RPM packager (eg. \"Jane Doe \") " "[default: vendor]", ), ('doc-files=', None, "list of documentation files (space or comma-separated)"), ('changelog=', None, "RPM changelog"), @@ -137,7 +137,7 @@ class bdist_rpm(Command): ('quiet', 'q', "Run the INSTALL phase of RPM building in quiet mode"), ] - boolean_options: ClassVar[list[str]] = [ + boolean_options = [ 'keep-temp', 'use-rpm-opt-flags', 'rpm3-mode', @@ -145,7 +145,7 @@ class bdist_rpm(Command): 'quiet', ] - negative_opt: ClassVar[dict[str, str]] = { + negative_opt = { 'no-keep-temp': 'keep-temp', 'no-rpm-opt-flags': 'use-rpm-opt-flags', 'rpm2-mode': 'rpm3-mode', @@ -188,15 +188,15 @@ class bdist_rpm(Command): self.build_requires = None self.obsoletes = None - self.keep_temp = False - self.use_rpm_opt_flags = True - self.rpm3_mode = True - self.no_autoreq = False + self.keep_temp = 0 + self.use_rpm_opt_flags = 1 + self.rpm3_mode = 1 + self.no_autoreq = 0 self.force_arch = None - self.quiet = False + self.quiet = 0 - def finalize_options(self) -> None: + def finalize_options(self): self.set_undefined_options('bdist', ('bdist_base', 'bdist_base')) if self.rpm_base is None: if not self.rpm3_mode: @@ -215,7 +215,7 @@ class bdist_rpm(Command): if os.name != 'posix': raise DistutilsPlatformError( - f"don't know how to create RPM distributions on platform {os.name}" + "don't know how to create RPM " "distributions on platform %s" % os.name ) if self.binary_only and self.source_only: raise DistutilsOptionError( @@ -224,16 +224,17 @@ class bdist_rpm(Command): # don't pass CFLAGS to pure python distributions if not self.distribution.has_ext_modules(): - self.use_rpm_opt_flags = False + self.use_rpm_opt_flags = 0 self.set_undefined_options('bdist', ('dist_dir', 'dist_dir')) self.finalize_package_data() - def finalize_package_data(self) -> None: + def finalize_package_data(self): self.ensure_string('group', "Development/Libraries") self.ensure_string( 'vendor', - f"{self.distribution.get_contact()} <{self.distribution.get_contact_email()}>", + "%s <%s>" + % (self.distribution.get_contact(), self.distribution.get_contact_email()), ) self.ensure_string('packager') self.ensure_string_list('doc_files') @@ -275,7 +276,7 @@ class bdist_rpm(Command): self.ensure_string('force_arch') - def run(self) -> None: # noqa: C901 + def run(self): # noqa: C901 if DEBUG: print("before _get_package_data():") print("vendor =", self.vendor) @@ -296,9 +297,9 @@ class bdist_rpm(Command): # Spec file goes into 'dist_dir' if '--spec-only specified', # build/rpm. otherwise. - spec_path = os.path.join(spec_dir, f"{self.distribution.get_name()}.spec") + spec_path = os.path.join(spec_dir, "%s.spec" % self.distribution.get_name()) self.execute( - write_file, (spec_path, self._make_spec_file()), f"writing '{spec_path}'" + write_file, (spec_path, self._make_spec_file()), "writing '%s'" % spec_path ) if self.spec_only: # stop if requested @@ -323,7 +324,7 @@ class bdist_rpm(Command): if os.path.exists(self.icon): self.copy_file(self.icon, source_dir) else: - raise DistutilsFileError(f"icon file '{self.icon}' does not exist") + raise DistutilsFileError("icon file '%s' does not exist" % self.icon) # build package log.info("building RPMs") @@ -335,9 +336,9 @@ class bdist_rpm(Command): rpm_cmd.append('-bb') else: rpm_cmd.append('-ba') - rpm_cmd.extend(['--define', f'__python {self.python}']) + rpm_cmd.extend(['--define', '__python %s' % self.python]) if self.rpm3_mode: - rpm_cmd.extend(['--define', f'_topdir {os.path.abspath(self.rpm_base)}']) + rpm_cmd.extend(['--define', '_topdir %s' % os.path.abspath(self.rpm_base)]) if not self.keep_temp: rpm_cmd.append('--clean') @@ -352,7 +353,11 @@ class bdist_rpm(Command): nvr_string = "%{name}-%{version}-%{release}" src_rpm = nvr_string + ".src.rpm" non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm" - q_cmd = rf"rpm -q --qf '{src_rpm} {non_src_rpm}\n' --specfile '{spec_path}'" + q_cmd = r"rpm -q --qf '{} {}\n' --specfile '{}'".format( + src_rpm, + non_src_rpm, + spec_path, + ) out = os.popen(q_cmd) try: @@ -371,7 +376,7 @@ class bdist_rpm(Command): status = out.close() if status: - raise DistutilsExecError(f"Failed to execute: {q_cmd!r}") + raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd)) finally: out.close() @@ -397,11 +402,9 @@ class bdist_rpm(Command): if os.path.exists(rpm): self.move_file(rpm, self.dist_dir) filename = os.path.join(self.dist_dir, os.path.basename(rpm)) - self.distribution.dist_files.append(( - 'bdist_rpm', - pyversion, - filename, - )) + self.distribution.dist_files.append( + ('bdist_rpm', pyversion, filename) + ) def _dist_path(self, path): return os.path.join(self.dist_dir, os.path.basename(path)) @@ -426,14 +429,14 @@ class bdist_rpm(Command): # Generate a potential replacement value for __os_install_post (whilst # normalizing the whitespace to simplify the test for whether the # invocation of brp-python-bytecompile passes in __python): - vendor_hook = '\n'.join([ - f' {line.strip()} \\' for line in vendor_hook.splitlines() - ]) + vendor_hook = '\n'.join( + [' %s \\' % line.strip() for line in vendor_hook.splitlines()] + ) problem = "brp-python-bytecompile \\\n" fixed = "brp-python-bytecompile %{__python} \\\n" fixed_hook = vendor_hook.replace(problem, fixed) if fixed_hook != vendor_hook: - spec_file.append('# Workaround for https://bugs.python.org/issue14443') + spec_file.append('# Workaround for http://bugs.python.org/issue14443') spec_file.append('%define __os_install_post ' + fixed_hook + '\n') # put locale summaries into spec file @@ -443,11 +446,13 @@ class bdist_rpm(Command): # spec_file.append('Summary(%s): %s' % (locale, # self.summaries[locale])) - spec_file.extend([ - 'Name: %{name}', - 'Version: %{version}', - 'Release: %{release}', - ]) + spec_file.extend( + [ + 'Name: %{name}', + 'Version: %{version}', + 'Release: %{release}', + ] + ) # XXX yuck! this filename is available from the "sdist" command, # but only after it has run: and we create the spec file before @@ -457,19 +462,21 @@ class bdist_rpm(Command): else: spec_file.append('Source0: %{name}-%{unmangled_version}.tar.gz') - spec_file.extend([ - 'License: ' + (self.distribution.get_license() or "UNKNOWN"), - 'Group: ' + self.group, - 'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot', - 'Prefix: %{_prefix}', - ]) + spec_file.extend( + [ + 'License: ' + (self.distribution.get_license() or "UNKNOWN"), + 'Group: ' + self.group, + 'BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot', + 'Prefix: %{_prefix}', + ] + ) if not self.force_arch: # noarch if no extension modules if not self.distribution.has_ext_modules(): spec_file.append('BuildArch: noarch') else: - spec_file.append(f'BuildArch: {self.force_arch}') + spec_file.append('BuildArch: %s' % self.force_arch) for field in ( 'Vendor', @@ -483,7 +490,7 @@ class bdist_rpm(Command): if isinstance(val, list): spec_file.append('{}: {}'.format(field, ' '.join(val))) elif val is not None: - spec_file.append(f'{field}: {val}') + spec_file.append('{}: {}'.format(field, val)) if self.distribution.get_url(): spec_file.append('Url: ' + self.distribution.get_url()) @@ -500,11 +507,13 @@ class bdist_rpm(Command): if self.no_autoreq: spec_file.append('AutoReq: 0') - spec_file.extend([ - '', - '%description', - self.distribution.get_long_description() or "", - ]) + spec_file.extend( + [ + '', + '%description', + self.distribution.get_long_description() or "", + ] + ) # put locale descriptions into spec file # XXX again, suppressed because config file syntax doesn't @@ -518,8 +527,8 @@ class bdist_rpm(Command): # rpm scripts # figure out default build script - def_setup_call = f"{self.python} {os.path.basename(sys.argv[0])}" - def_build = f"{def_setup_call} build" + def_setup_call = "{} {}".format(self.python, os.path.basename(sys.argv[0])) + def_build = "%s build" % def_setup_call if self.use_rpm_opt_flags: def_build = 'env CFLAGS="$RPM_OPT_FLAGS" ' + def_build @@ -529,7 +538,9 @@ class bdist_rpm(Command): # that we open and interpolate into the spec file, but the defaults # are just text that we drop in as-is. Hmmm. - install_cmd = f'{def_setup_call} install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES' + install_cmd = ( + '%s install -O1 --root=$RPM_BUILD_ROOT ' '--record=INSTALLED_FILES' + ) % def_setup_call script_options = [ ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"), @@ -543,15 +554,17 @@ class bdist_rpm(Command): ('postun', 'post_uninstall', None), ] - for rpm_opt, attr, default in script_options: + for (rpm_opt, attr, default) in script_options: # Insert contents of file referred to, if no file is referred to # use 'default' as contents of script val = getattr(self, attr) if val or default: - spec_file.extend([ - '', - '%' + rpm_opt, - ]) + spec_file.extend( + [ + '', + '%' + rpm_opt, + ] + ) if val: with open(val) as f: spec_file.extend(f.read().split('\n')) @@ -559,20 +572,24 @@ class bdist_rpm(Command): spec_file.append(default) # files section - spec_file.extend([ - '', - '%files -f INSTALLED_FILES', - '%defattr(-,root,root)', - ]) + spec_file.extend( + [ + '', + '%files -f INSTALLED_FILES', + '%defattr(-,root,root)', + ] + ) if self.doc_files: spec_file.append('%doc ' + ' '.join(self.doc_files)) if self.changelog: - spec_file.extend([ - '', - '%changelog', - ]) + spec_file.extend( + [ + '', + '%changelog', + ] + ) spec_file.extend(self.changelog) return spec_file diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build.py index 6a8303a..6d45341 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build.py @@ -2,21 +2,21 @@ Implements the Distutils 'build' command.""" -from __future__ import annotations - -import os import sys -import sysconfig -from collections.abc import Callable -from typing import ClassVar +import os +from distutils.core import Command +from distutils.errors import DistutilsOptionError +from distutils.util import get_platform -from ..ccompiler import show_compilers -from ..core import Command -from ..errors import DistutilsOptionError -from ..util import get_platform + +def show_compilers(): + from distutils.ccompiler import show_compilers + + show_compilers() class build(Command): + description = "build everything needed to install" user_options = [ @@ -26,14 +26,16 @@ class build(Command): ( 'build-lib=', None, - "build directory for all distribution (defaults to either build-purelib or build-platlib", + "build directory for all distribution (defaults to either " + + "build-purelib or build-platlib", ), ('build-scripts=', None, "build directory for scripts"), ('build-temp=', 't', "temporary build directory"), ( 'plat-name=', 'p', - f"platform name to build for, if supported [default: {get_platform()}]", + "platform name to build for, if supported " + "(default: %s)" % get_platform(), ), ('compiler=', 'c', "specify the compiler type"), ('parallel=', 'j', "number of parallel build jobs"), @@ -42,9 +44,9 @@ class build(Command): ('executable=', 'e', "specify final destination interpreter path (build.py)"), ] - boolean_options: ClassVar[list[str]] = ['debug', 'force'] + boolean_options = ['debug', 'force'] - help_options: ClassVar[list[tuple[str, str | None, str, Callable[[], object]]]] = [ + help_options = [ ('help-compiler', None, "list available compilers", show_compilers), ] @@ -60,11 +62,11 @@ class build(Command): self.compiler = None self.plat_name = None self.debug = None - self.force = False + self.force = 0 self.executable = None self.parallel = None - def finalize_options(self) -> None: # noqa: C901 + def finalize_options(self): # noqa: C901 if self.plat_name is None: self.plat_name = get_platform() else: @@ -77,11 +79,7 @@ class build(Command): "using './configure --help' on your platform)" ) - plat_specifier = f".{self.plat_name}-{sys.implementation.cache_tag}" - - # Python 3.13+ with --disable-gil shouldn't share build directories - if sysconfig.get_config_var('Py_GIL_DISABLED'): - plat_specifier += 't' + plat_specifier = ".{}-{}".format(self.plat_name, sys.implementation.cache_tag) # Make it so Python 2.x and Python 2.x with --with-pydebug don't # share the same build directories. Doing so confuses the build @@ -112,8 +110,7 @@ class build(Command): self.build_temp = os.path.join(self.build_base, 'temp' + plat_specifier) if self.build_scripts is None: self.build_scripts = os.path.join( - self.build_base, - f'scripts-{sys.version_info.major}.{sys.version_info.minor}', + self.build_base, 'scripts-%d.%d' % sys.version_info[:2] ) if self.executable is None and sys.executable: @@ -125,7 +122,7 @@ class build(Command): except ValueError: raise DistutilsOptionError("parallel should be an integer") - def run(self) -> None: + def run(self): # Run all relevant sub-commands. This will be some subset of: # - build_py - pure Python modules # - build_clib - standalone C libraries diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_clib.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_clib.py index 8b65b3d..50bb9bb 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_clib.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_clib.py @@ -4,6 +4,7 @@ Implements the Distutils 'build_clib' command, to build a C/C++ library that is included in the module distribution and needed by an extension module.""" + # XXX this module has *lots* of code ripped-off quite transparently from # build_ext.py -- not surprisingly really, as the work required to build # a static library from a collection of C source files is not really all @@ -12,23 +13,25 @@ module.""" # necessary refactoring to account for the overlap in code between the # two modules, mainly because a number of subtle details changed in the # cut 'n paste. Sigh. -from __future__ import annotations import os -from collections.abc import Callable -from distutils._log import log -from typing import ClassVar +from distutils.core import Command +from distutils.errors import DistutilsSetupError +from distutils.sysconfig import customize_compiler +from distutils import log -from ..ccompiler import new_compiler, show_compilers -from ..core import Command -from ..errors import DistutilsSetupError -from ..sysconfig import customize_compiler + +def show_compilers(): + from distutils.ccompiler import show_compilers + + show_compilers() class build_clib(Command): + description = "build C/C++ libraries used by Python extensions" - user_options: ClassVar[list[tuple[str, str, str]]] = [ + user_options = [ ('build-clib=', 'b', "directory to build C/C++ libraries to"), ('build-temp=', 't', "directory to put temporary build by-products"), ('debug', 'g', "compile with debugging information"), @@ -36,9 +39,9 @@ class build_clib(Command): ('compiler=', 'c', "specify the compiler type"), ] - boolean_options: ClassVar[list[str]] = ['debug', 'force'] + boolean_options = ['debug', 'force'] - help_options: ClassVar[list[tuple[str, str | None, str, Callable[[], object]]]] = [ + help_options = [ ('help-compiler', None, "list available compilers", show_compilers), ] @@ -54,10 +57,10 @@ class build_clib(Command): self.define = None self.undef = None self.debug = None - self.force = False + self.force = 0 self.compiler = None - def finalize_options(self) -> None: + def finalize_options(self): # This might be confusing: both build-clib and build-temp default # to build-temp as defined by the "build" command. This is because # I think that C libraries are really just temporary build @@ -84,10 +87,13 @@ class build_clib(Command): # XXX same as for build_ext -- what about 'self.define' and # 'self.undef' ? - def run(self) -> None: + def run(self): if not self.libraries: return + # Yech -- this is cut 'n pasted from build_ext.py! + from distutils.ccompiler import new_compiler + self.compiler = new_compiler( compiler=self.compiler, dry_run=self.dry_run, force=self.force ) @@ -97,7 +103,7 @@ class build_clib(Command): self.compiler.set_include_dirs(self.include_dirs) if self.define is not None: # 'define' option is a list of (name,value) tuples - for name, value in self.define: + for (name, value) in self.define: self.compiler.define_macro(name, value) if self.undef is not None: for macro in self.undef: @@ -105,7 +111,7 @@ class build_clib(Command): self.build_libraries(self.libraries) - def check_library_list(self, libraries) -> None: + def check_library_list(self, libraries): """Ensure that the list of libraries is valid. `library` is presumably provided as a command option 'libraries'. @@ -132,7 +138,8 @@ class build_clib(Command): if '/' in name or (os.sep != '/' and os.sep in name): raise DistutilsSetupError( - f"bad library name '{lib[0]}': may not contain directory separators" + "bad library name '%s': " + "may not contain directory separators" % lib[0] ) if not isinstance(build_info, dict): @@ -148,33 +155,33 @@ class build_clib(Command): return None lib_names = [] - for lib_name, _build_info in self.libraries: + for (lib_name, build_info) in self.libraries: lib_names.append(lib_name) return lib_names def get_source_files(self): self.check_library_list(self.libraries) filenames = [] - for lib_name, build_info in self.libraries: + for (lib_name, build_info) in self.libraries: sources = build_info.get('sources') if sources is None or not isinstance(sources, (list, tuple)): raise DistutilsSetupError( - f"in 'libraries' option (library '{lib_name}'), " + "in 'libraries' option (library '%s'), " "'sources' must be present and must be " - "a list of source filenames" + "a list of source filenames" % lib_name ) filenames.extend(sources) return filenames - def build_libraries(self, libraries) -> None: - for lib_name, build_info in libraries: + def build_libraries(self, libraries): + for (lib_name, build_info) in libraries: sources = build_info.get('sources') if sources is None or not isinstance(sources, (list, tuple)): raise DistutilsSetupError( - f"in 'libraries' option (library '{lib_name}'), " + "in 'libraries' option (library '%s'), " "'sources' must be present and must be " - "a list of source filenames" + "a list of source filenames" % lib_name ) sources = list(sources) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_ext.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_ext.py index ec45b44..3c6cee7 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_ext.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_ext.py @@ -4,38 +4,42 @@ Implements the Distutils 'build_ext' command, for building extension modules (currently limited to C extensions, should accommodate C++ extensions ASAP).""" -from __future__ import annotations - import contextlib import os import re import sys -from collections.abc import Callable -from distutils._log import log -from site import USER_BASE -from typing import ClassVar - -from .._modified import newer_group -from ..ccompiler import new_compiler, show_compilers -from ..core import Command -from ..errors import ( - CCompilerError, - CompileError, - DistutilsError, +from distutils.core import Command +from distutils.errors import ( DistutilsOptionError, - DistutilsPlatformError, DistutilsSetupError, + CCompilerError, + DistutilsError, + CompileError, + DistutilsPlatformError, ) -from ..extension import Extension -from ..sysconfig import customize_compiler, get_config_h_filename, get_python_version -from ..util import get_platform, is_freethreaded, is_mingw +from distutils.sysconfig import customize_compiler, get_python_version +from distutils.sysconfig import get_config_h_filename +from distutils.dep_util import newer_group +from distutils.extension import Extension +from distutils.util import get_platform +from distutils import log +from . import py37compat + +from site import USER_BASE # An extension name is just a dot-separated list of Python NAMEs (ie. # the same as a fully-qualified module name). extension_name_re = re.compile(r'^[a-zA-Z_][a-zA-Z_0-9]*(\.[a-zA-Z_][a-zA-Z_0-9]*)*$') +def show_compilers(): + from distutils.ccompiler import show_compilers + + show_compilers() + + class build_ext(Command): + description = "build C/C++ extensions (compile/link to build directory)" # XXX thoughts on how to deal with complex command-line options like @@ -56,7 +60,7 @@ class build_ext(Command): # takes care of both command-line and client options # in between initialize_options() and finalize_options()) - sep_by = f" (separated by '{os.pathsep}')" + sep_by = " (separated by '%s')" % os.pathsep user_options = [ ('build-lib=', 'b', "directory for compiled extension modules"), ('build-temp=', 't', "directory for temporary files (build by-products)"), @@ -64,13 +68,13 @@ class build_ext(Command): 'plat-name=', 'p', "platform name to cross-compile for, if supported " - f"[default: {get_platform()}]", + "(default: %s)" % get_platform(), ), ( 'inplace', 'i', "ignore build-lib and put compiled extensions into the source " - "directory alongside your pure Python modules", + + "directory alongside your pure Python modules", ), ( 'include-dirs=', @@ -97,15 +101,9 @@ class build_ext(Command): ('user', None, "add user include, library and rpath"), ] - boolean_options: ClassVar[list[str]] = [ - 'inplace', - 'debug', - 'force', - 'swig-cpp', - 'user', - ] + boolean_options = ['inplace', 'debug', 'force', 'swig-cpp', 'user'] - help_options: ClassVar[list[tuple[str, str | None, str, Callable[[], object]]]] = [ + help_options = [ ('help-compiler', None, "list available compilers", show_compilers), ] @@ -114,7 +112,7 @@ class build_ext(Command): self.build_lib = None self.plat_name = None self.build_temp = None - self.inplace = False + self.inplace = 0 self.package = None self.include_dirs = None @@ -133,32 +131,7 @@ class build_ext(Command): self.user = None self.parallel = None - @staticmethod - def _python_lib_dir(sysconfig): - """ - Resolve Python's library directory for building extensions - that rely on a shared Python library. - - See python/cpython#44264 and python/cpython#48686 - """ - if not sysconfig.get_config_var('Py_ENABLE_SHARED'): - return - - if sysconfig.python_build: - yield '.' - return - - if sys.platform == 'zos': - # On z/OS, a user is not required to install Python to - # a predetermined path, but can use Python portably - installed_dir = sysconfig.get_config_var('base') - lib_dir = sysconfig.get_config_var('platlibdir') - yield os.path.join(installed_dir, lib_dir) - else: - # building third party extensions - yield sysconfig.get_config_var('LIBDIR') - - def finalize_options(self) -> None: # noqa: C901 + def finalize_options(self): # noqa: C901 from distutils import sysconfig self.set_undefined_options( @@ -180,7 +153,7 @@ class build_ext(Command): # Make sure Python's include directories (for Python.h, pyconfig.h, # etc.) are in the include search path. py_include = sysconfig.get_python_inc() - plat_py_include = sysconfig.get_python_inc(plat_specific=True) + plat_py_include = sysconfig.get_python_inc(plat_specific=1) if self.include_dirs is None: self.include_dirs = self.distribution.include_dirs or [] if isinstance(self.include_dirs, str): @@ -217,7 +190,7 @@ class build_ext(Command): # for extensions under windows use different directories # for Release and Debug builds. # also Python's library directory must be appended to library_dirs - if os.name == 'nt' and not is_mingw(): + if os.name == 'nt': # the 'libs' directory is for binary installs - we assume that # must be the *native* platform. But we don't really support # cross-compiling via a binary install anyway, so we let it go. @@ -259,7 +232,16 @@ class build_ext(Command): # building python standard extensions self.library_dirs.append('.') - self.library_dirs.extend(self._python_lib_dir(sysconfig)) + # For building extensions with a shared Python library, + # Python's library directory must be appended to library_dirs + # See Issues: #1600860, #4366 + if sysconfig.get_config_var('Py_ENABLE_SHARED'): + if not sysconfig.python_build: + # building third party extensions + self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) + else: + # building python standard extensions + self.library_dirs.append('.') # The argument parsing will result in self.define being a string, but # it has to be a list of 2-tuples. All the preprocessor symbols @@ -297,7 +279,9 @@ class build_ext(Command): except ValueError: raise DistutilsOptionError("parallel should be an integer") - def run(self) -> None: # noqa: C901 + def run(self): # noqa: C901 + from distutils.ccompiler import new_compiler + # 'self.extensions', as supplied by setup.py, is a list of # Extension instances. See the documentation for Extension (in # distutils.extension) for details. @@ -336,12 +320,6 @@ class build_ext(Command): if os.name == 'nt' and self.plat_name != get_platform(): self.compiler.initialize(self.plat_name) - # The official Windows free threaded Python installer doesn't set - # Py_GIL_DISABLED because its pyconfig.h is shared with the - # default build, so define it here (pypa/setuptools#4662). - if os.name == 'nt' and is_freethreaded(): - self.compiler.define_macro('Py_GIL_DISABLED', '1') - # And make sure that any compile/link-related options (which might # come from the command-line or from the setup script) are set in # that CCompiler object -- that way, they automatically apply to @@ -350,7 +328,7 @@ class build_ext(Command): self.compiler.set_include_dirs(self.include_dirs) if self.define is not None: # 'define' option is a list of (name,value) tuples - for name, value in self.define: + for (name, value) in self.define: self.compiler.define_macro(name, value) if self.undef is not None: for macro in self.undef: @@ -367,7 +345,7 @@ class build_ext(Command): # Now actually compile and link everything. self.build_extensions() - def check_extensions_list(self, extensions) -> None: # noqa: C901 + def check_extensions_list(self, extensions): # noqa: C901 """Ensure that the list of extensions (presumably provided as a command option 'extensions') is valid, i.e. it is a list of Extension objects. We also support the old-style list of 2-tuples, @@ -395,7 +373,7 @@ class build_ext(Command): ext_name, build_info = ext - log.warning( + log.warn( "old-style (ext_name, build_info) tuple found in " "ext_modules for extension '%s' " "-- please convert to Extension instance", @@ -435,7 +413,7 @@ class build_ext(Command): # Medium-easy stuff: same syntax/semantics, different names. ext.runtime_library_dirs = build_info.get('rpath') if 'def_file' in build_info: - log.warning("'def_file' element of build info dict no longer supported") + log.warn("'def_file' element of build info dict " "no longer supported") # Non-trivial stuff: 'macros' split into 'define_macros' # and 'undef_macros'. @@ -446,7 +424,8 @@ class build_ext(Command): for macro in macros: if not (isinstance(macro, tuple) and len(macro) in (1, 2)): raise DistutilsSetupError( - "'macros' element of build info dict must be 1- or 2-tuple" + "'macros' element of build info dict " + "must be 1- or 2-tuple" ) if len(macro) == 1: ext.undef_macros.append(macro[0]) @@ -473,9 +452,12 @@ class build_ext(Command): # And build the list of output (built) filenames. Note that this # ignores the 'inplace' flag, and assumes everything goes in the # "build" tree. - return [self.get_ext_fullpath(ext.name) for ext in self.extensions] + outputs = [] + for ext in self.extensions: + outputs.append(self.get_ext_fullpath(ext.name)) + return outputs - def build_extensions(self) -> None: + def build_extensions(self): # First, sanity-check the 'extensions' list self.check_extensions_list(self.extensions) if self.parallel: @@ -516,15 +498,15 @@ class build_ext(Command): except (CCompilerError, DistutilsError, CompileError) as e: if not ext.optional: raise - self.warn(f'building extension "{ext.name}" failed: {e}') + self.warn('building extension "{}" failed: {}'.format(ext.name, e)) - def build_extension(self, ext) -> None: + def build_extension(self, ext): sources = ext.sources if sources is None or not isinstance(sources, (list, tuple)): raise DistutilsSetupError( - f"in 'ext_modules' option (extension '{ext.name}'), " + "in 'ext_modules' option (extension '%s'), " "'sources' must be present and must be " - "a list of source filenames" + "a list of source filenames" % ext.name ) # sort to make the resulting .so file build reproducible sources = sorted(sources) @@ -615,7 +597,7 @@ class build_ext(Command): # the temp dir. if self.swig_cpp: - log.warning("--swig-cpp is deprecated - use --swig-opts=-c++") + log.warn("--swig-cpp is deprecated - use --swig-opts=-c++") if ( self.swig_cpp @@ -646,7 +628,8 @@ class build_ext(Command): # Do not override commandline arguments if not self.swig_opts: - swig_cmd.extend(extension.swig_opts) + for o in extension.swig_opts: + swig_cmd.append(o) for source in swig_sources: target = swig_targets[source] @@ -667,19 +650,20 @@ class build_ext(Command): # Windows (or so I presume!). If we find it there, great; # if not, act like Unix and assume it's in the PATH. for vers in ("1.3", "1.2", "1.1"): - fn = os.path.join(f"c:\\swig{vers}", "swig.exe") + fn = os.path.join("c:\\swig%s" % vers, "swig.exe") if os.path.isfile(fn): return fn else: return "swig.exe" else: raise DistutilsPlatformError( - f"I don't know how to find (much less run) SWIG on platform '{os.name}'" + "I don't know how to find (much less run) SWIG " + "on platform '%s'" % os.name ) # -- Name generators ----------------------------------------------- # (extension names, filenames, whatever) - def get_ext_fullpath(self, ext_name: str) -> str: + def get_ext_fullpath(self, ext_name): """Returns the path of the filename for a given extension. The file is located in `build_lib` or directly in the package @@ -706,7 +690,7 @@ class build_ext(Command): # package_dir/filename return os.path.join(package_dir, filename) - def get_ext_fullname(self, ext_name: str) -> str: + def get_ext_fullname(self, ext_name): """Returns the fullname of a given extension name. Adds the `package.` prefix""" @@ -715,27 +699,27 @@ class build_ext(Command): else: return self.package + '.' + ext_name - def get_ext_filename(self, ext_name: str) -> str: + def get_ext_filename(self, ext_name): r"""Convert the name of an extension (eg. "foo.bar") into the name of the file from which it will be loaded (eg. "foo/bar.so", or "foo\bar.pyd"). """ - from ..sysconfig import get_config_var + from distutils.sysconfig import get_config_var ext_path = ext_name.split('.') ext_suffix = get_config_var('EXT_SUFFIX') return os.path.join(*ext_path) + ext_suffix - def get_export_symbols(self, ext: Extension) -> list[str]: + def get_export_symbols(self, ext): """Return the list of symbols that a shared extension has to export. This either uses 'ext.export_symbols' or, if it's not provided, "PyInit_" + module_name. Only relevant on Windows, where the .pyd file (DLL) must export the module "PyInit_" function. """ - name = self._get_module_name_for_symbol(ext) + name = ext.name.split('.')[-1] try: # Unicode module name support as defined in PEP-489 - # https://peps.python.org/pep-0489/#export-hook-name + # https://www.python.org/dev/peps/pep-0489/#export-hook-name name.encode('ascii') except UnicodeEncodeError: suffix = 'U_' + name.encode('punycode').replace(b'-', b'_').decode('ascii') @@ -747,16 +731,7 @@ class build_ext(Command): ext.export_symbols.append(initfunc_name) return ext.export_symbols - def _get_module_name_for_symbol(self, ext): - # Package name should be used for `__init__` modules - # https://github.com/python/cpython/issues/80074 - # https://github.com/pypa/setuptools/issues/4826 - parts = ext.name.split(".") - if parts[-1] == "__init__" and len(parts) >= 2: - return parts[-2] - return parts[-1] - - def get_libraries(self, ext: Extension) -> list[str]: # noqa: C901 + def get_libraries(self, ext): # noqa: C901 """Return the list of libraries to link against when building a shared extension. On most platforms, this is just 'ext.libraries'; on Windows, we add the Python library (eg. python20.dll). @@ -766,8 +741,8 @@ class build_ext(Command): # pyconfig.h that MSVC groks. The other Windows compilers all seem # to need it mentioned explicitly, though, so that's what we do. # Append '_d' to the python import library on debug builds. - if sys.platform == "win32" and not is_mingw(): - from .._msvccompiler import MSVCCompiler + if sys.platform == "win32": + from distutils._msvccompiler import MSVCCompiler if not isinstance(self.compiler, MSVCCompiler): template = "python%d%d" @@ -789,14 +764,14 @@ class build_ext(Command): # On Cygwin (and if required, other POSIX-like platforms based on # Windows like MinGW) it is simply necessary that all symbols in # shared libraries are resolved at link time. - from ..sysconfig import get_config_var + from distutils.sysconfig import get_config_var link_libpython = False if get_config_var('Py_ENABLE_SHARED'): # A native build on an Android device or on Cygwin if hasattr(sys, 'getandroidapilevel'): link_libpython = True - elif sys.platform == 'cygwin' or is_mingw(): + elif sys.platform == 'cygwin': link_libpython = True elif '_PYTHON_HOST_PLATFORM' in os.environ: # We are cross-compiling for one of the relevant platforms @@ -809,4 +784,4 @@ class build_ext(Command): ldversion = get_config_var('LDVERSION') return ext.libraries + ['python' + ldversion] - return ext.libraries + return ext.libraries + py37compat.pythonlib() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_py.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_py.py index a20b076..47c6158 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_py.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_py.py @@ -2,19 +2,19 @@ Implements the Distutils 'build_py' command.""" -import glob -import importlib.util import os +import importlib.util import sys -from distutils._log import log -from typing import ClassVar +import glob -from ..core import Command -from ..errors import DistutilsFileError, DistutilsOptionError -from ..util import convert_path +from distutils.core import Command +from distutils.errors import DistutilsOptionError, DistutilsFileError +from distutils.util import convert_path +from distutils import log class build_py(Command): + description = "\"build\" pure Python modules (copy to build directory)" user_options = [ @@ -30,8 +30,8 @@ class build_py(Command): ('force', 'f', "forcibly build everything (ignore file timestamps)"), ] - boolean_options: ClassVar[list[str]] = ['compile', 'force'] - negative_opt: ClassVar[dict[str, str]] = {'no-compile': 'compile'} + boolean_options = ['compile', 'force'] + negative_opt = {'no-compile': 'compile'} def initialize_options(self): self.build_lib = None @@ -39,11 +39,11 @@ class build_py(Command): self.package = None self.package_data = None self.package_dir = None - self.compile = False + self.compile = 0 self.optimize = 0 self.force = None - def finalize_options(self) -> None: + def finalize_options(self): self.set_undefined_options( 'build', ('build_lib', 'build_lib'), ('force', 'force') ) @@ -68,7 +68,7 @@ class build_py(Command): except (ValueError, AssertionError): raise DistutilsOptionError("optimize must be 0, 1, or 2") - def run(self) -> None: + def run(self): # XXX copy_file by default preserves atime and mtime. IMHO this is # the right thing to do, but perhaps it should be an option -- in # particular, a site administrator might want installed files to @@ -96,7 +96,7 @@ class build_py(Command): self.build_packages() self.build_package_data() - self.byte_compile(self.get_outputs(include_bytecode=False)) + self.byte_compile(self.get_outputs(include_bytecode=0)) def get_data_files(self): """Generate list of '(package,src_dir,build_dir,filenames)' tuples""" @@ -130,14 +130,14 @@ class build_py(Command): os.path.join(glob.escape(src_dir), convert_path(pattern)) ) # Files that match more than one pattern are only added once - files.extend([ - fn for fn in filelist if fn not in files and os.path.isfile(fn) - ]) + files.extend( + [fn for fn in filelist if fn not in files and os.path.isfile(fn)] + ) return files - def build_package_data(self) -> None: + def build_package_data(self): """Copy data files into build directory""" - for _package, src_dir, build_dir, filenames in self.data_files: + for package, src_dir, build_dir, filenames in self.data_files: for filename in filenames: target = os.path.join(build_dir, filename) self.mkpath(os.path.dirname(target)) @@ -192,12 +192,12 @@ class build_py(Command): if package_dir != "": if not os.path.exists(package_dir): raise DistutilsFileError( - f"package directory '{package_dir}' does not exist" + "package directory '%s' does not exist" % package_dir ) if not os.path.isdir(package_dir): raise DistutilsFileError( - f"supposed package directory '{package_dir}' exists, " - "but is not a directory" + "supposed package directory '%s' exists, " + "but is not a directory" % package_dir ) # Directories without __init__.py are namespace packages (PEP 420). @@ -212,7 +212,7 @@ class build_py(Command): def check_module(self, module, module_file): if not os.path.isfile(module_file): - log.warning("file %s (for module %s) not found", module_file, module) + log.warn("file %s (for module %s) not found", module_file, module) return False else: return True @@ -229,7 +229,7 @@ class build_py(Command): module = os.path.splitext(os.path.basename(f))[0] modules.append((package, module, f)) else: - self.debug_print(f"excluding {setup_script}") + self.debug_print("excluding %s" % setup_script) return modules def find_modules(self): @@ -265,7 +265,7 @@ class build_py(Command): (package_dir, checked) = packages[package] except KeyError: package_dir = self.get_package_dir(package) - checked = False + checked = 0 if not checked: init_py = self.check_package(package, package_dir) @@ -307,10 +307,10 @@ class build_py(Command): outfile_path = [build_dir] + list(package) + [module + ".py"] return os.path.join(*outfile_path) - def get_outputs(self, include_bytecode: bool = True) -> list[str]: + def get_outputs(self, include_bytecode=1): modules = self.find_all_modules() outputs = [] - for package, module, _module_file in modules: + for (package, module, module_file) in modules: package = package.split('.') filename = self.get_module_outfile(self.build_lib, package, module) outputs.append(filename) @@ -348,18 +348,18 @@ class build_py(Command): outfile = self.get_module_outfile(self.build_lib, package, module) dir = os.path.dirname(outfile) self.mkpath(dir) - return self.copy_file(module_file, outfile, preserve_mode=False) + return self.copy_file(module_file, outfile, preserve_mode=0) - def build_modules(self) -> None: + def build_modules(self): modules = self.find_modules() - for package, module, module_file in modules: + for (package, module, module_file) in modules: # Now "build" the module -- ie. copy the source file to # self.build_lib (the build directory for Python source). # (Actually, it gets copied to the directory for this package # under self.build_lib.) self.build_module(module, module_file, package) - def build_packages(self) -> None: + def build_packages(self): for package in self.packages: # Get list of (package, module, module_file) tuples based on # scanning the package directory. 'package' is only included @@ -375,16 +375,16 @@ class build_py(Command): # Now loop over the modules we found, "building" each one (just # copy it to self.build_lib). - for package_, module, module_file in modules: + for (package_, module, module_file) in modules: assert package == package_ self.build_module(module, module_file, package) - def byte_compile(self, files) -> None: + def byte_compile(self, files): if sys.dont_write_bytecode: self.warn('byte-compiling is disabled, skipping.') return - from ..util import byte_compile + from distutils.util import byte_compile prefix = self.build_lib if prefix[-1] != os.sep: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_scripts.py index 127c51d..2cc5d1e 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_scripts.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/build_scripts.py @@ -4,14 +4,13 @@ Implements the Distutils 'build_scripts' command.""" import os import re -import tokenize -from distutils._log import log from stat import ST_MODE -from typing import ClassVar - -from .._modified import newer -from ..core import Command -from ..util import convert_path +from distutils import sysconfig +from distutils.core import Command +from distutils.dep_util import newer +from distutils.util import convert_path +from distutils import log +import tokenize shebang_pattern = re.compile('^#!.*python[0-9.]*([ \t].*)?$') """ @@ -23,15 +22,16 @@ first_line_re = shebang_pattern class build_scripts(Command): + description = "\"build\" scripts (copy and fixup #! line)" - user_options: ClassVar[list[tuple[str, str, str]]] = [ + user_options = [ ('build-dir=', 'd', "directory to \"build\" (copy) to"), ('force', 'f', "forcibly build everything (ignore file timestamps"), ('executable=', 'e', "specify final destination interpreter path"), ] - boolean_options: ClassVar[list[str]] = ['force'] + boolean_options = ['force'] def initialize_options(self): self.build_dir = None @@ -75,7 +75,7 @@ class build_scripts(Command): return outfiles, updated_files - def _copy_script(self, script, outfiles, updated_files): + def _copy_script(self, script, outfiles, updated_files): # noqa: C901 shebang_match = None script = convert_path(script) outfile = os.path.join(self.build_dir, os.path.basename(script)) @@ -96,7 +96,7 @@ class build_scripts(Command): else: first_line = f.readline() if not first_line: - self.warn(f"{script} is an empty file (skipping)") + self.warn("%s is an empty file (skipping)" % script) return shebang_match = shebang_pattern.match(first_line) @@ -105,8 +105,19 @@ class build_scripts(Command): if shebang_match: log.info("copying and adjusting %s -> %s", script, self.build_dir) if not self.dry_run: + if not sysconfig.python_build: + executable = self.executable + else: + executable = os.path.join( + sysconfig.get_config_var("BINDIR"), + "python%s%s" + % ( + sysconfig.get_config_var("VERSION"), + sysconfig.get_config_var("EXE"), + ), + ) post_interp = shebang_match.group(1) or '' - shebang = f"#!python{post_interp}\n" + shebang = "#!" + executable + post_interp + "\n" self._validate_shebang(shebang, f.encoding) with open(outfile, "w", encoding=f.encoding) as outf: outf.write(shebang) @@ -146,7 +157,9 @@ class build_scripts(Command): try: shebang.encode('utf-8') except UnicodeEncodeError: - raise ValueError(f"The shebang ({shebang!r}) is not encodable to utf-8") + raise ValueError( + "The shebang ({!r}) is not encodable " "to utf-8".format(shebang) + ) # If the script is encoded to a custom encoding (use a # #coding:xxx cookie), the shebang has to be encodable to @@ -155,6 +168,6 @@ class build_scripts(Command): shebang.encode(encoding) except UnicodeEncodeError: raise ValueError( - f"The shebang ({shebang!r}) is not encodable " - f"to the script encoding ({encoding})" + "The shebang ({!r}) is not encodable " + "to the script encoding ({})".format(shebang, encoding) ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/check.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/check.py index 58a823d..539481c 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/check.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/check.py @@ -2,18 +2,16 @@ Implements the Distutils 'check' command. """ - import contextlib -from typing import ClassVar -from ..core import Command -from ..errors import DistutilsSetupError +from distutils.core import Command +from distutils.errors import DistutilsSetupError with contextlib.suppress(ImportError): + import docutils.utils + import docutils.parsers.rst import docutils.frontend import docutils.nodes - import docutils.parsers.rst - import docutils.utils class SilentReporter(docutils.utils.Reporter): def __init__( @@ -22,7 +20,7 @@ with contextlib.suppress(ImportError): report_level, halt_level, stream=None, - debug=False, + debug=0, encoding='ascii', error_handler='replace', ): @@ -34,7 +32,7 @@ with contextlib.suppress(ImportError): def system_message(self, level, message, *children, **kwargs): self.messages.append((level, message, children, kwargs)) return docutils.nodes.system_message( - message, *children, level=level, type=self.levels[level], **kwargs + message, level=level, type=self.levels[level], *children, **kwargs ) @@ -42,23 +40,26 @@ class check(Command): """This command checks the meta-data of the package.""" description = "perform some checks on the package" - user_options: ClassVar[list[tuple[str, str, str]]] = [ + user_options = [ ('metadata', 'm', 'Verify meta-data'), ( 'restructuredtext', 'r', - 'Checks if long string meta-data syntax are reStructuredText-compliant', + ( + 'Checks if long string meta-data syntax ' + 'are reStructuredText-compliant' + ), ), ('strict', 's', 'Will exit with an error if a check fails'), ] - boolean_options: ClassVar[list[str]] = ['metadata', 'restructuredtext', 'strict'] + boolean_options = ['metadata', 'restructuredtext', 'strict'] def initialize_options(self): """Sets default values for options.""" - self.restructuredtext = False + self.restructuredtext = 0 self.metadata = 1 - self.strict = False + self.strict = 0 self._warnings = 0 def finalize_options(self): @@ -98,12 +99,13 @@ class check(Command): """ metadata = self.distribution.metadata - missing = [ - attr for attr in ('name', 'version') if not getattr(metadata, attr, None) - ] + missing = [] + for attr in 'name', 'version': + if not getattr(metadata, attr, None): + missing.append(attr) if missing: - self.warn("missing required meta-data: {}".format(', '.join(missing))) + self.warn("missing required meta-data: %s" % ', '.join(missing)) def check_restructuredtext(self): """Checks if the long string fields are reST-compliant.""" @@ -113,7 +115,7 @@ class check(Command): if line is None: warning = warning[1] else: - warning = f'{warning[1]} (line {line})' + warning = '{} (line {})'.format(warning[1], line) self.warn(warning) def _check_rst_data(self, data): @@ -141,12 +143,9 @@ class check(Command): document.note_source(source_path, -1) try: parser.parse(data, document) - except (AttributeError, TypeError) as e: - reporter.messages.append(( - -1, - f'Could not finish the parsing: {e}.', - '', - {}, - )) + except AttributeError as e: + reporter.messages.append( + (-1, 'Could not finish the parsing: %s.' % e, '', {}) + ) return reporter.messages diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/clean.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/clean.py index 23427ab..b731b60 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/clean.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/clean.py @@ -5,33 +5,32 @@ Implements the Distutils 'clean' command.""" # contributed by Bastian Kleineidam , added 2000-03-18 import os -from distutils._log import log -from typing import ClassVar - -from ..core import Command -from ..dir_util import remove_tree +from distutils.core import Command +from distutils.dir_util import remove_tree +from distutils import log class clean(Command): + description = "clean up temporary files from 'build' command" user_options = [ - ('build-base=', 'b', "base build directory [default: 'build.build-base']"), + ('build-base=', 'b', "base build directory (default: 'build.build-base')"), ( 'build-lib=', None, - "build directory for all modules [default: 'build.build-lib']", + "build directory for all modules (default: 'build.build-lib')", ), - ('build-temp=', 't', "temporary build directory [default: 'build.build-temp']"), + ('build-temp=', 't', "temporary build directory (default: 'build.build-temp')"), ( 'build-scripts=', None, - "build directory for scripts [default: 'build.build-scripts']", + "build directory for scripts (default: 'build.build-scripts')", ), ('bdist-base=', None, "temporary directory for built distributions"), ('all', 'a', "remove all build output, not just temporary by-products"), ] - boolean_options: ClassVar[list[str]] = ['all'] + boolean_options = ['all'] def initialize_options(self): self.build_base = None @@ -65,7 +64,7 @@ class clean(Command): if os.path.exists(directory): remove_tree(directory, dry_run=self.dry_run) else: - log.warning("'%s' does not exist -- can't clean it", directory) + log.warn("'%s' does not exist -- can't clean it", directory) # just for the heck of it, try to remove the base build directory: # we might have emptied it right now, but if not we don't care diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/config.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/config.py index c825765..4492c89 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/config.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/config.py @@ -9,23 +9,19 @@ configure-like tasks: "try to compile this C code", or "figure out where this header file lives". """ -from __future__ import annotations - import os -import pathlib import re -from collections.abc import Sequence -from distutils._log import log -from ..ccompiler import CCompiler, CompileError, LinkError, new_compiler -from ..core import Command -from ..errors import DistutilsExecError -from ..sysconfig import customize_compiler +from distutils.core import Command +from distutils.errors import DistutilsExecError +from distutils.sysconfig import customize_compiler +from distutils import log LANG_EXT = {"c": ".c", "c++": ".cxx"} class config(Command): + description = "prepare to build" user_options = [ @@ -89,9 +85,13 @@ class config(Command): """Check that 'self.compiler' really is a CCompiler object; if not, make it one. """ + # We do this late, and only on-demand, because this is an expensive + # import. + from distutils.ccompiler import CCompiler, new_compiler + if not isinstance(self.compiler, CCompiler): self.compiler = new_compiler( - compiler=self.compiler, dry_run=self.dry_run, force=True + compiler=self.compiler, dry_run=self.dry_run, force=1 ) customize_compiler(self.compiler) if self.include_dirs: @@ -103,10 +103,10 @@ class config(Command): def _gen_temp_sourcefile(self, body, headers, lang): filename = "_configtest" + LANG_EXT[lang] - with open(filename, "w", encoding='utf-8') as file: + with open(filename, "w") as file: if headers: for header in headers: - file.write(f"#include <{header}>\n") + file.write("#include <%s>\n" % header) file.write("\n") file.write(body) if body[-1] != "\n": @@ -123,7 +123,7 @@ class config(Command): def _compile(self, body, headers, include_dirs, lang): src = self._gen_temp_sourcefile(body, headers, lang) if self.dump_source: - dump_file(src, f"compiling '{src}':") + dump_file(src, "compiling '%s':" % src) (obj,) = self.compiler.object_filenames([src]) self.temp_files.extend([src, obj]) self.compiler.compile([src], include_dirs=include_dirs) @@ -174,6 +174,8 @@ class config(Command): preprocessor succeeded, false if there were any errors. ('body' probably isn't of much use, but what the heck.) """ + from distutils.ccompiler import CompileError + self._check_compiler() ok = True try: @@ -198,8 +200,15 @@ class config(Command): if isinstance(pattern, str): pattern = re.compile(pattern) - with open(out, encoding='utf-8') as file: - match = any(pattern.search(line) for line in file) + with open(out) as file: + match = False + while True: + line = file.readline() + if line == '': + break + if pattern.search(line): + match = True + break self._clean() return match @@ -208,6 +217,8 @@ class config(Command): """Try to compile a source file built from 'body' and 'headers'. Return true on success, false otherwise. """ + from distutils.ccompiler import CompileError + self._check_compiler() try: self._compile(body, headers, include_dirs, lang) @@ -232,6 +243,8 @@ class config(Command): 'headers', to executable form. Return true on success, false otherwise. """ + from distutils.ccompiler import CompileError, LinkError + self._check_compiler() try: self._link(body, headers, include_dirs, libraries, library_dirs, lang) @@ -256,6 +269,8 @@ class config(Command): built from 'body' and 'headers'. Return true on success, false otherwise. """ + from distutils.ccompiler import CompileError, LinkError + self._check_compiler() try: src, obj, exe = self._link( @@ -281,8 +296,8 @@ class config(Command): include_dirs=None, libraries=None, library_dirs=None, - decl=False, - call=False, + decl=0, + call=0, ): """Determine if function 'func' is available by constructing a source file that refers to 'func', and compiles and links it. @@ -300,12 +315,12 @@ class config(Command): self._check_compiler() body = [] if decl: - body.append(f"int {func} ();") + body.append("int %s ();" % func) body.append("int main () {") if call: - body.append(f" {func}();") + body.append(" %s();" % func) else: - body.append(f" {func};") + body.append(" %s;" % func) body.append("}") body = "\n".join(body) + "\n" @@ -317,7 +332,7 @@ class config(Command): library_dirs=None, headers=None, include_dirs=None, - other_libraries: Sequence[str] = [], + other_libraries=[], ): """Determine if 'library' is available to be linked against, without actually checking that any particular symbols are provided @@ -332,7 +347,7 @@ class config(Command): "int main (void) { }", headers, include_dirs, - [library] + list(other_libraries), + [library] + other_libraries, library_dirs, ) @@ -355,4 +370,8 @@ def dump_file(filename, head=None): log.info('%s', filename) else: log.info(head) - log.info(pathlib.Path(filename).read_text(encoding='utf-8')) + file = open(filename) + try: + log.info(file.read()) + finally: + file.close() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install.py index dc17e56..a38cddc 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install.py @@ -2,25 +2,25 @@ Implements the Distutils 'install' command.""" -from __future__ import annotations - -import collections -import contextlib -import itertools -import os import sys +import os +import contextlib import sysconfig -from distutils._log import log -from site import USER_BASE, USER_SITE -from typing import ClassVar +import itertools -from ..core import Command -from ..debug import DEBUG -from ..errors import DistutilsOptionError, DistutilsPlatformError -from ..file_util import write_file -from ..sysconfig import get_config_vars -from ..util import change_root, convert_path, get_platform, subst_vars +from distutils import log +from distutils.core import Command +from distutils.debug import DEBUG +from distutils.sysconfig import get_config_vars +from distutils.file_util import write_file +from distutils.util import convert_path, subst_vars, change_root +from distutils.util import get_platform +from distutils.errors import DistutilsOptionError, DistutilsPlatformError from . import _framework_compat as fw +from .. import _collections + +from site import USER_BASE +from site import USER_SITE HAS_USER_SITE = True @@ -144,7 +144,7 @@ def _resolve_scheme(name): try: resolved = sysconfig.get_preferred_scheme(key) except Exception: - resolved = fw.scheme(name) + resolved = fw.scheme(_pypy_hack(name)) return resolved @@ -161,7 +161,7 @@ def _inject_headers(name, scheme): """ # Bypass the preferred scheme, which may not # have defined headers. - fallback = _load_scheme(name) + fallback = _load_scheme(_pypy_hack(name)) scheme.setdefault('headers', fallback['headers']) return scheme @@ -171,7 +171,16 @@ def _scheme_attrs(scheme): return {f'install_{key}': scheme[key] for key in SCHEME_KEYS} +def _pypy_hack(name): + PY37 = sys.version_info < (3, 8) + old_pypy = hasattr(sys, 'pypy_version_info') and PY37 + prefix = not name.endswith(('_user', '_home')) + pypy_name = 'pypy' + '_nt' * (os.name == 'nt') + return pypy_name if old_pypy and prefix else name + + class install(Command): + description = "install everything from build directory" user_options = [ @@ -188,7 +197,8 @@ class install(Command): ( 'install-platbase=', None, - "base installation directory for platform-specific files (instead of --exec-prefix or --home)", + "base installation directory for platform-specific files " + + "(instead of --exec-prefix or --home)", ), ('root=', None, "install everything relative to this alternate root directory"), # Or, explicitly set the installation scheme @@ -205,7 +215,8 @@ class install(Command): ( 'install-lib=', None, - "installation directory for all module distributions (overrides --install-purelib and --install-platlib)", + "installation directory for all module distributions " + + "(overrides --install-purelib and --install-platlib)", ), ('install-headers=', None, "installation directory for C/C++ headers"), ('install-scripts=', None, "installation directory for Python scripts"), @@ -232,33 +243,31 @@ class install(Command): ('record=', None, "filename in which to record list of installed files"), ] - boolean_options: ClassVar[list[str]] = ['compile', 'force', 'skip-build'] + boolean_options = ['compile', 'force', 'skip-build'] if HAS_USER_SITE: - user_options.append(( - 'user', - None, - f"install in user site-package '{USER_SITE}'", - )) + user_options.append( + ('user', None, "install in user site-package '%s'" % USER_SITE) + ) boolean_options.append('user') - negative_opt: ClassVar[dict[str, str]] = {'no-compile': 'compile'} + negative_opt = {'no-compile': 'compile'} - def initialize_options(self) -> None: + def initialize_options(self): """Initializes options.""" # High-level options: these select both an installation base # and scheme. - self.prefix: str | None = None - self.exec_prefix: str | None = None - self.home: str | None = None - self.user = False + self.prefix = None + self.exec_prefix = None + self.home = None + self.user = 0 # These select only the installation base; it's up to the user to # specify the installation scheme (currently, that means supplying # the --install-{platlib,purelib,scripts,data} options). self.install_base = None self.install_platbase = None - self.root: str | None = None + self.root = None # These options are the actual installation directories; if not # supplied by the user, they are filled in using the installation @@ -267,7 +276,7 @@ class install(Command): self.install_purelib = None # for pure module distributions self.install_platlib = None # non-pure (dists w/ extensions) self.install_headers = None # for C/C++ headers - self.install_lib: str | None = None # set to either purelib or platlib + self.install_lib = None # set to either purelib or platlib self.install_scripts = None self.install_data = None self.install_userbase = USER_BASE @@ -286,7 +295,7 @@ class install(Command): # 'install_path_file' is always true unless some outsider meddles # with it. self.extra_path = None - self.install_path_file = True + self.install_path_file = 1 # 'force' forces installation, even if target files are not # out-of-date. 'skip_build' skips running the "build" command, @@ -294,9 +303,9 @@ class install(Command): # a user option, it's just there so the bdist_* commands can turn # it off) determines whether we warn about installing to a # directory not in sys.path. - self.force = False - self.skip_build = False - self.warn_dir = True + self.force = 0 + self.skip_build = 0 + self.warn_dir = 1 # These are only here as a conduit from the 'build' command to the # 'install_*' commands that do the real work. ('build_base' isn't @@ -321,7 +330,7 @@ class install(Command): # party Python modules on various platforms given a wide # array of user input is decided. Yes, it's quite complex!) - def finalize_options(self) -> None: # noqa: C901 + def finalize_options(self): # noqa: C901 """Finalizes options.""" # This method (and its helpers, like 'finalize_unix()', # 'finalize_other()', and 'select_scheme()') is where the default @@ -341,7 +350,8 @@ class install(Command): self.install_base or self.install_platbase ): raise DistutilsOptionError( - "must supply either prefix/exec-prefix/home or install-base/install-platbase -- not both" + "must supply either prefix/exec-prefix/home or " + + "install-base/install-platbase -- not both" ) if self.home and (self.prefix or self.exec_prefix): @@ -401,8 +411,8 @@ class install(Command): 'dist_version': self.distribution.get_version(), 'dist_fullname': self.distribution.get_fullname(), 'py_version': py_version, - 'py_version_short': f'{sys.version_info.major}.{sys.version_info.minor}', - 'py_version_nodot': f'{sys.version_info.major}{sys.version_info.minor}', + 'py_version_short': '%d.%d' % sys.version_info[:2], + 'py_version_nodot': '%d%d' % sys.version_info[:2], 'sys_prefix': prefix, 'prefix': prefix, 'sys_exec_prefix': exec_prefix, @@ -423,11 +433,8 @@ class install(Command): local_vars['userbase'] = self.install_userbase local_vars['usersite'] = self.install_usersite - self.config_vars = collections.ChainMap( - local_vars, - sysconfig.get_config_vars(), - compat_vars, - fw.vars(), + self.config_vars = _collections.DictStack( + [fw.vars(), compat_vars, sysconfig.get_config_vars(), local_vars] ) self.expand_basedirs() @@ -504,11 +511,11 @@ class install(Command): # Punt on doc directories for now -- after all, we're punting on # documentation completely! - def dump_dirs(self, msg) -> None: + def dump_dirs(self, msg): """Dumps the list of user options.""" if not DEBUG: return - from ..fancy_getopt import longopt_xlate + from distutils.fancy_getopt import longopt_xlate log.debug(msg + ":") for opt in self.user_options: @@ -524,7 +531,7 @@ class install(Command): val = getattr(self, opt_name) log.debug(" %s: %s", opt_name, val) - def finalize_unix(self) -> None: + def finalize_unix(self): """Finalizes options for posix platforms.""" if self.install_base is not None or self.install_platbase is not None: incomplete_scheme = ( @@ -573,7 +580,7 @@ class install(Command): self.install_platbase = self.exec_prefix self.select_scheme("posix_prefix") - def finalize_other(self) -> None: + def finalize_other(self): """Finalizes options for non-posix platforms""" if self.user: if self.install_userbase is None: @@ -592,50 +599,52 @@ class install(Command): self.select_scheme(os.name) except KeyError: raise DistutilsPlatformError( - f"I don't know how to install stuff on '{os.name}'" + "I don't know how to install stuff on '%s'" % os.name ) - def select_scheme(self, name) -> None: + def select_scheme(self, name): _select_scheme(self, name) def _expand_attrs(self, attrs): for attr in attrs: val = getattr(self, attr) if val is not None: - if os.name in ('posix', 'nt'): + if os.name == 'posix' or os.name == 'nt': val = os.path.expanduser(val) val = subst_vars(val, self.config_vars) setattr(self, attr, val) - def expand_basedirs(self) -> None: + def expand_basedirs(self): """Calls `os.path.expanduser` on install_base, install_platbase and root.""" self._expand_attrs(['install_base', 'install_platbase', 'root']) - def expand_dirs(self) -> None: + def expand_dirs(self): """Calls `os.path.expanduser` on install dirs.""" - self._expand_attrs([ - 'install_purelib', - 'install_platlib', - 'install_lib', - 'install_headers', - 'install_scripts', - 'install_data', - ]) + self._expand_attrs( + [ + 'install_purelib', + 'install_platlib', + 'install_lib', + 'install_headers', + 'install_scripts', + 'install_data', + ] + ) - def convert_paths(self, *names) -> None: + def convert_paths(self, *names): """Call `convert_path` over `names`.""" for name in names: attr = "install_" + name setattr(self, attr, convert_path(getattr(self, attr))) - def handle_extra_path(self) -> None: + def handle_extra_path(self): """Set `path_file` and `extra_dirs` using `extra_path`.""" if self.extra_path is None: self.extra_path = self.distribution.extra_path if self.extra_path is not None: - log.warning( + log.warn( "Distribution option extra_path is deprecated. " "See issue27919 for details." ) @@ -664,20 +673,20 @@ class install(Command): self.path_file = path_file self.extra_dirs = extra_dirs - def change_roots(self, *names) -> None: + def change_roots(self, *names): """Change the install directories pointed by name using root.""" for name in names: attr = "install_" + name setattr(self, attr, change_root(self.root, getattr(self, attr))) - def create_home_path(self) -> None: + def create_home_path(self): """Create directories under ~.""" if not self.user: return home = convert_path(os.path.expanduser("~")) - for path in self.config_vars.values(): + for name, path in self.config_vars.items(): if str(path).startswith(home) and not os.path.isdir(path): - self.debug_print(f"os.makedirs('{path}', 0o700)") + self.debug_print("os.makedirs('%s', 0o700)" % path) os.makedirs(path, 0o700) # -- Command execution methods ------------------------------------- @@ -693,7 +702,7 @@ class install(Command): # internally, and not to sys.path, so we don't check the platform # matches what we are running. if self.warn_dir and build_plat != get_platform(): - raise DistutilsPlatformError("Can't install when cross-compiling") + raise DistutilsPlatformError("Can't install when " "cross-compiling") # Run all sub-commands (at least those that need to be run) for cmd_name in self.get_sub_commands(): @@ -712,7 +721,7 @@ class install(Command): self.execute( write_file, (self.record, outputs), - f"writing list of installed files to '{self.record}'", + "writing list of installed files to '%s'" % self.record, ) sys_path = map(os.path.normpath, sys.path) @@ -737,10 +746,10 @@ class install(Command): filename = os.path.join(self.install_libbase, self.path_file + ".pth") if self.install_path_file: self.execute( - write_file, (filename, [self.extra_dirs]), f"creating {filename}" + write_file, (filename, [self.extra_dirs]), "creating %s" % filename ) else: - self.warn(f"path file '{filename}' not created") + self.warn("path file '%s' not created" % filename) # -- Reporting methods --------------------------------------------- diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_data.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_data.py index 4ad186e..23d91ad 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_data.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_data.py @@ -5,41 +5,37 @@ platform-independent data files.""" # contributed by Bastian Kleineidam -from __future__ import annotations - -import functools import os -from collections.abc import Iterable -from typing import ClassVar - -from ..core import Command -from ..util import change_root, convert_path +from distutils.core import Command +from distutils.util import change_root, convert_path class install_data(Command): + description = "install data files" user_options = [ ( 'install-dir=', 'd', - "base directory for installing data files [default: installation base dir]", + "base directory for installing data files " + "(default: installation base dir)", ), ('root=', None, "install everything relative to this alternate root directory"), ('force', 'f', "force installation (overwrite existing files)"), ] - boolean_options: ClassVar[list[str]] = ['force'] + boolean_options = ['force'] def initialize_options(self): self.install_dir = None self.outfiles = [] self.root = None - self.force = False + self.force = 0 self.data_files = self.distribution.data_files - self.warn_dir = True + self.warn_dir = 1 - def finalize_options(self) -> None: + def finalize_options(self): self.set_undefined_options( 'install', ('install_data', 'install_dir'), @@ -47,45 +43,39 @@ class install_data(Command): ('force', 'force'), ) - def run(self) -> None: + def run(self): self.mkpath(self.install_dir) for f in self.data_files: - self._copy(f) - - @functools.singledispatchmethod - def _copy(self, f: tuple[str | os.PathLike, Iterable[str | os.PathLike]]): - # it's a tuple with path to install to and a list of files - dir = convert_path(f[0]) - if not os.path.isabs(dir): - dir = os.path.join(self.install_dir, dir) - elif self.root: - dir = change_root(self.root, dir) - self.mkpath(dir) - - if f[1] == []: - # If there are no files listed, the user must be - # trying to create an empty directory, so add the - # directory to the list of output files. - self.outfiles.append(dir) - else: - # Copy files, adding them to the list of output files. - for data in f[1]: - data = convert_path(data) - (out, _) = self.copy_file(data, dir) + if isinstance(f, str): + # it's a simple file, so copy it + f = convert_path(f) + if self.warn_dir: + self.warn( + "setup script did not provide a directory for " + "'%s' -- installing right in '%s'" % (f, self.install_dir) + ) + (out, _) = self.copy_file(f, self.install_dir) self.outfiles.append(out) + else: + # it's a tuple with path to install to and a list of files + dir = convert_path(f[0]) + if not os.path.isabs(dir): + dir = os.path.join(self.install_dir, dir) + elif self.root: + dir = change_root(self.root, dir) + self.mkpath(dir) - @_copy.register(str) - @_copy.register(os.PathLike) - def _(self, f: str | os.PathLike): - # it's a simple file, so copy it - f = convert_path(f) - if self.warn_dir: - self.warn( - "setup script did not provide a directory for " - f"'{f}' -- installing right in '{self.install_dir}'" - ) - (out, _) = self.copy_file(f, self.install_dir) - self.outfiles.append(out) + if f[1] == []: + # If there are no files listed, the user must be + # trying to create an empty directory, so add the + # directory to the list of output files. + self.outfiles.append(dir) + else: + # Copy files, adding them to the list of output files. + for data in f[1]: + data = convert_path(data) + (out, _) = self.copy_file(data, dir) + self.outfiles.append(out) def get_inputs(self): return self.data_files or [] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_egg_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_egg_info.py index 230e94a..d5e68a6 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_egg_info.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_egg_info.py @@ -6,20 +6,18 @@ a package's PKG-INFO metadata. """ import os -import re import sys -from typing import ClassVar +import re -from .. import dir_util -from .._log import log -from ..cmd import Command +from distutils.cmd import Command +from distutils import log, dir_util class install_egg_info(Command): """Install an .egg-info file for the package""" description = "Install package's PKG-INFO metadata as an .egg-info file" - user_options: ClassVar[list[tuple[str, str, str]]] = [ + user_options = [ ('install-dir=', 'd', "directory to install to"), ] @@ -32,9 +30,11 @@ class install_egg_info(Command): Allow basename to be overridden by child class. Ref pypa/distutils#2. """ - name = to_filename(safe_name(self.distribution.get_name())) - version = to_filename(safe_version(self.distribution.get_version())) - return f"{name}-{version}-py{sys.version_info.major}.{sys.version_info.minor}.egg-info" + return "%s-%s-py%d.%d.egg-info" % ( + to_filename(safe_name(self.distribution.get_name())), + to_filename(safe_version(self.distribution.get_version())), + *sys.version_info[:2], + ) def finalize_options(self): self.set_undefined_options('install_lib', ('install_dir', 'install_dir')) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_headers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_headers.py index 97af137..87046ab 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_headers.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_headers.py @@ -3,25 +3,24 @@ Implements the Distutils 'install_headers' command, to install C/C++ header files to the Python include directory.""" -from typing import ClassVar - -from ..core import Command +from distutils.core import Command # XXX force is never used class install_headers(Command): + description = "install C/C++ header files" - user_options: ClassVar[list[tuple[str, str, str]]] = [ + user_options = [ ('install-dir=', 'd', "directory to install header files to"), ('force', 'f', "force installation (overwrite existing files)"), ] - boolean_options: ClassVar[list[str]] = ['force'] + boolean_options = ['force'] def initialize_options(self): self.install_dir = None - self.force = False + self.force = 0 self.outfiles = [] def finalize_options(self): diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_lib.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_lib.py index 2aababf..ad3089c 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_lib.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_lib.py @@ -3,21 +3,20 @@ Implements the Distutils 'install_lib' command (install all Python modules).""" -from __future__ import annotations - -import importlib.util import os +import importlib.util import sys -from typing import Any, ClassVar -from ..core import Command -from ..errors import DistutilsOptionError +from distutils.core import Command +from distutils.errors import DistutilsOptionError + # Extension for Python source files. PYTHON_SOURCE_EXTENSION = ".py" class install_lib(Command): + description = "install all Python modules (extensions and pure Python)" # The byte-compilation options are a tad confusing. Here are the @@ -50,19 +49,19 @@ class install_lib(Command): ('skip-build', None, "skip the build steps"), ] - boolean_options: ClassVar[list[str]] = ['force', 'compile', 'skip-build'] - negative_opt: ClassVar[dict[str, str]] = {'no-compile': 'compile'} + boolean_options = ['force', 'compile', 'skip-build'] + negative_opt = {'no-compile': 'compile'} def initialize_options(self): # let the 'install' command dictate our installation directory self.install_dir = None self.build_dir = None - self.force = False + self.force = 0 self.compile = None self.optimize = None self.skip_build = None - def finalize_options(self) -> None: + def finalize_options(self): # Get all the information we need to install pure Python modules # from the umbrella 'install' command -- build (source) directory, # install (target) directory, and whether to compile .py files. @@ -84,12 +83,12 @@ class install_lib(Command): if not isinstance(self.optimize, int): try: self.optimize = int(self.optimize) - except ValueError: - pass - if self.optimize not in (0, 1, 2): + if self.optimize not in (0, 1, 2): + raise AssertionError + except (ValueError, AssertionError): raise DistutilsOptionError("optimize must be 0, 1, or 2") - def run(self) -> None: + def run(self): # Make sure we have built everything we need first self.build() @@ -105,30 +104,29 @@ class install_lib(Command): # -- Top-level worker functions ------------------------------------ # (called from 'run()') - def build(self) -> None: + def build(self): if not self.skip_build: if self.distribution.has_pure_modules(): self.run_command('build_py') if self.distribution.has_ext_modules(): self.run_command('build_ext') - # Any: https://typing.readthedocs.io/en/latest/guides/writing_stubs.html#the-any-trick - def install(self) -> list[str] | Any: + def install(self): if os.path.isdir(self.build_dir): outfiles = self.copy_tree(self.build_dir, self.install_dir) else: self.warn( - f"'{self.build_dir}' does not exist -- no Python modules to install" + "'%s' does not exist -- no Python modules to install" % self.build_dir ) return return outfiles - def byte_compile(self, files) -> None: + def byte_compile(self, files): if sys.dont_write_bytecode: self.warn('byte-compiling is disabled, skipping.') return - from ..util import byte_compile + from distutils.util import byte_compile # Get the "--root" directory supplied to the "install" command, # and use it as a prefix to strip off the purported filename @@ -165,7 +163,9 @@ class install_lib(Command): build_dir = getattr(build_cmd, cmd_option) prefix_len = len(build_dir) + len(os.sep) - outputs = [os.path.join(output_dir, file[prefix_len:]) for file in build_files] + outputs = [] + for file in build_files: + outputs.append(os.path.join(output_dir, file[prefix_len:])) return outputs diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_scripts.py index 92e8694..f09bd64 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_scripts.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/install_scripts.py @@ -6,14 +6,13 @@ Python scripts.""" # contributed by Bastian Kleineidam import os -from distutils._log import log +from distutils.core import Command +from distutils import log from stat import ST_MODE -from typing import ClassVar - -from ..core import Command class install_scripts(Command): + description = "install scripts (Python or otherwise)" user_options = [ @@ -23,15 +22,15 @@ class install_scripts(Command): ('skip-build', None, "skip the build steps"), ] - boolean_options: ClassVar[list[str]] = ['force', 'skip-build'] + boolean_options = ['force', 'skip-build'] def initialize_options(self): self.install_dir = None - self.force = False + self.force = 0 self.build_dir = None self.skip_build = None - def finalize_options(self) -> None: + def finalize_options(self): self.set_undefined_options('build', ('build_scripts', 'build_dir')) self.set_undefined_options( 'install', @@ -40,7 +39,7 @@ class install_scripts(Command): ('skip_build', 'skip_build'), ) - def run(self) -> None: + def run(self): if not self.skip_build: self.run_command('build_scripts') self.outfiles = self.copy_tree(self.build_dir, self.install_dir) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/sdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/sdist.py index b3bf0c3..d6e9489 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/sdist.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/command/sdist.py @@ -2,42 +2,41 @@ Implements the Distutils 'sdist' command (create a source distribution).""" -from __future__ import annotations - import os import sys -from collections.abc import Callable -from distutils import archive_util, dir_util, file_util -from distutils._log import log from glob import glob -from itertools import filterfalse -from typing import ClassVar +from warnings import warn -from ..core import Command -from ..errors import DistutilsOptionError, DistutilsTemplateError -from ..filelist import FileList -from ..text_file import TextFile -from ..util import convert_path +from distutils.core import Command +from distutils import dir_util +from distutils import file_util +from distutils import archive_util +from distutils.text_file import TextFile +from distutils.filelist import FileList +from distutils import log +from distutils.util import convert_path +from distutils.errors import DistutilsOptionError, DistutilsTemplateError def show_formats(): """Print all possible values for the 'formats' option (used by the "--help-formats" command-line option). """ - from ..archive_util import ARCHIVE_FORMATS - from ..fancy_getopt import FancyGetopt + from distutils.fancy_getopt import FancyGetopt + from distutils.archive_util import ARCHIVE_FORMATS - formats = sorted( - ("formats=" + format, None, ARCHIVE_FORMATS[format][2]) - for format in ARCHIVE_FORMATS.keys() - ) + formats = [] + for format in ARCHIVE_FORMATS.keys(): + formats.append(("formats=" + format, None, ARCHIVE_FORMATS[format][2])) + formats.sort() FancyGetopt(formats).print_help("List of available source distribution formats:") class sdist(Command): + description = "create a source distribution (tarball, zip file, etc.)" - def checking_metadata(self) -> bool: + def checking_metadata(self): """Callable used for the check sub-command. Placed here so user_options can view it""" @@ -64,7 +63,7 @@ class sdist(Command): ( 'manifest-only', 'o', - "just regenerate the manifest and then stop (implies --force-manifest)", + "just regenerate the manifest and then stop " "(implies --force-manifest)", ), ( 'force-manifest', @@ -81,7 +80,7 @@ class sdist(Command): ( 'dist-dir=', 'd', - "directory to put the source distribution archive(s) in [default: dist]", + "directory to put the source distribution archive(s) in " "[default: dist]", ), ( 'metadata-check', @@ -101,7 +100,7 @@ class sdist(Command): ), ] - boolean_options: ClassVar[list[str]] = [ + boolean_options = [ 'use-defaults', 'prune', 'manifest-only', @@ -110,18 +109,15 @@ class sdist(Command): 'metadata-check', ] - help_options: ClassVar[list[tuple[str, str | None, str, Callable[[], object]]]] = [ + help_options = [ ('help-formats', None, "list available distribution formats", show_formats), ] - negative_opt: ClassVar[dict[str, str]] = { - 'no-defaults': 'use-defaults', - 'no-prune': 'prune', - } + negative_opt = {'no-defaults': 'use-defaults', 'no-prune': 'prune'} sub_commands = [('check', checking_metadata)] - READMES: ClassVar[tuple[str, ...]] = ('README', 'README.txt', 'README.rst') + READMES = ('README', 'README.txt', 'README.rst') def initialize_options(self): # 'template' and 'manifest' are, respectively, the names of @@ -131,22 +127,22 @@ class sdist(Command): # 'use_defaults': if true, we will include the default file set # in the manifest - self.use_defaults = True - self.prune = True + self.use_defaults = 1 + self.prune = 1 - self.manifest_only = False - self.force_manifest = False + self.manifest_only = 0 + self.force_manifest = 0 self.formats = ['gztar'] - self.keep_temp = False + self.keep_temp = 0 self.dist_dir = None self.archive_files = None - self.metadata_check = True + self.metadata_check = 1 self.owner = None self.group = None - def finalize_options(self) -> None: + def finalize_options(self): if self.manifest is None: self.manifest = "MANIFEST" if self.template is None: @@ -156,12 +152,12 @@ class sdist(Command): bad_format = archive_util.check_archive_formats(self.formats) if bad_format: - raise DistutilsOptionError(f"unknown archive format '{bad_format}'") + raise DistutilsOptionError("unknown archive format '%s'" % bad_format) if self.dist_dir is None: self.dist_dir = "dist" - def run(self) -> None: + def run(self): # 'filelist' contains the list of files that will make up the # manifest self.filelist = FileList() @@ -183,7 +179,18 @@ class sdist(Command): # or zipfile, or whatever. self.make_distribution() - def get_file_list(self) -> None: + def check_metadata(self): + """Deprecated API.""" + warn( + "distutils.command.sdist.check_metadata is deprecated, \ + use the check command instead", + PendingDeprecationWarning, + ) + check = self.distribution.get_command_obj('check') + check.ensure_finalized() + check.run() + + def get_file_list(self): """Figure out the list of files to include in the source distribution, and put it in 'self.filelist'. This might involve reading the manifest template (and writing the manifest), or just @@ -224,11 +231,11 @@ class sdist(Command): self.filelist.remove_duplicates() self.write_manifest() - def add_defaults(self) -> None: + def add_defaults(self): """Add all the default files to self.filelist: - README or README.txt - setup.py - - tests/test*.py and test/test*.py + - test/test*.py - all pure Python modules mentioned in setup script - all files pointed by package_data (build_py) - all files defined in data_files. @@ -283,10 +290,10 @@ class sdist(Command): if self._cs_path_exists(fn): self.filelist.append(fn) else: - self.warn(f"standard file '{fn}' not found") + self.warn("standard file '%s' not found" % fn) def _add_defaults_optional(self): - optional = ['tests/test*.py', 'test/test*.py', 'setup.cfg'] + optional = ['test/test*.py', 'setup.cfg'] for pattern in optional: files = filter(os.path.isfile, glob(pattern)) self.filelist.extend(files) @@ -303,7 +310,7 @@ class sdist(Command): # getting package_data files # (computed in build_py.data_files by build_py.finalize_options) - for _pkg, src_dir, _build_dir, filenames in build_py.data_files: + for pkg, src_dir, build_dir, filenames in build_py.data_files: for filename in filenames: self.filelist.append(os.path.join(src_dir, filename)) @@ -339,7 +346,7 @@ class sdist(Command): build_scripts = self.get_finalized_command('build_scripts') self.filelist.extend(build_scripts.get_source_files()) - def read_template(self) -> None: + def read_template(self): """Read and parse manifest template file named by self.template. (usually "MANIFEST.in") The parsing and processing is done by @@ -348,12 +355,12 @@ class sdist(Command): log.info("reading manifest template '%s'", self.template) template = TextFile( self.template, - strip_comments=True, - skip_blanks=True, - join_lines=True, - lstrip_ws=True, - rstrip_ws=True, - collapse_join=True, + strip_comments=1, + skip_blanks=1, + join_lines=1, + lstrip_ws=1, + rstrip_ws=1, + collapse_join=1, ) try: @@ -369,12 +376,13 @@ class sdist(Command): # convert_path function except (DistutilsTemplateError, ValueError) as msg: self.warn( - f"{template.filename}, line {int(template.current_line)}: {msg}" + "%s, line %d: %s" + % (template.filename, template.current_line, msg) ) finally: template.close() - def prune_file_list(self) -> None: + def prune_file_list(self): """Prune off branches that might slip into the file list as created by 'read_template()', but really don't belong there: * the build tree (typically "build") @@ -385,7 +393,7 @@ class sdist(Command): build = self.get_finalized_command('build') base_dir = self.distribution.get_fullname() - self.filelist.exclude_pattern(None, prefix=os.fspath(build.build_base)) + self.filelist.exclude_pattern(None, prefix=build.build_base) self.filelist.exclude_pattern(None, prefix=base_dir) if sys.platform == 'win32': @@ -395,16 +403,17 @@ class sdist(Command): vcs_dirs = ['RCS', 'CVS', r'\.svn', r'\.hg', r'\.git', r'\.bzr', '_darcs'] vcs_ptrn = r'(^|{})({})({}).*'.format(seps, '|'.join(vcs_dirs), seps) - self.filelist.exclude_pattern(vcs_ptrn, is_regex=True) + self.filelist.exclude_pattern(vcs_ptrn, is_regex=1) - def write_manifest(self) -> None: + def write_manifest(self): """Write the file list in 'self.filelist' (presumably as filled in by 'add_defaults()' and 'read_template()') to the manifest file named by 'self.manifest'. """ if self._manifest_is_not_generated(): log.info( - f"not writing to manually maintained manifest file '{self.manifest}'" + "not writing to manually maintained " + "manifest file '%s'" % self.manifest ) return @@ -413,7 +422,7 @@ class sdist(Command): self.execute( file_util.write_file, (self.manifest, content), - f"writing manifest file '{self.manifest}'", + "writing manifest file '%s'" % self.manifest, ) def _manifest_is_not_generated(self): @@ -421,23 +430,28 @@ class sdist(Command): if not os.path.isfile(self.manifest): return False - with open(self.manifest, encoding='utf-8') as fp: - first_line = next(fp) + fp = open(self.manifest) + try: + first_line = fp.readline() + finally: + fp.close() return first_line != '# file GENERATED by distutils, do NOT edit\n' - def read_manifest(self) -> None: + def read_manifest(self): """Read the manifest file (named by 'self.manifest') and use it to fill in 'self.filelist', the list of files to include in the source distribution. """ log.info("reading manifest file '%s'", self.manifest) - with open(self.manifest, encoding='utf-8') as lines: - self.filelist.extend( + with open(self.manifest) as manifest: + for line in manifest: # ignore comments and blank lines - filter(None, filterfalse(is_comment, map(str.strip, lines))) - ) + line = line.strip() + if line.startswith('#') or not line: + continue + self.filelist.append(line) - def make_release_tree(self, base_dir, files) -> None: + def make_release_tree(self, base_dir, files): """Create the directory tree that will become the source distribution archive. All directories implied by the filenames in 'files' are created under 'base_dir', and then we hard link or copy @@ -461,25 +475,25 @@ class sdist(Command): if hasattr(os, 'link'): # can make hard links on this system link = 'hard' - msg = f"making hard links in {base_dir}..." + msg = "making hard links in %s..." % base_dir else: # nope, have to copy link = None - msg = f"copying files to {base_dir}..." + msg = "copying files to %s..." % base_dir if not files: - log.warning("no files to distribute -- empty manifest?") + log.warn("no files to distribute -- empty manifest?") else: log.info(msg) for file in files: if not os.path.isfile(file): - log.warning("'%s' not a regular file -- skipping", file) + log.warn("'%s' not a regular file -- skipping", file) else: dest = os.path.join(base_dir, file) self.copy_file(file, dest, link=link) self.distribution.metadata.write_pkg_info(base_dir) - def make_distribution(self) -> None: + def make_distribution(self): """Create the source distribution(s). First, we create the release tree with 'make_release_tree()'; then, we create all required archive files (according to 'self.formats') from the release tree. @@ -515,7 +529,3 @@ class sdist(Command): was run, or None if the command hasn't run yet. """ return self.archive_files - - -def is_comment(line: str) -> bool: - return line.startswith('#') diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__init__.py deleted file mode 100644 index 2c43729..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -from __future__ import annotations - -from collections.abc import Iterable -from typing import TypeVar - -_IterableT = TypeVar("_IterableT", bound="Iterable[str]") - - -def consolidate_linker_args(args: _IterableT) -> _IterableT | str: - """ - Ensure the return value is a string for backward compatibility. - - Retain until at least 2025-04-31. See pypa/distutils#246 - """ - - if not all(arg.startswith('-Wl,') for arg in args): - return args - return '-Wl,' + ','.join(arg.removeprefix('-Wl,') for arg in args) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index f01b04f..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/numpy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/numpy.cpython-311.pyc deleted file mode 100644 index e4ae71e..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/numpy.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/py39.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/py39.cpython-311.pyc deleted file mode 100644 index 8594db0..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/__pycache__/py39.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/numpy.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/numpy.py deleted file mode 100644 index 73eca7a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/numpy.py +++ /dev/null @@ -1,2 +0,0 @@ -# required for older numpy versions on Pythons prior to 3.12; see pypa/setuptools#4876 -from ..compilers.C.base import _default_compilers, compiler_class # noqa: F401 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/py39.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/py39.py deleted file mode 100644 index 1b436d7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compat/py39.py +++ /dev/null @@ -1,66 +0,0 @@ -import functools -import itertools -import platform -import sys - - -def add_ext_suffix_39(vars): - """ - Ensure vars contains 'EXT_SUFFIX'. pypa/distutils#130 - """ - import _imp - - ext_suffix = _imp.extension_suffixes()[0] - vars.update( - EXT_SUFFIX=ext_suffix, - # sysconfig sets SO to match EXT_SUFFIX, so maintain - # that expectation. - # https://github.com/python/cpython/blob/785cc6770588de087d09e89a69110af2542be208/Lib/sysconfig.py#L671-L673 - SO=ext_suffix, - ) - - -needs_ext_suffix = sys.version_info < (3, 10) and platform.system() == 'Windows' -add_ext_suffix = add_ext_suffix_39 if needs_ext_suffix else lambda vars: None - - -# from more_itertools -class UnequalIterablesError(ValueError): - def __init__(self, details=None): - msg = 'Iterables have different lengths' - if details is not None: - msg += (': index 0 has length {}; index {} has length {}').format(*details) - - super().__init__(msg) - - -# from more_itertools -def _zip_equal_generator(iterables): - _marker = object() - for combo in itertools.zip_longest(*iterables, fillvalue=_marker): - for val in combo: - if val is _marker: - raise UnequalIterablesError() - yield combo - - -# from more_itertools -def _zip_equal(*iterables): - # Check whether the iterables are all the same size. - try: - first_size = len(iterables[0]) - for i, it in enumerate(iterables[1:], 1): - size = len(it) - if size != first_size: - raise UnequalIterablesError(details=(first_size, i, size)) - # All sizes are equal, we can use the built-in zip. - return zip(*iterables) - # If any one of the iterables didn't have a length, start reading - # them until one runs out. - except TypeError: - return _zip_equal_generator(iterables) - - -zip_strict = ( - _zip_equal if sys.version_info < (3, 10) else functools.partial(zip, strict=True) -) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/base.cpython-311.pyc deleted file mode 100644 index 79bb363..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/base.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/cygwin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/cygwin.cpython-311.pyc deleted file mode 100644 index 15d97d5..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/cygwin.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/errors.cpython-311.pyc deleted file mode 100644 index 932f35b..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/errors.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/msvc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/msvc.cpython-311.pyc deleted file mode 100644 index 87c229d..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/msvc.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/unix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/unix.cpython-311.pyc deleted file mode 100644 index 53679f5..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/unix.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/zos.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/zos.cpython-311.pyc deleted file mode 100644 index e16ac0e..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/__pycache__/zos.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/base.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/base.py deleted file mode 100644 index 5efd2a3..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/base.py +++ /dev/null @@ -1,1394 +0,0 @@ -"""distutils.ccompiler - -Contains Compiler, an abstract base class that defines the interface -for the Distutils compiler abstraction model.""" - -from __future__ import annotations - -import os -import pathlib -import re -import sys -import warnings -from collections.abc import Callable, Iterable, MutableSequence, Sequence -from typing import ( - TYPE_CHECKING, - ClassVar, - Literal, - TypeVar, - Union, - overload, -) - -from more_itertools import always_iterable - -from ..._log import log -from ..._modified import newer_group -from ...dir_util import mkpath -from ...errors import ( - DistutilsModuleError, - DistutilsPlatformError, -) -from ...file_util import move_file -from ...spawn import spawn -from ...util import execute, is_mingw, split_quoted -from .errors import ( - CompileError, - LinkError, - UnknownFileType, -) - -if TYPE_CHECKING: - from typing_extensions import TypeAlias, TypeVarTuple, Unpack - - _Ts = TypeVarTuple("_Ts") - -_Macro: TypeAlias = Union[tuple[str], tuple[str, Union[str, None]]] -_StrPathT = TypeVar("_StrPathT", bound="str | os.PathLike[str]") -_BytesPathT = TypeVar("_BytesPathT", bound="bytes | os.PathLike[bytes]") - - -class Compiler: - """Abstract base class to define the interface that must be implemented - by real compiler classes. Also has some utility methods used by - several compiler classes. - - The basic idea behind a compiler abstraction class is that each - instance can be used for all the compile/link steps in building a - single project. Thus, attributes common to all of those compile and - link steps -- include directories, macros to define, libraries to link - against, etc. -- are attributes of the compiler instance. To allow for - variability in how individual files are treated, most of those - attributes may be varied on a per-compilation or per-link basis. - """ - - # 'compiler_type' is a class attribute that identifies this class. It - # keeps code that wants to know what kind of compiler it's dealing with - # from having to import all possible compiler classes just to do an - # 'isinstance'. In concrete CCompiler subclasses, 'compiler_type' - # should really, really be one of the keys of the 'compiler_class' - # dictionary (see below -- used by the 'new_compiler()' factory - # function) -- authors of new compiler interface classes are - # responsible for updating 'compiler_class'! - compiler_type: ClassVar[str] = None # type: ignore[assignment] - - # XXX things not handled by this compiler abstraction model: - # * client can't provide additional options for a compiler, - # e.g. warning, optimization, debugging flags. Perhaps this - # should be the domain of concrete compiler abstraction classes - # (UnixCCompiler, MSVCCompiler, etc.) -- or perhaps the base - # class should have methods for the common ones. - # * can't completely override the include or library searchg - # path, ie. no "cc -I -Idir1 -Idir2" or "cc -L -Ldir1 -Ldir2". - # I'm not sure how widely supported this is even by Unix - # compilers, much less on other platforms. And I'm even less - # sure how useful it is; maybe for cross-compiling, but - # support for that is a ways off. (And anyways, cross - # compilers probably have a dedicated binary with the - # right paths compiled in. I hope.) - # * can't do really freaky things with the library list/library - # dirs, e.g. "-Ldir1 -lfoo -Ldir2 -lfoo" to link against - # different versions of libfoo.a in different locations. I - # think this is useless without the ability to null out the - # library search path anyways. - - executables: ClassVar[dict] - - # Subclasses that rely on the standard filename generation methods - # implemented below should override these; see the comment near - # those methods ('object_filenames()' et. al.) for details: - src_extensions: ClassVar[list[str] | None] = None - obj_extension: ClassVar[str | None] = None - static_lib_extension: ClassVar[str | None] = None - shared_lib_extension: ClassVar[str | None] = None - static_lib_format: ClassVar[str | None] = None # format string - shared_lib_format: ClassVar[str | None] = None # prob. same as static_lib_format - exe_extension: ClassVar[str | None] = None - - # Default language settings. language_map is used to detect a source - # file or Extension target language, checking source filenames. - # language_order is used to detect the language precedence, when deciding - # what language to use when mixing source types. For example, if some - # extension has two files with ".c" extension, and one with ".cpp", it - # is still linked as c++. - language_map: ClassVar[dict[str, str]] = { - ".c": "c", - ".cc": "c++", - ".cpp": "c++", - ".cxx": "c++", - ".m": "objc", - } - language_order: ClassVar[list[str]] = ["c++", "objc", "c"] - - include_dirs: list[str] = [] - """ - include dirs specific to this compiler class - """ - - library_dirs: list[str] = [] - """ - library dirs specific to this compiler class - """ - - def __init__( - self, verbose: bool = False, dry_run: bool = False, force: bool = False - ) -> None: - self.dry_run = dry_run - self.force = force - self.verbose = verbose - - # 'output_dir': a common output directory for object, library, - # shared object, and shared library files - self.output_dir: str | None = None - - # 'macros': a list of macro definitions (or undefinitions). A - # macro definition is a 2-tuple (name, value), where the value is - # either a string or None (no explicit value). A macro - # undefinition is a 1-tuple (name,). - self.macros: list[_Macro] = [] - - # 'include_dirs': a list of directories to search for include files - self.include_dirs = [] - - # 'libraries': a list of libraries to include in any link - # (library names, not filenames: eg. "foo" not "libfoo.a") - self.libraries: list[str] = [] - - # 'library_dirs': a list of directories to search for libraries - self.library_dirs = [] - - # 'runtime_library_dirs': a list of directories to search for - # shared libraries/objects at runtime - self.runtime_library_dirs: list[str] = [] - - # 'objects': a list of object files (or similar, such as explicitly - # named library files) to include on any link - self.objects: list[str] = [] - - for key in self.executables.keys(): - self.set_executable(key, self.executables[key]) - - def set_executables(self, **kwargs: str) -> None: - """Define the executables (and options for them) that will be run - to perform the various stages of compilation. The exact set of - executables that may be specified here depends on the compiler - class (via the 'executables' class attribute), but most will have: - compiler the C/C++ compiler - linker_so linker used to create shared objects and libraries - linker_exe linker used to create binary executables - archiver static library creator - - On platforms with a command-line (Unix, DOS/Windows), each of these - is a string that will be split into executable name and (optional) - list of arguments. (Splitting the string is done similarly to how - Unix shells operate: words are delimited by spaces, but quotes and - backslashes can override this. See - 'distutils.util.split_quoted()'.) - """ - - # Note that some CCompiler implementation classes will define class - # attributes 'cpp', 'cc', etc. with hard-coded executable names; - # this is appropriate when a compiler class is for exactly one - # compiler/OS combination (eg. MSVCCompiler). Other compiler - # classes (UnixCCompiler, in particular) are driven by information - # discovered at run-time, since there are many different ways to do - # basically the same things with Unix C compilers. - - for key in kwargs: - if key not in self.executables: - raise ValueError( - f"unknown executable '{key}' for class {self.__class__.__name__}" - ) - self.set_executable(key, kwargs[key]) - - def set_executable(self, key, value): - if isinstance(value, str): - setattr(self, key, split_quoted(value)) - else: - setattr(self, key, value) - - def _find_macro(self, name): - i = 0 - for defn in self.macros: - if defn[0] == name: - return i - i += 1 - return None - - def _check_macro_definitions(self, definitions): - """Ensure that every element of 'definitions' is valid.""" - for defn in definitions: - self._check_macro_definition(*defn) - - def _check_macro_definition(self, defn): - """ - Raise a TypeError if defn is not valid. - - A valid definition is either a (name, value) 2-tuple or a (name,) tuple. - """ - if not isinstance(defn, tuple) or not self._is_valid_macro(*defn): - raise TypeError( - f"invalid macro definition '{defn}': " - "must be tuple (string,), (string, string), or (string, None)" - ) - - @staticmethod - def _is_valid_macro(name, value=None): - """ - A valid macro is a ``name : str`` and a ``value : str | None``. - - >>> Compiler._is_valid_macro('foo', None) - True - """ - return isinstance(name, str) and isinstance(value, (str, type(None))) - - # -- Bookkeeping methods ------------------------------------------- - - def define_macro(self, name: str, value: str | None = None) -> None: - """Define a preprocessor macro for all compilations driven by this - compiler object. The optional parameter 'value' should be a - string; if it is not supplied, then the macro will be defined - without an explicit value and the exact outcome depends on the - compiler used (XXX true? does ANSI say anything about this?) - """ - # Delete from the list of macro definitions/undefinitions if - # already there (so that this one will take precedence). - i = self._find_macro(name) - if i is not None: - del self.macros[i] - - self.macros.append((name, value)) - - def undefine_macro(self, name: str) -> None: - """Undefine a preprocessor macro for all compilations driven by - this compiler object. If the same macro is defined by - 'define_macro()' and undefined by 'undefine_macro()' the last call - takes precedence (including multiple redefinitions or - undefinitions). If the macro is redefined/undefined on a - per-compilation basis (ie. in the call to 'compile()'), then that - takes precedence. - """ - # Delete from the list of macro definitions/undefinitions if - # already there (so that this one will take precedence). - i = self._find_macro(name) - if i is not None: - del self.macros[i] - - undefn = (name,) - self.macros.append(undefn) - - def add_include_dir(self, dir: str) -> None: - """Add 'dir' to the list of directories that will be searched for - header files. The compiler is instructed to search directories in - the order in which they are supplied by successive calls to - 'add_include_dir()'. - """ - self.include_dirs.append(dir) - - def set_include_dirs(self, dirs: list[str]) -> None: - """Set the list of directories that will be searched to 'dirs' (a - list of strings). Overrides any preceding calls to - 'add_include_dir()'; subsequence calls to 'add_include_dir()' add - to the list passed to 'set_include_dirs()'. This does not affect - any list of standard include directories that the compiler may - search by default. - """ - self.include_dirs = dirs[:] - - def add_library(self, libname: str) -> None: - """Add 'libname' to the list of libraries that will be included in - all links driven by this compiler object. Note that 'libname' - should *not* be the name of a file containing a library, but the - name of the library itself: the actual filename will be inferred by - the linker, the compiler, or the compiler class (depending on the - platform). - - The linker will be instructed to link against libraries in the - order they were supplied to 'add_library()' and/or - 'set_libraries()'. It is perfectly valid to duplicate library - names; the linker will be instructed to link against libraries as - many times as they are mentioned. - """ - self.libraries.append(libname) - - def set_libraries(self, libnames: list[str]) -> None: - """Set the list of libraries to be included in all links driven by - this compiler object to 'libnames' (a list of strings). This does - not affect any standard system libraries that the linker may - include by default. - """ - self.libraries = libnames[:] - - def add_library_dir(self, dir: str) -> None: - """Add 'dir' to the list of directories that will be searched for - libraries specified to 'add_library()' and 'set_libraries()'. The - linker will be instructed to search for libraries in the order they - are supplied to 'add_library_dir()' and/or 'set_library_dirs()'. - """ - self.library_dirs.append(dir) - - def set_library_dirs(self, dirs: list[str]) -> None: - """Set the list of library search directories to 'dirs' (a list of - strings). This does not affect any standard library search path - that the linker may search by default. - """ - self.library_dirs = dirs[:] - - def add_runtime_library_dir(self, dir: str) -> None: - """Add 'dir' to the list of directories that will be searched for - shared libraries at runtime. - """ - self.runtime_library_dirs.append(dir) - - def set_runtime_library_dirs(self, dirs: list[str]) -> None: - """Set the list of directories to search for shared libraries at - runtime to 'dirs' (a list of strings). This does not affect any - standard search path that the runtime linker may search by - default. - """ - self.runtime_library_dirs = dirs[:] - - def add_link_object(self, object: str) -> None: - """Add 'object' to the list of object files (or analogues, such as - explicitly named library files or the output of "resource - compilers") to be included in every link driven by this compiler - object. - """ - self.objects.append(object) - - def set_link_objects(self, objects: list[str]) -> None: - """Set the list of object files (or analogues) to be included in - every link to 'objects'. This does not affect any standard object - files that the linker may include by default (such as system - libraries). - """ - self.objects = objects[:] - - # -- Private utility methods -------------------------------------- - # (here for the convenience of subclasses) - - # Helper method to prep compiler in subclass compile() methods - - def _setup_compile( - self, - outdir: str | None, - macros: list[_Macro] | None, - incdirs: list[str] | tuple[str, ...] | None, - sources, - depends, - extra, - ): - """Process arguments and decide which source files to compile.""" - outdir, macros, incdirs = self._fix_compile_args(outdir, macros, incdirs) - - if extra is None: - extra = [] - - # Get the list of expected output (object) files - objects = self.object_filenames(sources, strip_dir=False, output_dir=outdir) - assert len(objects) == len(sources) - - pp_opts = gen_preprocess_options(macros, incdirs) - - build = {} - for i in range(len(sources)): - src = sources[i] - obj = objects[i] - ext = os.path.splitext(src)[1] - self.mkpath(os.path.dirname(obj)) - build[obj] = (src, ext) - - return macros, objects, extra, pp_opts, build - - def _get_cc_args(self, pp_opts, debug, before): - # works for unixccompiler, cygwinccompiler - cc_args = pp_opts + ['-c'] - if debug: - cc_args[:0] = ['-g'] - if before: - cc_args[:0] = before - return cc_args - - def _fix_compile_args( - self, - output_dir: str | None, - macros: list[_Macro] | None, - include_dirs: list[str] | tuple[str, ...] | None, - ) -> tuple[str, list[_Macro], list[str]]: - """Typecheck and fix-up some of the arguments to the 'compile()' - method, and return fixed-up values. Specifically: if 'output_dir' - is None, replaces it with 'self.output_dir'; ensures that 'macros' - is a list, and augments it with 'self.macros'; ensures that - 'include_dirs' is a list, and augments it with 'self.include_dirs'. - Guarantees that the returned values are of the correct type, - i.e. for 'output_dir' either string or None, and for 'macros' and - 'include_dirs' either list or None. - """ - if output_dir is None: - output_dir = self.output_dir - elif not isinstance(output_dir, str): - raise TypeError("'output_dir' must be a string or None") - - if macros is None: - macros = list(self.macros) - elif isinstance(macros, list): - macros = macros + (self.macros or []) - else: - raise TypeError("'macros' (if supplied) must be a list of tuples") - - if include_dirs is None: - include_dirs = list(self.include_dirs) - elif isinstance(include_dirs, (list, tuple)): - include_dirs = list(include_dirs) + (self.include_dirs or []) - else: - raise TypeError("'include_dirs' (if supplied) must be a list of strings") - - # add include dirs for class - include_dirs += self.__class__.include_dirs - - return output_dir, macros, include_dirs - - def _prep_compile(self, sources, output_dir, depends=None): - """Decide which source files must be recompiled. - - Determine the list of object files corresponding to 'sources', - and figure out which ones really need to be recompiled. - Return a list of all object files and a dictionary telling - which source files can be skipped. - """ - # Get the list of expected output (object) files - objects = self.object_filenames(sources, output_dir=output_dir) - assert len(objects) == len(sources) - - # Return an empty dict for the "which source files can be skipped" - # return value to preserve API compatibility. - return objects, {} - - def _fix_object_args( - self, objects: list[str] | tuple[str, ...], output_dir: str | None - ) -> tuple[list[str], str]: - """Typecheck and fix up some arguments supplied to various methods. - Specifically: ensure that 'objects' is a list; if output_dir is - None, replace with self.output_dir. Return fixed versions of - 'objects' and 'output_dir'. - """ - if not isinstance(objects, (list, tuple)): - raise TypeError("'objects' must be a list or tuple of strings") - objects = list(objects) - - if output_dir is None: - output_dir = self.output_dir - elif not isinstance(output_dir, str): - raise TypeError("'output_dir' must be a string or None") - - return (objects, output_dir) - - def _fix_lib_args( - self, - libraries: list[str] | tuple[str, ...] | None, - library_dirs: list[str] | tuple[str, ...] | None, - runtime_library_dirs: list[str] | tuple[str, ...] | None, - ) -> tuple[list[str], list[str], list[str]]: - """Typecheck and fix up some of the arguments supplied to the - 'link_*' methods. Specifically: ensure that all arguments are - lists, and augment them with their permanent versions - (eg. 'self.libraries' augments 'libraries'). Return a tuple with - fixed versions of all arguments. - """ - if libraries is None: - libraries = list(self.libraries) - elif isinstance(libraries, (list, tuple)): - libraries = list(libraries) + (self.libraries or []) - else: - raise TypeError("'libraries' (if supplied) must be a list of strings") - - if library_dirs is None: - library_dirs = list(self.library_dirs) - elif isinstance(library_dirs, (list, tuple)): - library_dirs = list(library_dirs) + (self.library_dirs or []) - else: - raise TypeError("'library_dirs' (if supplied) must be a list of strings") - - # add library dirs for class - library_dirs += self.__class__.library_dirs - - if runtime_library_dirs is None: - runtime_library_dirs = list(self.runtime_library_dirs) - elif isinstance(runtime_library_dirs, (list, tuple)): - runtime_library_dirs = list(runtime_library_dirs) + ( - self.runtime_library_dirs or [] - ) - else: - raise TypeError( - "'runtime_library_dirs' (if supplied) must be a list of strings" - ) - - return (libraries, library_dirs, runtime_library_dirs) - - def _need_link(self, objects, output_file): - """Return true if we need to relink the files listed in 'objects' - to recreate 'output_file'. - """ - if self.force: - return True - else: - if self.dry_run: - newer = newer_group(objects, output_file, missing='newer') - else: - newer = newer_group(objects, output_file) - return newer - - def detect_language(self, sources: str | list[str]) -> str | None: - """Detect the language of a given file, or list of files. Uses - language_map, and language_order to do the job. - """ - if not isinstance(sources, list): - sources = [sources] - lang = None - index = len(self.language_order) - for source in sources: - base, ext = os.path.splitext(source) - extlang = self.language_map.get(ext) - try: - extindex = self.language_order.index(extlang) - if extindex < index: - lang = extlang - index = extindex - except ValueError: - pass - return lang - - # -- Worker methods ------------------------------------------------ - # (must be implemented by subclasses) - - def preprocess( - self, - source: str | os.PathLike[str], - output_file: str | os.PathLike[str] | None = None, - macros: list[_Macro] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - extra_preargs: list[str] | None = None, - extra_postargs: Iterable[str] | None = None, - ): - """Preprocess a single C/C++ source file, named in 'source'. - Output will be written to file named 'output_file', or stdout if - 'output_file' not supplied. 'macros' is a list of macro - definitions as for 'compile()', which will augment the macros set - with 'define_macro()' and 'undefine_macro()'. 'include_dirs' is a - list of directory names that will be added to the default list. - - Raises PreprocessError on failure. - """ - pass - - def compile( - self, - sources: Sequence[str | os.PathLike[str]], - output_dir: str | None = None, - macros: list[_Macro] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: list[str] | None = None, - depends: list[str] | tuple[str, ...] | None = None, - ) -> list[str]: - """Compile one or more source files. - - 'sources' must be a list of filenames, most likely C/C++ - files, but in reality anything that can be handled by a - particular compiler and compiler class (eg. MSVCCompiler can - handle resource files in 'sources'). Return a list of object - filenames, one per source filename in 'sources'. Depending on - the implementation, not all source files will necessarily be - compiled, but all corresponding object filenames will be - returned. - - If 'output_dir' is given, object files will be put under it, while - retaining their original path component. That is, "foo/bar.c" - normally compiles to "foo/bar.o" (for a Unix implementation); if - 'output_dir' is "build", then it would compile to - "build/foo/bar.o". - - 'macros', if given, must be a list of macro definitions. A macro - definition is either a (name, value) 2-tuple or a (name,) 1-tuple. - The former defines a macro; if the value is None, the macro is - defined without an explicit value. The 1-tuple case undefines a - macro. Later definitions/redefinitions/ undefinitions take - precedence. - - 'include_dirs', if given, must be a list of strings, the - directories to add to the default include file search path for this - compilation only. - - 'debug' is a boolean; if true, the compiler will be instructed to - output debug symbols in (or alongside) the object file(s). - - 'extra_preargs' and 'extra_postargs' are implementation- dependent. - On platforms that have the notion of a command-line (e.g. Unix, - DOS/Windows), they are most likely lists of strings: extra - command-line arguments to prepend/append to the compiler command - line. On other platforms, consult the implementation class - documentation. In any event, they are intended as an escape hatch - for those occasions when the abstract compiler framework doesn't - cut the mustard. - - 'depends', if given, is a list of filenames that all targets - depend on. If a source file is older than any file in - depends, then the source file will be recompiled. This - supports dependency tracking, but only at a coarse - granularity. - - Raises CompileError on failure. - """ - # A concrete compiler class can either override this method - # entirely or implement _compile(). - macros, objects, extra_postargs, pp_opts, build = self._setup_compile( - output_dir, macros, include_dirs, sources, depends, extra_postargs - ) - cc_args = self._get_cc_args(pp_opts, debug, extra_preargs) - - for obj in objects: - try: - src, ext = build[obj] - except KeyError: - continue - self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) - - # Return *all* object filenames, not just the ones we just built. - return objects - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - """Compile 'src' to product 'obj'.""" - # A concrete compiler class that does not override compile() - # should implement _compile(). - pass - - def create_static_lib( - self, - objects: list[str] | tuple[str, ...], - output_libname: str, - output_dir: str | None = None, - debug: bool = False, - target_lang: str | None = None, - ) -> None: - """Link a bunch of stuff together to create a static library file. - The "bunch of stuff" consists of the list of object files supplied - as 'objects', the extra object files supplied to - 'add_link_object()' and/or 'set_link_objects()', the libraries - supplied to 'add_library()' and/or 'set_libraries()', and the - libraries supplied as 'libraries' (if any). - - 'output_libname' should be a library name, not a filename; the - filename will be inferred from the library name. 'output_dir' is - the directory where the library file will be put. - - 'debug' is a boolean; if true, debugging information will be - included in the library (note that on most platforms, it is the - compile step where this matters: the 'debug' flag is included here - just for consistency). - - 'target_lang' is the target language for which the given objects - are being compiled. This allows specific linkage time treatment of - certain languages. - - Raises LibError on failure. - """ - pass - - # values for target_desc parameter in link() - SHARED_OBJECT = "shared_object" - SHARED_LIBRARY = "shared_library" - EXECUTABLE = "executable" - - def link( - self, - target_desc: str, - objects: list[str] | tuple[str, ...], - output_filename: str, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Iterable[str] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: list[str] | None = None, - build_temp: str | os.PathLike[str] | None = None, - target_lang: str | None = None, - ): - """Link a bunch of stuff together to create an executable or - shared library file. - - The "bunch of stuff" consists of the list of object files supplied - as 'objects'. 'output_filename' should be a filename. If - 'output_dir' is supplied, 'output_filename' is relative to it - (i.e. 'output_filename' can provide directory components if - needed). - - 'libraries' is a list of libraries to link against. These are - library names, not filenames, since they're translated into - filenames in a platform-specific way (eg. "foo" becomes "libfoo.a" - on Unix and "foo.lib" on DOS/Windows). However, they can include a - directory component, which means the linker will look in that - specific directory rather than searching all the normal locations. - - 'library_dirs', if supplied, should be a list of directories to - search for libraries that were specified as bare library names - (ie. no directory component). These are on top of the system - default and those supplied to 'add_library_dir()' and/or - 'set_library_dirs()'. 'runtime_library_dirs' is a list of - directories that will be embedded into the shared library and used - to search for other shared libraries that *it* depends on at - run-time. (This may only be relevant on Unix.) - - 'export_symbols' is a list of symbols that the shared library will - export. (This appears to be relevant only on Windows.) - - 'debug' is as for 'compile()' and 'create_static_lib()', with the - slight distinction that it actually matters on most platforms (as - opposed to 'create_static_lib()', which includes a 'debug' flag - mostly for form's sake). - - 'extra_preargs' and 'extra_postargs' are as for 'compile()' (except - of course that they supply command-line arguments for the - particular linker being used). - - 'target_lang' is the target language for which the given objects - are being compiled. This allows specific linkage time treatment of - certain languages. - - Raises LinkError on failure. - """ - raise NotImplementedError - - # Old 'link_*()' methods, rewritten to use the new 'link()' method. - - def link_shared_lib( - self, - objects: list[str] | tuple[str, ...], - output_libname: str, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Iterable[str] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: list[str] | None = None, - build_temp: str | os.PathLike[str] | None = None, - target_lang: str | None = None, - ): - self.link( - Compiler.SHARED_LIBRARY, - objects, - self.library_filename(output_libname, lib_type='shared'), - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - export_symbols, - debug, - extra_preargs, - extra_postargs, - build_temp, - target_lang, - ) - - def link_shared_object( - self, - objects: list[str] | tuple[str, ...], - output_filename: str, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Iterable[str] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: list[str] | None = None, - build_temp: str | os.PathLike[str] | None = None, - target_lang: str | None = None, - ): - self.link( - Compiler.SHARED_OBJECT, - objects, - output_filename, - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - export_symbols, - debug, - extra_preargs, - extra_postargs, - build_temp, - target_lang, - ) - - def link_executable( - self, - objects: list[str] | tuple[str, ...], - output_progname: str, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: list[str] | None = None, - target_lang: str | None = None, - ): - self.link( - Compiler.EXECUTABLE, - objects, - self.executable_filename(output_progname), - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - None, - debug, - extra_preargs, - extra_postargs, - None, - target_lang, - ) - - # -- Miscellaneous methods ----------------------------------------- - # These are all used by the 'gen_lib_options() function; there is - # no appropriate default implementation so subclasses should - # implement all of these. - - def library_dir_option(self, dir: str) -> str: - """Return the compiler option to add 'dir' to the list of - directories searched for libraries. - """ - raise NotImplementedError - - def runtime_library_dir_option(self, dir: str) -> str: - """Return the compiler option to add 'dir' to the list of - directories searched for runtime libraries. - """ - raise NotImplementedError - - def library_option(self, lib: str) -> str: - """Return the compiler option to add 'lib' to the list of libraries - linked into the shared library or executable. - """ - raise NotImplementedError - - def has_function( # noqa: C901 - self, - funcname: str, - includes: Iterable[str] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - libraries: list[str] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - ) -> bool: - """Return a boolean indicating whether funcname is provided as - a symbol on the current platform. The optional arguments can - be used to augment the compilation environment. - - The libraries argument is a list of flags to be passed to the - linker to make additional symbol definitions available for - linking. - - The includes and include_dirs arguments are deprecated. - Usually, supplying include files with function declarations - will cause function detection to fail even in cases where the - symbol is available for linking. - - """ - # this can't be included at module scope because it tries to - # import math which might not be available at that point - maybe - # the necessary logic should just be inlined? - import tempfile - - if includes is None: - includes = [] - else: - warnings.warn("includes is deprecated", DeprecationWarning) - if include_dirs is None: - include_dirs = [] - else: - warnings.warn("include_dirs is deprecated", DeprecationWarning) - if libraries is None: - libraries = [] - if library_dirs is None: - library_dirs = [] - fd, fname = tempfile.mkstemp(".c", funcname, text=True) - with os.fdopen(fd, "w", encoding='utf-8') as f: - for incl in includes: - f.write(f"""#include "{incl}"\n""") - if not includes: - # Use "char func(void);" as the prototype to follow - # what autoconf does. This prototype does not match - # any well-known function the compiler might recognize - # as a builtin, so this ends up as a true link test. - # Without a fake prototype, the test would need to - # know the exact argument types, and the has_function - # interface does not provide that level of information. - f.write( - f"""\ -#ifdef __cplusplus -extern "C" -#endif -char {funcname}(void); -""" - ) - f.write( - f"""\ -int main (int argc, char **argv) {{ - {funcname}(); - return 0; -}} -""" - ) - - try: - objects = self.compile([fname], include_dirs=include_dirs) - except CompileError: - return False - finally: - os.remove(fname) - - try: - self.link_executable( - objects, "a.out", libraries=libraries, library_dirs=library_dirs - ) - except (LinkError, TypeError): - return False - else: - os.remove( - self.executable_filename("a.out", output_dir=self.output_dir or '') - ) - finally: - for fn in objects: - os.remove(fn) - return True - - def find_library_file( - self, dirs: Iterable[str], lib: str, debug: bool = False - ) -> str | None: - """Search the specified list of directories for a static or shared - library file 'lib' and return the full path to that file. If - 'debug' true, look for a debugging version (if that makes sense on - the current platform). Return None if 'lib' wasn't found in any of - the specified directories. - """ - raise NotImplementedError - - # -- Filename generation methods ----------------------------------- - - # The default implementation of the filename generating methods are - # prejudiced towards the Unix/DOS/Windows view of the world: - # * object files are named by replacing the source file extension - # (eg. .c/.cpp -> .o/.obj) - # * library files (shared or static) are named by plugging the - # library name and extension into a format string, eg. - # "lib%s.%s" % (lib_name, ".a") for Unix static libraries - # * executables are named by appending an extension (possibly - # empty) to the program name: eg. progname + ".exe" for - # Windows - # - # To reduce redundant code, these methods expect to find - # several attributes in the current object (presumably defined - # as class attributes): - # * src_extensions - - # list of C/C++ source file extensions, eg. ['.c', '.cpp'] - # * obj_extension - - # object file extension, eg. '.o' or '.obj' - # * static_lib_extension - - # extension for static library files, eg. '.a' or '.lib' - # * shared_lib_extension - - # extension for shared library/object files, eg. '.so', '.dll' - # * static_lib_format - - # format string for generating static library filenames, - # eg. 'lib%s.%s' or '%s.%s' - # * shared_lib_format - # format string for generating shared library filenames - # (probably same as static_lib_format, since the extension - # is one of the intended parameters to the format string) - # * exe_extension - - # extension for executable files, eg. '' or '.exe' - - def object_filenames( - self, - source_filenames: Iterable[str | os.PathLike[str]], - strip_dir: bool = False, - output_dir: str | os.PathLike[str] | None = '', - ) -> list[str]: - if output_dir is None: - output_dir = '' - return list( - self._make_out_path(output_dir, strip_dir, src_name) - for src_name in source_filenames - ) - - @property - def out_extensions(self): - return dict.fromkeys(self.src_extensions, self.obj_extension) - - def _make_out_path(self, output_dir, strip_dir, src_name): - return self._make_out_path_exts( - output_dir, strip_dir, src_name, self.out_extensions - ) - - @classmethod - def _make_out_path_exts(cls, output_dir, strip_dir, src_name, extensions): - r""" - >>> exts = {'.c': '.o'} - >>> Compiler._make_out_path_exts('.', False, '/foo/bar.c', exts).replace('\\', '/') - './foo/bar.o' - >>> Compiler._make_out_path_exts('.', True, '/foo/bar.c', exts).replace('\\', '/') - './bar.o' - """ - src = pathlib.PurePath(src_name) - # Ensure base is relative to honor output_dir (python/cpython#37775). - base = cls._make_relative(src) - try: - new_ext = extensions[src.suffix] - except LookupError: - raise UnknownFileType(f"unknown file type '{src.suffix}' (from '{src}')") - if strip_dir: - base = pathlib.PurePath(base.name) - return os.path.join(output_dir, base.with_suffix(new_ext)) - - @staticmethod - def _make_relative(base: pathlib.Path): - return base.relative_to(base.anchor) - - @overload - def shared_object_filename( - self, - basename: str, - strip_dir: Literal[False] = False, - output_dir: str | os.PathLike[str] = "", - ) -> str: ... - @overload - def shared_object_filename( - self, - basename: str | os.PathLike[str], - strip_dir: Literal[True], - output_dir: str | os.PathLike[str] = "", - ) -> str: ... - def shared_object_filename( - self, - basename: str | os.PathLike[str], - strip_dir: bool = False, - output_dir: str | os.PathLike[str] = '', - ) -> str: - assert output_dir is not None - if strip_dir: - basename = os.path.basename(basename) - return os.path.join(output_dir, basename + self.shared_lib_extension) - - @overload - def executable_filename( - self, - basename: str, - strip_dir: Literal[False] = False, - output_dir: str | os.PathLike[str] = "", - ) -> str: ... - @overload - def executable_filename( - self, - basename: str | os.PathLike[str], - strip_dir: Literal[True], - output_dir: str | os.PathLike[str] = "", - ) -> str: ... - def executable_filename( - self, - basename: str | os.PathLike[str], - strip_dir: bool = False, - output_dir: str | os.PathLike[str] = '', - ) -> str: - assert output_dir is not None - if strip_dir: - basename = os.path.basename(basename) - return os.path.join(output_dir, basename + (self.exe_extension or '')) - - def library_filename( - self, - libname: str, - lib_type: str = "static", - strip_dir: bool = False, - output_dir: str | os.PathLike[str] = "", # or 'shared' - ): - assert output_dir is not None - expected = '"static", "shared", "dylib", "xcode_stub"' - if lib_type not in eval(expected): - raise ValueError(f"'lib_type' must be {expected}") - fmt = getattr(self, lib_type + "_lib_format") - ext = getattr(self, lib_type + "_lib_extension") - - dir, base = os.path.split(libname) - filename = fmt % (base, ext) - if strip_dir: - dir = '' - - return os.path.join(output_dir, dir, filename) - - # -- Utility methods ----------------------------------------------- - - def announce(self, msg: object, level: int = 1) -> None: - log.debug(msg) - - def debug_print(self, msg: object) -> None: - from distutils.debug import DEBUG - - if DEBUG: - print(msg) - - def warn(self, msg: object) -> None: - sys.stderr.write(f"warning: {msg}\n") - - def execute( - self, - func: Callable[[Unpack[_Ts]], object], - args: tuple[Unpack[_Ts]], - msg: object = None, - level: int = 1, - ) -> None: - execute(func, args, msg, self.dry_run) - - def spawn( - self, cmd: MutableSequence[bytes | str | os.PathLike[str]], **kwargs - ) -> None: - spawn(cmd, dry_run=self.dry_run, **kwargs) - - @overload - def move_file( - self, src: str | os.PathLike[str], dst: _StrPathT - ) -> _StrPathT | str: ... - @overload - def move_file( - self, src: bytes | os.PathLike[bytes], dst: _BytesPathT - ) -> _BytesPathT | bytes: ... - def move_file( - self, - src: str | os.PathLike[str] | bytes | os.PathLike[bytes], - dst: str | os.PathLike[str] | bytes | os.PathLike[bytes], - ) -> str | os.PathLike[str] | bytes | os.PathLike[bytes]: - return move_file(src, dst, dry_run=self.dry_run) - - def mkpath(self, name, mode=0o777): - mkpath(name, mode, dry_run=self.dry_run) - - -# Map a sys.platform/os.name ('posix', 'nt') to the default compiler -# type for that platform. Keys are interpreted as re match -# patterns. Order is important; platform mappings are preferred over -# OS names. -_default_compilers = ( - # Platform string mappings - # on a cygwin built python we can use gcc like an ordinary UNIXish - # compiler - ('cygwin.*', 'unix'), - ('zos', 'zos'), - # OS name mappings - ('posix', 'unix'), - ('nt', 'msvc'), -) - - -def get_default_compiler(osname: str | None = None, platform: str | None = None) -> str: - """Determine the default compiler to use for the given platform. - - osname should be one of the standard Python OS names (i.e. the - ones returned by os.name) and platform the common value - returned by sys.platform for the platform in question. - - The default values are os.name and sys.platform in case the - parameters are not given. - """ - if osname is None: - osname = os.name - if platform is None: - platform = sys.platform - # Mingw is a special case where sys.platform is 'win32' but we - # want to use the 'mingw32' compiler, so check it first - if is_mingw(): - return 'mingw32' - for pattern, compiler in _default_compilers: - if ( - re.match(pattern, platform) is not None - or re.match(pattern, osname) is not None - ): - return compiler - # Default to Unix compiler - return 'unix' - - -# Map compiler types to (module_name, class_name) pairs -- ie. where to -# find the code that implements an interface to this compiler. (The module -# is assumed to be in the 'distutils' package.) -compiler_class = { - 'unix': ('unixccompiler', 'UnixCCompiler', "standard UNIX-style compiler"), - 'msvc': ('_msvccompiler', 'MSVCCompiler', "Microsoft Visual C++"), - 'cygwin': ( - 'cygwinccompiler', - 'CygwinCCompiler', - "Cygwin port of GNU C Compiler for Win32", - ), - 'mingw32': ( - 'cygwinccompiler', - 'Mingw32CCompiler', - "Mingw32 port of GNU C Compiler for Win32", - ), - 'bcpp': ('bcppcompiler', 'BCPPCompiler', "Borland C++ Compiler"), - 'zos': ('zosccompiler', 'zOSCCompiler', 'IBM XL C/C++ Compilers'), -} - - -def show_compilers() -> None: - """Print list of available compilers (used by the "--help-compiler" - options to "build", "build_ext", "build_clib"). - """ - # XXX this "knows" that the compiler option it's describing is - # "--compiler", which just happens to be the case for the three - # commands that use it. - from distutils.fancy_getopt import FancyGetopt - - compilers = sorted( - ("compiler=" + compiler, None, compiler_class[compiler][2]) - for compiler in compiler_class.keys() - ) - pretty_printer = FancyGetopt(compilers) - pretty_printer.print_help("List of available compilers:") - - -def new_compiler( - plat: str | None = None, - compiler: str | None = None, - verbose: bool = False, - dry_run: bool = False, - force: bool = False, -) -> Compiler: - """Generate an instance of some CCompiler subclass for the supplied - platform/compiler combination. 'plat' defaults to 'os.name' - (eg. 'posix', 'nt'), and 'compiler' defaults to the default compiler - for that platform. Currently only 'posix' and 'nt' are supported, and - the default compilers are "traditional Unix interface" (UnixCCompiler - class) and Visual C++ (MSVCCompiler class). Note that it's perfectly - possible to ask for a Unix compiler object under Windows, and a - Microsoft compiler object under Unix -- if you supply a value for - 'compiler', 'plat' is ignored. - """ - if plat is None: - plat = os.name - - try: - if compiler is None: - compiler = get_default_compiler(plat) - - (module_name, class_name, long_description) = compiler_class[compiler] - except KeyError: - msg = f"don't know how to compile C/C++ code on platform '{plat}'" - if compiler is not None: - msg = msg + f" with '{compiler}' compiler" - raise DistutilsPlatformError(msg) - - try: - module_name = "distutils." + module_name - __import__(module_name) - module = sys.modules[module_name] - klass = vars(module)[class_name] - except ImportError: - raise DistutilsModuleError( - f"can't compile C/C++ code: unable to load module '{module_name}'" - ) - except KeyError: - raise DistutilsModuleError( - f"can't compile C/C++ code: unable to find class '{class_name}' " - f"in module '{module_name}'" - ) - - # XXX The None is necessary to preserve backwards compatibility - # with classes that expect verbose to be the first positional - # argument. - return klass(None, dry_run, force) - - -def gen_preprocess_options( - macros: Iterable[_Macro], include_dirs: Iterable[str] -) -> list[str]: - """Generate C pre-processor options (-D, -U, -I) as used by at least - two types of compilers: the typical Unix compiler and Visual C++. - 'macros' is the usual thing, a list of 1- or 2-tuples, where (name,) - means undefine (-U) macro 'name', and (name,value) means define (-D) - macro 'name' to 'value'. 'include_dirs' is just a list of directory - names to be added to the header file search path (-I). Returns a list - of command-line options suitable for either Unix compilers or Visual - C++. - """ - # XXX it would be nice (mainly aesthetic, and so we don't generate - # stupid-looking command lines) to go over 'macros' and eliminate - # redundant definitions/undefinitions (ie. ensure that only the - # latest mention of a particular macro winds up on the command - # line). I don't think it's essential, though, since most (all?) - # Unix C compilers only pay attention to the latest -D or -U - # mention of a macro on their command line. Similar situation for - # 'include_dirs'. I'm punting on both for now. Anyways, weeding out - # redundancies like this should probably be the province of - # CCompiler, since the data structures used are inherited from it - # and therefore common to all CCompiler classes. - pp_opts = [] - for macro in macros: - if not (isinstance(macro, tuple) and 1 <= len(macro) <= 2): - raise TypeError( - f"bad macro definition '{macro}': " - "each element of 'macros' list must be a 1- or 2-tuple" - ) - - if len(macro) == 1: # undefine this macro - pp_opts.append(f"-U{macro[0]}") - elif len(macro) == 2: - if macro[1] is None: # define with no explicit value - pp_opts.append(f"-D{macro[0]}") - else: - # XXX *don't* need to be clever about quoting the - # macro value here, because we're going to avoid the - # shell at all costs when we spawn the command! - pp_opts.append("-D{}={}".format(*macro)) - - pp_opts.extend(f"-I{dir}" for dir in include_dirs) - return pp_opts - - -def gen_lib_options( - compiler: Compiler, - library_dirs: Iterable[str], - runtime_library_dirs: Iterable[str], - libraries: Iterable[str], -) -> list[str]: - """Generate linker options for searching library directories and - linking with specific libraries. 'libraries' and 'library_dirs' are, - respectively, lists of library names (not filenames!) and search - directories. Returns a list of command-line options suitable for use - with some compiler (depending on the two format strings passed in). - """ - lib_opts = [compiler.library_dir_option(dir) for dir in library_dirs] - - for dir in runtime_library_dirs: - lib_opts.extend(always_iterable(compiler.runtime_library_dir_option(dir))) - - # XXX it's important that we *not* remove redundant library mentions! - # sometimes you really do have to say "-lfoo -lbar -lfoo" in order to - # resolve all symbols. I just hope we never have to say "-lfoo obj.o - # -lbar" to get things to work -- that's certainly a possibility, but a - # pretty nasty way to arrange your C code. - - for lib in libraries: - (lib_dir, lib_name) = os.path.split(lib) - if lib_dir: - lib_file = compiler.find_library_file([lib_dir], lib_name) - if lib_file: - lib_opts.append(lib_file) - else: - compiler.warn( - f"no library file corresponding to '{lib}' found (skipping)" - ) - else: - lib_opts.append(compiler.library_option(lib)) - return lib_opts diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/cygwin.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/cygwin.py deleted file mode 100644 index bfabbb3..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/cygwin.py +++ /dev/null @@ -1,340 +0,0 @@ -"""distutils.cygwinccompiler - -Provides the CygwinCCompiler class, a subclass of UnixCCompiler that -handles the Cygwin port of the GNU C compiler to Windows. It also contains -the Mingw32CCompiler class which handles the mingw32 port of GCC (same as -cygwin in no-cygwin mode). -""" - -import copy -import os -import pathlib -import shlex -import sys -import warnings -from subprocess import check_output - -from ...errors import ( - DistutilsExecError, - DistutilsPlatformError, -) -from ...file_util import write_file -from ...sysconfig import get_config_vars -from ...version import LooseVersion, suppress_known_deprecation -from . import unix -from .errors import ( - CompileError, - Error, -) - - -def get_msvcr(): - """No longer needed, but kept for backward compatibility.""" - return [] - - -_runtime_library_dirs_msg = ( - "Unable to set runtime library search path on Windows, " - "usually indicated by `runtime_library_dirs` parameter to Extension" -) - - -class Compiler(unix.Compiler): - """Handles the Cygwin port of the GNU C compiler to Windows.""" - - compiler_type = 'cygwin' - obj_extension = ".o" - static_lib_extension = ".a" - shared_lib_extension = ".dll.a" - dylib_lib_extension = ".dll" - static_lib_format = "lib%s%s" - shared_lib_format = "lib%s%s" - dylib_lib_format = "cyg%s%s" - exe_extension = ".exe" - - def __init__(self, verbose=False, dry_run=False, force=False): - super().__init__(verbose, dry_run, force) - - status, details = check_config_h() - self.debug_print(f"Python's GCC status: {status} (details: {details})") - if status is not CONFIG_H_OK: - self.warn( - "Python's pyconfig.h doesn't seem to support your compiler. " - f"Reason: {details}. " - "Compiling may fail because of undefined preprocessor macros." - ) - - self.cc, self.cxx = get_config_vars('CC', 'CXX') - - # Override 'CC' and 'CXX' environment variables for - # building using MINGW compiler for MSVC python. - self.cc = os.environ.get('CC', self.cc or 'gcc') - self.cxx = os.environ.get('CXX', self.cxx or 'g++') - - self.linker_dll = self.cc - self.linker_dll_cxx = self.cxx - shared_option = "-shared" - - self.set_executables( - compiler=f'{self.cc} -mcygwin -O -Wall', - compiler_so=f'{self.cc} -mcygwin -mdll -O -Wall', - compiler_cxx=f'{self.cxx} -mcygwin -O -Wall', - compiler_so_cxx=f'{self.cxx} -mcygwin -mdll -O -Wall', - linker_exe=f'{self.cc} -mcygwin', - linker_so=f'{self.linker_dll} -mcygwin {shared_option}', - linker_exe_cxx=f'{self.cxx} -mcygwin', - linker_so_cxx=f'{self.linker_dll_cxx} -mcygwin {shared_option}', - ) - - self.dll_libraries = get_msvcr() - - @property - def gcc_version(self): - # Older numpy depended on this existing to check for ancient - # gcc versions. This doesn't make much sense with clang etc so - # just hardcode to something recent. - # https://github.com/numpy/numpy/pull/20333 - warnings.warn( - "gcc_version attribute of CygwinCCompiler is deprecated. " - "Instead of returning actual gcc version a fixed value 11.2.0 is returned.", - DeprecationWarning, - stacklevel=2, - ) - with suppress_known_deprecation(): - return LooseVersion("11.2.0") - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - """Compiles the source by spawning GCC and windres if needed.""" - if ext in ('.rc', '.res'): - # gcc needs '.res' and '.rc' compiled to object files !!! - try: - self.spawn(["windres", "-i", src, "-o", obj]) - except DistutilsExecError as msg: - raise CompileError(msg) - else: # for other files use the C-compiler - try: - if self.detect_language(src) == 'c++': - self.spawn( - self.compiler_so_cxx - + cc_args - + [src, '-o', obj] - + extra_postargs - ) - else: - self.spawn( - self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs - ) - except DistutilsExecError as msg: - raise CompileError(msg) - - def link( - self, - target_desc, - objects, - output_filename, - output_dir=None, - libraries=None, - library_dirs=None, - runtime_library_dirs=None, - export_symbols=None, - debug=False, - extra_preargs=None, - extra_postargs=None, - build_temp=None, - target_lang=None, - ): - """Link the objects.""" - # use separate copies, so we can modify the lists - extra_preargs = copy.copy(extra_preargs or []) - libraries = copy.copy(libraries or []) - objects = copy.copy(objects or []) - - if runtime_library_dirs: - self.warn(_runtime_library_dirs_msg) - - # Additional libraries - libraries.extend(self.dll_libraries) - - # handle export symbols by creating a def-file - # with executables this only works with gcc/ld as linker - if (export_symbols is not None) and ( - target_desc != self.EXECUTABLE or self.linker_dll == "gcc" - ): - # (The linker doesn't do anything if output is up-to-date. - # So it would probably better to check if we really need this, - # but for this we had to insert some unchanged parts of - # UnixCCompiler, and this is not what we want.) - - # we want to put some files in the same directory as the - # object files are, build_temp doesn't help much - # where are the object files - temp_dir = os.path.dirname(objects[0]) - # name of dll to give the helper files the same base name - (dll_name, dll_extension) = os.path.splitext( - os.path.basename(output_filename) - ) - - # generate the filenames for these files - def_file = os.path.join(temp_dir, dll_name + ".def") - - # Generate .def file - contents = [f"LIBRARY {os.path.basename(output_filename)}", "EXPORTS"] - contents.extend(export_symbols) - self.execute(write_file, (def_file, contents), f"writing {def_file}") - - # next add options for def-file - - # for gcc/ld the def-file is specified as any object files - objects.append(def_file) - - # end: if ((export_symbols is not None) and - # (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")): - - # who wants symbols and a many times larger output file - # should explicitly switch the debug mode on - # otherwise we let ld strip the output file - # (On my machine: 10KiB < stripped_file < ??100KiB - # unstripped_file = stripped_file + XXX KiB - # ( XXX=254 for a typical python extension)) - if not debug: - extra_preargs.append("-s") - - super().link( - target_desc, - objects, - output_filename, - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - None, # export_symbols, we do this in our def-file - debug, - extra_preargs, - extra_postargs, - build_temp, - target_lang, - ) - - def runtime_library_dir_option(self, dir): - # cygwin doesn't support rpath. While in theory we could error - # out like MSVC does, code might expect it to work like on Unix, so - # just warn and hope for the best. - self.warn(_runtime_library_dirs_msg) - return [] - - # -- Miscellaneous methods ----------------------------------------- - - def _make_out_path(self, output_dir, strip_dir, src_name): - # use normcase to make sure '.rc' is really '.rc' and not '.RC' - norm_src_name = os.path.normcase(src_name) - return super()._make_out_path(output_dir, strip_dir, norm_src_name) - - @property - def out_extensions(self): - """ - Add support for rc and res files. - """ - return { - **super().out_extensions, - **{ext: ext + self.obj_extension for ext in ('.res', '.rc')}, - } - - -# the same as cygwin plus some additional parameters -class MinGW32Compiler(Compiler): - """Handles the Mingw32 port of the GNU C compiler to Windows.""" - - compiler_type = 'mingw32' - - def __init__(self, verbose=False, dry_run=False, force=False): - super().__init__(verbose, dry_run, force) - - shared_option = "-shared" - - if is_cygwincc(self.cc): - raise Error('Cygwin gcc cannot be used with --compiler=mingw32') - - self.set_executables( - compiler=f'{self.cc} -O -Wall', - compiler_so=f'{self.cc} -shared -O -Wall', - compiler_so_cxx=f'{self.cxx} -shared -O -Wall', - compiler_cxx=f'{self.cxx} -O -Wall', - linker_exe=f'{self.cc}', - linker_so=f'{self.linker_dll} {shared_option}', - linker_exe_cxx=f'{self.cxx}', - linker_so_cxx=f'{self.linker_dll_cxx} {shared_option}', - ) - - def runtime_library_dir_option(self, dir): - raise DistutilsPlatformError(_runtime_library_dirs_msg) - - -# Because these compilers aren't configured in Python's pyconfig.h file by -# default, we should at least warn the user if he is using an unmodified -# version. - -CONFIG_H_OK = "ok" -CONFIG_H_NOTOK = "not ok" -CONFIG_H_UNCERTAIN = "uncertain" - - -def check_config_h(): - """Check if the current Python installation appears amenable to building - extensions with GCC. - - Returns a tuple (status, details), where 'status' is one of the following - constants: - - - CONFIG_H_OK: all is well, go ahead and compile - - CONFIG_H_NOTOK: doesn't look good - - CONFIG_H_UNCERTAIN: not sure -- unable to read pyconfig.h - - 'details' is a human-readable string explaining the situation. - - Note there are two ways to conclude "OK": either 'sys.version' contains - the string "GCC" (implying that this Python was built with GCC), or the - installed "pyconfig.h" contains the string "__GNUC__". - """ - - # XXX since this function also checks sys.version, it's not strictly a - # "pyconfig.h" check -- should probably be renamed... - - from distutils import sysconfig - - # if sys.version contains GCC then python was compiled with GCC, and the - # pyconfig.h file should be OK - if "GCC" in sys.version: - return CONFIG_H_OK, "sys.version mentions 'GCC'" - - # Clang would also work - if "Clang" in sys.version: - return CONFIG_H_OK, "sys.version mentions 'Clang'" - - # let's see if __GNUC__ is mentioned in python.h - fn = sysconfig.get_config_h_filename() - try: - config_h = pathlib.Path(fn).read_text(encoding='utf-8') - except OSError as exc: - return (CONFIG_H_UNCERTAIN, f"couldn't read '{fn}': {exc.strerror}") - else: - substring = '__GNUC__' - if substring in config_h: - code = CONFIG_H_OK - mention_inflected = 'mentions' - else: - code = CONFIG_H_NOTOK - mention_inflected = 'does not mention' - return code, f"{fn!r} {mention_inflected} {substring!r}" - - -def is_cygwincc(cc): - """Try to determine if the compiler that would be used is from cygwin.""" - out_string = check_output(shlex.split(cc) + ['-dumpmachine']) - return out_string.strip().endswith(b'cygwin') - - -get_versions = None -""" -A stand-in for the previous get_versions() function to prevent failures -when monkeypatched. See pypa/setuptools#2969. -""" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/errors.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/errors.py deleted file mode 100644 index 0132859..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/errors.py +++ /dev/null @@ -1,24 +0,0 @@ -class Error(Exception): - """Some compile/link operation failed.""" - - -class PreprocessError(Error): - """Failure to preprocess one or more C/C++ files.""" - - -class CompileError(Error): - """Failure to compile one or more C/C++ source files.""" - - -class LibError(Error): - """Failure to create a static library from one or more C/C++ object - files.""" - - -class LinkError(Error): - """Failure to link one or more C/C++ object files into an executable - or shared library file.""" - - -class UnknownFileType(Error): - """Attempt to process an unknown file type.""" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/msvc.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/msvc.py deleted file mode 100644 index 6db062a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/msvc.py +++ /dev/null @@ -1,614 +0,0 @@ -"""distutils._msvccompiler - -Contains MSVCCompiler, an implementation of the abstract CCompiler class -for Microsoft Visual Studio 2015. - -This module requires VS 2015 or later. -""" - -# Written by Perry Stoll -# hacked by Robin Becker and Thomas Heller to do a better job of -# finding DevStudio (through the registry) -# ported to VS 2005 and VS 2008 by Christian Heimes -# ported to VS 2015 by Steve Dower -from __future__ import annotations - -import contextlib -import os -import subprocess -import unittest.mock as mock -import warnings -from collections.abc import Iterable - -with contextlib.suppress(ImportError): - import winreg - -from itertools import count - -from ..._log import log -from ...errors import ( - DistutilsExecError, - DistutilsPlatformError, -) -from ...util import get_host_platform, get_platform -from . import base -from .base import gen_lib_options -from .errors import ( - CompileError, - LibError, - LinkError, -) - - -def _find_vc2015(): - try: - key = winreg.OpenKeyEx( - winreg.HKEY_LOCAL_MACHINE, - r"Software\Microsoft\VisualStudio\SxS\VC7", - access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY, - ) - except OSError: - log.debug("Visual C++ is not registered") - return None, None - - best_version = 0 - best_dir = None - with key: - for i in count(): - try: - v, vc_dir, vt = winreg.EnumValue(key, i) - except OSError: - break - if v and vt == winreg.REG_SZ and os.path.isdir(vc_dir): - try: - version = int(float(v)) - except (ValueError, TypeError): - continue - if version >= 14 and version > best_version: - best_version, best_dir = version, vc_dir - return best_version, best_dir - - -def _find_vc2017(): - """Returns "15, path" based on the result of invoking vswhere.exe - If no install is found, returns "None, None" - - The version is returned to avoid unnecessarily changing the function - result. It may be ignored when the path is not None. - - If vswhere.exe is not available, by definition, VS 2017 is not - installed. - """ - root = os.environ.get("ProgramFiles(x86)") or os.environ.get("ProgramFiles") - if not root: - return None, None - - variant = 'arm64' if get_platform() == 'win-arm64' else 'x86.x64' - suitable_components = ( - f"Microsoft.VisualStudio.Component.VC.Tools.{variant}", - "Microsoft.VisualStudio.Workload.WDExpress", - ) - - for component in suitable_components: - # Workaround for `-requiresAny` (only available on VS 2017 > 15.6) - with contextlib.suppress( - subprocess.CalledProcessError, OSError, UnicodeDecodeError - ): - path = ( - subprocess.check_output([ - os.path.join( - root, "Microsoft Visual Studio", "Installer", "vswhere.exe" - ), - "-latest", - "-prerelease", - "-requires", - component, - "-property", - "installationPath", - "-products", - "*", - ]) - .decode(encoding="mbcs", errors="strict") - .strip() - ) - - path = os.path.join(path, "VC", "Auxiliary", "Build") - if os.path.isdir(path): - return 15, path - - return None, None # no suitable component found - - -PLAT_SPEC_TO_RUNTIME = { - 'x86': 'x86', - 'x86_amd64': 'x64', - 'x86_arm': 'arm', - 'x86_arm64': 'arm64', -} - - -def _find_vcvarsall(plat_spec): - # bpo-38597: Removed vcruntime return value - _, best_dir = _find_vc2017() - - if not best_dir: - best_version, best_dir = _find_vc2015() - - if not best_dir: - log.debug("No suitable Visual C++ version found") - return None, None - - vcvarsall = os.path.join(best_dir, "vcvarsall.bat") - if not os.path.isfile(vcvarsall): - log.debug("%s cannot be found", vcvarsall) - return None, None - - return vcvarsall, None - - -def _get_vc_env(plat_spec): - if os.getenv("DISTUTILS_USE_SDK"): - return {key.lower(): value for key, value in os.environ.items()} - - vcvarsall, _ = _find_vcvarsall(plat_spec) - if not vcvarsall: - raise DistutilsPlatformError( - 'Microsoft Visual C++ 14.0 or greater is required. ' - 'Get it with "Microsoft C++ Build Tools": ' - 'https://visualstudio.microsoft.com/visual-cpp-build-tools/' - ) - - try: - out = subprocess.check_output( - f'cmd /u /c "{vcvarsall}" {plat_spec} && set', - stderr=subprocess.STDOUT, - ).decode('utf-16le', errors='replace') - except subprocess.CalledProcessError as exc: - log.error(exc.output) - raise DistutilsPlatformError(f"Error executing {exc.cmd}") - - env = { - key.lower(): value - for key, _, value in (line.partition('=') for line in out.splitlines()) - if key and value - } - - return env - - -def _find_exe(exe, paths=None): - """Return path to an MSVC executable program. - - Tries to find the program in several places: first, one of the - MSVC program search paths from the registry; next, the directories - in the PATH environment variable. If any of those work, return an - absolute path that is known to exist. If none of them work, just - return the original program name, 'exe'. - """ - if not paths: - paths = os.getenv('path').split(os.pathsep) - for p in paths: - fn = os.path.join(os.path.abspath(p), exe) - if os.path.isfile(fn): - return fn - return exe - - -_vcvars_names = { - 'win32': 'x86', - 'win-amd64': 'amd64', - 'win-arm32': 'arm', - 'win-arm64': 'arm64', -} - - -def _get_vcvars_spec(host_platform, platform): - """ - Given a host platform and platform, determine the spec for vcvarsall. - - Uses the native MSVC host if the host platform would need expensive - emulation for x86. - - >>> _get_vcvars_spec('win-arm64', 'win32') - 'arm64_x86' - >>> _get_vcvars_spec('win-arm64', 'win-amd64') - 'arm64_amd64' - - Otherwise, always cross-compile from x86 to work with the - lighter-weight MSVC installs that do not include native 64-bit tools. - - >>> _get_vcvars_spec('win32', 'win32') - 'x86' - >>> _get_vcvars_spec('win-arm32', 'win-arm32') - 'x86_arm' - >>> _get_vcvars_spec('win-amd64', 'win-arm64') - 'x86_arm64' - """ - if host_platform != 'win-arm64': - host_platform = 'win32' - vc_hp = _vcvars_names[host_platform] - vc_plat = _vcvars_names[platform] - return vc_hp if vc_hp == vc_plat else f'{vc_hp}_{vc_plat}' - - -class Compiler(base.Compiler): - """Concrete class that implements an interface to Microsoft Visual C++, - as defined by the CCompiler abstract class.""" - - compiler_type = 'msvc' - - # Just set this so CCompiler's constructor doesn't barf. We currently - # don't use the 'set_executables()' bureaucracy provided by CCompiler, - # as it really isn't necessary for this sort of single-compiler class. - # Would be nice to have a consistent interface with UnixCCompiler, - # though, so it's worth thinking about. - executables = {} - - # Private class data (need to distinguish C from C++ source for compiler) - _c_extensions = ['.c'] - _cpp_extensions = ['.cc', '.cpp', '.cxx'] - _rc_extensions = ['.rc'] - _mc_extensions = ['.mc'] - - # Needed for the filename generation methods provided by the - # base class, CCompiler. - src_extensions = _c_extensions + _cpp_extensions + _rc_extensions + _mc_extensions - res_extension = '.res' - obj_extension = '.obj' - static_lib_extension = '.lib' - shared_lib_extension = '.dll' - static_lib_format = shared_lib_format = '%s%s' - exe_extension = '.exe' - - def __init__(self, verbose=False, dry_run=False, force=False) -> None: - super().__init__(verbose, dry_run, force) - # target platform (.plat_name is consistent with 'bdist') - self.plat_name = None - self.initialized = False - - @classmethod - def _configure(cls, vc_env): - """ - Set class-level include/lib dirs. - """ - cls.include_dirs = cls._parse_path(vc_env.get('include', '')) - cls.library_dirs = cls._parse_path(vc_env.get('lib', '')) - - @staticmethod - def _parse_path(val): - return [dir.rstrip(os.sep) for dir in val.split(os.pathsep) if dir] - - def initialize(self, plat_name: str | None = None) -> None: - # multi-init means we would need to check platform same each time... - assert not self.initialized, "don't init multiple times" - if plat_name is None: - plat_name = get_platform() - # sanity check for platforms to prevent obscure errors later. - if plat_name not in _vcvars_names: - raise DistutilsPlatformError( - f"--plat-name must be one of {tuple(_vcvars_names)}" - ) - - plat_spec = _get_vcvars_spec(get_host_platform(), plat_name) - - vc_env = _get_vc_env(plat_spec) - if not vc_env: - raise DistutilsPlatformError( - "Unable to find a compatible Visual Studio installation." - ) - self._configure(vc_env) - - self._paths = vc_env.get('path', '') - paths = self._paths.split(os.pathsep) - self.cc = _find_exe("cl.exe", paths) - self.linker = _find_exe("link.exe", paths) - self.lib = _find_exe("lib.exe", paths) - self.rc = _find_exe("rc.exe", paths) # resource compiler - self.mc = _find_exe("mc.exe", paths) # message compiler - self.mt = _find_exe("mt.exe", paths) # message compiler - - self.preprocess_options = None - # bpo-38597: Always compile with dynamic linking - # Future releases of Python 3.x will include all past - # versions of vcruntime*.dll for compatibility. - self.compile_options = ['/nologo', '/O2', '/W3', '/GL', '/DNDEBUG', '/MD'] - - self.compile_options_debug = [ - '/nologo', - '/Od', - '/MDd', - '/Zi', - '/W3', - '/D_DEBUG', - ] - - ldflags = ['/nologo', '/INCREMENTAL:NO', '/LTCG'] - - ldflags_debug = ['/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'] - - self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1'] - self.ldflags_exe_debug = [*ldflags_debug, '/MANIFEST:EMBED,ID=1'] - self.ldflags_shared = [ - *ldflags, - '/DLL', - '/MANIFEST:EMBED,ID=2', - '/MANIFESTUAC:NO', - ] - self.ldflags_shared_debug = [ - *ldflags_debug, - '/DLL', - '/MANIFEST:EMBED,ID=2', - '/MANIFESTUAC:NO', - ] - self.ldflags_static = [*ldflags] - self.ldflags_static_debug = [*ldflags_debug] - - self._ldflags = { - (base.Compiler.EXECUTABLE, None): self.ldflags_exe, - (base.Compiler.EXECUTABLE, False): self.ldflags_exe, - (base.Compiler.EXECUTABLE, True): self.ldflags_exe_debug, - (base.Compiler.SHARED_OBJECT, None): self.ldflags_shared, - (base.Compiler.SHARED_OBJECT, False): self.ldflags_shared, - (base.Compiler.SHARED_OBJECT, True): self.ldflags_shared_debug, - (base.Compiler.SHARED_LIBRARY, None): self.ldflags_static, - (base.Compiler.SHARED_LIBRARY, False): self.ldflags_static, - (base.Compiler.SHARED_LIBRARY, True): self.ldflags_static_debug, - } - - self.initialized = True - - # -- Worker methods ------------------------------------------------ - - @property - def out_extensions(self) -> dict[str, str]: - return { - **super().out_extensions, - **{ - ext: self.res_extension - for ext in self._rc_extensions + self._mc_extensions - }, - } - - def compile( # noqa: C901 - self, - sources, - output_dir=None, - macros=None, - include_dirs=None, - debug=False, - extra_preargs=None, - extra_postargs=None, - depends=None, - ): - if not self.initialized: - self.initialize() - compile_info = self._setup_compile( - output_dir, macros, include_dirs, sources, depends, extra_postargs - ) - macros, objects, extra_postargs, pp_opts, build = compile_info - - compile_opts = extra_preargs or [] - compile_opts.append('/c') - if debug: - compile_opts.extend(self.compile_options_debug) - else: - compile_opts.extend(self.compile_options) - - add_cpp_opts = False - - for obj in objects: - try: - src, ext = build[obj] - except KeyError: - continue - if debug: - # pass the full pathname to MSVC in debug mode, - # this allows the debugger to find the source file - # without asking the user to browse for it - src = os.path.abspath(src) - - if ext in self._c_extensions: - input_opt = f"/Tc{src}" - elif ext in self._cpp_extensions: - input_opt = f"/Tp{src}" - add_cpp_opts = True - elif ext in self._rc_extensions: - # compile .RC to .RES file - input_opt = src - output_opt = "/fo" + obj - try: - self.spawn([self.rc] + pp_opts + [output_opt, input_opt]) - except DistutilsExecError as msg: - raise CompileError(msg) - continue - elif ext in self._mc_extensions: - # Compile .MC to .RC file to .RES file. - # * '-h dir' specifies the directory for the - # generated include file - # * '-r dir' specifies the target directory of the - # generated RC file and the binary message resource - # it includes - # - # For now (since there are no options to change this), - # we use the source-directory for the include file and - # the build directory for the RC file and message - # resources. This works at least for win32all. - h_dir = os.path.dirname(src) - rc_dir = os.path.dirname(obj) - try: - # first compile .MC to .RC and .H file - self.spawn([self.mc, '-h', h_dir, '-r', rc_dir, src]) - base, _ = os.path.splitext(os.path.basename(src)) - rc_file = os.path.join(rc_dir, base + '.rc') - # then compile .RC to .RES file - self.spawn([self.rc, "/fo" + obj, rc_file]) - - except DistutilsExecError as msg: - raise CompileError(msg) - continue - else: - # how to handle this file? - raise CompileError(f"Don't know how to compile {src} to {obj}") - - args = [self.cc] + compile_opts + pp_opts - if add_cpp_opts: - args.append('/EHsc') - args.extend((input_opt, "/Fo" + obj)) - args.extend(extra_postargs) - - try: - self.spawn(args) - except DistutilsExecError as msg: - raise CompileError(msg) - - return objects - - def create_static_lib( - self, - objects: list[str] | tuple[str, ...], - output_libname: str, - output_dir: str | None = None, - debug: bool = False, - target_lang: str | None = None, - ) -> None: - if not self.initialized: - self.initialize() - objects, output_dir = self._fix_object_args(objects, output_dir) - output_filename = self.library_filename(output_libname, output_dir=output_dir) - - if self._need_link(objects, output_filename): - lib_args = objects + ['/OUT:' + output_filename] - if debug: - pass # XXX what goes here? - try: - log.debug('Executing "%s" %s', self.lib, ' '.join(lib_args)) - self.spawn([self.lib] + lib_args) - except DistutilsExecError as msg: - raise LibError(msg) - else: - log.debug("skipping %s (up-to-date)", output_filename) - - def link( - self, - target_desc: str, - objects: list[str] | tuple[str, ...], - output_filename: str, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Iterable[str] | None = None, - debug: bool = False, - extra_preargs: list[str] | None = None, - extra_postargs: Iterable[str] | None = None, - build_temp: str | os.PathLike[str] | None = None, - target_lang: str | None = None, - ) -> None: - if not self.initialized: - self.initialize() - objects, output_dir = self._fix_object_args(objects, output_dir) - fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) - libraries, library_dirs, runtime_library_dirs = fixed_args - - if runtime_library_dirs: - self.warn( - "I don't know what to do with 'runtime_library_dirs': " - + str(runtime_library_dirs) - ) - - lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries) - if output_dir is not None: - output_filename = os.path.join(output_dir, output_filename) - - if self._need_link(objects, output_filename): - ldflags = self._ldflags[target_desc, debug] - - export_opts = ["/EXPORT:" + sym for sym in (export_symbols or [])] - - ld_args = ( - ldflags + lib_opts + export_opts + objects + ['/OUT:' + output_filename] - ) - - # The MSVC linker generates .lib and .exp files, which cannot be - # suppressed by any linker switches. The .lib files may even be - # needed! Make sure they are generated in the temporary build - # directory. Since they have different names for debug and release - # builds, they can go into the same directory. - build_temp = os.path.dirname(objects[0]) - if export_symbols is not None: - (dll_name, dll_ext) = os.path.splitext( - os.path.basename(output_filename) - ) - implib_file = os.path.join(build_temp, self.library_filename(dll_name)) - ld_args.append('/IMPLIB:' + implib_file) - - if extra_preargs: - ld_args[:0] = extra_preargs - if extra_postargs: - ld_args.extend(extra_postargs) - - output_dir = os.path.dirname(os.path.abspath(output_filename)) - self.mkpath(output_dir) - try: - log.debug('Executing "%s" %s', self.linker, ' '.join(ld_args)) - self.spawn([self.linker] + ld_args) - except DistutilsExecError as msg: - raise LinkError(msg) - else: - log.debug("skipping %s (up-to-date)", output_filename) - - def spawn(self, cmd): - env = dict(os.environ, PATH=self._paths) - with self._fallback_spawn(cmd, env) as fallback: - return super().spawn(cmd, env=env) - return fallback.value - - @contextlib.contextmanager - def _fallback_spawn(self, cmd, env): - """ - Discovered in pypa/distutils#15, some tools monkeypatch the compiler, - so the 'env' kwarg causes a TypeError. Detect this condition and - restore the legacy, unsafe behavior. - """ - bag = type('Bag', (), {})() - try: - yield bag - except TypeError as exc: - if "unexpected keyword argument 'env'" not in str(exc): - raise - else: - return - warnings.warn("Fallback spawn triggered. Please update distutils monkeypatch.") - with mock.patch.dict('os.environ', env): - bag.value = super().spawn(cmd) - - # -- Miscellaneous methods ----------------------------------------- - # These are all used by the 'gen_lib_options() function, in - # ccompiler.py. - - def library_dir_option(self, dir): - return "/LIBPATH:" + dir - - def runtime_library_dir_option(self, dir): - raise DistutilsPlatformError( - "don't know how to set runtime library search path for MSVC" - ) - - def library_option(self, lib): - return self.library_filename(lib) - - def find_library_file(self, dirs, lib, debug=False): - # Prefer a debugging library if found (and requested), but deal - # with it if we don't have one. - if debug: - try_names = [lib + "_d", lib] - else: - try_names = [lib] - for dir in dirs: - for name in try_names: - libfile = os.path.join(dir, self.library_filename(name)) - if os.path.isfile(libfile): - return libfile - else: - # Oops, didn't find it in *any* of 'dirs' - return None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_base.cpython-311.pyc deleted file mode 100644 index 206aa1c..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_base.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_cygwin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_cygwin.cpython-311.pyc deleted file mode 100644 index ec2f38c..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_cygwin.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_mingw.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_mingw.cpython-311.pyc deleted file mode 100644 index 8a30207..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_mingw.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_msvc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_msvc.cpython-311.pyc deleted file mode 100644 index b49c51f..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_msvc.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_unix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_unix.cpython-311.pyc deleted file mode 100644 index 64fc545..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/__pycache__/test_unix.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_base.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_base.py deleted file mode 100644 index a762e2b..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_base.py +++ /dev/null @@ -1,83 +0,0 @@ -import platform -import sysconfig -import textwrap - -import pytest - -from .. import base - -pytestmark = pytest.mark.usefixtures('suppress_path_mangle') - - -@pytest.fixture -def c_file(tmp_path): - c_file = tmp_path / 'foo.c' - gen_headers = ('Python.h',) - is_windows = platform.system() == "Windows" - plat_headers = ('windows.h',) * is_windows - all_headers = gen_headers + plat_headers - headers = '\n'.join(f'#include <{header}>\n' for header in all_headers) - payload = ( - textwrap.dedent( - """ - #headers - void PyInit_foo(void) {} - """ - ) - .lstrip() - .replace('#headers', headers) - ) - c_file.write_text(payload, encoding='utf-8') - return c_file - - -def test_set_include_dirs(c_file): - """ - Extensions should build even if set_include_dirs is invoked. - In particular, compiler-specific paths should not be overridden. - """ - compiler = base.new_compiler() - python = sysconfig.get_paths()['include'] - compiler.set_include_dirs([python]) - compiler.compile([c_file]) - - # do it again, setting include dirs after any initialization - compiler.set_include_dirs([python]) - compiler.compile([c_file]) - - -def test_has_function_prototype(): - # Issue https://github.com/pypa/setuptools/issues/3648 - # Test prototype-generating behavior. - - compiler = base.new_compiler() - - # Every C implementation should have these. - assert compiler.has_function('abort') - assert compiler.has_function('exit') - with pytest.deprecated_call(match='includes is deprecated'): - # abort() is a valid expression with the prototype. - assert compiler.has_function('abort', includes=['stdlib.h']) - with pytest.deprecated_call(match='includes is deprecated'): - # But exit() is not valid with the actual prototype in scope. - assert not compiler.has_function('exit', includes=['stdlib.h']) - # And setuptools_does_not_exist is not declared or defined at all. - assert not compiler.has_function('setuptools_does_not_exist') - with pytest.deprecated_call(match='includes is deprecated'): - assert not compiler.has_function( - 'setuptools_does_not_exist', includes=['stdio.h'] - ) - - -def test_include_dirs_after_multiple_compile_calls(c_file): - """ - Calling compile multiple times should not change the include dirs - (regression test for setuptools issue #3591). - """ - compiler = base.new_compiler() - python = sysconfig.get_paths()['include'] - compiler.set_include_dirs([python]) - compiler.compile([c_file]) - assert compiler.include_dirs == [python] - compiler.compile([c_file]) - assert compiler.include_dirs == [python] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py deleted file mode 100644 index 9adf6b8..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_cygwin.py +++ /dev/null @@ -1,76 +0,0 @@ -"""Tests for distutils.cygwinccompiler.""" - -import os -import sys -from distutils import sysconfig -from distutils.tests import support - -import pytest - -from .. import cygwin - - -@pytest.fixture(autouse=True) -def stuff(request, monkeypatch, distutils_managed_tempdir): - self = request.instance - self.python_h = os.path.join(self.mkdtemp(), 'python.h') - monkeypatch.setattr(sysconfig, 'get_config_h_filename', self._get_config_h_filename) - monkeypatch.setattr(sys, 'version', sys.version) - - -class TestCygwinCCompiler(support.TempdirManager): - def _get_config_h_filename(self): - return self.python_h - - @pytest.mark.skipif('sys.platform != "cygwin"') - @pytest.mark.skipif('not os.path.exists("/usr/lib/libbash.dll.a")') - def test_find_library_file(self): - from distutils.cygwinccompiler import CygwinCCompiler - - compiler = CygwinCCompiler() - link_name = "bash" - linkable_file = compiler.find_library_file(["/usr/lib"], link_name) - assert linkable_file is not None - assert os.path.exists(linkable_file) - assert linkable_file == f"/usr/lib/lib{link_name:s}.dll.a" - - @pytest.mark.skipif('sys.platform != "cygwin"') - def test_runtime_library_dir_option(self): - from distutils.cygwinccompiler import CygwinCCompiler - - compiler = CygwinCCompiler() - assert compiler.runtime_library_dir_option('/foo') == [] - - def test_check_config_h(self): - # check_config_h looks for "GCC" in sys.version first - # returns CONFIG_H_OK if found - sys.version = ( - '2.6.1 (r261:67515, Dec 6 2008, 16:42:21) \n[GCC ' - '4.0.1 (Apple Computer, Inc. build 5370)]' - ) - - assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_OK - - # then it tries to see if it can find "__GNUC__" in pyconfig.h - sys.version = 'something without the *CC word' - - # if the file doesn't exist it returns CONFIG_H_UNCERTAIN - assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_UNCERTAIN - - # if it exists but does not contain __GNUC__, it returns CONFIG_H_NOTOK - self.write_file(self.python_h, 'xxx') - assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_NOTOK - - # and CONFIG_H_OK if __GNUC__ is found - self.write_file(self.python_h, 'xxx __GNUC__ xxx') - assert cygwin.check_config_h()[0] == cygwin.CONFIG_H_OK - - def test_get_msvcr(self): - assert cygwin.get_msvcr() == [] - - @pytest.mark.skipif('sys.platform != "cygwin"') - def test_dll_libraries_not_none(self): - from distutils.cygwinccompiler import CygwinCCompiler - - compiler = CygwinCCompiler() - assert compiler.dll_libraries is not None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_mingw.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_mingw.py deleted file mode 100644 index dc45687..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_mingw.py +++ /dev/null @@ -1,48 +0,0 @@ -from distutils import sysconfig -from distutils.errors import DistutilsPlatformError -from distutils.util import is_mingw, split_quoted - -import pytest - -from .. import cygwin, errors - - -class TestMinGW32Compiler: - @pytest.mark.skipif(not is_mingw(), reason='not on mingw') - def test_compiler_type(self): - compiler = cygwin.MinGW32Compiler() - assert compiler.compiler_type == 'mingw32' - - @pytest.mark.skipif(not is_mingw(), reason='not on mingw') - def test_set_executables(self, monkeypatch): - monkeypatch.setenv('CC', 'cc') - monkeypatch.setenv('CXX', 'c++') - - compiler = cygwin.MinGW32Compiler() - - assert compiler.compiler == split_quoted('cc -O -Wall') - assert compiler.compiler_so == split_quoted('cc -shared -O -Wall') - assert compiler.compiler_cxx == split_quoted('c++ -O -Wall') - assert compiler.linker_exe == split_quoted('cc') - assert compiler.linker_so == split_quoted('cc -shared') - - @pytest.mark.skipif(not is_mingw(), reason='not on mingw') - def test_runtime_library_dir_option(self): - compiler = cygwin.MinGW32Compiler() - with pytest.raises(DistutilsPlatformError): - compiler.runtime_library_dir_option('/usr/lib') - - @pytest.mark.skipif(not is_mingw(), reason='not on mingw') - def test_cygwincc_error(self, monkeypatch): - monkeypatch.setattr(cygwin, 'is_cygwincc', lambda _: True) - - with pytest.raises(errors.Error): - cygwin.MinGW32Compiler() - - @pytest.mark.skipif('sys.platform == "cygwin"') - def test_customize_compiler_with_msvc_python(self): - # In case we have an MSVC Python build, but still want to use - # MinGW32Compiler, then customize_compiler() shouldn't fail at least. - # https://github.com/pypa/setuptools/issues/4456 - compiler = cygwin.MinGW32Compiler() - sysconfig.customize_compiler(compiler) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py deleted file mode 100644 index eca8319..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_msvc.py +++ /dev/null @@ -1,136 +0,0 @@ -import os -import sys -import sysconfig -import threading -import unittest.mock as mock -from distutils.errors import DistutilsPlatformError -from distutils.tests import support -from distutils.util import get_platform - -import pytest - -from .. import msvc - -needs_winreg = pytest.mark.skipif('not hasattr(msvc, "winreg")') - - -class Testmsvccompiler(support.TempdirManager): - def test_no_compiler(self, monkeypatch): - # makes sure query_vcvarsall raises - # a DistutilsPlatformError if the compiler - # is not found - def _find_vcvarsall(plat_spec): - return None, None - - monkeypatch.setattr(msvc, '_find_vcvarsall', _find_vcvarsall) - - with pytest.raises(DistutilsPlatformError): - msvc._get_vc_env( - 'wont find this version', - ) - - @pytest.mark.skipif( - not sysconfig.get_platform().startswith("win"), - reason="Only run test for non-mingw Windows platforms", - ) - @pytest.mark.parametrize( - "plat_name, expected", - [ - ("win-arm64", "win-arm64"), - ("win-amd64", "win-amd64"), - (None, get_platform()), - ], - ) - def test_cross_platform_compilation_paths(self, monkeypatch, plat_name, expected): - """ - Ensure a specified target platform is passed to _get_vcvars_spec. - """ - compiler = msvc.Compiler() - - def _get_vcvars_spec(host_platform, platform): - assert platform == expected - - monkeypatch.setattr(msvc, '_get_vcvars_spec', _get_vcvars_spec) - compiler.initialize(plat_name) - - @needs_winreg - def test_get_vc_env_unicode(self): - test_var = 'ṰḖṤṪ┅ṼẨṜ' - test_value = '₃⁴₅' - - # Ensure we don't early exit from _get_vc_env - old_distutils_use_sdk = os.environ.pop('DISTUTILS_USE_SDK', None) - os.environ[test_var] = test_value - try: - env = msvc._get_vc_env('x86') - assert test_var.lower() in env - assert test_value == env[test_var.lower()] - finally: - os.environ.pop(test_var) - if old_distutils_use_sdk: - os.environ['DISTUTILS_USE_SDK'] = old_distutils_use_sdk - - @needs_winreg - @pytest.mark.parametrize('ver', (2015, 2017)) - def test_get_vc(self, ver): - # This function cannot be mocked, so pass if VC is found - # and skip otherwise. - lookup = getattr(msvc, f'_find_vc{ver}') - expected_version = {2015: 14, 2017: 15}[ver] - version, path = lookup() - if not version: - pytest.skip(f"VS {ver} is not installed") - assert version >= expected_version - assert os.path.isdir(path) - - -class CheckThread(threading.Thread): - exc_info = None - - def run(self): - try: - super().run() - except Exception: - self.exc_info = sys.exc_info() - - def __bool__(self): - return not self.exc_info - - -class TestSpawn: - def test_concurrent_safe(self): - """ - Concurrent calls to spawn should have consistent results. - """ - compiler = msvc.Compiler() - compiler._paths = "expected" - inner_cmd = 'import os; assert os.environ["PATH"] == "expected"' - command = [sys.executable, '-c', inner_cmd] - - threads = [ - CheckThread(target=compiler.spawn, args=[command]) for n in range(100) - ] - for thread in threads: - thread.start() - for thread in threads: - thread.join() - assert all(threads) - - def test_concurrent_safe_fallback(self): - """ - If CCompiler.spawn has been monkey-patched without support - for an env, it should still execute. - """ - from distutils import ccompiler - - compiler = msvc.Compiler() - compiler._paths = "expected" - - def CCompiler_spawn(self, cmd): - "A spawn without an env argument." - assert os.environ["PATH"] == "expected" - - with mock.patch.object(ccompiler.CCompiler, 'spawn', CCompiler_spawn): - compiler.spawn(["n/a"]) - - assert os.environ.get("PATH") != "expected" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_unix.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_unix.py deleted file mode 100644 index 35b6b0e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/tests/test_unix.py +++ /dev/null @@ -1,413 +0,0 @@ -"""Tests for distutils.unixccompiler.""" - -import os -import sys -import unittest.mock as mock -from distutils import sysconfig -from distutils.compat import consolidate_linker_args -from distutils.errors import DistutilsPlatformError -from distutils.tests import support -from distutils.tests.compat.py39 import EnvironmentVarGuard -from distutils.util import _clear_cached_macosx_ver - -import pytest - -from .. import unix - - -@pytest.fixture(autouse=True) -def save_values(monkeypatch): - monkeypatch.setattr(sys, 'platform', sys.platform) - monkeypatch.setattr(sysconfig, 'get_config_var', sysconfig.get_config_var) - monkeypatch.setattr(sysconfig, 'get_config_vars', sysconfig.get_config_vars) - - -@pytest.fixture(autouse=True) -def compiler_wrapper(request): - class CompilerWrapper(unix.Compiler): - def rpath_foo(self): - return self.runtime_library_dir_option('/foo') - - request.instance.cc = CompilerWrapper() - - -class TestUnixCCompiler(support.TempdirManager): - @pytest.mark.skipif('platform.system == "Windows"') - def test_runtime_libdir_option(self): # noqa: C901 - # Issue #5900; GitHub Issue #37 - # - # Ensure RUNPATH is added to extension modules with RPATH if - # GNU ld is used - - # darwin - sys.platform = 'darwin' - darwin_ver_var = 'MACOSX_DEPLOYMENT_TARGET' - darwin_rpath_flag = '-Wl,-rpath,/foo' - darwin_lib_flag = '-L/foo' - - # (macOS version from syscfg, macOS version from env var) -> flag - # Version value of None generates two tests: as None and as empty string - # Expected flag value of None means an mismatch exception is expected - darwin_test_cases = [ - ((None, None), darwin_lib_flag), - ((None, '11'), darwin_rpath_flag), - (('10', None), darwin_lib_flag), - (('10.3', None), darwin_lib_flag), - (('10.3.1', None), darwin_lib_flag), - (('10.5', None), darwin_rpath_flag), - (('10.5.1', None), darwin_rpath_flag), - (('10.3', '10.3'), darwin_lib_flag), - (('10.3', '10.5'), darwin_rpath_flag), - (('10.5', '10.3'), darwin_lib_flag), - (('10.5', '11'), darwin_rpath_flag), - (('10.4', '10'), None), - ] - - def make_darwin_gcv(syscfg_macosx_ver): - def gcv(var): - if var == darwin_ver_var: - return syscfg_macosx_ver - return "xxx" - - return gcv - - def do_darwin_test(syscfg_macosx_ver, env_macosx_ver, expected_flag): - env = os.environ - msg = f"macOS version = (sysconfig={syscfg_macosx_ver!r}, env={env_macosx_ver!r})" - - # Save - old_gcv = sysconfig.get_config_var - old_env_macosx_ver = env.get(darwin_ver_var) - - # Setup environment - _clear_cached_macosx_ver() - sysconfig.get_config_var = make_darwin_gcv(syscfg_macosx_ver) - if env_macosx_ver is not None: - env[darwin_ver_var] = env_macosx_ver - elif darwin_ver_var in env: - env.pop(darwin_ver_var) - - # Run the test - if expected_flag is not None: - assert self.cc.rpath_foo() == expected_flag, msg - else: - with pytest.raises( - DistutilsPlatformError, match=darwin_ver_var + r' mismatch' - ): - self.cc.rpath_foo() - - # Restore - if old_env_macosx_ver is not None: - env[darwin_ver_var] = old_env_macosx_ver - elif darwin_ver_var in env: - env.pop(darwin_ver_var) - sysconfig.get_config_var = old_gcv - _clear_cached_macosx_ver() - - for macosx_vers, expected_flag in darwin_test_cases: - syscfg_macosx_ver, env_macosx_ver = macosx_vers - do_darwin_test(syscfg_macosx_ver, env_macosx_ver, expected_flag) - # Bonus test cases with None interpreted as empty string - if syscfg_macosx_ver is None: - do_darwin_test("", env_macosx_ver, expected_flag) - if env_macosx_ver is None: - do_darwin_test(syscfg_macosx_ver, "", expected_flag) - if syscfg_macosx_ver is None and env_macosx_ver is None: - do_darwin_test("", "", expected_flag) - - old_gcv = sysconfig.get_config_var - - # hp-ux - sys.platform = 'hp-ux' - - def gcv(v): - return 'xxx' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == ['+s', '-L/foo'] - - def gcv(v): - return 'gcc' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == ['-Wl,+s', '-L/foo'] - - def gcv(v): - return 'g++' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == ['-Wl,+s', '-L/foo'] - - sysconfig.get_config_var = old_gcv - - # GCC GNULD - sys.platform = 'bar' - - def gcv(v): - if v == 'CC': - return 'gcc' - elif v == 'GNULD': - return 'yes' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == consolidate_linker_args([ - '-Wl,--enable-new-dtags', - '-Wl,-rpath,/foo', - ]) - - def gcv(v): - if v == 'CC': - return 'gcc -pthread -B /bar' - elif v == 'GNULD': - return 'yes' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == consolidate_linker_args([ - '-Wl,--enable-new-dtags', - '-Wl,-rpath,/foo', - ]) - - # GCC non-GNULD - sys.platform = 'bar' - - def gcv(v): - if v == 'CC': - return 'gcc' - elif v == 'GNULD': - return 'no' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == '-Wl,-R/foo' - - # GCC GNULD with fully qualified configuration prefix - # see #7617 - sys.platform = 'bar' - - def gcv(v): - if v == 'CC': - return 'x86_64-pc-linux-gnu-gcc-4.4.2' - elif v == 'GNULD': - return 'yes' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == consolidate_linker_args([ - '-Wl,--enable-new-dtags', - '-Wl,-rpath,/foo', - ]) - - # non-GCC GNULD - sys.platform = 'bar' - - def gcv(v): - if v == 'CC': - return 'cc' - elif v == 'GNULD': - return 'yes' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == consolidate_linker_args([ - '-Wl,--enable-new-dtags', - '-Wl,-rpath,/foo', - ]) - - # non-GCC non-GNULD - sys.platform = 'bar' - - def gcv(v): - if v == 'CC': - return 'cc' - elif v == 'GNULD': - return 'no' - - sysconfig.get_config_var = gcv - assert self.cc.rpath_foo() == '-Wl,-R/foo' - - @pytest.mark.skipif('platform.system == "Windows"') - def test_cc_overrides_ldshared(self): - # Issue #18080: - # ensure that setting CC env variable also changes default linker - def gcv(v): - if v == 'LDSHARED': - return 'gcc-4.2 -bundle -undefined dynamic_lookup ' - return 'gcc-4.2' - - def gcvs(*args, _orig=sysconfig.get_config_vars): - if args: - return list(map(sysconfig.get_config_var, args)) - return _orig() - - sysconfig.get_config_var = gcv - sysconfig.get_config_vars = gcvs - with EnvironmentVarGuard() as env: - env['CC'] = 'my_cc' - del env['LDSHARED'] - sysconfig.customize_compiler(self.cc) - assert self.cc.linker_so[0] == 'my_cc' - - @pytest.mark.skipif('platform.system == "Windows"') - def test_cxx_commands_used_are_correct(self): - def gcv(v): - if v == 'LDSHARED': - return 'ccache gcc-4.2 -bundle -undefined dynamic_lookup' - elif v == 'LDCXXSHARED': - return 'ccache g++-4.2 -bundle -undefined dynamic_lookup' - elif v == 'CXX': - return 'ccache g++-4.2' - elif v == 'CC': - return 'ccache gcc-4.2' - return '' - - def gcvs(*args, _orig=sysconfig.get_config_vars): - if args: - return list(map(sysconfig.get_config_var, args)) - return _orig() # pragma: no cover - - sysconfig.get_config_var = gcv - sysconfig.get_config_vars = gcvs - with ( - mock.patch.object(self.cc, 'spawn', return_value=None) as mock_spawn, - mock.patch.object(self.cc, '_need_link', return_value=True), - mock.patch.object(self.cc, 'mkpath', return_value=None), - EnvironmentVarGuard() as env, - ): - # override environment overrides in case they're specified by CI - del env['CXX'] - del env['LDCXXSHARED'] - - sysconfig.customize_compiler(self.cc) - assert self.cc.linker_so_cxx[0:2] == ['ccache', 'g++-4.2'] - assert self.cc.linker_exe_cxx[0:2] == ['ccache', 'g++-4.2'] - self.cc.link(None, [], 'a.out', target_lang='c++') - call_args = mock_spawn.call_args[0][0] - expected = ['ccache', 'g++-4.2', '-bundle', '-undefined', 'dynamic_lookup'] - assert call_args[:5] == expected - - self.cc.link_executable([], 'a.out', target_lang='c++') - call_args = mock_spawn.call_args[0][0] - expected = ['ccache', 'g++-4.2', '-o', self.cc.executable_filename('a.out')] - assert call_args[:4] == expected - - env['LDCXXSHARED'] = 'wrapper g++-4.2 -bundle -undefined dynamic_lookup' - env['CXX'] = 'wrapper g++-4.2' - sysconfig.customize_compiler(self.cc) - assert self.cc.linker_so_cxx[0:2] == ['wrapper', 'g++-4.2'] - assert self.cc.linker_exe_cxx[0:2] == ['wrapper', 'g++-4.2'] - self.cc.link(None, [], 'a.out', target_lang='c++') - call_args = mock_spawn.call_args[0][0] - expected = ['wrapper', 'g++-4.2', '-bundle', '-undefined', 'dynamic_lookup'] - assert call_args[:5] == expected - - self.cc.link_executable([], 'a.out', target_lang='c++') - call_args = mock_spawn.call_args[0][0] - expected = [ - 'wrapper', - 'g++-4.2', - '-o', - self.cc.executable_filename('a.out'), - ] - assert call_args[:4] == expected - - @pytest.mark.skipif('platform.system == "Windows"') - @pytest.mark.usefixtures('disable_macos_customization') - def test_cc_overrides_ldshared_for_cxx_correctly(self): - """ - Ensure that setting CC env variable also changes default linker - correctly when building C++ extensions. - - pypa/distutils#126 - """ - - def gcv(v): - if v == 'LDSHARED': - return 'gcc-4.2 -bundle -undefined dynamic_lookup ' - elif v == 'LDCXXSHARED': - return 'g++-4.2 -bundle -undefined dynamic_lookup ' - elif v == 'CXX': - return 'g++-4.2' - elif v == 'CC': - return 'gcc-4.2' - return '' - - def gcvs(*args, _orig=sysconfig.get_config_vars): - if args: - return list(map(sysconfig.get_config_var, args)) - return _orig() - - sysconfig.get_config_var = gcv - sysconfig.get_config_vars = gcvs - with ( - mock.patch.object(self.cc, 'spawn', return_value=None) as mock_spawn, - mock.patch.object(self.cc, '_need_link', return_value=True), - mock.patch.object(self.cc, 'mkpath', return_value=None), - EnvironmentVarGuard() as env, - ): - env['CC'] = 'ccache my_cc' - env['CXX'] = 'my_cxx' - del env['LDSHARED'] - sysconfig.customize_compiler(self.cc) - assert self.cc.linker_so[0:2] == ['ccache', 'my_cc'] - self.cc.link(None, [], 'a.out', target_lang='c++') - call_args = mock_spawn.call_args[0][0] - expected = ['my_cxx', '-bundle', '-undefined', 'dynamic_lookup'] - assert call_args[:4] == expected - - @pytest.mark.skipif('platform.system == "Windows"') - def test_explicit_ldshared(self): - # Issue #18080: - # ensure that setting CC env variable does not change - # explicit LDSHARED setting for linker - def gcv(v): - if v == 'LDSHARED': - return 'gcc-4.2 -bundle -undefined dynamic_lookup ' - return 'gcc-4.2' - - def gcvs(*args, _orig=sysconfig.get_config_vars): - if args: - return list(map(sysconfig.get_config_var, args)) - return _orig() - - sysconfig.get_config_var = gcv - sysconfig.get_config_vars = gcvs - with EnvironmentVarGuard() as env: - env['CC'] = 'my_cc' - env['LDSHARED'] = 'my_ld -bundle -dynamic' - sysconfig.customize_compiler(self.cc) - assert self.cc.linker_so[0] == 'my_ld' - - def test_has_function(self): - # Issue https://github.com/pypa/distutils/issues/64: - # ensure that setting output_dir does not raise - # FileNotFoundError: [Errno 2] No such file or directory: 'a.out' - self.cc.output_dir = 'scratch' - os.chdir(self.mkdtemp()) - self.cc.has_function('abort') - - def test_find_library_file(self, monkeypatch): - compiler = unix.Compiler() - compiler._library_root = lambda dir: dir - monkeypatch.setattr(os.path, 'exists', lambda d: 'existing' in d) - - libname = 'libabc.dylib' if sys.platform != 'cygwin' else 'cygabc.dll' - dirs = ('/foo/bar/missing', '/foo/bar/existing') - assert ( - compiler.find_library_file(dirs, 'abc').replace('\\', '/') - == f'/foo/bar/existing/{libname}' - ) - assert ( - compiler.find_library_file(reversed(dirs), 'abc').replace('\\', '/') - == f'/foo/bar/existing/{libname}' - ) - - monkeypatch.setattr( - os.path, - 'exists', - lambda d: 'existing' in d and '.a' in d and '.dll.a' not in d, - ) - assert ( - compiler.find_library_file(dirs, 'abc').replace('\\', '/') - == '/foo/bar/existing/libabc.a' - ) - assert ( - compiler.find_library_file(reversed(dirs), 'abc').replace('\\', '/') - == '/foo/bar/existing/libabc.a' - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/unix.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/unix.py deleted file mode 100644 index 1231b32..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/unix.py +++ /dev/null @@ -1,422 +0,0 @@ -"""distutils.unixccompiler - -Contains the UnixCCompiler class, a subclass of CCompiler that handles -the "typical" Unix-style command-line C compiler: - * macros defined with -Dname[=value] - * macros undefined with -Uname - * include search directories specified with -Idir - * libraries specified with -lllib - * library search directories specified with -Ldir - * compile handled by 'cc' (or similar) executable with -c option: - compiles .c to .o - * link static library handled by 'ar' command (possibly with 'ranlib') - * link shared library handled by 'cc -shared' -""" - -from __future__ import annotations - -import itertools -import os -import re -import shlex -import sys -from collections.abc import Iterable - -from ... import sysconfig -from ..._log import log -from ..._macos_compat import compiler_fixup -from ..._modified import newer -from ...compat import consolidate_linker_args -from ...errors import DistutilsExecError -from . import base -from .base import _Macro, gen_lib_options, gen_preprocess_options -from .errors import ( - CompileError, - LibError, - LinkError, -) - -# XXX Things not currently handled: -# * optimization/debug/warning flags; we just use whatever's in Python's -# Makefile and live with it. Is this adequate? If not, we might -# have to have a bunch of subclasses GNUCCompiler, SGICCompiler, -# SunCCompiler, and I suspect down that road lies madness. -# * even if we don't know a warning flag from an optimization flag, -# we need some way for outsiders to feed preprocessor/compiler/linker -# flags in to us -- eg. a sysadmin might want to mandate certain flags -# via a site config file, or a user might want to set something for -# compiling this module distribution only via the setup.py command -# line, whatever. As long as these options come from something on the -# current system, they can be as system-dependent as they like, and we -# should just happily stuff them into the preprocessor/compiler/linker -# options and carry on. - - -def _split_env(cmd): - """ - For macOS, split command into 'env' portion (if any) - and the rest of the linker command. - - >>> _split_env(['a', 'b', 'c']) - ([], ['a', 'b', 'c']) - >>> _split_env(['/usr/bin/env', 'A=3', 'gcc']) - (['/usr/bin/env', 'A=3'], ['gcc']) - """ - pivot = 0 - if os.path.basename(cmd[0]) == "env": - pivot = 1 - while '=' in cmd[pivot]: - pivot += 1 - return cmd[:pivot], cmd[pivot:] - - -def _split_aix(cmd): - """ - AIX platforms prefix the compiler with the ld_so_aix - script, so split that from the linker command. - - >>> _split_aix(['a', 'b', 'c']) - ([], ['a', 'b', 'c']) - >>> _split_aix(['/bin/foo/ld_so_aix', 'gcc']) - (['/bin/foo/ld_so_aix'], ['gcc']) - """ - pivot = os.path.basename(cmd[0]) == 'ld_so_aix' - return cmd[:pivot], cmd[pivot:] - - -def _linker_params(linker_cmd, compiler_cmd): - """ - The linker command usually begins with the compiler - command (possibly multiple elements), followed by zero or more - params for shared library building. - - If the LDSHARED env variable overrides the linker command, - however, the commands may not match. - - Return the best guess of the linker parameters by stripping - the linker command. If the compiler command does not - match the linker command, assume the linker command is - just the first element. - - >>> _linker_params('gcc foo bar'.split(), ['gcc']) - ['foo', 'bar'] - >>> _linker_params('gcc foo bar'.split(), ['other']) - ['foo', 'bar'] - >>> _linker_params('ccache gcc foo bar'.split(), 'ccache gcc'.split()) - ['foo', 'bar'] - >>> _linker_params(['gcc'], ['gcc']) - [] - """ - c_len = len(compiler_cmd) - pivot = c_len if linker_cmd[:c_len] == compiler_cmd else 1 - return linker_cmd[pivot:] - - -class Compiler(base.Compiler): - compiler_type = 'unix' - - # These are used by CCompiler in two places: the constructor sets - # instance attributes 'preprocessor', 'compiler', etc. from them, and - # 'set_executable()' allows any of these to be set. The defaults here - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). - executables = { - 'preprocessor': None, - 'compiler': ["cc"], - 'compiler_so': ["cc"], - 'compiler_cxx': ["c++"], - 'compiler_so_cxx': ["c++"], - 'linker_so': ["cc", "-shared"], - 'linker_so_cxx': ["c++", "-shared"], - 'linker_exe': ["cc"], - 'linker_exe_cxx': ["c++", "-shared"], - 'archiver': ["ar", "-cr"], - 'ranlib': None, - } - - if sys.platform[:6] == "darwin": - executables['ranlib'] = ["ranlib"] - - # Needed for the filename generation methods provided by the base - # class, CCompiler. NB. whoever instantiates/uses a particular - # UnixCCompiler instance should set 'shared_lib_ext' -- we set a - # reasonable common default here, but it's not necessarily used on all - # Unices! - - src_extensions = [".c", ".C", ".cc", ".cxx", ".cpp", ".m"] - obj_extension = ".o" - static_lib_extension = ".a" - shared_lib_extension = ".so" - dylib_lib_extension = ".dylib" - xcode_stub_lib_extension = ".tbd" - static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" - xcode_stub_lib_format = dylib_lib_format - if sys.platform == "cygwin": - exe_extension = ".exe" - shared_lib_extension = ".dll.a" - dylib_lib_extension = ".dll" - dylib_lib_format = "cyg%s%s" - - def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs): - """Remove standard library path from rpath""" - libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args( - libraries, library_dirs, runtime_library_dirs - ) - libdir = sysconfig.get_config_var('LIBDIR') - if ( - runtime_library_dirs - and libdir.startswith("/usr/lib") - and (libdir in runtime_library_dirs) - ): - runtime_library_dirs.remove(libdir) - return libraries, library_dirs, runtime_library_dirs - - def preprocess( - self, - source: str | os.PathLike[str], - output_file: str | os.PathLike[str] | None = None, - macros: list[_Macro] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - extra_preargs: list[str] | None = None, - extra_postargs: Iterable[str] | None = None, - ): - fixed_args = self._fix_compile_args(None, macros, include_dirs) - ignore, macros, include_dirs = fixed_args - pp_opts = gen_preprocess_options(macros, include_dirs) - pp_args = self.preprocessor + pp_opts - if output_file: - pp_args.extend(['-o', output_file]) - if extra_preargs: - pp_args[:0] = extra_preargs - if extra_postargs: - pp_args.extend(extra_postargs) - pp_args.append(source) - - # reasons to preprocess: - # - force is indicated - # - output is directed to stdout - # - source file is newer than the target - preprocess = self.force or output_file is None or newer(source, output_file) - if not preprocess: - return - - if output_file: - self.mkpath(os.path.dirname(output_file)) - - try: - self.spawn(pp_args) - except DistutilsExecError as msg: - raise CompileError(msg) - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) - compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs) - try: - if self.detect_language(src) == 'c++': - self.spawn( - compiler_so_cxx + cc_args + [src, '-o', obj] + extra_postargs - ) - else: - self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - - def create_static_lib( - self, objects, output_libname, output_dir=None, debug=False, target_lang=None - ): - objects, output_dir = self._fix_object_args(objects, output_dir) - - output_filename = self.library_filename(output_libname, output_dir=output_dir) - - if self._need_link(objects, output_filename): - self.mkpath(os.path.dirname(output_filename)) - self.spawn(self.archiver + [output_filename] + objects + self.objects) - - # Not many Unices required ranlib anymore -- SunOS 4.x is, I - # think the only major Unix that does. Maybe we need some - # platform intelligence here to skip ranlib if it's not - # needed -- or maybe Python's configure script took care of - # it for us, hence the check for leading colon. - if self.ranlib: - try: - self.spawn(self.ranlib + [output_filename]) - except DistutilsExecError as msg: - raise LibError(msg) - else: - log.debug("skipping %s (up-to-date)", output_filename) - - def link( - self, - target_desc, - objects: list[str] | tuple[str, ...], - output_filename, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols=None, - debug=False, - extra_preargs=None, - extra_postargs=None, - build_temp=None, - target_lang=None, - ): - objects, output_dir = self._fix_object_args(objects, output_dir) - fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) - libraries, library_dirs, runtime_library_dirs = fixed_args - - lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries) - if not isinstance(output_dir, (str, type(None))): - raise TypeError("'output_dir' must be a string or None") - if output_dir is not None: - output_filename = os.path.join(output_dir, output_filename) - - if self._need_link(objects, output_filename): - ld_args = objects + self.objects + lib_opts + ['-o', output_filename] - if debug: - ld_args[:0] = ['-g'] - if extra_preargs: - ld_args[:0] = extra_preargs - if extra_postargs: - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: - # Select a linker based on context: linker_exe when - # building an executable or linker_so (with shared options) - # when building a shared library. - building_exe = target_desc == base.Compiler.EXECUTABLE - target_cxx = target_lang == "c++" - linker = ( - (self.linker_exe_cxx if target_cxx else self.linker_exe) - if building_exe - else (self.linker_so_cxx if target_cxx else self.linker_so) - )[:] - - if target_cxx and self.compiler_cxx: - env, linker_ne = _split_env(linker) - aix, linker_na = _split_aix(linker_ne) - _, compiler_cxx_ne = _split_env(self.compiler_cxx) - _, linker_exe_ne = _split_env(self.linker_exe_cxx) - - params = _linker_params(linker_na, linker_exe_ne) - linker = env + aix + compiler_cxx_ne + params - - linker = compiler_fixup(linker, ld_args) - - self.spawn(linker + ld_args) - except DistutilsExecError as msg: - raise LinkError(msg) - else: - log.debug("skipping %s (up-to-date)", output_filename) - - # -- Miscellaneous methods ----------------------------------------- - # These are all used by the 'gen_lib_options() function, in - # ccompiler.py. - - def library_dir_option(self, dir): - return "-L" + dir - - def _is_gcc(self): - cc_var = sysconfig.get_config_var("CC") - compiler = os.path.basename(shlex.split(cc_var)[0]) - return "gcc" in compiler or "g++" in compiler - - def runtime_library_dir_option(self, dir: str) -> str | list[str]: # type: ignore[override] # Fixed in pypa/distutils#339 - # XXX Hackish, at the very least. See Python bug #445902: - # https://bugs.python.org/issue445902 - # Linkers on different platforms need different options to - # specify that directories need to be added to the list of - # directories searched for dependencies when a dynamic library - # is sought. GCC on GNU systems (Linux, FreeBSD, ...) has to - # be told to pass the -R option through to the linker, whereas - # other compilers and gcc on other systems just know this. - # Other compilers may need something slightly different. At - # this time, there's no way to determine this information from - # the configuration data stored in the Python installation, so - # we use this hack. - if sys.platform[:6] == "darwin": - from distutils.util import get_macosx_target_ver, split_version - - macosx_target_ver = get_macosx_target_ver() - if macosx_target_ver and split_version(macosx_target_ver) >= [10, 5]: - return "-Wl,-rpath," + dir - else: # no support for -rpath on earlier macOS versions - return "-L" + dir - elif sys.platform[:7] == "freebsd": - return "-Wl,-rpath=" + dir - elif sys.platform[:5] == "hp-ux": - return [ - "-Wl,+s" if self._is_gcc() else "+s", - "-L" + dir, - ] - - # For all compilers, `-Wl` is the presumed way to pass a - # compiler option to the linker - if sysconfig.get_config_var("GNULD") == "yes": - return consolidate_linker_args([ - # Force RUNPATH instead of RPATH - "-Wl,--enable-new-dtags", - "-Wl,-rpath," + dir, - ]) - else: - return "-Wl,-R" + dir - - def library_option(self, lib): - return "-l" + lib - - @staticmethod - def _library_root(dir): - """ - macOS users can specify an alternate SDK using'-isysroot'. - Calculate the SDK root if it is specified. - - Note that, as of Xcode 7, Apple SDKs may contain textual stub - libraries with .tbd extensions rather than the normal .dylib - shared libraries installed in /. The Apple compiler tool - chain handles this transparently but it can cause problems - for programs that are being built with an SDK and searching - for specific libraries. Callers of find_library_file need to - keep in mind that the base filename of the returned SDK library - file might have a different extension from that of the library - file installed on the running system, for example: - /Applications/Xcode.app/Contents/Developer/Platforms/ - MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/ - usr/lib/libedit.tbd - vs - /usr/lib/libedit.dylib - """ - cflags = sysconfig.get_config_var('CFLAGS') - match = re.search(r'-isysroot\s*(\S+)', cflags) - - apply_root = ( - sys.platform == 'darwin' - and match - and ( - dir.startswith('/System/') - or (dir.startswith('/usr/') and not dir.startswith('/usr/local/')) - ) - ) - - return os.path.join(match.group(1), dir[1:]) if apply_root else dir - - def find_library_file(self, dirs, lib, debug=False): - """ - Second-guess the linker with not much hard - data to go on: GCC seems to prefer the shared library, so - assume that *all* Unix C compilers do, - ignoring even GCC's "-static" option. - """ - lib_names = ( - self.library_filename(lib, lib_type=type) - for type in 'dylib xcode_stub shared static'.split() - ) - - roots = map(self._library_root, dirs) - - searched = itertools.starmap(os.path.join, itertools.product(roots, lib_names)) - - found = filter(os.path.exists, searched) - - # Return None if it could not be found in any dir. - return next(found, None) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/zos.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/zos.py deleted file mode 100644 index 82d017f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/compilers/C/zos.py +++ /dev/null @@ -1,230 +0,0 @@ -"""distutils.zosccompiler - -Contains the selection of the c & c++ compilers on z/OS. There are several -different c compilers on z/OS, all of them are optional, so the correct -one needs to be chosen based on the users input. This is compatible with -the following compilers: - -IBM C/C++ For Open Enterprise Languages on z/OS 2.0 -IBM Open XL C/C++ 1.1 for z/OS -IBM XL C/C++ V2.4.1 for z/OS 2.4 and 2.5 -IBM z/OS XL C/C++ -""" - -import os - -from ... import sysconfig -from ...errors import DistutilsExecError -from . import unix -from .errors import CompileError - -_cc_args = { - 'ibm-openxl': [ - '-m64', - '-fvisibility=default', - '-fzos-le-char-mode=ascii', - '-fno-short-enums', - ], - 'ibm-xlclang': [ - '-q64', - '-qexportall', - '-qascii', - '-qstrict', - '-qnocsect', - '-Wa,asa,goff', - '-Wa,xplink', - '-qgonumber', - '-qenum=int', - '-Wc,DLL', - ], - 'ibm-xlc': [ - '-q64', - '-qexportall', - '-qascii', - '-qstrict', - '-qnocsect', - '-Wa,asa,goff', - '-Wa,xplink', - '-qgonumber', - '-qenum=int', - '-Wc,DLL', - '-qlanglvl=extc99', - ], -} - -_cxx_args = { - 'ibm-openxl': [ - '-m64', - '-fvisibility=default', - '-fzos-le-char-mode=ascii', - '-fno-short-enums', - ], - 'ibm-xlclang': [ - '-q64', - '-qexportall', - '-qascii', - '-qstrict', - '-qnocsect', - '-Wa,asa,goff', - '-Wa,xplink', - '-qgonumber', - '-qenum=int', - '-Wc,DLL', - ], - 'ibm-xlc': [ - '-q64', - '-qexportall', - '-qascii', - '-qstrict', - '-qnocsect', - '-Wa,asa,goff', - '-Wa,xplink', - '-qgonumber', - '-qenum=int', - '-Wc,DLL', - '-qlanglvl=extended0x', - ], -} - -_asm_args = { - 'ibm-openxl': ['-fasm', '-fno-integrated-as', '-Wa,--ASA', '-Wa,--GOFF'], - 'ibm-xlclang': [], - 'ibm-xlc': [], -} - -_ld_args = { - 'ibm-openxl': [], - 'ibm-xlclang': ['-Wl,dll', '-q64'], - 'ibm-xlc': ['-Wl,dll', '-q64'], -} - - -# Python on z/OS is built with no compiler specific options in it's CFLAGS. -# But each compiler requires it's own specific options to build successfully, -# though some of the options are common between them -class Compiler(unix.Compiler): - src_extensions = ['.c', '.C', '.cc', '.cxx', '.cpp', '.m', '.s'] - _cpp_extensions = ['.cc', '.cpp', '.cxx', '.C'] - _asm_extensions = ['.s'] - - def _get_zos_compiler_name(self): - zos_compiler_names = [ - os.path.basename(binary) - for envvar in ('CC', 'CXX', 'LDSHARED') - if (binary := os.environ.get(envvar, None)) - ] - if len(zos_compiler_names) == 0: - return 'ibm-openxl' - - zos_compilers = {} - for compiler in ( - 'ibm-clang', - 'ibm-clang64', - 'ibm-clang++', - 'ibm-clang++64', - 'clang', - 'clang++', - 'clang-14', - ): - zos_compilers[compiler] = 'ibm-openxl' - - for compiler in ('xlclang', 'xlclang++', 'njsc', 'njsc++'): - zos_compilers[compiler] = 'ibm-xlclang' - - for compiler in ('xlc', 'xlC', 'xlc++'): - zos_compilers[compiler] = 'ibm-xlc' - - return zos_compilers.get(zos_compiler_names[0], 'ibm-openxl') - - def __init__(self, verbose=False, dry_run=False, force=False): - super().__init__(verbose, dry_run, force) - self.zos_compiler = self._get_zos_compiler_name() - sysconfig.customize_compiler(self) - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - local_args = [] - if ext in self._cpp_extensions: - compiler = self.compiler_cxx - local_args.extend(_cxx_args[self.zos_compiler]) - elif ext in self._asm_extensions: - compiler = self.compiler_so - local_args.extend(_cc_args[self.zos_compiler]) - local_args.extend(_asm_args[self.zos_compiler]) - else: - compiler = self.compiler_so - local_args.extend(_cc_args[self.zos_compiler]) - local_args.extend(cc_args) - - try: - self.spawn(compiler + local_args + [src, '-o', obj] + extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - - def runtime_library_dir_option(self, dir): - return '-L' + dir - - def link( - self, - target_desc, - objects, - output_filename, - output_dir=None, - libraries=None, - library_dirs=None, - runtime_library_dirs=None, - export_symbols=None, - debug=False, - extra_preargs=None, - extra_postargs=None, - build_temp=None, - target_lang=None, - ): - # For a built module to use functions from cpython, it needs to use Pythons - # side deck file. The side deck is located beside the libpython3.xx.so - ldversion = sysconfig.get_config_var('LDVERSION') - if sysconfig.python_build: - side_deck_path = os.path.join( - sysconfig.get_config_var('abs_builddir'), - f'libpython{ldversion}.x', - ) - else: - side_deck_path = os.path.join( - sysconfig.get_config_var('installed_base'), - sysconfig.get_config_var('platlibdir'), - f'libpython{ldversion}.x', - ) - - if os.path.exists(side_deck_path): - if extra_postargs: - extra_postargs.append(side_deck_path) - else: - extra_postargs = [side_deck_path] - - # Check and replace libraries included side deck files - if runtime_library_dirs: - for dir in runtime_library_dirs: - for library in libraries[:]: - library_side_deck = os.path.join(dir, f'{library}.x') - if os.path.exists(library_side_deck): - libraries.remove(library) - extra_postargs.append(library_side_deck) - break - - # Any required ld args for the given compiler - extra_postargs.extend(_ld_args[self.zos_compiler]) - - super().link( - target_desc, - objects, - output_filename, - output_dir, - libraries, - library_dirs, - runtime_library_dirs, - export_symbols, - debug, - extra_preargs, - extra_postargs, - build_temp, - target_lang, - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/core.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/core.py index bd62546..de13978 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/core.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/core.py @@ -6,27 +6,26 @@ indirectly provides the Distribution and Command classes, although they are really defined in distutils.dist and distutils.cmd. """ -from __future__ import annotations - import os import sys import tokenize -from collections.abc import Iterable -from .cmd import Command -from .debug import DEBUG - -# Mainly import these so setup scripts can "from distutils.core import" them. -from .dist import Distribution -from .errors import ( +from distutils.debug import DEBUG +from distutils.errors import ( + DistutilsSetupError, + DistutilsError, CCompilerError, DistutilsArgError, - DistutilsError, - DistutilsSetupError, ) -from .extension import Extension -__all__ = ['Distribution', 'Command', 'Extension', 'setup'] +# Mainly import these so setup scripts can "from distutils.core import" them. +from distutils.dist import Distribution +from distutils.cmd import Command +from distutils.config import PyPIRCCommand +from distutils.extension import Extension + + +__all__ = ['Distribution', 'Command', 'PyPIRCCommand', 'Extension', 'setup'] # This is a barebones help message generated displayed when the user # runs the setup script with no arguments at all. More useful help @@ -133,7 +132,7 @@ def setup(**attrs): # noqa: C901 # our Distribution (see below). klass = attrs.get('distclass') if klass: - attrs.pop('distclass') + del attrs['distclass'] else: klass = Distribution @@ -148,7 +147,7 @@ def setup(**attrs): # noqa: C901 _setup_distribution = dist = klass(attrs) except DistutilsSetupError as msg: if 'name' not in attrs: - raise SystemExit(f"error in setup command: {msg}") + raise SystemExit("error in setup command: %s" % msg) else: raise SystemExit("error in {} setup command: {}".format(attrs['name'], msg)) @@ -172,7 +171,7 @@ def setup(**attrs): # noqa: C901 try: ok = dist.parse_command_line() except DistutilsArgError as msg: - raise SystemExit(gen_usage(dist.script_name) + f"\nerror: {msg}") + raise SystemExit(gen_usage(dist.script_name) + "\nerror: %s" % msg) if DEBUG: print("options (after parsing command line):") @@ -204,10 +203,10 @@ def run_commands(dist): raise SystemExit("interrupted") except OSError as exc: if DEBUG: - sys.stderr.write(f"error: {exc}\n") + sys.stderr.write("error: {}\n".format(exc)) raise else: - raise SystemExit(f"error: {exc}") + raise SystemExit("error: {}".format(exc)) except (DistutilsError, CCompilerError) as msg: if DEBUG: @@ -218,7 +217,7 @@ def run_commands(dist): return dist -def run_setup(script_name, script_args: Iterable[str] | None = None, stop_after="run"): +def run_setup(script_name, script_args=None, stop_after="run"): """Run a setup script in a somewhat controlled environment, and return the Distribution instance that drives things. This is useful if you need to find out the distribution meta-data (passed as @@ -250,7 +249,7 @@ def run_setup(script_name, script_args: Iterable[str] | None = None, stop_after= used to drive the Distutils. """ if stop_after not in ('init', 'config', 'commandline', 'run'): - raise ValueError(f"invalid value for 'stop_after': {stop_after!r}") + raise ValueError("invalid value for 'stop_after': {!r}".format(stop_after)) global _setup_stop_after, _setup_distribution _setup_stop_after = stop_after @@ -276,8 +275,11 @@ def run_setup(script_name, script_args: Iterable[str] | None = None, stop_after= if _setup_distribution is None: raise RuntimeError( - "'distutils.core.setup()' was never called -- " - f"perhaps '{script_name}' is not a Distutils setup script?" + ( + "'distutils.core.setup()' was never called -- " + "perhaps '%s' is not a Distutils setup script?" + ) + % script_name ) # I wonder if the setup script's namespace -- g and l -- would be of diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cygwinccompiler.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cygwinccompiler.py index de89e3c..2c4da5b 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cygwinccompiler.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/cygwinccompiler.py @@ -1,27 +1,360 @@ -from .compilers.C import cygwin -from .compilers.C.cygwin import ( - CONFIG_H_NOTOK, - CONFIG_H_OK, - CONFIG_H_UNCERTAIN, - check_config_h, - get_msvcr, - is_cygwincc, +"""distutils.cygwinccompiler + +Provides the CygwinCCompiler class, a subclass of UnixCCompiler that +handles the Cygwin port of the GNU C compiler to Windows. It also contains +the Mingw32CCompiler class which handles the mingw32 port of GCC (same as +cygwin in no-cygwin mode). +""" + +import os +import sys +import copy +import shlex +import warnings +from subprocess import check_output + +from distutils.unixccompiler import UnixCCompiler +from distutils.file_util import write_file +from distutils.errors import ( + DistutilsExecError, + DistutilsPlatformError, + CCompilerError, + CompileError, +) +from distutils.version import LooseVersion, suppress_known_deprecation + + +def get_msvcr(): + """Include the appropriate MSVC runtime library if Python was built + with MSVC 7.0 or later. + """ + msc_pos = sys.version.find('MSC v.') + if msc_pos != -1: + msc_ver = sys.version[msc_pos + 6 : msc_pos + 10] + if msc_ver == '1300': + # MSVC 7.0 + return ['msvcr70'] + elif msc_ver == '1310': + # MSVC 7.1 + return ['msvcr71'] + elif msc_ver == '1400': + # VS2005 / MSVC 8.0 + return ['msvcr80'] + elif msc_ver == '1500': + # VS2008 / MSVC 9.0 + return ['msvcr90'] + elif msc_ver == '1600': + # VS2010 / MSVC 10.0 + return ['msvcr100'] + elif msc_ver == '1700': + # VS2012 / MSVC 11.0 + return ['msvcr110'] + elif msc_ver == '1800': + # VS2013 / MSVC 12.0 + return ['msvcr120'] + elif 1900 <= int(msc_ver) < 2000: + # VS2015 / MSVC 14.0 + return ['ucrt', 'vcruntime140'] + else: + raise ValueError("Unknown MS Compiler version %s " % msc_ver) + + +_runtime_library_dirs_msg = ( + "Unable to set runtime library search path on Windows, " + "usually indicated by `runtime_library_dirs` parameter to Extension" ) -__all__ = [ - 'CONFIG_H_NOTOK', - 'CONFIG_H_OK', - 'CONFIG_H_UNCERTAIN', - 'CygwinCCompiler', - 'Mingw32CCompiler', - 'check_config_h', - 'get_msvcr', - 'is_cygwincc', -] + +class CygwinCCompiler(UnixCCompiler): + """Handles the Cygwin port of the GNU C compiler to Windows.""" + + compiler_type = 'cygwin' + obj_extension = ".o" + static_lib_extension = ".a" + shared_lib_extension = ".dll.a" + dylib_lib_extension = ".dll" + static_lib_format = "lib%s%s" + shared_lib_format = "lib%s%s" + dylib_lib_format = "cyg%s%s" + exe_extension = ".exe" + + def __init__(self, verbose=0, dry_run=0, force=0): + + super().__init__(verbose, dry_run, force) + + status, details = check_config_h() + self.debug_print( + "Python's GCC status: {} (details: {})".format(status, details) + ) + if status is not CONFIG_H_OK: + self.warn( + "Python's pyconfig.h doesn't seem to support your compiler. " + "Reason: %s. " + "Compiling may fail because of undefined preprocessor macros." % details + ) + + self.cc = os.environ.get('CC', 'gcc') + self.cxx = os.environ.get('CXX', 'g++') + + self.linker_dll = self.cc + shared_option = "-shared" + + self.set_executables( + compiler='%s -mcygwin -O -Wall' % self.cc, + compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, + compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, + linker_exe='%s -mcygwin' % self.cc, + linker_so=('{} -mcygwin {}'.format(self.linker_dll, shared_option)), + ) + + # Include the appropriate MSVC runtime library if Python was built + # with MSVC 7.0 or later. + self.dll_libraries = get_msvcr() + + @property + def gcc_version(self): + # Older numpy dependend on this existing to check for ancient + # gcc versions. This doesn't make much sense with clang etc so + # just hardcode to something recent. + # https://github.com/numpy/numpy/pull/20333 + warnings.warn( + "gcc_version attribute of CygwinCCompiler is deprecated. " + "Instead of returning actual gcc version a fixed value 11.2.0 is returned.", + DeprecationWarning, + stacklevel=2, + ) + with suppress_known_deprecation(): + return LooseVersion("11.2.0") + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + """Compiles the source by spawning GCC and windres if needed.""" + if ext == '.rc' or ext == '.res': + # gcc needs '.res' and '.rc' compiled to object files !!! + try: + self.spawn(["windres", "-i", src, "-o", obj]) + except DistutilsExecError as msg: + raise CompileError(msg) + else: # for other files use the C-compiler + try: + self.spawn( + self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs + ) + except DistutilsExecError as msg: + raise CompileError(msg) + + def link( + self, + target_desc, + objects, + output_filename, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + """Link the objects.""" + # use separate copies, so we can modify the lists + extra_preargs = copy.copy(extra_preargs or []) + libraries = copy.copy(libraries or []) + objects = copy.copy(objects or []) + + if runtime_library_dirs: + self.warn(_runtime_library_dirs_msg) + + # Additional libraries + libraries.extend(self.dll_libraries) + + # handle export symbols by creating a def-file + # with executables this only works with gcc/ld as linker + if (export_symbols is not None) and ( + target_desc != self.EXECUTABLE or self.linker_dll == "gcc" + ): + # (The linker doesn't do anything if output is up-to-date. + # So it would probably better to check if we really need this, + # but for this we had to insert some unchanged parts of + # UnixCCompiler, and this is not what we want.) + + # we want to put some files in the same directory as the + # object files are, build_temp doesn't help much + # where are the object files + temp_dir = os.path.dirname(objects[0]) + # name of dll to give the helper files the same base name + (dll_name, dll_extension) = os.path.splitext( + os.path.basename(output_filename) + ) + + # generate the filenames for these files + def_file = os.path.join(temp_dir, dll_name + ".def") + + # Generate .def file + contents = ["LIBRARY %s" % os.path.basename(output_filename), "EXPORTS"] + for sym in export_symbols: + contents.append(sym) + self.execute(write_file, (def_file, contents), "writing %s" % def_file) + + # next add options for def-file + + # for gcc/ld the def-file is specified as any object files + objects.append(def_file) + + # end: if ((export_symbols is not None) and + # (target_desc != self.EXECUTABLE or self.linker_dll == "gcc")): + + # who wants symbols and a many times larger output file + # should explicitly switch the debug mode on + # otherwise we let ld strip the output file + # (On my machine: 10KiB < stripped_file < ??100KiB + # unstripped_file = stripped_file + XXX KiB + # ( XXX=254 for a typical python extension)) + if not debug: + extra_preargs.append("-s") + + UnixCCompiler.link( + self, + target_desc, + objects, + output_filename, + output_dir, + libraries, + library_dirs, + runtime_library_dirs, + None, # export_symbols, we do this in our def-file + debug, + extra_preargs, + extra_postargs, + build_temp, + target_lang, + ) + + def runtime_library_dir_option(self, dir): + # cygwin doesn't support rpath. While in theory we could error + # out like MSVC does, code might expect it to work like on Unix, so + # just warn and hope for the best. + self.warn(_runtime_library_dirs_msg) + return [] + + # -- Miscellaneous methods ----------------------------------------- + + def _make_out_path(self, output_dir, strip_dir, src_name): + # use normcase to make sure '.rc' is really '.rc' and not '.RC' + norm_src_name = os.path.normcase(src_name) + return super()._make_out_path(output_dir, strip_dir, norm_src_name) + + @property + def out_extensions(self): + """ + Add support for rc and res files. + """ + return { + **super().out_extensions, + **{ext: ext + self.obj_extension for ext in ('.res', '.rc')}, + } -CygwinCCompiler = cygwin.Compiler -Mingw32CCompiler = cygwin.MinGW32Compiler +# the same as cygwin plus some additional parameters +class Mingw32CCompiler(CygwinCCompiler): + """Handles the Mingw32 port of the GNU C compiler to Windows.""" + + compiler_type = 'mingw32' + + def __init__(self, verbose=0, dry_run=0, force=0): + + super().__init__(verbose, dry_run, force) + + shared_option = "-shared" + + if is_cygwincc(self.cc): + raise CCompilerError('Cygwin gcc cannot be used with --compiler=mingw32') + + self.set_executables( + compiler='%s -O -Wall' % self.cc, + compiler_so='%s -mdll -O -Wall' % self.cc, + compiler_cxx='%s -O -Wall' % self.cxx, + linker_exe='%s' % self.cc, + linker_so='{} {}'.format(self.linker_dll, shared_option), + ) + + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) + # (-mthreads: Support thread-safe exception handling on `Mingw32') + + # no additional libraries needed + self.dll_libraries = [] + + # Include the appropriate MSVC runtime library if Python was built + # with MSVC 7.0 or later. + self.dll_libraries = get_msvcr() + + def runtime_library_dir_option(self, dir): + raise DistutilsPlatformError(_runtime_library_dirs_msg) + + +# Because these compilers aren't configured in Python's pyconfig.h file by +# default, we should at least warn the user if he is using an unmodified +# version. + +CONFIG_H_OK = "ok" +CONFIG_H_NOTOK = "not ok" +CONFIG_H_UNCERTAIN = "uncertain" + + +def check_config_h(): + """Check if the current Python installation appears amenable to building + extensions with GCC. + + Returns a tuple (status, details), where 'status' is one of the following + constants: + + - CONFIG_H_OK: all is well, go ahead and compile + - CONFIG_H_NOTOK: doesn't look good + - CONFIG_H_UNCERTAIN: not sure -- unable to read pyconfig.h + + 'details' is a human-readable string explaining the situation. + + Note there are two ways to conclude "OK": either 'sys.version' contains + the string "GCC" (implying that this Python was built with GCC), or the + installed "pyconfig.h" contains the string "__GNUC__". + """ + + # XXX since this function also checks sys.version, it's not strictly a + # "pyconfig.h" check -- should probably be renamed... + + from distutils import sysconfig + + # if sys.version contains GCC then python was compiled with GCC, and the + # pyconfig.h file should be OK + if "GCC" in sys.version: + return CONFIG_H_OK, "sys.version mentions 'GCC'" + + # Clang would also work + if "Clang" in sys.version: + return CONFIG_H_OK, "sys.version mentions 'Clang'" + + # let's see if __GNUC__ is mentioned in python.h + fn = sysconfig.get_config_h_filename() + try: + config_h = open(fn) + try: + if "__GNUC__" in config_h.read(): + return CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn + else: + return CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn + finally: + config_h.close() + except OSError as exc: + return (CONFIG_H_UNCERTAIN, "couldn't read '{}': {}".format(fn, exc.strerror)) + + +def is_cygwincc(cc): + '''Try to determine if the compiler that would be used is from cygwin.''' + out_string = check_output(shlex.split(cc) + ['-dumpmachine']) + return out_string.strip().endswith(b'cygwin') get_versions = None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dep_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dep_util.py index 09a8a2e..db1fa01 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dep_util.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dep_util.py @@ -1,14 +1,96 @@ -import warnings +"""distutils.dep_util -from . import _modified +Utility functions for simple, timestamp-based dependency of files +and groups of files; also, function based entirely on such +timestamp dependency analysis.""" + +import os +from distutils.errors import DistutilsFileError -def __getattr__(name): - if name not in ['newer', 'newer_group', 'newer_pairwise']: - raise AttributeError(name) - warnings.warn( - "dep_util is Deprecated. Use functions from setuptools instead.", - DeprecationWarning, - stacklevel=2, - ) - return getattr(_modified, name) +def newer(source, target): + """Return true if 'source' exists and is more recently modified than + 'target', or if 'source' exists and 'target' doesn't. Return false if + both exist and 'target' is the same age or younger than 'source'. + Raise DistutilsFileError if 'source' does not exist. + """ + if not os.path.exists(source): + raise DistutilsFileError("file '%s' does not exist" % os.path.abspath(source)) + if not os.path.exists(target): + return 1 + + from stat import ST_MTIME + + mtime1 = os.stat(source)[ST_MTIME] + mtime2 = os.stat(target)[ST_MTIME] + + return mtime1 > mtime2 + + +# newer () + + +def newer_pairwise(sources, targets): + """Walk two filename lists in parallel, testing if each source is newer + than its corresponding target. Return a pair of lists (sources, + targets) where source is newer than target, according to the semantics + of 'newer()'. + """ + if len(sources) != len(targets): + raise ValueError("'sources' and 'targets' must be same length") + + # build a pair of lists (sources, targets) where source is newer + n_sources = [] + n_targets = [] + for i in range(len(sources)): + if newer(sources[i], targets[i]): + n_sources.append(sources[i]) + n_targets.append(targets[i]) + + return (n_sources, n_targets) + + +# newer_pairwise () + + +def newer_group(sources, target, missing='error'): + """Return true if 'target' is out-of-date with respect to any file + listed in 'sources'. In other words, if 'target' exists and is newer + than every file in 'sources', return false; otherwise return true. + 'missing' controls what we do when a source file is missing; the + default ("error") is to blow up with an OSError from inside 'stat()'; + if it is "ignore", we silently drop any missing source files; if it is + "newer", any missing source files make us assume that 'target' is + out-of-date (this is handy in "dry-run" mode: it'll make you pretend to + carry out commands that wouldn't work because inputs are missing, but + that doesn't matter because you're not actually going to run the + commands). + """ + # If the target doesn't even exist, then it's definitely out-of-date. + if not os.path.exists(target): + return 1 + + # Otherwise we have to find out the hard way: if *any* source file + # is more recent than 'target', then 'target' is out-of-date and + # we can immediately return true. If we fall through to the end + # of the loop, then 'target' is up-to-date and we return false. + from stat import ST_MTIME + + target_mtime = os.stat(target)[ST_MTIME] + for source in sources: + if not os.path.exists(source): + if missing == 'error': # blow up when we stat() the file + pass + elif missing == 'ignore': # missing source dropped from + continue # target's dependency list + elif missing == 'newer': # missing source means target is + return 1 # out-of-date + + source_mtime = os.stat(source)[ST_MTIME] + if source_mtime > target_mtime: + return 1 + else: + return 0 + + +# newer_group () diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dir_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dir_util.py index d978260..6f0bb8a 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dir_util.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dir_util.py @@ -2,81 +2,89 @@ Utility functions for manipulating directories and directory trees.""" -import functools -import itertools import os -import pathlib +import errno +from distutils.errors import DistutilsInternalError, DistutilsFileError +from distutils import log -from . import file_util -from ._log import log -from .errors import DistutilsFileError, DistutilsInternalError +# cache for by mkpath() -- in addition to cheapening redundant calls, +# eliminates redundant "creating /foo/bar/baz" messages in dry-run mode +_path_created = {} -class SkipRepeatAbsolutePaths(set): - """ - Cache for mkpath. - - In addition to cheapening redundant calls, eliminates redundant - "creating /foo/bar/baz" messages in dry-run mode. - """ - - def __init__(self): - SkipRepeatAbsolutePaths.instance = self - - @classmethod - def clear(cls): - super(cls, cls.instance).clear() - - def wrap(self, func): - @functools.wraps(func) - def wrapper(path, *args, **kwargs): - if path.absolute() in self: - return - result = func(path, *args, **kwargs) - self.add(path.absolute()) - return result - - return wrapper - - -# Python 3.8 compatibility -wrapper = SkipRepeatAbsolutePaths().wrap - - -@functools.singledispatch -@wrapper -def mkpath(name: pathlib.Path, mode=0o777, verbose=True, dry_run=False) -> None: +def mkpath(name, mode=0o777, verbose=1, dry_run=0): # noqa: C901 """Create a directory and any missing ancestor directories. If the directory already exists (or if 'name' is the empty string, which means the current directory, which of course exists), then do nothing. Raise DistutilsFileError if unable to create some directory along the way (eg. some sub-path exists, but is a file rather than a directory). - If 'verbose' is true, log the directory created. + If 'verbose' is true, print a one-line summary of each mkdir to stdout. + Return the list of directories actually created. + + os.makedirs is not used because: + + a) It's new to Python 1.5.2, and + b) it blows up if the directory already exists (in which case it should + silently succeed). """ - if verbose and not name.is_dir(): - log.info("creating %s", name) - try: - dry_run or name.mkdir(mode=mode, parents=True, exist_ok=True) - except OSError as exc: - raise DistutilsFileError(f"could not create '{name}': {exc.args[-1]}") + global _path_created + + # Detect a common bug -- name is None + if not isinstance(name, str): + raise DistutilsInternalError( + "mkpath: 'name' must be a string (got {!r})".format(name) + ) + + # XXX what's the better way to handle verbosity? print as we create + # each directory in the path (the current behaviour), or only announce + # the creation of the whole path? (quite easy to do the latter since + # we're not using a recursive algorithm) + + name = os.path.normpath(name) + created_dirs = [] + if os.path.isdir(name) or name == '': + return created_dirs + if _path_created.get(os.path.abspath(name)): + return created_dirs + + (head, tail) = os.path.split(name) + tails = [tail] # stack of lone dirs to create + + while head and tail and not os.path.isdir(head): + (head, tail) = os.path.split(head) + tails.insert(0, tail) # push next higher dir onto stack + + # now 'head' contains the deepest directory that already exists + # (that is, the child of 'head' in 'name' is the highest directory + # that does *not* exist) + for d in tails: + # print "head = %s, d = %s: " % (head, d), + head = os.path.join(head, d) + abs_head = os.path.abspath(head) + + if _path_created.get(abs_head): + continue + + if verbose >= 1: + log.info("creating %s", head) + + if not dry_run: + try: + os.mkdir(head, mode) + except OSError as exc: + if not (exc.errno == errno.EEXIST and os.path.isdir(head)): + raise DistutilsFileError( + "could not create '{}': {}".format(head, exc.args[-1]) + ) + created_dirs.append(head) + + _path_created[abs_head] = 1 + return created_dirs -@mkpath.register -def _(name: str, *args, **kwargs): - return mkpath(pathlib.Path(name), *args, **kwargs) - - -@mkpath.register -def _(name: None, *args, **kwargs): - """ - Detect a common bug -- name is None. - """ - raise DistutilsInternalError(f"mkpath: 'name' must be a string (got {name!r})") - - -def create_tree(base_dir, files, mode=0o777, verbose=True, dry_run=False): +def create_tree(base_dir, files, mode=0o777, verbose=1, dry_run=0): """Create all the empty directories under 'base_dir' needed to put 'files' there. @@ -87,22 +95,24 @@ def create_tree(base_dir, files, mode=0o777, verbose=True, dry_run=False): 'dry_run' flags are as for 'mkpath()'. """ # First get the list of directories to create - need_dir = set(os.path.join(base_dir, os.path.dirname(file)) for file in files) + need_dir = set() + for file in files: + need_dir.add(os.path.join(base_dir, os.path.dirname(file))) # Now create them for dir in sorted(need_dir): mkpath(dir, mode, verbose=verbose, dry_run=dry_run) -def copy_tree( +def copy_tree( # noqa: C901 src, dst, - preserve_mode=True, - preserve_times=True, - preserve_symlinks=False, - update=False, - verbose=True, - dry_run=False, + preserve_mode=1, + preserve_times=1, + preserve_symlinks=0, + update=0, + verbose=1, + dry_run=0, ): """Copy an entire directory tree 'src' to a new location 'dst'. @@ -123,82 +133,67 @@ def copy_tree( (the default), the destination of the symlink will be copied. 'update' and 'verbose' are the same as for 'copy_file'. """ + from distutils.file_util import copy_file + if not dry_run and not os.path.isdir(src): - raise DistutilsFileError(f"cannot copy tree '{src}': not a directory") + raise DistutilsFileError("cannot copy tree '%s': not a directory" % src) try: names = os.listdir(src) except OSError as e: if dry_run: names = [] else: - raise DistutilsFileError(f"error listing files in '{src}': {e.strerror}") + raise DistutilsFileError( + "error listing files in '{}': {}".format(src, e.strerror) + ) if not dry_run: mkpath(dst, verbose=verbose) - copy_one = functools.partial( - _copy_one, - src=src, - dst=dst, - preserve_symlinks=preserve_symlinks, - verbose=verbose, - dry_run=dry_run, - preserve_mode=preserve_mode, - preserve_times=preserve_times, - update=update, - ) - return list(itertools.chain.from_iterable(map(copy_one, names))) + outputs = [] + for n in names: + src_name = os.path.join(src, n) + dst_name = os.path.join(dst, n) -def _copy_one( - name, - *, - src, - dst, - preserve_symlinks, - verbose, - dry_run, - preserve_mode, - preserve_times, - update, -): - src_name = os.path.join(src, name) - dst_name = os.path.join(dst, name) + if n.startswith('.nfs'): + # skip NFS rename files + continue - if name.startswith('.nfs'): - # skip NFS rename files - return + if preserve_symlinks and os.path.islink(src_name): + link_dest = os.readlink(src_name) + if verbose >= 1: + log.info("linking %s -> %s", dst_name, link_dest) + if not dry_run: + os.symlink(link_dest, dst_name) + outputs.append(dst_name) - if preserve_symlinks and os.path.islink(src_name): - link_dest = os.readlink(src_name) - if verbose >= 1: - log.info("linking %s -> %s", dst_name, link_dest) - if not dry_run: - os.symlink(link_dest, dst_name) - yield dst_name + elif os.path.isdir(src_name): + outputs.extend( + copy_tree( + src_name, + dst_name, + preserve_mode, + preserve_times, + preserve_symlinks, + update, + verbose=verbose, + dry_run=dry_run, + ) + ) + else: + copy_file( + src_name, + dst_name, + preserve_mode, + preserve_times, + update, + verbose=verbose, + dry_run=dry_run, + ) + outputs.append(dst_name) - elif os.path.isdir(src_name): - yield from copy_tree( - src_name, - dst_name, - preserve_mode, - preserve_times, - preserve_symlinks, - update, - verbose=verbose, - dry_run=dry_run, - ) - else: - file_util.copy_file( - src_name, - dst_name, - preserve_mode, - preserve_times, - update, - verbose=verbose, - dry_run=dry_run, - ) - yield dst_name + return outputs def _build_cmdtuple(path, cmdtuples): @@ -212,12 +207,14 @@ def _build_cmdtuple(path, cmdtuples): cmdtuples.append((os.rmdir, path)) -def remove_tree(directory, verbose=True, dry_run=False): +def remove_tree(directory, verbose=1, dry_run=0): """Recursively remove an entire directory tree. Any errors are ignored (apart from being reported to stdout if 'verbose' is true). """ + global _path_created + if verbose >= 1: log.info("removing '%s' (and everything under it)", directory) if dry_run: @@ -227,10 +224,12 @@ def remove_tree(directory, verbose=True, dry_run=False): for cmd in cmdtuples: try: cmd[0](cmd[1]) - # Clear the cache - SkipRepeatAbsolutePaths.clear() + # remove dir from cache if it's already there + abspath = os.path.abspath(cmd[1]) + if abspath in _path_created: + del _path_created[abspath] except OSError as exc: - log.warning("error removing %s: %s", directory, exc) + log.warn("error removing %s: %s", directory, exc) def ensure_relative(path): diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dist.py index 37b788d..917cd94 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dist.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/dist.py @@ -4,53 +4,28 @@ Provides the Distribution class, which represents the module distribution being built/installed/distributed. """ -from __future__ import annotations - -import contextlib -import logging -import os -import pathlib -import re import sys -import warnings -from collections.abc import Iterable, MutableMapping +import os +import re +import pathlib +import contextlib from email import message_from_file -from typing import ( - IO, - TYPE_CHECKING, - Any, - ClassVar, - Literal, - TypeVar, - Union, - overload, -) -from packaging.utils import canonicalize_name, canonicalize_version +try: + import warnings +except ImportError: + warnings = None -from ._log import log -from .debug import DEBUG -from .errors import ( +from distutils.errors import ( + DistutilsOptionError, + DistutilsModuleError, DistutilsArgError, DistutilsClassError, - DistutilsModuleError, - DistutilsOptionError, ) -from .fancy_getopt import FancyGetopt, translate_longopt -from .util import check_environ, rfc822_escape, strtobool - -if TYPE_CHECKING: - from _typeshed import SupportsWrite - from typing_extensions import TypeAlias - - # type-only import because of mutual dependence between these modules - from .cmd import Command - -_CommandT = TypeVar("_CommandT", bound="Command") -_OptionsList: TypeAlias = list[ - Union[tuple[str, Union[str, None], str, int], tuple[str, Union[str, None], str]] -] - +from distutils.fancy_getopt import FancyGetopt, translate_longopt +from distutils.util import check_environ, strtobool, rfc822_escape +from distutils import log +from distutils.debug import DEBUG # Regex to define acceptable Distutils command names. This is not *quite* # the same as a Python NAME -- I don't allow leading underscores. The fact @@ -59,7 +34,7 @@ _OptionsList: TypeAlias = list[ command_re = re.compile(r'^[a-zA-Z]([a-zA-Z0-9_]*)$') -def _ensure_list(value: str | Iterable[str], fieldname) -> str | list[str]: +def _ensure_list(value, fieldname): if isinstance(value, str): # a string containing comma separated values is okay. It will # be converted to a list by Distribution.finalize_options(). @@ -69,7 +44,7 @@ def _ensure_list(value: str | Iterable[str], fieldname) -> str | list[str]: typename = type(value).__name__ msg = "Warning: '{fieldname}' should be a list, got type '{typename}'" msg = msg.format(**locals()) - log.warning(msg) + log.log(log.WARN, msg) value = list(value) return value @@ -96,7 +71,7 @@ class Distribution: # don't want to pollute the commands with too many options that they # have minimal control over. # The fourth entry for verbose means that it can be repeated. - global_options: ClassVar[_OptionsList] = [ + global_options = [ ('verbose', 'v', "run verbosely (default)", 1), ('quiet', 'q', "run quietly (turns verbosity off)"), ('dry-run', 'n', "don't actually do anything"), @@ -106,7 +81,7 @@ class Distribution: # 'common_usage' is a short (2-3 line) string describing the common # usage of the setup script. - common_usage: ClassVar[str] = """\ + common_usage = """\ Common commands: (see '--help-commands' for more) setup.py build will build the package underneath 'build/' @@ -114,7 +89,7 @@ Common commands: (see '--help-commands' for more) """ # options that are not propagated to the commands - display_options: ClassVar[_OptionsList] = [ + display_options = [ ('help-commands', None, "list all available commands"), ('name', None, "print package name"), ('version', 'V', "print package version"), @@ -141,17 +116,14 @@ Common commands: (see '--help-commands' for more) ('requires', None, "print the list of packages/modules required"), ('obsoletes', None, "print the list of packages/modules made obsolete"), ] - display_option_names: ClassVar[list[str]] = [ - translate_longopt(x[0]) for x in display_options - ] + display_option_names = [translate_longopt(x[0]) for x in display_options] # negative options are options that exclude other options - negative_opt: ClassVar[dict[str, str]] = {'quiet': 'verbose'} + negative_opt = {'quiet': 'verbose'} # -- Creation/initialization methods ------------------------------- - # Can't Unpack a TypedDict with optional properties, so using Any instead - def __init__(self, attrs: MutableMapping[str, Any] | None = None) -> None: # noqa: C901 + def __init__(self, attrs=None): # noqa: C901 """Construct a new Distribution instance: initialize all the attributes of a Distribution, and then use 'attrs' (a dictionary mapping attribute names to values) to assign some of those @@ -163,11 +135,11 @@ Common commands: (see '--help-commands' for more) """ # Default values for our command-line options - self.verbose = True - self.dry_run = False - self.help = False + self.verbose = 1 + self.dry_run = 0 + self.help = 0 for attr in self.display_option_names: - setattr(self, attr, False) + setattr(self, attr, 0) # Store the distribution meta-data (name, version, author, and so # forth) in a separate object -- we're getting to have enough @@ -183,7 +155,7 @@ Common commands: (see '--help-commands' for more) # can 1) quickly figure out which class to instantiate when # we need to create a new command object, and 2) have a way # for the setup script to override command classes - self.cmdclass: dict[str, type[Command]] = {} + self.cmdclass = {} # 'command_packages' is a list of packages in which commands # are searched for. The factory for command 'foo' is expected @@ -191,20 +163,20 @@ Common commands: (see '--help-commands' for more) # named here. This list is searched from the left; an error # is raised if no named package provides the command being # searched for. (Always access using get_command_packages().) - self.command_packages: str | list[str] | None = None + self.command_packages = None # 'script_name' and 'script_args' are usually set to sys.argv[0] # and sys.argv[1:], but they can be overridden when the caller is # not necessarily a setup script run from the command-line. - self.script_name: str | os.PathLike[str] | None = None - self.script_args: list[str] | None = None + self.script_name = None + self.script_args = None # 'command_options' is where we store command options between # parsing them (from config files, the command-line, etc.) and when # they are actually needed -- ie. when the command in question is # instantiated. It is a dictionary of dictionaries of 2-tuples: # command_options = { command_name : { option : (source, value) } } - self.command_options: dict[str, dict[str, tuple[str, str]]] = {} + self.command_options = {} # 'dist_files' is the list of (command, pyversion, file) that # have been created by any dist commands run so far. This is @@ -215,13 +187,13 @@ Common commands: (see '--help-commands' for more) # file. pyversion should not be used to specify minimum or # maximum required Python versions; use the metainfo for that # instead. - self.dist_files: list[tuple[str, str, str]] = [] + self.dist_files = [] # These options are really the business of various commands, rather # than of the Distribution itself. We provide aliases for them in # Distribution as a convenience to the developer. self.packages = None - self.package_data: dict[str, list[str]] = {} + self.package_data = {} self.package_dir = None self.py_modules = None self.libraries = None @@ -238,7 +210,7 @@ Common commands: (see '--help-commands' for more) # the caller at all. 'command_obj' maps command names to # Command instances -- that's how we enforce that every command # class is a singleton. - self.command_obj: dict[str, Command] = {} + self.command_obj = {} # 'have_run' maps command names to boolean values; it keeps track # of whether we have actually run a particular command, to make it @@ -250,7 +222,7 @@ Common commands: (see '--help-commands' for more) # command object is created, and replaced with a true value when # the command is successfully run. Thus it's probably best to use # '.get()' rather than a straight lookup. - self.have_run: dict[str, bool] = {} + self.have_run = {} # Now we'll use the attrs dictionary (ultimately, keyword args from # the setup script) to possibly override any or all of these @@ -264,20 +236,23 @@ Common commands: (see '--help-commands' for more) options = attrs.get('options') if options is not None: del attrs['options'] - for command, cmd_options in options.items(): + for (command, cmd_options) in options.items(): opt_dict = self.get_option_dict(command) - for opt, val in cmd_options.items(): + for (opt, val) in cmd_options.items(): opt_dict[opt] = ("setup script", val) if 'licence' in attrs: attrs['license'] = attrs['licence'] del attrs['licence'] msg = "'licence' distribution option is deprecated; use 'license'" - warnings.warn(msg) + if warnings is not None: + warnings.warn(msg) + else: + sys.stderr.write(msg + "\n") # Now work on the rest of the attributes. Any attribute that's # not already defined is invalid! - for key, val in attrs.items(): + for (key, val) in attrs.items(): if hasattr(self.metadata, "set_" + key): getattr(self.metadata, "set_" + key)(val) elif hasattr(self.metadata, key): @@ -285,7 +260,7 @@ Common commands: (see '--help-commands' for more) elif hasattr(self, key): setattr(self, key, val) else: - msg = f"Unknown distribution option: {key!r}" + msg = "Unknown distribution option: %s" % repr(key) warnings.warn(msg) # no-user-cfg is handled before other command line args @@ -297,8 +272,6 @@ Common commands: (see '--help-commands' for more) self.want_user_cfg = True if self.script_args is not None: - # Coerce any possible iterable from attrs into a list - self.script_args = list(self.script_args) for arg in self.script_args: if not arg.startswith('-'): break @@ -319,7 +292,7 @@ Common commands: (see '--help-commands' for more) dict = self.command_options[command] = {} return dict - def dump_option_dicts(self, header=None, commands=None, indent: str = "") -> None: + def dump_option_dicts(self, header=None, commands=None, indent=""): from pprint import pformat if commands is None: # dump all command option dicts @@ -336,9 +309,9 @@ Common commands: (see '--help-commands' for more) for cmd_name in commands: opt_dict = self.command_options.get(cmd_name) if opt_dict is None: - self.announce(indent + f"no option dict for '{cmd_name}' command") + self.announce(indent + "no option dict for '%s' command" % cmd_name) else: - self.announce(indent + f"option dict for '{cmd_name}' command:") + self.announce(indent + "option dict for '%s' command:" % cmd_name) out = pformat(opt_dict) for line in out.split('\n'): self.announce(indent + " " + line) @@ -364,7 +337,7 @@ Common commands: (see '--help-commands' for more) files = [str(path) for path in self._gen_paths() if os.path.isfile(path)] if DEBUG: - self.announce("using config files: {}".format(', '.join(files))) + self.announce("using config files: %s" % ', '.join(files)) return files @@ -377,8 +350,7 @@ Common commands: (see '--help-commands' for more) prefix = '.' * (os.name == 'posix') filename = prefix + 'pydistutils.cfg' if self.want_user_cfg: - with contextlib.suppress(RuntimeError): - yield pathlib.Path('~').expanduser() / filename + yield pathlib.Path('~').expanduser() / filename # All platforms support local setup.cfg yield pathlib.Path('setup.cfg') @@ -421,8 +393,8 @@ Common commands: (see '--help-commands' for more) parser = ConfigParser() for filename in filenames: if DEBUG: - self.announce(f" reading {filename}") - parser.read(filename, encoding='utf-8') + self.announce(" reading %s" % filename) + parser.read(filename) for section in parser.sections(): options = parser.options(section) opt_dict = self.get_option_dict(section) @@ -441,7 +413,7 @@ Common commands: (see '--help-commands' for more) # to set Distribution options. if 'global' in self.command_options: - for opt, (_src, val) in self.command_options['global'].items(): + for (opt, (src, val)) in self.command_options['global'].items(): alias = self.negative_opt.get(opt) try: if alias: @@ -493,7 +465,7 @@ Common commands: (see '--help-commands' for more) parser.set_aliases({'licence': 'license'}) args = parser.getopt(args=self.script_args, object=self) option_order = parser.get_option_order() - logging.getLogger().setLevel(logging.WARN - 10 * self.verbose) + log.set_verbosity(self.verbose) # for display options we return immediately if self.handle_display_options(option_order): @@ -551,7 +523,7 @@ Common commands: (see '--help-commands' for more) # Pull the current command from the head of the command line command = args[0] if not command_re.match(command): - raise SystemExit(f"invalid command name '{command}'") + raise SystemExit("invalid command name '%s'" % command) self.commands.append(command) # Dig up the command class that implements this command, so we @@ -566,7 +538,7 @@ Common commands: (see '--help-commands' for more) # to be sure that the basic "command" interface is implemented. if not issubclass(cmd_class, Command): raise DistutilsClassError( - f"command class {cmd_class} must subclass Command" + "command class %s must subclass Command" % cmd_class ) # Also make sure that the command object provides a list of its @@ -605,22 +577,23 @@ Common commands: (see '--help-commands' for more) parser.set_negative_aliases(negative_opt) (args, opts) = parser.getopt(args[1:]) if hasattr(opts, 'help') and opts.help: - self._show_help(parser, display_options=False, commands=[cmd_class]) + self._show_help(parser, display_options=0, commands=[cmd_class]) return if hasattr(cmd_class, 'help_options') and isinstance( cmd_class.help_options, list ): help_option_found = 0 - for help_option, _short, _desc, func in cmd_class.help_options: + for (help_option, short, desc, func) in cmd_class.help_options: if hasattr(opts, parser.get_attr_name(help_option)): help_option_found = 1 if callable(func): func() else: raise DistutilsClassError( - f"invalid help function {func!r} for help option '{help_option}': " + "invalid help function %r for help option '%s': " "must be a callable object (function, etc.)" + % (func, help_option) ) if help_option_found: @@ -629,12 +602,12 @@ Common commands: (see '--help-commands' for more) # Put the options from the command-line into their official # holding pen, the 'command_options' dictionary. opt_dict = self.get_option_dict(command) - for name, value in vars(opts).items(): + for (name, value) in vars(opts).items(): opt_dict[name] = ("command line", value) return args - def finalize_options(self) -> None: + def finalize_options(self): """Set final values for all the options on the Distribution instance, analogous to the .finalize_options() method of Command objects. @@ -647,9 +620,7 @@ Common commands: (see '--help-commands' for more) value = [elm.strip() for elm in value.split(',')] setattr(self.metadata, attr, value) - def _show_help( - self, parser, global_options=True, display_options=True, commands: Iterable = () - ): + def _show_help(self, parser, global_options=1, display_options=1, commands=[]): """Show help for the setup script command-line in the form of several lists of command-line options. 'parser' should be a FancyGetopt instance; do not expect it to be returned in the @@ -663,8 +634,8 @@ Common commands: (see '--help-commands' for more) in 'commands'. """ # late import because of mutual dependence between these modules - from distutils.cmd import Command from distutils.core import gen_usage + from distutils.cmd import Command if global_options: if display_options: @@ -673,16 +644,17 @@ Common commands: (see '--help-commands' for more) options = self.global_options parser.set_option_table(options) parser.print_help(self.common_usage + "\nGlobal options:") - print() + print('') if display_options: parser.set_option_table(self.display_options) parser.print_help( - "Information display options (just display information, ignore any commands)" + "Information display options (just display " + + "information, ignore any commands)" ) - print() + print('') - for command in commands: + for command in self.commands: if isinstance(command, type) and issubclass(command, Command): klass = command else: @@ -693,8 +665,8 @@ Common commands: (see '--help-commands' for more) ) else: parser.set_option_table(klass.user_options) - parser.print_help(f"Options for '{klass.__name__}' command:") - print() + parser.print_help("Options for '%s' command:" % klass.__name__) + print('') print(gen_usage(self.script_name)) @@ -711,7 +683,7 @@ Common commands: (see '--help-commands' for more) # we ignore "foo bar"). if self.help_commands: self.print_commands() - print() + print('') print(gen_usage(self.script_name)) return 1 @@ -719,15 +691,15 @@ Common commands: (see '--help-commands' for more) # display that metadata in the order in which the user supplied the # metadata options. any_display_options = 0 - is_display_option = set() + is_display_option = {} for option in self.display_options: - is_display_option.add(option[0]) + is_display_option[option[0]] = 1 - for opt, val in option_order: - if val and opt in is_display_option: + for (opt, val) in option_order: + if val and is_display_option.get(opt): opt = translate_longopt(opt) value = getattr(self.metadata, "get_" + opt)() - if opt in ('keywords', 'platforms'): + if opt in ['keywords', 'platforms']: print(','.join(value)) elif opt in ('classifiers', 'provides', 'requires', 'obsoletes'): print('\n'.join(value)) @@ -737,7 +709,7 @@ Common commands: (see '--help-commands' for more) return any_display_options - def print_command_list(self, commands, header, max_length) -> None: + def print_command_list(self, commands, header, max_length): """Print a subset of the list of all commands -- used by 'print_commands()'. """ @@ -752,9 +724,9 @@ Common commands: (see '--help-commands' for more) except AttributeError: description = "(no description available)" - print(f" {cmd:<{max_length}} {description}") + print(" %-*s %s" % (max_length, cmd, description)) - def print_commands(self) -> None: + def print_commands(self): """Print out a help message listing all available commands with a description of each. The list is divided into "standard commands" (listed in distutils.command.__all__) and "extra commands" @@ -765,9 +737,14 @@ Common commands: (see '--help-commands' for more) import distutils.command std_commands = distutils.command.__all__ - is_std = set(std_commands) + is_std = {} + for cmd in std_commands: + is_std[cmd] = 1 - extra_commands = [cmd for cmd in self.cmdclass.keys() if cmd not in is_std] + extra_commands = [] + for cmd in self.cmdclass.keys(): + if not is_std.get(cmd): + extra_commands.append(cmd) max_length = 0 for cmd in std_commands + extra_commands: @@ -791,9 +768,14 @@ Common commands: (see '--help-commands' for more) import distutils.command std_commands = distutils.command.__all__ - is_std = set(std_commands) + is_std = {} + for cmd in std_commands: + is_std[cmd] = 1 - extra_commands = [cmd for cmd in self.cmdclass.keys() if cmd not in is_std] + extra_commands = [] + for cmd in self.cmdclass.keys(): + if not is_std.get(cmd): + extra_commands.append(cmd) rv = [] for cmd in std_commands + extra_commands: @@ -821,7 +803,7 @@ Common commands: (see '--help-commands' for more) self.command_packages = pkgs return pkgs - def get_command_class(self, command: str) -> type[Command]: + def get_command_class(self, command): """Return the class that implements the Distutils command named by 'command'. First we check the 'cmdclass' dictionary; if the command is mentioned there, we fetch the class object from the @@ -838,7 +820,7 @@ Common commands: (see '--help-commands' for more) return klass for pkgname in self.get_command_packages(): - module_name = f"{pkgname}.{command}" + module_name = "{}.{}".format(pkgname, command) klass_name = command try: @@ -851,23 +833,16 @@ Common commands: (see '--help-commands' for more) klass = getattr(module, klass_name) except AttributeError: raise DistutilsModuleError( - f"invalid command '{command}' (no class '{klass_name}' in module '{module_name}')" + "invalid command '%s' (no class '%s' in module '%s')" + % (command, klass_name, module_name) ) self.cmdclass[command] = klass return klass - raise DistutilsModuleError(f"invalid command '{command}'") + raise DistutilsModuleError("invalid command '%s'" % command) - @overload - def get_command_obj( - self, command: str, create: Literal[True] = True - ) -> Command: ... - @overload - def get_command_obj( - self, command: str, create: Literal[False] - ) -> Command | None: ... - def get_command_obj(self, command: str, create: bool = True) -> Command | None: + def get_command_obj(self, command, create=1): """Return the command object for 'command'. Normally this object is cached on a previous call to 'get_command_obj()'; if no command object for 'command' is in the cache, then we either create and @@ -878,12 +853,12 @@ Common commands: (see '--help-commands' for more) if DEBUG: self.announce( "Distribution.get_command_obj(): " - f"creating '{command}' command object" + "creating '%s' command object" % command ) klass = self.get_command_class(command) cmd_obj = self.command_obj[command] = klass(self) - self.have_run[command] = False + self.have_run[command] = 0 # Set any options that were supplied in config files # or on the command line. (NB. support for error @@ -910,10 +885,10 @@ Common commands: (see '--help-commands' for more) option_dict = self.get_option_dict(command_name) if DEBUG: - self.announce(f" setting options for '{command_name}' command:") - for option, (source, value) in option_dict.items(): + self.announce(" setting options for '%s' command:" % command_name) + for (option, (source, value)) in option_dict.items(): if DEBUG: - self.announce(f" {option} = {value} (from {source})") + self.announce(" {} = {} (from {})".format(option, value, source)) try: bool_opts = [translate_longopt(o) for o in command_obj.boolean_options] except AttributeError: @@ -933,22 +908,13 @@ Common commands: (see '--help-commands' for more) setattr(command_obj, option, value) else: raise DistutilsOptionError( - f"error in {source}: command '{command_name}' has no such option '{option}'" + "error in %s: command '%s' has no such option '%s'" + % (source, command_name, option) ) except ValueError as msg: raise DistutilsOptionError(msg) - @overload - def reinitialize_command( - self, command: str, reinit_subcommands: bool = False - ) -> Command: ... - @overload - def reinitialize_command( - self, command: _CommandT, reinit_subcommands: bool = False - ) -> _CommandT: ... - def reinitialize_command( - self, command: str | Command, reinit_subcommands=False - ) -> Command: + def reinitialize_command(self, command, reinit_subcommands=0): """Reinitializes a command to the state it was in when first returned by 'get_command_obj()': ie., initialized but not yet finalized. This provides the opportunity to sneak option @@ -978,8 +944,8 @@ Common commands: (see '--help-commands' for more) if not command.finalized: return command command.initialize_options() - command.finalized = False - self.have_run[command_name] = False + command.finalized = 0 + self.have_run[command_name] = 0 self._set_command_options(command) if reinit_subcommands: @@ -990,10 +956,10 @@ Common commands: (see '--help-commands' for more) # -- Methods that operate on the Distribution ---------------------- - def announce(self, msg, level: int = logging.INFO) -> None: + def announce(self, msg, level=log.INFO): log.log(level, msg) - def run_commands(self) -> None: + def run_commands(self): """Run each command that was seen on the setup script command line. Uses the list of commands found and cache of command objects created by 'get_command_obj()'. @@ -1003,7 +969,7 @@ Common commands: (see '--help-commands' for more) # -- Methods that operate on its Commands -------------------------- - def run_command(self, command: str) -> None: + def run_command(self, command): """Do whatever it takes to run a command (including nothing at all, if the command has already been run). Specifically: if we have already created and run the command named by 'command', return @@ -1019,32 +985,32 @@ Common commands: (see '--help-commands' for more) cmd_obj = self.get_command_obj(command) cmd_obj.ensure_finalized() cmd_obj.run() - self.have_run[command] = True + self.have_run[command] = 1 # -- Distribution query methods ------------------------------------ - def has_pure_modules(self) -> bool: + def has_pure_modules(self): return len(self.packages or self.py_modules or []) > 0 - def has_ext_modules(self) -> bool: + def has_ext_modules(self): return self.ext_modules and len(self.ext_modules) > 0 - def has_c_libraries(self) -> bool: + def has_c_libraries(self): return self.libraries and len(self.libraries) > 0 - def has_modules(self) -> bool: + def has_modules(self): return self.has_pure_modules() or self.has_ext_modules() - def has_headers(self) -> bool: + def has_headers(self): return self.headers and len(self.headers) > 0 - def has_scripts(self) -> bool: + def has_scripts(self): return self.scripts and len(self.scripts) > 0 - def has_data_files(self) -> bool: + def has_data_files(self): return self.data_files and len(self.data_files) > 0 - def is_pure(self) -> bool: + def is_pure(self): return ( self.has_pure_modules() and not self.has_ext_modules() @@ -1057,53 +1023,6 @@ Common commands: (see '--help-commands' for more) # they are defined in a sneaky way: the constructor binds self.get_XXX # to self.metadata.get_XXX. The actual code is in the # DistributionMetadata class, below. - if TYPE_CHECKING: - # Unfortunately this means we need to specify them manually or not expose statically - def _(self) -> None: - self.get_name = self.metadata.get_name - self.get_version = self.metadata.get_version - self.get_fullname = self.metadata.get_fullname - self.get_author = self.metadata.get_author - self.get_author_email = self.metadata.get_author_email - self.get_maintainer = self.metadata.get_maintainer - self.get_maintainer_email = self.metadata.get_maintainer_email - self.get_contact = self.metadata.get_contact - self.get_contact_email = self.metadata.get_contact_email - self.get_url = self.metadata.get_url - self.get_license = self.metadata.get_license - self.get_licence = self.metadata.get_licence - self.get_description = self.metadata.get_description - self.get_long_description = self.metadata.get_long_description - self.get_keywords = self.metadata.get_keywords - self.get_platforms = self.metadata.get_platforms - self.get_classifiers = self.metadata.get_classifiers - self.get_download_url = self.metadata.get_download_url - self.get_requires = self.metadata.get_requires - self.get_provides = self.metadata.get_provides - self.get_obsoletes = self.metadata.get_obsoletes - - # Default attributes generated in __init__ from self.display_option_names - help_commands: bool - name: str | Literal[False] - version: str | Literal[False] - fullname: str | Literal[False] - author: str | Literal[False] - author_email: str | Literal[False] - maintainer: str | Literal[False] - maintainer_email: str | Literal[False] - contact: str | Literal[False] - contact_email: str | Literal[False] - url: str | Literal[False] - license: str | Literal[False] - licence: str | Literal[False] - description: str | Literal[False] - long_description: str | Literal[False] - platforms: str | list[str] | Literal[False] - classifiers: str | list[str] | Literal[False] - keywords: str | list[str] | Literal[False] - provides: list[str] | Literal[False] - requires: list[str] | Literal[False] - obsoletes: list[str] | Literal[False] class DistributionMetadata: @@ -1135,40 +1054,37 @@ class DistributionMetadata: "obsoletes", ) - def __init__( - self, path: str | bytes | os.PathLike[str] | os.PathLike[bytes] | None = None - ) -> None: + def __init__(self, path=None): if path is not None: self.read_pkg_file(open(path)) else: - self.name: str | None = None - self.version: str | None = None - self.author: str | None = None - self.author_email: str | None = None - self.maintainer: str | None = None - self.maintainer_email: str | None = None - self.url: str | None = None - self.license: str | None = None - self.description: str | None = None - self.long_description: str | None = None - self.keywords: str | list[str] | None = None - self.platforms: str | list[str] | None = None - self.classifiers: str | list[str] | None = None - self.download_url: str | None = None + self.name = None + self.version = None + self.author = None + self.author_email = None + self.maintainer = None + self.maintainer_email = None + self.url = None + self.license = None + self.description = None + self.long_description = None + self.keywords = None + self.platforms = None + self.classifiers = None + self.download_url = None # PEP 314 - self.provides: str | list[str] | None = None - self.requires: str | list[str] | None = None - self.obsoletes: str | list[str] | None = None + self.provides = None + self.requires = None + self.obsoletes = None - def read_pkg_file(self, file: IO[str]) -> None: + def read_pkg_file(self, file): """Reads the metadata values from a file object.""" msg = message_from_file(file) - def _read_field(name: str) -> str | None: + def _read_field(name): value = msg[name] if value and value != "UNKNOWN": return value - return None def _read_list(name): values = msg.get_all(name, None) @@ -1212,14 +1128,14 @@ class DistributionMetadata: self.provides = None self.obsoletes = None - def write_pkg_info(self, base_dir: str | os.PathLike[str]) -> None: + def write_pkg_info(self, base_dir): """Write the PKG-INFO file into the release tree.""" with open( os.path.join(base_dir, 'PKG-INFO'), 'w', encoding='UTF-8' ) as pkg_info: self.write_pkg_file(pkg_info) - def write_pkg_file(self, file: SupportsWrite[str]) -> None: + def write_pkg_file(self, file): """Write the PKG-INFO format data to a file object.""" version = '1.0' if ( @@ -1232,9 +1148,9 @@ class DistributionMetadata: version = '1.1' # required fields - file.write(f'Metadata-Version: {version}\n') - file.write(f'Name: {self.get_name()}\n') - file.write(f'Version: {self.get_version()}\n') + file.write('Metadata-Version: %s\n' % version) + file.write('Name: %s\n' % self.get_name()) + file.write('Version: %s\n' % self.get_version()) def maybe_write(header, val): if val: @@ -1261,106 +1177,87 @@ class DistributionMetadata: def _write_list(self, file, name, values): values = values or [] for value in values: - file.write(f'{name}: {value}\n') + file.write('{}: {}\n'.format(name, value)) # -- Metadata query methods ---------------------------------------- - def get_name(self) -> str: + def get_name(self): return self.name or "UNKNOWN" - def get_version(self) -> str: + def get_version(self): return self.version or "0.0.0" - def get_fullname(self) -> str: - return self._fullname(self.get_name(), self.get_version()) + def get_fullname(self): + return "{}-{}".format(self.get_name(), self.get_version()) - @staticmethod - def _fullname(name: str, version: str) -> str: - """ - >>> DistributionMetadata._fullname('setup.tools', '1.0-2') - 'setup_tools-1.0.post2' - >>> DistributionMetadata._fullname('setup-tools', '1.2post2') - 'setup_tools-1.2.post2' - >>> DistributionMetadata._fullname('setup-tools', '1.0-r2') - 'setup_tools-1.0.post2' - >>> DistributionMetadata._fullname('setup.tools', '1.0.post') - 'setup_tools-1.0.post0' - >>> DistributionMetadata._fullname('setup.tools', '1.0+ubuntu-1') - 'setup_tools-1.0+ubuntu.1' - """ - return "{}-{}".format( - canonicalize_name(name).replace('-', '_'), - canonicalize_version(version, strip_trailing_zero=False), - ) - - def get_author(self) -> str | None: + def get_author(self): return self.author - def get_author_email(self) -> str | None: + def get_author_email(self): return self.author_email - def get_maintainer(self) -> str | None: + def get_maintainer(self): return self.maintainer - def get_maintainer_email(self) -> str | None: + def get_maintainer_email(self): return self.maintainer_email - def get_contact(self) -> str | None: + def get_contact(self): return self.maintainer or self.author - def get_contact_email(self) -> str | None: + def get_contact_email(self): return self.maintainer_email or self.author_email - def get_url(self) -> str | None: + def get_url(self): return self.url - def get_license(self) -> str | None: + def get_license(self): return self.license get_licence = get_license - def get_description(self) -> str | None: + def get_description(self): return self.description - def get_long_description(self) -> str | None: + def get_long_description(self): return self.long_description - def get_keywords(self) -> str | list[str]: + def get_keywords(self): return self.keywords or [] - def set_keywords(self, value: str | Iterable[str]) -> None: + def set_keywords(self, value): self.keywords = _ensure_list(value, 'keywords') - def get_platforms(self) -> str | list[str] | None: + def get_platforms(self): return self.platforms - def set_platforms(self, value: str | Iterable[str]) -> None: + def set_platforms(self, value): self.platforms = _ensure_list(value, 'platforms') - def get_classifiers(self) -> str | list[str]: + def get_classifiers(self): return self.classifiers or [] - def set_classifiers(self, value: str | Iterable[str]) -> None: + def set_classifiers(self, value): self.classifiers = _ensure_list(value, 'classifiers') - def get_download_url(self) -> str | None: + def get_download_url(self): return self.download_url # PEP 314 - def get_requires(self) -> str | list[str]: + def get_requires(self): return self.requires or [] - def set_requires(self, value: Iterable[str]) -> None: + def set_requires(self, value): import distutils.versionpredicate for v in value: distutils.versionpredicate.VersionPredicate(v) self.requires = list(value) - def get_provides(self) -> str | list[str]: + def get_provides(self): return self.provides or [] - def set_provides(self, value: Iterable[str]) -> None: + def set_provides(self, value): value = [v.strip() for v in value] for v in value: import distutils.versionpredicate @@ -1368,10 +1265,10 @@ class DistributionMetadata: distutils.versionpredicate.split_provision(v) self.provides = value - def get_obsoletes(self) -> str | list[str]: + def get_obsoletes(self): return self.obsoletes or [] - def set_obsoletes(self, value: Iterable[str]) -> None: + def set_obsoletes(self, value): import distutils.versionpredicate for v in value: @@ -1383,4 +1280,7 @@ def fix_help_options(options): """Convert a 4-tuple 'help_options' list as found in various command classes to the 3-tuple form required by FancyGetopt. """ - return [opt[0:3] for opt in options] + new_options = [] + for help_tuple in options: + new_options.append(help_tuple[0:3]) + return new_options diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/errors.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/errors.py index 409d21f..626254c 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/errors.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/errors.py @@ -1,20 +1,12 @@ -""" -Exceptions used by the Distutils modules. +"""distutils.errors -Distutils modules may raise these or standard exceptions, -including :exc:`SystemExit`. -""" +Provides exceptions used by the Distutils modules. Note that Distutils +modules may raise standard exceptions; in particular, SystemExit is +usually raised for errors that are obviously the end-user's fault +(eg. bad command-line arguments). -# compiler exceptions aliased for compatibility -from .compilers.C.errors import CompileError as CompileError -from .compilers.C.errors import Error as _Error -from .compilers.C.errors import LibError as LibError -from .compilers.C.errors import LinkError as LinkError -from .compilers.C.errors import PreprocessError as PreprocessError -from .compilers.C.errors import UnknownFileType as _UnknownFileType - -CCompilerError = _Error -UnknownFileError = _UnknownFileType +This module is safe to use in "from ... import *" mode; it only exports +symbols whose names start with "Distutils" and end with "Error".""" class DistutilsError(Exception): @@ -106,3 +98,30 @@ class DistutilsTemplateError(DistutilsError): class DistutilsByteCompileError(DistutilsError): """Byte compile error.""" + + +# Exception classes used by the CCompiler implementation classes +class CCompilerError(Exception): + """Some compile/link operation failed.""" + + +class PreprocessError(CCompilerError): + """Failure to preprocess one or more C/C++ files.""" + + +class CompileError(CCompilerError): + """Failure to compile one or more C/C++ source files.""" + + +class LibError(CCompilerError): + """Failure to create a static library from one or more C/C++ object + files.""" + + +class LinkError(CCompilerError): + """Failure to link one or more C/C++ object files into an executable + or shared library file.""" + + +class UnknownFileError(CCompilerError): + """Attempt to process an unknown file type.""" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/extension.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/extension.py index f514112..6b8575d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/extension.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/extension.py @@ -3,11 +3,8 @@ Provides the Extension class, used to describe C/C++ extension modules in setup scripts.""" -from __future__ import annotations - import os import warnings -from collections.abc import Iterable # This class is really only used by the "build_ext" command, so it might # make sense to put it in distutils.command.build_ext. However, that @@ -29,14 +26,12 @@ class Extension: name : string the full name of the extension, including any packages -- ie. *not* a filename or pathname, but Python dotted name - sources : Iterable[string | os.PathLike] - iterable of source filenames (except strings, which could be misinterpreted - as a single filename), relative to the distribution root (where the setup - script lives), in Unix form (slash-separated) for portability. Can be any - non-string iterable (list, tuple, set, etc.) containing strings or - PathLike objects. Source files may be C, C++, SWIG (.i), platform-specific - resource files, or whatever else is recognized by the "build_ext" command - as source for a Python extension. + sources : [string] + list of source filenames, relative to the distribution root + (where the setup script lives), in Unix form (slash-separated) + for portability. Source files may be C, C++, SWIG (.i), + platform-specific resource files, or whatever else is recognized + by the "build_ext" command as source for a Python extension. include_dirs : [string] list of directories to search for C/C++ header files (in Unix form for portability) @@ -91,42 +86,31 @@ class Extension: # setup_keywords in core.py. def __init__( self, - name: str, - sources: Iterable[str | os.PathLike[str]], - include_dirs: list[str] | None = None, - define_macros: list[tuple[str, str | None]] | None = None, - undef_macros: list[str] | None = None, - library_dirs: list[str] | None = None, - libraries: list[str] | None = None, - runtime_library_dirs: list[str] | None = None, - extra_objects: list[str] | None = None, - extra_compile_args: list[str] | None = None, - extra_link_args: list[str] | None = None, - export_symbols: list[str] | None = None, - swig_opts: list[str] | None = None, - depends: list[str] | None = None, - language: str | None = None, - optional: bool | None = None, - **kw, # To catch unknown keywords + name, + sources, + include_dirs=None, + define_macros=None, + undef_macros=None, + library_dirs=None, + libraries=None, + runtime_library_dirs=None, + extra_objects=None, + extra_compile_args=None, + extra_link_args=None, + export_symbols=None, + swig_opts=None, + depends=None, + language=None, + optional=None, + **kw # To catch unknown keywords ): if not isinstance(name, str): - raise TypeError("'name' must be a string") - - # handle the string case first; since strings are iterable, disallow them - if isinstance(sources, str): - raise TypeError( - "'sources' must be an iterable of strings or PathLike objects, not a string" - ) - - # now we check if it's iterable and contains valid types - try: - self.sources = list(map(os.fspath, sources)) - except TypeError: - raise TypeError( - "'sources' must be an iterable of strings or PathLike objects" - ) + raise AssertionError("'name' must be a string") + if not (isinstance(sources, list) and all(isinstance(v, str) for v in sources)): + raise AssertionError("'sources' must be a list of strings") self.name = name + self.sources = sources self.include_dirs = include_dirs or [] self.define_macros = define_macros or [] self.undef_macros = undef_macros or [] @@ -146,16 +130,22 @@ class Extension: if len(kw) > 0: options = [repr(option) for option in kw] options = ', '.join(sorted(options)) - msg = f"Unknown Extension options: {options}" + msg = "Unknown Extension options: %s" % options warnings.warn(msg) def __repr__(self): - return f'<{self.__class__.__module__}.{self.__class__.__qualname__}({self.name!r}) at {id(self):#x}>' + return '<{}.{}({!r}) at {:#x}>'.format( + self.__class__.__module__, + self.__class__.__qualname__, + self.name, + id(self), + ) def read_setup_file(filename): # noqa: C901 """Reads a Setup file and returns Extension instances.""" - from distutils.sysconfig import _variable_rx, expand_makefile_vars, parse_makefile + from distutils.sysconfig import parse_makefile, expand_makefile_vars, _variable_rx + from distutils.text_file import TextFile from distutils.util import split_quoted @@ -166,11 +156,11 @@ def read_setup_file(filename): # noqa: C901 # ... [ ...] [ ...] [ ...] file = TextFile( filename, - strip_comments=True, - skip_blanks=True, - join_lines=True, - lstrip_ws=True, - rstrip_ws=True, + strip_comments=1, + skip_blanks=1, + join_lines=1, + lstrip_ws=1, + rstrip_ws=1, ) try: extensions = [] @@ -183,7 +173,7 @@ def read_setup_file(filename): # noqa: C901 continue if line[0] == line[-1] == "*": - file.warn(f"'{line}' lines not handled yet") + file.warn("'%s' lines not handled yet" % line) continue line = expand_makefile_vars(line, vars) @@ -249,7 +239,7 @@ def read_setup_file(filename): # noqa: C901 # and append it to sources. Hmmmm. ext.extra_objects.append(word) else: - file.warn(f"unrecognized argument '{word}'") + file.warn("unrecognized argument '%s'" % word) extensions.append(ext) finally: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/fancy_getopt.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/fancy_getopt.py index 1a1d3a0..830f047 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/fancy_getopt.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/fancy_getopt.py @@ -8,26 +8,21 @@ additional features: * options set attributes of a passed-in object """ -from __future__ import annotations - -import getopt -import re -import string import sys -from collections.abc import Sequence -from typing import Any - -from .errors import DistutilsArgError, DistutilsGetoptError +import string +import re +import getopt +from distutils.errors import DistutilsGetoptError, DistutilsArgError # Much like command_re in distutils.core, this is close to but not quite # the same as a Python NAME -- except, in the spirit of most GNU # utilities, we use '-' in place of '_'. (The spirit of LISP lives on!) # The similarities to NAME are again not a coincidence... longopt_pat = r'[a-zA-Z](?:[a-zA-Z0-9-]*)' -longopt_re = re.compile(rf'^{longopt_pat}$') +longopt_re = re.compile(r'^%s$' % longopt_pat) # For recognizing "negative alias" options, eg. "quiet=!verbose" -neg_alias_re = re.compile(f"^({longopt_pat})=!({longopt_pat})$") +neg_alias_re = re.compile("^({})=!({})$".format(longopt_pat, longopt_pat)) # This is used to translate long options to legitimate Python identifiers # (for use as attributes of some object). @@ -98,7 +93,7 @@ class FancyGetopt: def add_option(self, long_option, short_option=None, help_string=None): if long_option in self.option_index: raise DistutilsGetoptError( - f"option conflict: already an option '{long_option}'" + "option conflict: already an option '%s'" % long_option ) else: option = (long_option, short_option, help_string) @@ -118,14 +113,16 @@ class FancyGetopt: def _check_alias_dict(self, aliases, what): assert isinstance(aliases, dict) - for alias, opt in aliases.items(): + for (alias, opt) in aliases.items(): if alias not in self.option_index: raise DistutilsGetoptError( - f"invalid {what} '{alias}': option '{alias}' not defined" + ("invalid %s '%s': " "option '%s' not defined") + % (what, alias, alias) ) if opt not in self.option_index: raise DistutilsGetoptError( - f"invalid {what} '{alias}': aliased option '{opt}' not defined" + ("invalid %s '%s': " "aliased option '%s' not defined") + % (what, alias, opt) ) def set_aliases(self, alias): @@ -160,17 +157,19 @@ class FancyGetopt: else: # the option table is part of the code, so simply # assert that it is correct - raise ValueError(f"invalid option tuple: {option!r}") + raise ValueError("invalid option tuple: {!r}".format(option)) # Type- and value-check the option names if not isinstance(long, str) or len(long) < 2: raise DistutilsGetoptError( - f"invalid long option '{long}': must be a string of length >= 2" + ("invalid long option '%s': " "must be a string of length >= 2") + % long ) if not ((short is None) or (isinstance(short, str) and len(short) == 1)): raise DistutilsGetoptError( - f"invalid short option '{short}': must a single character or None" + "invalid short option '%s': " + "must a single character or None" % short ) self.repeat[long] = repeat @@ -180,7 +179,7 @@ class FancyGetopt: if short: short = short + ':' long = long[0:-1] - self.takes_arg[long] = True + self.takes_arg[long] = 1 else: # Is option is a "negative alias" for some other option (eg. # "quiet" == "!verbose")? @@ -188,12 +187,12 @@ class FancyGetopt: if alias_to is not None: if self.takes_arg[alias_to]: raise DistutilsGetoptError( - f"invalid negative alias '{long}': " - f"aliased option '{alias_to}' takes a value" + "invalid negative alias '%s': " + "aliased option '%s' takes a value" % (long, alias_to) ) self.long_opts[-1] = long # XXX redundant?! - self.takes_arg[long] = False + self.takes_arg[long] = 0 # If this is an alias option, make sure its "takes arg" flag is # the same as the option it's aliased to. @@ -201,9 +200,9 @@ class FancyGetopt: if alias_to is not None: if self.takes_arg[long] != self.takes_arg[alias_to]: raise DistutilsGetoptError( - f"invalid alias '{long}': inconsistent with " - f"aliased option '{alias_to}' (one of them takes a value, " - "the other doesn't" + "invalid alias '%s': inconsistent with " + "aliased option '%s' (one of them takes a value, " + "the other doesn't" % (long, alias_to) ) # Now enforce some bondage on the long option name, so we can @@ -212,8 +211,8 @@ class FancyGetopt: # '='. if not longopt_re.match(long): raise DistutilsGetoptError( - f"invalid long option name '{long}' " - "(must be letters, numbers, hyphens only" + "invalid long option name '%s' " + "(must be letters, numbers, hyphens only" % long ) self.attr_name[long] = self.get_attr_name(long) @@ -221,7 +220,7 @@ class FancyGetopt: self.short_opts.append(short) self.short2long[short[0]] = long - def getopt(self, args: Sequence[str] | None = None, object=None): # noqa: C901 + def getopt(self, args=None, object=None): # noqa: C901 """Parse command-line options in args. Store as attributes on object. If 'args' is None or not supplied, uses 'sys.argv[1:]'. If @@ -270,7 +269,7 @@ class FancyGetopt: attr = self.attr_name[opt] # The only repeating option at the moment is 'verbose'. - # It has a negative option -q quiet, which should set verbose = False. + # It has a negative option -q quiet, which should set verbose = 0. if val and self.repeat.get(attr) is not None: val = getattr(object, attr, 0) + 1 setattr(object, attr, val) @@ -353,18 +352,18 @@ class FancyGetopt: # Case 1: no short option at all (makes life easy) if short is None: if text: - lines.append(f" --{long:<{max_opt}} {text[0]}") + lines.append(" --%-*s %s" % (max_opt, long, text[0])) else: - lines.append(f" --{long:<{max_opt}}") + lines.append(" --%-*s " % (max_opt, long)) # Case 2: we have a short option, so we have to include it # just after the long option else: - opt_names = f"{long} (-{short})" + opt_names = "{} (-{})".format(long, short) if text: - lines.append(f" --{opt_names:<{max_opt}} {text[0]}") + lines.append(" --%-*s %s" % (max_opt, opt_names, text[0])) else: - lines.append(f" --{opt_names:<{max_opt}}") + lines.append(" --%-*s" % opt_names) for ell in text[1:]: lines.append(big_indent + ell) @@ -377,7 +376,7 @@ class FancyGetopt: file.write(line + "\n") -def fancy_getopt(options, negative_opt, object, args: Sequence[str] | None): +def fancy_getopt(options, negative_opt, object, args): parser = FancyGetopt(options) parser.set_negative_aliases(negative_opt) return parser.getopt(args, object) @@ -451,7 +450,7 @@ class OptionDummy: """Dummy class just used as a place to hold command-line option values as instance attributes.""" - def __init__(self, options: Sequence[Any] = []): + def __init__(self, options=[]): """Create a new OptionDummy instance. The attributes listed in 'options' will be initialized to None.""" for opt in options: @@ -466,6 +465,6 @@ How *do* you spell that odd word, anyways? say, "How should I know?"].)""" for w in (10, 20, 30, 40): - print(f"width: {w}") + print("width: %d" % w) print("\n".join(wrap_text(text, w))) print() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/file_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/file_util.py index 0acc8cb..1f1e444 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/file_util.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/file_util.py @@ -4,9 +4,8 @@ Utility functions for operating on single files. """ import os - -from ._log import log -from .errors import DistutilsFileError +from distutils.errors import DistutilsFileError +from distutils import log # for generating verbose output in 'copy_file()' _copy_action = {None: 'copying', 'hard': 'hard linking', 'sym': 'symbolically linking'} @@ -27,24 +26,30 @@ def _copy_file_contents(src, dst, buffer_size=16 * 1024): # noqa: C901 try: fsrc = open(src, 'rb') except OSError as e: - raise DistutilsFileError(f"could not open '{src}': {e.strerror}") + raise DistutilsFileError("could not open '{}': {}".format(src, e.strerror)) if os.path.exists(dst): try: os.unlink(dst) except OSError as e: - raise DistutilsFileError(f"could not delete '{dst}': {e.strerror}") + raise DistutilsFileError( + "could not delete '{}': {}".format(dst, e.strerror) + ) try: fdst = open(dst, 'wb') except OSError as e: - raise DistutilsFileError(f"could not create '{dst}': {e.strerror}") + raise DistutilsFileError( + "could not create '{}': {}".format(dst, e.strerror) + ) while True: try: buf = fsrc.read(buffer_size) except OSError as e: - raise DistutilsFileError(f"could not read from '{src}': {e.strerror}") + raise DistutilsFileError( + "could not read from '{}': {}".format(src, e.strerror) + ) if not buf: break @@ -52,7 +57,9 @@ def _copy_file_contents(src, dst, buffer_size=16 * 1024): # noqa: C901 try: fdst.write(buf) except OSError as e: - raise DistutilsFileError(f"could not write to '{dst}': {e.strerror}") + raise DistutilsFileError( + "could not write to '{}': {}".format(dst, e.strerror) + ) finally: if fdst: fdst.close() @@ -63,12 +70,12 @@ def _copy_file_contents(src, dst, buffer_size=16 * 1024): # noqa: C901 def copy_file( # noqa: C901 src, dst, - preserve_mode=True, - preserve_times=True, - update=False, + preserve_mode=1, + preserve_times=1, + update=0, link=None, - verbose=True, - dry_run=False, + verbose=1, + dry_run=0, ): """Copy a file 'src' to 'dst'. If 'dst' is a directory, then 'src' is copied there with the same name; otherwise, it must be a filename. (If @@ -101,12 +108,12 @@ def copy_file( # noqa: C901 # changing it (ie. it's not already a hard/soft link to src OR # (not update) and (src newer than dst). - from distutils._modified import newer - from stat import S_IMODE, ST_ATIME, ST_MODE, ST_MTIME + from distutils.dep_util import newer + from stat import ST_ATIME, ST_MTIME, ST_MODE, S_IMODE if not os.path.isfile(src): raise DistutilsFileError( - f"can't copy '{src}': doesn't exist or not a regular file" + "can't copy '%s': doesn't exist or not a regular file" % src ) if os.path.isdir(dst): @@ -118,12 +125,12 @@ def copy_file( # noqa: C901 if update and not newer(src, dst): if verbose >= 1: log.debug("not copying %s (output up-to-date)", src) - return (dst, False) + return (dst, 0) try: action = _copy_action[link] except KeyError: - raise ValueError(f"invalid value '{link}' for 'link' argument") + raise ValueError("invalid value '%s' for 'link' argument" % link) if verbose >= 1: if os.path.basename(dst) == os.path.basename(src): @@ -132,7 +139,7 @@ def copy_file( # noqa: C901 log.info("%s %s -> %s", action, src, dst) if dry_run: - return (dst, True) + return (dst, 1) # If linking (hard or symbolic), use the appropriate system call # (Unix only, of course, but that's the caller's responsibility) @@ -140,17 +147,16 @@ def copy_file( # noqa: C901 if not (os.path.exists(dst) and os.path.samefile(src, dst)): try: os.link(src, dst) + return (dst, 1) except OSError: # If hard linking fails, fall back on copying file # (some special filesystems don't support hard linking # even under Unix, see issue #8876). pass - else: - return (dst, True) elif link == 'sym': if not (os.path.exists(dst) and os.path.samefile(src, dst)): os.symlink(src, dst) - return (dst, True) + return (dst, 1) # Otherwise (non-Mac, not linking), copy the file contents and # (optionally) copy the times and mode. @@ -165,11 +171,12 @@ def copy_file( # noqa: C901 if preserve_mode: os.chmod(dst, S_IMODE(st[ST_MODE])) - return (dst, True) + return (dst, 1) # XXX I suspect this is Unix-specific -- need porting help! -def move_file(src, dst, verbose=True, dry_run=False): # noqa: C901 +def move_file(src, dst, verbose=1, dry_run=0): # noqa: C901 + """Move a file 'src' to 'dst'. If 'dst' is a directory, the file will be moved into it with the same name; otherwise, 'src' is just renamed to 'dst'. Return the new full name of the file. @@ -177,8 +184,8 @@ def move_file(src, dst, verbose=True, dry_run=False): # noqa: C901 Handles cross-device moves on Unix using 'copy_file()'. What about other systems??? """ + from os.path import exists, isfile, isdir, basename, dirname import errno - from os.path import basename, dirname, exists, isdir, isfile if verbose >= 1: log.info("moving %s -> %s", src, dst) @@ -187,18 +194,18 @@ def move_file(src, dst, verbose=True, dry_run=False): # noqa: C901 return dst if not isfile(src): - raise DistutilsFileError(f"can't move '{src}': not a regular file") + raise DistutilsFileError("can't move '%s': not a regular file" % src) if isdir(dst): dst = os.path.join(dst, basename(src)) elif exists(dst): raise DistutilsFileError( - f"can't move '{src}': destination '{dst}' already exists" + "can't move '{}': destination '{}' already exists".format(src, dst) ) if not isdir(dirname(dst)): raise DistutilsFileError( - f"can't move '{src}': destination '{dst}' not a valid path" + "can't move '{}': destination '{}' not a valid path".format(src, dst) ) copy_it = False @@ -209,7 +216,9 @@ def move_file(src, dst, verbose=True, dry_run=False): # noqa: C901 if num == errno.EXDEV: copy_it = True else: - raise DistutilsFileError(f"couldn't move '{src}' to '{dst}': {msg}") + raise DistutilsFileError( + "couldn't move '{}' to '{}': {}".format(src, dst, msg) + ) if copy_it: copy_file(src, dst, verbose=verbose) @@ -222,8 +231,8 @@ def move_file(src, dst, verbose=True, dry_run=False): # noqa: C901 except OSError: pass raise DistutilsFileError( - f"couldn't move '{src}' to '{dst}' by copy/delete: " - f"delete '{src}' failed: {msg}" + "couldn't move '%s' to '%s' by copy/delete: " + "delete '%s' failed: %s" % (src, dst, src, msg) ) return dst @@ -232,5 +241,9 @@ def write_file(filename, contents): """Create a file with the specified name and write 'contents' (a sequence of strings without line terminators) to it. """ - with open(filename, 'w', encoding='utf-8') as f: - f.writelines(line + '\n' for line in contents) + f = open(filename, "w") + try: + for line in contents: + f.write(line + "\n") + finally: + f.close() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/filelist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/filelist.py index 70dc0fd..987931a 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/filelist.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/filelist.py @@ -4,18 +4,14 @@ Provides the FileList class, used for poking about the filesystem and building lists of files. """ -from __future__ import annotations - -import fnmatch -import functools import os import re -from collections.abc import Iterable -from typing import Literal, overload +import fnmatch +import functools -from ._log import log -from .errors import DistutilsInternalError, DistutilsTemplateError -from .util import convert_path +from distutils.util import convert_path +from distutils.errors import DistutilsTemplateError, DistutilsInternalError +from distutils import log class FileList: @@ -33,19 +29,19 @@ class FileList: filtering applied) """ - def __init__(self, warn: object = None, debug_print: object = None) -> None: + def __init__(self, warn=None, debug_print=None): # ignore argument to FileList, but keep them for backwards # compatibility - self.allfiles: Iterable[str] | None = None - self.files: list[str] = [] + self.allfiles = None + self.files = [] - def set_allfiles(self, allfiles: Iterable[str]) -> None: + def set_allfiles(self, allfiles): self.allfiles = allfiles - def findall(self, dir: str | os.PathLike[str] = os.curdir) -> None: + def findall(self, dir=os.curdir): self.allfiles = findall(dir) - def debug_print(self, msg: object) -> None: + def debug_print(self, msg): """Print 'msg' to stdout if the global DEBUG (taken from the DISTUTILS_DEBUG environment variable) flag is true. """ @@ -56,13 +52,13 @@ class FileList: # Collection methods - def append(self, item: str) -> None: + def append(self, item): self.files.append(item) - def extend(self, items: Iterable[str]) -> None: + def extend(self, items): self.files.extend(items) - def sort(self) -> None: + def sort(self): # Not a strict lexical sort! sortable_files = sorted(map(os.path.split, self.files)) self.files = [] @@ -71,7 +67,7 @@ class FileList: # Other miscellaneous utility methods - def remove_duplicates(self) -> None: + def remove_duplicates(self): # Assumes list has been sorted! for i in range(len(self.files) - 1, 0, -1): if self.files[i] == self.files[i - 1]: @@ -88,28 +84,28 @@ class FileList: if action in ('include', 'exclude', 'global-include', 'global-exclude'): if len(words) < 2: raise DistutilsTemplateError( - f"'{action}' expects ..." + "'%s' expects ..." % action ) patterns = [convert_path(w) for w in words[1:]] elif action in ('recursive-include', 'recursive-exclude'): if len(words) < 3: raise DistutilsTemplateError( - f"'{action}' expects ..." + "'%s' expects ..." % action ) dir = convert_path(words[1]) patterns = [convert_path(w) for w in words[2:]] elif action in ('graft', 'prune'): if len(words) != 2: raise DistutilsTemplateError( - f"'{action}' expects a single " + "'%s' expects a single " % action ) dir_pattern = convert_path(words[1]) else: - raise DistutilsTemplateError(f"unknown action '{action}'") + raise DistutilsTemplateError("unknown action '%s'" % action) return (action, patterns, dir, dir_pattern) - def process_template_line(self, line: str) -> None: # noqa: C901 + def process_template_line(self, line): # noqa: C901 # Parse the line: split it up, make sure the right number of words # is there, and return the relevant words. 'action' is always # defined: it's the first word of the line. Which of the other @@ -123,23 +119,26 @@ class FileList: if action == 'include': self.debug_print("include " + ' '.join(patterns)) for pattern in patterns: - if not self.include_pattern(pattern, anchor=True): - log.warning("warning: no files found matching '%s'", pattern) + if not self.include_pattern(pattern, anchor=1): + log.warn("warning: no files found matching '%s'", pattern) elif action == 'exclude': self.debug_print("exclude " + ' '.join(patterns)) for pattern in patterns: - if not self.exclude_pattern(pattern, anchor=True): - log.warning( - "warning: no previously-included files found matching '%s'", + if not self.exclude_pattern(pattern, anchor=1): + log.warn( + ( + "warning: no previously-included files " + "found matching '%s'" + ), pattern, ) elif action == 'global-include': self.debug_print("global-include " + ' '.join(patterns)) for pattern in patterns: - if not self.include_pattern(pattern, anchor=False): - log.warning( + if not self.include_pattern(pattern, anchor=0): + log.warn( ( "warning: no files found matching '%s' " "anywhere in distribution" @@ -150,8 +149,8 @@ class FileList: elif action == 'global-exclude': self.debug_print("global-exclude " + ' '.join(patterns)) for pattern in patterns: - if not self.exclude_pattern(pattern, anchor=False): - log.warning( + if not self.exclude_pattern(pattern, anchor=0): + log.warn( ( "warning: no previously-included files matching " "'%s' found anywhere in distribution" @@ -163,14 +162,16 @@ class FileList: self.debug_print("recursive-include {} {}".format(dir, ' '.join(patterns))) for pattern in patterns: if not self.include_pattern(pattern, prefix=dir): - msg = "warning: no files found matching '%s' under directory '%s'" - log.warning(msg, pattern, dir) + msg = ( + "warning: no files found matching '%s' " "under directory '%s'" + ) + log.warn(msg, pattern, dir) elif action == 'recursive-exclude': self.debug_print("recursive-exclude {} {}".format(dir, ' '.join(patterns))) for pattern in patterns: if not self.exclude_pattern(pattern, prefix=dir): - log.warning( + log.warn( ( "warning: no previously-included files matching " "'%s' found under directory '%s'" @@ -182,53 +183,23 @@ class FileList: elif action == 'graft': self.debug_print("graft " + dir_pattern) if not self.include_pattern(None, prefix=dir_pattern): - log.warning("warning: no directories found matching '%s'", dir_pattern) + log.warn("warning: no directories found matching '%s'", dir_pattern) elif action == 'prune': self.debug_print("prune " + dir_pattern) if not self.exclude_pattern(None, prefix=dir_pattern): - log.warning( - ("no previously-included directories found matching '%s'"), + log.warn( + ("no previously-included directories found " "matching '%s'"), dir_pattern, ) else: raise DistutilsInternalError( - f"this cannot happen: invalid action '{action}'" + "this cannot happen: invalid action '%s'" % action ) # Filtering/selection methods - @overload - def include_pattern( - self, - pattern: str, - anchor: bool = True, - prefix: str | None = None, - is_regex: Literal[False] = False, - ) -> bool: ... - @overload - def include_pattern( - self, - pattern: str | re.Pattern[str], - anchor: bool = True, - prefix: str | None = None, - *, - is_regex: Literal[True], - ) -> bool: ... - @overload - def include_pattern( - self, - pattern: str | re.Pattern[str], - anchor: bool, - prefix: str | None, - is_regex: Literal[True], - ) -> bool: ... - def include_pattern( - self, - pattern: str | re.Pattern, - anchor: bool = True, - prefix: str | None = None, - is_regex: bool = False, - ) -> bool: + + def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0): """Select strings (presumably filenames) from 'self.files' that match 'pattern', a Unix-style wildcard (glob) pattern. Patterns are not quite the same as implemented by the 'fnmatch' module: '*' @@ -256,7 +227,7 @@ class FileList: # XXX docstring lying about what the special chars are? files_found = False pattern_re = translate_pattern(pattern, anchor, prefix, is_regex) - self.debug_print(f"include_pattern: applying regex r'{pattern_re.pattern}'") + self.debug_print("include_pattern: applying regex r'%s'" % pattern_re.pattern) # delayed loading of allfiles list if self.allfiles is None: @@ -269,38 +240,7 @@ class FileList: files_found = True return files_found - @overload - def exclude_pattern( - self, - pattern: str, - anchor: bool = True, - prefix: str | None = None, - is_regex: Literal[False] = False, - ) -> bool: ... - @overload - def exclude_pattern( - self, - pattern: str | re.Pattern[str], - anchor: bool = True, - prefix: str | None = None, - *, - is_regex: Literal[True], - ) -> bool: ... - @overload - def exclude_pattern( - self, - pattern: str | re.Pattern[str], - anchor: bool, - prefix: str | None, - is_regex: Literal[True], - ) -> bool: ... - def exclude_pattern( - self, - pattern: str | re.Pattern, - anchor: bool = True, - prefix: str | None = None, - is_regex: bool = False, - ) -> bool: + def exclude_pattern(self, pattern, anchor=1, prefix=None, is_regex=0): """Remove strings (presumably filenames) from 'files' that match 'pattern'. Other parameters are the same as for 'include_pattern()', above. @@ -309,7 +249,7 @@ class FileList: """ files_found = False pattern_re = translate_pattern(pattern, anchor, prefix, is_regex) - self.debug_print(f"exclude_pattern: applying regex r'{pattern_re.pattern}'") + self.debug_print("exclude_pattern: applying regex r'%s'" % pattern_re.pattern) for i in range(len(self.files) - 1, -1, -1): if pattern_re.search(self.files[i]): self.debug_print(" removing " + self.files[i]) @@ -359,7 +299,7 @@ class _UniqueDirs(set): return filter(cls(), items) -def findall(dir: str | os.PathLike[str] = os.curdir): +def findall(dir=os.curdir): """ Find all files under 'dir' and return the list of full filenames. Unless dir is '.', return full filenames with dir prepended. @@ -389,12 +329,12 @@ def glob_to_re(pattern): # we're using a regex to manipulate a regex, so we need # to escape the backslash twice sep = r'\\\\' - escaped = rf'\1[^{sep}]' + escaped = r'\1[^%s]' % sep pattern_re = re.sub(r'((?= self.threshold: + if args: + msg = msg % args + if level in (WARN, ERROR, FATAL): + stream = sys.stderr + else: + stream = sys.stdout + try: + stream.write('%s\n' % msg) + except UnicodeEncodeError: + # emulate backslashreplace error handler + encoding = stream.encoding + msg = msg.encode(encoding, "backslashreplace").decode(encoding) + stream.write('%s\n' % msg) + stream.flush() + + def log(self, level, msg, *args): + self._log(level, msg, args) + + def debug(self, msg, *args): + self._log(DEBUG, msg, args) + + def info(self, msg, *args): + self._log(INFO, msg, args) + + def warn(self, msg, *args): + self._log(WARN, msg, args) + + def error(self, msg, *args): + self._log(ERROR, msg, args) + + def fatal(self, msg, *args): + self._log(FATAL, msg, args) + + +_global_log = Log() log = _global_log.log debug = _global_log.debug info = _global_log.info -warn = _global_log.warning +warn = _global_log.warn error = _global_log.error fatal = _global_log.fatal def set_threshold(level): - orig = _global_log.level - _global_log.setLevel(level) - return orig + # return the old threshold for use from tests + old = _global_log.threshold + _global_log.threshold = level + return old def set_verbosity(v): if v <= 0: - set_threshold(logging.WARN) + set_threshold(WARN) elif v == 1: - set_threshold(logging.INFO) + set_threshold(INFO) elif v >= 2: - set_threshold(logging.DEBUG) - - -class Log(logging.Logger): - """distutils.log.Log is deprecated, please use an alternative from `logging`.""" - - def __init__(self, threshold=WARN): - warnings.warn(Log.__doc__) # avoid DeprecationWarning to ensure warn is shown - super().__init__(__name__, level=threshold) - - @property - def threshold(self): - return self.level - - @threshold.setter - def threshold(self, level): - self.setLevel(level) - - warn = logging.Logger.warning + set_threshold(DEBUG) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/spawn.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/spawn.py index 973668f..b18ba9d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/spawn.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/spawn.py @@ -2,63 +2,20 @@ Provides the 'spawn()' function, a front-end to various platform- specific functions for launching another program in a sub-process. +Also provides the 'find_executable()' to search the path for a given +executable name. """ -from __future__ import annotations - -import os -import platform -import shutil -import subprocess import sys -import warnings -from collections.abc import Mapping, MutableSequence -from typing import TYPE_CHECKING, TypeVar, overload +import os +import subprocess -from ._log import log -from .debug import DEBUG -from .errors import DistutilsExecError - -if TYPE_CHECKING: - from subprocess import _ENV +from distutils.errors import DistutilsExecError +from distutils.debug import DEBUG +from distutils import log -_MappingT = TypeVar("_MappingT", bound=Mapping) - - -def _debug(cmd): - """ - Render a subprocess command differently depending on DEBUG. - """ - return cmd if DEBUG else cmd[0] - - -def _inject_macos_ver(env: _MappingT | None) -> _MappingT | dict[str, str | int] | None: - if platform.system() != 'Darwin': - return env - - from .util import MACOSX_VERSION_VAR, get_macosx_target_ver - - target_ver = get_macosx_target_ver() - update = {MACOSX_VERSION_VAR: target_ver} if target_ver else {} - return {**_resolve(env), **update} - - -@overload -def _resolve(env: None) -> os._Environ[str]: ... -@overload -def _resolve(env: _MappingT) -> _MappingT: ... -def _resolve(env: _MappingT | None) -> _MappingT | os._Environ[str]: - return os.environ if env is None else env - - -def spawn( - cmd: MutableSequence[bytes | str | os.PathLike[str]], - search_path: bool = True, - verbose: bool = False, - dry_run: bool = False, - env: _ENV | None = None, -) -> None: +def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None): # noqa: C901 """Run another program, specified as a command list 'cmd', in a new process. 'cmd' is just the argument list for the new process, ie. @@ -74,36 +31,53 @@ def spawn( Raise DistutilsExecError if running the program fails in any way; just return on success. """ + # cmd is documented as a list, but just in case some code passes a tuple + # in, protect our %-formatting code against horrible death + cmd = list(cmd) + log.info(subprocess.list2cmdline(cmd)) if dry_run: return if search_path: - executable = shutil.which(cmd[0]) + executable = find_executable(cmd[0]) if executable is not None: cmd[0] = executable + env = env if env is not None else dict(os.environ) + + if sys.platform == 'darwin': + from distutils.util import MACOSX_VERSION_VAR, get_macosx_target_ver + + macosx_target_ver = get_macosx_target_ver() + if macosx_target_ver: + env[MACOSX_VERSION_VAR] = macosx_target_ver + try: - subprocess.check_call(cmd, env=_inject_macos_ver(env)) + proc = subprocess.Popen(cmd, env=env) + proc.wait() + exitcode = proc.returncode except OSError as exc: + if not DEBUG: + cmd = cmd[0] raise DistutilsExecError( - f"command {_debug(cmd)!r} failed: {exc.args[-1]}" + "command {!r} failed: {}".format(cmd, exc.args[-1]) ) from exc - except subprocess.CalledProcessError as err: + + if exitcode: + if not DEBUG: + cmd = cmd[0] raise DistutilsExecError( - f"command {_debug(cmd)!r} failed with exit code {err.returncode}" - ) from err + "command {!r} failed with exit code {}".format(cmd, exitcode) + ) -def find_executable(executable: str, path: str | None = None) -> str | None: +def find_executable(executable, path=None): """Tries to find 'executable' in the directories listed in 'path'. A string listing directories separated by 'os.pathsep'; defaults to os.environ['PATH']. Returns the complete filename or None if not found. """ - warnings.warn( - 'Use shutil.which instead of find_executable', DeprecationWarning, stacklevel=2 - ) _, ext = os.path.splitext(executable) if (sys.platform == 'win32') and (ext != '.exe'): executable = executable + '.exe' @@ -113,13 +87,14 @@ def find_executable(executable: str, path: str | None = None) -> str | None: if path is None: path = os.environ.get('PATH', None) - # bpo-35755: Don't fall through if PATH is the empty string if path is None: try: path = os.confstr("CS_PATH") except (AttributeError, ValueError): # os.confstr() or CS_PATH is not available path = os.defpath + # bpo-35755: Don't use os.defpath if the PATH environment variable is + # set to an empty string # PATH='' doesn't match, whereas PATH=':' looks in the current directory if not path: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/sysconfig.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/sysconfig.py index 7ddc869..6a979f8 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/sysconfig.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/sysconfig.py @@ -9,30 +9,15 @@ Written by: Fred L. Drake, Jr. Email: """ -from __future__ import annotations - -import functools import os -import pathlib import re import sys import sysconfig -from typing import TYPE_CHECKING, Literal, overload +import pathlib -from jaraco.functools import pass_none - -from .ccompiler import CCompiler -from .compat import py39 from .errors import DistutilsPlatformError -from .util import is_mingw - -if TYPE_CHECKING: - from typing_extensions import deprecated -else: - - def deprecated(message): - return lambda fn: fn - +from . import py39compat +from ._functools import pass_none IS_PYPY = '__pypy__' in sys.builtin_module_names @@ -119,10 +104,10 @@ def get_python_version(): leaving off the patchlevel. Sample return values could be '1.5' or '2.2'. """ - return f'{sys.version_info.major}.{sys.version_info.minor}' + return '%d.%d' % sys.version_info[:2] -def get_python_inc(plat_specific: bool = False, prefix: str | None = None) -> str: +def get_python_inc(plat_specific=0, prefix=None): """Return the directory containing installed Python header files. If 'plat_specific' is false (the default), this is the path to the @@ -135,30 +120,22 @@ def get_python_inc(plat_specific: bool = False, prefix: str | None = None) -> st """ default_prefix = BASE_EXEC_PREFIX if plat_specific else BASE_PREFIX resolved_prefix = prefix if prefix is not None else default_prefix - # MinGW imitates posix like layout, but os.name != posix - os_name = "posix" if is_mingw() else os.name try: - getter = globals()[f'_get_python_inc_{os_name}'] + getter = globals()[f'_get_python_inc_{os.name}'] except KeyError: raise DistutilsPlatformError( "I don't know where Python installs its C header files " - f"on platform '{os.name}'" + "on platform '%s'" % os.name ) return getter(resolved_prefix, prefix, plat_specific) -@pass_none -def _extant(path): - """ - Replace path with None if it doesn't exist. - """ - return path if os.path.exists(path) else None - - def _get_python_inc_posix(prefix, spec_prefix, plat_specific): + if IS_PYPY and sys.version_info < (3, 8): + return os.path.join(prefix, 'include') return ( _get_python_inc_posix_python(plat_specific) - or _extant(_get_python_inc_from_config(plat_specific, spec_prefix)) + or _get_python_inc_from_config(plat_specific, spec_prefix) or _get_python_inc_posix_prefix(prefix) ) @@ -210,11 +187,12 @@ def _get_python_inc_posix_prefix(prefix): def _get_python_inc_nt(prefix, spec_prefix, plat_specific): if python_build: - # Include both include dirs to ensure we can find pyconfig.h + # Include both the include and PC dir to ensure we can find + # pyconfig.h return ( os.path.join(prefix, "include") + os.path.pathsep - + os.path.dirname(sysconfig.get_config_h_filename()) + + os.path.join(prefix, "PC") ) return os.path.join(prefix, "include") @@ -227,9 +205,7 @@ def _posix_lib(standard_lib, libpython, early_prefix, prefix): return os.path.join(libpython, "site-packages") -def get_python_lib( - plat_specific: bool = False, standard_lib: bool = False, prefix: str | None = None -) -> str: +def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): """Return the directory containing the Python library (standard or site additions). @@ -244,6 +220,14 @@ def get_python_lib( sys.base_exec_prefix -- i.e., ignore 'plat_specific'. """ + if IS_PYPY and sys.version_info < (3, 8): + # PyPy-specific schema + if prefix is None: + prefix = PREFIX + if standard_lib: + return os.path.join(prefix, "lib-python", sys.version[0]) + return os.path.join(prefix, 'site-packages') + early_prefix = prefix if prefix is None: @@ -252,7 +236,7 @@ def get_python_lib( else: prefix = plat_specific and EXEC_PREFIX or PREFIX - if os.name == "posix" or is_mingw(): + if os.name == "posix": if plat_specific or standard_lib: # Platform-specific modules (any module from a non-pure-Python # module distribution) or standard Python library modules. @@ -270,38 +254,34 @@ def get_python_lib( return os.path.join(prefix, "Lib", "site-packages") else: raise DistutilsPlatformError( - f"I don't know where Python installs its library on platform '{os.name}'" + "I don't know where Python installs its library " + "on platform '%s'" % os.name ) -@functools.lru_cache -def _customize_macos(): - """ - Perform first-time customization of compiler-related - config vars on macOS. Use after a compiler is known - to be needed. This customization exists primarily to support Pythons - from binary installers. The kind and paths to build tools on - the user system may vary significantly from the system - that Python itself was built on. Also the user OS - version and build tools may not support the same set - of CPU architectures for universal builds. - """ - - sys.platform == "darwin" and __import__('_osx_support').customize_compiler( - get_config_vars() - ) - - -def customize_compiler(compiler: CCompiler) -> None: +def customize_compiler(compiler): # noqa: C901 """Do any platform-specific customization of a CCompiler instance. Mainly needed on Unix, so we can plug in the information that varies across Unices and is stored in Python's Makefile. """ - if compiler.compiler_type in ["unix", "cygwin"] or ( - compiler.compiler_type == "mingw32" and is_mingw() - ): - _customize_macos() + if compiler.compiler_type == "unix": + if sys.platform == "darwin": + # Perform first-time customization of compiler-related + # config vars on OS X now that we know we need a compiler. + # This is primarily to support Pythons from binary + # installers. The kind and paths to build tools on + # the user system may vary significantly from the system + # that Python itself was built on. Also the user OS + # version and build tools may not support the same set + # of CPU architectures for universal builds. + global _config_vars + # Use get_config_var() to ensure _config_vars is initialized. + if not get_config_var('CUSTOMIZED_OSX_COMPILER'): + import _osx_support + + _osx_support.customize_compiler(_config_vars) + _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' ( cc, @@ -309,7 +289,6 @@ def customize_compiler(compiler: CCompiler) -> None: cflags, ccshared, ldshared, - ldcxxshared, shlib_suffix, ar, ar_flags, @@ -319,14 +298,11 @@ def customize_compiler(compiler: CCompiler) -> None: 'CFLAGS', 'CCSHARED', 'LDSHARED', - 'LDCXXSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS', ) - cxxflags = cflags - if 'CC' in os.environ: newcc = os.environ['CC'] if 'LDSHARED' not in os.environ and ldshared.startswith(cc): @@ -334,42 +310,38 @@ def customize_compiler(compiler: CCompiler) -> None: # command for LDSHARED as well ldshared = newcc + ldshared[len(cc) :] cc = newcc - cxx = os.environ.get('CXX', cxx) - ldshared = os.environ.get('LDSHARED', ldshared) - ldcxxshared = os.environ.get('LDCXXSHARED', ldcxxshared) - cpp = os.environ.get( - 'CPP', - cc + " -E", # not always - ) + if 'CXX' in os.environ: + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: + cflags = cflags + ' ' + os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: + archiver = ar + ' ' + os.environ['ARFLAGS'] + else: + archiver = ar + ' ' + ar_flags - ldshared = _add_flags(ldshared, 'LD') - ldcxxshared = _add_flags(ldcxxshared, 'LD') - cflags = os.environ.get('CFLAGS', cflags) - ldshared = _add_flags(ldshared, 'C') - cxxflags = os.environ.get('CXXFLAGS', cxxflags) - ldcxxshared = _add_flags(ldcxxshared, 'CXX') - cpp = _add_flags(cpp, 'CPP') - cflags = _add_flags(cflags, 'CPP') - cxxflags = _add_flags(cxxflags, 'CPP') - ldshared = _add_flags(ldshared, 'CPP') - ldcxxshared = _add_flags(ldcxxshared, 'CPP') - - ar = os.environ.get('AR', ar) - - archiver = ar + ' ' + os.environ.get('ARFLAGS', ar_flags) cc_cmd = cc + ' ' + cflags - cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( preprocessor=cpp, compiler=cc_cmd, compiler_so=cc_cmd + ' ' + ccshared, - compiler_cxx=cxx_cmd, - compiler_so_cxx=cxx_cmd + ' ' + ccshared, + compiler_cxx=cxx, linker_so=ldshared, - linker_so_cxx=ldcxxshared, linker_exe=cc, - linker_exe_cxx=cxx, archiver=archiver, ) @@ -379,12 +351,19 @@ def customize_compiler(compiler: CCompiler) -> None: compiler.shared_lib_extension = shlib_suffix -def get_config_h_filename() -> str: +def get_config_h_filename(): """Return full pathname of installed pyconfig.h file.""" - return sysconfig.get_config_h_filename() + if python_build: + if os.name == "nt": + inc_dir = os.path.join(_sys_home or project_base, "PC") + else: + inc_dir = _sys_home or project_base + return os.path.join(inc_dir, 'pyconfig.h') + else: + return sysconfig.get_config_h_filename() -def get_makefile_filename() -> str: +def get_makefile_filename(): """Return full pathname of installed Makefile from the Python build.""" return sysconfig.get_makefile_filename() @@ -416,11 +395,7 @@ def parse_makefile(fn, g=None): # noqa: C901 from distutils.text_file import TextFile fp = TextFile( - fn, - strip_comments=True, - skip_blanks=True, - join_lines=True, - errors="surrogateescape", + fn, strip_comments=1, skip_blanks=1, join_lines=1, errors="surrogateescape" ) if g is None: @@ -499,6 +474,7 @@ def parse_makefile(fn, g=None): # noqa: C901 del notdone[name] if name.startswith('PY_') and name[3:] in renamed_variables: + name = name[3:] if name not in done: done[name] = value @@ -546,11 +522,7 @@ def expand_makefile_vars(s, vars): _config_vars = None -@overload -def get_config_vars() -> dict[str, str | int]: ... -@overload -def get_config_vars(arg: str, /, *args: str) -> list[str | int]: ... -def get_config_vars(*args: str) -> list[str | int] | dict[str, str | int]: +def get_config_vars(*args): """With no arguments, return a dictionary of all configuration variables relevant for the current platform. Generally this includes everything needed to build extensions and install both pure modules and @@ -563,19 +535,18 @@ def get_config_vars(*args: str) -> list[str | int] | dict[str, str | int]: global _config_vars if _config_vars is None: _config_vars = sysconfig.get_config_vars().copy() - py39.add_ext_suffix(_config_vars) + py39compat.add_ext_suffix(_config_vars) - return [_config_vars.get(name) for name in args] if args else _config_vars + if args: + vals = [] + for name in args: + vals.append(_config_vars.get(name)) + return vals + else: + return _config_vars -@overload -@deprecated( - "SO is deprecated, use EXT_SUFFIX. Support will be removed when this module is synchronized with stdlib Python 3.11" -) -def get_config_var(name: Literal["SO"]) -> int | str | None: ... -@overload -def get_config_var(name: str) -> int | str | None: ... -def get_config_var(name: str) -> int | str | None: +def get_config_var(name): """Return the value of a single variable using the dictionary returned by 'get_config_vars()'. Equivalent to get_config_vars().get(name) @@ -585,14 +556,3 @@ def get_config_var(name: str) -> int | str | None: warnings.warn('SO is deprecated, use EXT_SUFFIX', DeprecationWarning, 2) return get_config_vars().get(name) - - -@pass_none -def _add_flags(value: str, type: str) -> str: - """ - Add any flags from the environment for the given type. - - type is the prefix to FLAGS in the environment key (e.g. "C" for "CFLAGS"). - """ - flags = os.environ.get(f'{type}FLAGS') - return f'{value} {flags}' if flags else value diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__init__.py deleted file mode 100644 index 5a8ab06..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -""" -Test suite for distutils. - -Tests for the command classes in the distutils.command package are -included in distutils.tests as well, instead of using a separate -distutils.command.tests package, since command identification is done -by import rather than matching pre-defined names. -""" - -import shutil -from collections.abc import Sequence - - -def missing_compiler_executable(cmd_names: Sequence[str] = []): # pragma: no cover - """Check if the compiler components used to build the interpreter exist. - - Check for the existence of the compiler executables whose names are listed - in 'cmd_names' or all the compiler executables when 'cmd_names' is empty - and return the first missing executable or None when none is found - missing. - - """ - from distutils import ccompiler, errors, sysconfig - - compiler = ccompiler.new_compiler() - sysconfig.customize_compiler(compiler) - if compiler.compiler_type == "msvc": - # MSVC has no executables, so check whether initialization succeeds - try: - compiler.initialize() - except errors.DistutilsPlatformError: - return "msvc" - for name in compiler.executables: - if cmd_names and name not in cmd_names: - continue - cmd = getattr(compiler, name) - if cmd_names: - assert cmd is not None, f"the '{name}' executable is not configured" - elif not cmd: - continue - if shutil.which(cmd[0]) is None: - return cmd[0] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 7d13b8e..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/support.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/support.cpython-311.pyc deleted file mode 100644 index 5f0805e..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/support.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_archive_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_archive_util.cpython-311.pyc deleted file mode 100644 index 4a374cd..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_archive_util.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist.cpython-311.pyc deleted file mode 100644 index da36e43..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_dumb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_dumb.cpython-311.pyc deleted file mode 100644 index 4813aef..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_dumb.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_rpm.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_rpm.cpython-311.pyc deleted file mode 100644 index f356695..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_bdist_rpm.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build.cpython-311.pyc deleted file mode 100644 index dba6fdf..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_clib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_clib.cpython-311.pyc deleted file mode 100644 index 1abdbc0..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_clib.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_ext.cpython-311.pyc deleted file mode 100644 index 170fa71..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_ext.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_py.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_py.cpython-311.pyc deleted file mode 100644 index c32b96d..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_py.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_scripts.cpython-311.pyc deleted file mode 100644 index b0ecb0c..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_build_scripts.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_check.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_check.cpython-311.pyc deleted file mode 100644 index 91cc08a..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_check.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_clean.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_clean.cpython-311.pyc deleted file mode 100644 index dd6d597..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_clean.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_cmd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_cmd.cpython-311.pyc deleted file mode 100644 index 8b92544..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_cmd.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_config_cmd.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_config_cmd.cpython-311.pyc deleted file mode 100644 index f238332..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_config_cmd.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_core.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_core.cpython-311.pyc deleted file mode 100644 index 3e86ef8..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_core.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dir_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dir_util.cpython-311.pyc deleted file mode 100644 index 51f1262..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dir_util.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dist.cpython-311.pyc deleted file mode 100644 index 53ab5d9..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_dist.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_extension.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_extension.cpython-311.pyc deleted file mode 100644 index 5215254..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_extension.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_file_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_file_util.cpython-311.pyc deleted file mode 100644 index 8a8eeee..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_file_util.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_filelist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_filelist.cpython-311.pyc deleted file mode 100644 index a3e9501..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_filelist.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install.cpython-311.pyc deleted file mode 100644 index c62833e..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_data.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_data.cpython-311.pyc deleted file mode 100644 index 9c9d9a4..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_data.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_headers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_headers.cpython-311.pyc deleted file mode 100644 index d6dcffc..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_headers.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_lib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_lib.cpython-311.pyc deleted file mode 100644 index 41f2ca8..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_lib.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_scripts.cpython-311.pyc deleted file mode 100644 index f18de4b..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_install_scripts.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_log.cpython-311.pyc deleted file mode 100644 index 43abcd5..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_log.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_modified.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_modified.cpython-311.pyc deleted file mode 100644 index a33499b..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_modified.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sdist.cpython-311.pyc deleted file mode 100644 index b3d0531..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sdist.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_spawn.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_spawn.cpython-311.pyc deleted file mode 100644 index fbca678..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_spawn.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sysconfig.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sysconfig.cpython-311.pyc deleted file mode 100644 index 4f7085d..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_sysconfig.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_text_file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_text_file.cpython-311.pyc deleted file mode 100644 index fea3139..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_text_file.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_util.cpython-311.pyc deleted file mode 100644 index f180ff0..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_util.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_version.cpython-311.pyc deleted file mode 100644 index 7c41b5f..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_version.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_versionpredicate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_versionpredicate.cpython-311.pyc deleted file mode 100644 index 9bf7ee6..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/test_versionpredicate.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/unix_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/unix_compat.cpython-311.pyc deleted file mode 100644 index 214af5c..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/__pycache__/unix_compat.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 265dbde..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/py39.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/py39.cpython-311.pyc deleted file mode 100644 index d99f826..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/__pycache__/py39.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/py39.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/py39.py deleted file mode 100644 index aca3939..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/compat/py39.py +++ /dev/null @@ -1,40 +0,0 @@ -import sys - -if sys.version_info >= (3, 10): - from test.support.import_helper import ( - CleanImport as CleanImport, - ) - from test.support.import_helper import ( - DirsOnSysPath as DirsOnSysPath, - ) - from test.support.os_helper import ( - EnvironmentVarGuard as EnvironmentVarGuard, - ) - from test.support.os_helper import ( - rmtree as rmtree, - ) - from test.support.os_helper import ( - skip_unless_symlink as skip_unless_symlink, - ) - from test.support.os_helper import ( - unlink as unlink, - ) -else: - from test.support import ( - CleanImport as CleanImport, - ) - from test.support import ( - DirsOnSysPath as DirsOnSysPath, - ) - from test.support import ( - EnvironmentVarGuard as EnvironmentVarGuard, - ) - from test.support import ( - rmtree as rmtree, - ) - from test.support import ( - skip_unless_symlink as skip_unless_symlink, - ) - from test.support import ( - unlink as unlink, - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/support.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/support.py deleted file mode 100644 index 9cd2b8a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/support.py +++ /dev/null @@ -1,134 +0,0 @@ -"""Support code for distutils test cases.""" - -import itertools -import os -import pathlib -import shutil -import sys -import sysconfig -import tempfile -from distutils.core import Distribution - -import pytest -from more_itertools import always_iterable - - -@pytest.mark.usefixtures('distutils_managed_tempdir') -class TempdirManager: - """ - Mix-in class that handles temporary directories for test cases. - """ - - def mkdtemp(self): - """Create a temporary directory that will be cleaned up. - - Returns the path of the directory. - """ - d = tempfile.mkdtemp() - self.tempdirs.append(d) - return d - - def write_file(self, path, content='xxx'): - """Writes a file in the given path. - - path can be a string or a sequence. - """ - pathlib.Path(*always_iterable(path)).write_text(content, encoding='utf-8') - - def create_dist(self, pkg_name='foo', **kw): - """Will generate a test environment. - - This function creates: - - a Distribution instance using keywords - - a temporary directory with a package structure - - It returns the package directory and the distribution - instance. - """ - tmp_dir = self.mkdtemp() - pkg_dir = os.path.join(tmp_dir, pkg_name) - os.mkdir(pkg_dir) - dist = Distribution(attrs=kw) - - return pkg_dir, dist - - -class DummyCommand: - """Class to store options for retrieval via set_undefined_options().""" - - def __init__(self, **kwargs): - vars(self).update(kwargs) - - def ensure_finalized(self): - pass - - -def copy_xxmodule_c(directory): - """Helper for tests that need the xxmodule.c source file. - - Example use: - - def test_compile(self): - copy_xxmodule_c(self.tmpdir) - self.assertIn('xxmodule.c', os.listdir(self.tmpdir)) - - If the source file can be found, it will be copied to *directory*. If not, - the test will be skipped. Errors during copy are not caught. - """ - shutil.copy(_get_xxmodule_path(), os.path.join(directory, 'xxmodule.c')) - - -def _get_xxmodule_path(): - source_name = 'xxmodule.c' if sys.version_info > (3, 9) else 'xxmodule-3.8.c' - return os.path.join(os.path.dirname(__file__), source_name) - - -def fixup_build_ext(cmd): - """Function needed to make build_ext tests pass. - - When Python was built with --enable-shared on Unix, -L. is not enough to - find libpython.so, because regrtest runs in a tempdir, not in the - source directory where the .so lives. - - When Python was built with in debug mode on Windows, build_ext commands - need their debug attribute set, and it is not done automatically for - some reason. - - This function handles both of these things. Example use: - - cmd = build_ext(dist) - support.fixup_build_ext(cmd) - cmd.ensure_finalized() - - Unlike most other Unix platforms, Mac OS X embeds absolute paths - to shared libraries into executables, so the fixup is not needed there. - """ - if os.name == 'nt': - cmd.debug = sys.executable.endswith('_d.exe') - elif sysconfig.get_config_var('Py_ENABLE_SHARED'): - # To further add to the shared builds fun on Unix, we can't just add - # library_dirs to the Extension() instance because that doesn't get - # plumbed through to the final compiler command. - runshared = sysconfig.get_config_var('RUNSHARED') - if runshared is None: - cmd.library_dirs = ['.'] - else: - if sys.platform == 'darwin': - cmd.library_dirs = [] - else: - name, equals, value = runshared.partition('=') - cmd.library_dirs = [d for d in value.split(os.pathsep) if d] - - -def combine_markers(cls): - """ - pytest will honor markers as found on the class, but when - markers are on multiple subclasses, only one appears. Use - this decorator to combine those markers. - """ - cls.pytestmark = [ - mark - for base in itertools.chain([cls], cls.__bases__) - for mark in getattr(base, 'pytestmark', []) - ] - return cls diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_archive_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_archive_util.py deleted file mode 100644 index 3e4ed75..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_archive_util.py +++ /dev/null @@ -1,353 +0,0 @@ -"""Tests for distutils.archive_util.""" - -import functools -import operator -import os -import pathlib -import sys -import tarfile -from distutils import archive_util -from distutils.archive_util import ( - ARCHIVE_FORMATS, - check_archive_formats, - make_archive, - make_tarball, - make_zipfile, -) -from distutils.spawn import spawn -from distutils.tests import support -from os.path import splitdrive - -import path -import pytest -from test.support import patch - -from .unix_compat import UID_0_SUPPORT, grp, pwd, require_uid_0, require_unix_id - - -def can_fs_encode(filename): - """ - Return True if the filename can be saved in the file system. - """ - if os.path.supports_unicode_filenames: - return True - try: - filename.encode(sys.getfilesystemencoding()) - except UnicodeEncodeError: - return False - return True - - -def all_equal(values): - return functools.reduce(operator.eq, values) - - -def same_drive(*paths): - return all_equal(pathlib.Path(path).drive for path in paths) - - -class ArchiveUtilTestCase(support.TempdirManager): - @pytest.mark.usefixtures('needs_zlib') - def test_make_tarball(self, name='archive'): - # creating something to tar - tmpdir = self._create_files() - self._make_tarball(tmpdir, name, '.tar.gz') - # trying an uncompressed one - self._make_tarball(tmpdir, name, '.tar', compress=None) - - @pytest.mark.usefixtures('needs_zlib') - def test_make_tarball_gzip(self): - tmpdir = self._create_files() - self._make_tarball(tmpdir, 'archive', '.tar.gz', compress='gzip') - - def test_make_tarball_bzip2(self): - pytest.importorskip('bz2') - tmpdir = self._create_files() - self._make_tarball(tmpdir, 'archive', '.tar.bz2', compress='bzip2') - - def test_make_tarball_xz(self): - pytest.importorskip('lzma') - tmpdir = self._create_files() - self._make_tarball(tmpdir, 'archive', '.tar.xz', compress='xz') - - @pytest.mark.skipif("not can_fs_encode('årchiv')") - def test_make_tarball_latin1(self): - """ - Mirror test_make_tarball, except filename contains latin characters. - """ - self.test_make_tarball('årchiv') # note this isn't a real word - - @pytest.mark.skipif("not can_fs_encode('のアーカイブ')") - def test_make_tarball_extended(self): - """ - Mirror test_make_tarball, except filename contains extended - characters outside the latin charset. - """ - self.test_make_tarball('のアーカイブ') # japanese for archive - - def _make_tarball(self, tmpdir, target_name, suffix, **kwargs): - tmpdir2 = self.mkdtemp() - if same_drive(tmpdir, tmpdir2): - pytest.skip("source and target should be on same drive") - - base_name = os.path.join(tmpdir2, target_name) - - # working with relative paths to avoid tar warnings - with path.Path(tmpdir): - make_tarball(splitdrive(base_name)[1], 'dist', **kwargs) - - # check if the compressed tarball was created - tarball = base_name + suffix - assert os.path.exists(tarball) - assert self._tarinfo(tarball) == self._created_files - - def _tarinfo(self, path): - tar = tarfile.open(path) - try: - names = tar.getnames() - names.sort() - return names - finally: - tar.close() - - _zip_created_files = [ - 'dist/', - 'dist/file1', - 'dist/file2', - 'dist/sub/', - 'dist/sub/file3', - 'dist/sub2/', - ] - _created_files = [p.rstrip('/') for p in _zip_created_files] - - def _create_files(self): - # creating something to tar - tmpdir = self.mkdtemp() - dist = os.path.join(tmpdir, 'dist') - os.mkdir(dist) - self.write_file([dist, 'file1'], 'xxx') - self.write_file([dist, 'file2'], 'xxx') - os.mkdir(os.path.join(dist, 'sub')) - self.write_file([dist, 'sub', 'file3'], 'xxx') - os.mkdir(os.path.join(dist, 'sub2')) - return tmpdir - - @pytest.mark.usefixtures('needs_zlib') - @pytest.mark.skipif("not (shutil.which('tar') and shutil.which('gzip'))") - def test_tarfile_vs_tar(self): - tmpdir = self._create_files() - tmpdir2 = self.mkdtemp() - base_name = os.path.join(tmpdir2, 'archive') - old_dir = os.getcwd() - os.chdir(tmpdir) - try: - make_tarball(base_name, 'dist') - finally: - os.chdir(old_dir) - - # check if the compressed tarball was created - tarball = base_name + '.tar.gz' - assert os.path.exists(tarball) - - # now create another tarball using `tar` - tarball2 = os.path.join(tmpdir, 'archive2.tar.gz') - tar_cmd = ['tar', '-cf', 'archive2.tar', 'dist'] - gzip_cmd = ['gzip', '-f', '-9', 'archive2.tar'] - old_dir = os.getcwd() - os.chdir(tmpdir) - try: - spawn(tar_cmd) - spawn(gzip_cmd) - finally: - os.chdir(old_dir) - - assert os.path.exists(tarball2) - # let's compare both tarballs - assert self._tarinfo(tarball) == self._created_files - assert self._tarinfo(tarball2) == self._created_files - - # trying an uncompressed one - base_name = os.path.join(tmpdir2, 'archive') - old_dir = os.getcwd() - os.chdir(tmpdir) - try: - make_tarball(base_name, 'dist', compress=None) - finally: - os.chdir(old_dir) - tarball = base_name + '.tar' - assert os.path.exists(tarball) - - # now for a dry_run - base_name = os.path.join(tmpdir2, 'archive') - old_dir = os.getcwd() - os.chdir(tmpdir) - try: - make_tarball(base_name, 'dist', compress=None, dry_run=True) - finally: - os.chdir(old_dir) - tarball = base_name + '.tar' - assert os.path.exists(tarball) - - @pytest.mark.usefixtures('needs_zlib') - def test_make_zipfile(self): - zipfile = pytest.importorskip('zipfile') - # creating something to tar - tmpdir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - with path.Path(tmpdir): - make_zipfile(base_name, 'dist') - - # check if the compressed tarball was created - tarball = base_name + '.zip' - assert os.path.exists(tarball) - with zipfile.ZipFile(tarball) as zf: - assert sorted(zf.namelist()) == self._zip_created_files - - def test_make_zipfile_no_zlib(self): - zipfile = pytest.importorskip('zipfile') - patch(self, archive_util.zipfile, 'zlib', None) # force zlib ImportError - - called = [] - zipfile_class = zipfile.ZipFile - - def fake_zipfile(*a, **kw): - if kw.get('compression', None) == zipfile.ZIP_STORED: - called.append((a, kw)) - return zipfile_class(*a, **kw) - - patch(self, archive_util.zipfile, 'ZipFile', fake_zipfile) - - # create something to tar and compress - tmpdir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - with path.Path(tmpdir): - make_zipfile(base_name, 'dist') - - tarball = base_name + '.zip' - assert called == [((tarball, "w"), {'compression': zipfile.ZIP_STORED})] - assert os.path.exists(tarball) - with zipfile.ZipFile(tarball) as zf: - assert sorted(zf.namelist()) == self._zip_created_files - - def test_check_archive_formats(self): - assert check_archive_formats(['gztar', 'xxx', 'zip']) == 'xxx' - assert ( - check_archive_formats(['gztar', 'bztar', 'xztar', 'ztar', 'tar', 'zip']) - is None - ) - - def test_make_archive(self): - tmpdir = self.mkdtemp() - base_name = os.path.join(tmpdir, 'archive') - with pytest.raises(ValueError): - make_archive(base_name, 'xxx') - - def test_make_archive_cwd(self): - current_dir = os.getcwd() - - def _breaks(*args, **kw): - raise RuntimeError() - - ARCHIVE_FORMATS['xxx'] = (_breaks, [], 'xxx file') - try: - try: - make_archive('xxx', 'xxx', root_dir=self.mkdtemp()) - except Exception: - pass - assert os.getcwd() == current_dir - finally: - ARCHIVE_FORMATS.pop('xxx') - - def test_make_archive_tar(self): - base_dir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive(base_name, 'tar', base_dir, 'dist') - assert os.path.exists(res) - assert os.path.basename(res) == 'archive.tar' - assert self._tarinfo(res) == self._created_files - - @pytest.mark.usefixtures('needs_zlib') - def test_make_archive_gztar(self): - base_dir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive(base_name, 'gztar', base_dir, 'dist') - assert os.path.exists(res) - assert os.path.basename(res) == 'archive.tar.gz' - assert self._tarinfo(res) == self._created_files - - def test_make_archive_bztar(self): - pytest.importorskip('bz2') - base_dir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive(base_name, 'bztar', base_dir, 'dist') - assert os.path.exists(res) - assert os.path.basename(res) == 'archive.tar.bz2' - assert self._tarinfo(res) == self._created_files - - def test_make_archive_xztar(self): - pytest.importorskip('lzma') - base_dir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive(base_name, 'xztar', base_dir, 'dist') - assert os.path.exists(res) - assert os.path.basename(res) == 'archive.tar.xz' - assert self._tarinfo(res) == self._created_files - - def test_make_archive_owner_group(self): - # testing make_archive with owner and group, with various combinations - # this works even if there's not gid/uid support - if UID_0_SUPPORT: - group = grp.getgrgid(0)[0] - owner = pwd.getpwuid(0)[0] - else: - group = owner = 'root' - - base_dir = self._create_files() - root_dir = self.mkdtemp() - base_name = os.path.join(self.mkdtemp(), 'archive') - res = make_archive( - base_name, 'zip', root_dir, base_dir, owner=owner, group=group - ) - assert os.path.exists(res) - - res = make_archive(base_name, 'zip', root_dir, base_dir) - assert os.path.exists(res) - - res = make_archive( - base_name, 'tar', root_dir, base_dir, owner=owner, group=group - ) - assert os.path.exists(res) - - res = make_archive( - base_name, 'tar', root_dir, base_dir, owner='kjhkjhkjg', group='oihohoh' - ) - assert os.path.exists(res) - - @pytest.mark.usefixtures('needs_zlib') - @require_unix_id - @require_uid_0 - def test_tarfile_root_owner(self): - tmpdir = self._create_files() - base_name = os.path.join(self.mkdtemp(), 'archive') - old_dir = os.getcwd() - os.chdir(tmpdir) - group = grp.getgrgid(0)[0] - owner = pwd.getpwuid(0)[0] - try: - archive_name = make_tarball( - base_name, 'dist', compress=None, owner=owner, group=group - ) - finally: - os.chdir(old_dir) - - # check if the compressed tarball was created - assert os.path.exists(archive_name) - - # now checks the rights - archive = tarfile.open(archive_name) - try: - for member in archive.getmembers(): - assert member.uid == 0 - assert member.gid == 0 - finally: - archive.close() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist.py deleted file mode 100644 index d5696fc..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist.py +++ /dev/null @@ -1,47 +0,0 @@ -"""Tests for distutils.command.bdist.""" - -from distutils.command.bdist import bdist -from distutils.tests import support - - -class TestBuild(support.TempdirManager): - def test_formats(self): - # let's create a command and make sure - # we can set the format - dist = self.create_dist()[1] - cmd = bdist(dist) - cmd.formats = ['gztar'] - cmd.ensure_finalized() - assert cmd.formats == ['gztar'] - - # what formats does bdist offer? - formats = [ - 'bztar', - 'gztar', - 'rpm', - 'tar', - 'xztar', - 'zip', - 'ztar', - ] - found = sorted(cmd.format_commands) - assert found == formats - - def test_skip_build(self): - # bug #10946: bdist --skip-build should trickle down to subcommands - dist = self.create_dist()[1] - cmd = bdist(dist) - cmd.skip_build = True - cmd.ensure_finalized() - dist.command_obj['bdist'] = cmd - - names = [ - 'bdist_dumb', - ] # bdist_rpm does not support --skip-build - - for name in names: - subcmd = cmd.get_finalized_command(name) - if getattr(subcmd, '_unsupported', False): - # command is not supported on this build - continue - assert subcmd.skip_build, f'{name} should take --skip-build from bdist' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_dumb.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_dumb.py deleted file mode 100644 index 1fc51d2..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_dumb.py +++ /dev/null @@ -1,78 +0,0 @@ -"""Tests for distutils.command.bdist_dumb.""" - -import os -import sys -import zipfile -from distutils.command.bdist_dumb import bdist_dumb -from distutils.core import Distribution -from distutils.tests import support - -import pytest - -SETUP_PY = """\ -from distutils.core import setup -import foo - -setup(name='foo', version='0.1', py_modules=['foo'], - url='xxx', author='xxx', author_email='xxx') - -""" - - -@support.combine_markers -@pytest.mark.usefixtures('save_env') -@pytest.mark.usefixtures('save_argv') -@pytest.mark.usefixtures('save_cwd') -class TestBuildDumb( - support.TempdirManager, -): - @pytest.mark.usefixtures('needs_zlib') - def test_simple_built(self): - # let's create a simple package - tmp_dir = self.mkdtemp() - pkg_dir = os.path.join(tmp_dir, 'foo') - os.mkdir(pkg_dir) - self.write_file((pkg_dir, 'setup.py'), SETUP_PY) - self.write_file((pkg_dir, 'foo.py'), '#') - self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py') - self.write_file((pkg_dir, 'README'), '') - - dist = Distribution({ - 'name': 'foo', - 'version': '0.1', - 'py_modules': ['foo'], - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - }) - dist.script_name = 'setup.py' - os.chdir(pkg_dir) - - sys.argv = ['setup.py'] - cmd = bdist_dumb(dist) - - # so the output is the same no matter - # what is the platform - cmd.format = 'zip' - - cmd.ensure_finalized() - cmd.run() - - # see what we have - dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - base = f"{dist.get_fullname()}.{cmd.plat_name}.zip" - - assert dist_created == [base] - - # now let's check what we have in the zip file - fp = zipfile.ZipFile(os.path.join('dist', base)) - try: - contents = fp.namelist() - finally: - fp.close() - - contents = sorted(filter(None, map(os.path.basename, contents))) - wanted = ['foo-0.1-py{}.{}.egg-info'.format(*sys.version_info[:2]), 'foo.py'] - if not sys.dont_write_bytecode: - wanted.append(f'foo.{sys.implementation.cache_tag}.pyc') - assert contents == sorted(wanted) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_rpm.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_rpm.py deleted file mode 100644 index 7505143..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_bdist_rpm.py +++ /dev/null @@ -1,127 +0,0 @@ -"""Tests for distutils.command.bdist_rpm.""" - -import os -import shutil # noqa: F401 -import sys -from distutils.command.bdist_rpm import bdist_rpm -from distutils.core import Distribution -from distutils.tests import support - -import pytest -from test.support import requires_zlib - -SETUP_PY = """\ -from distutils.core import setup -import foo - -setup(name='foo', version='0.1', py_modules=['foo'], - url='xxx', author='xxx', author_email='xxx') - -""" - - -@pytest.fixture(autouse=True) -def sys_executable_encodable(): - try: - sys.executable.encode('UTF-8') - except UnicodeEncodeError: - pytest.skip("sys.executable is not encodable to UTF-8") - - -mac_woes = pytest.mark.skipif( - "not sys.platform.startswith('linux')", - reason='spurious sdtout/stderr output under macOS', -) - - -@pytest.mark.usefixtures('save_env') -@pytest.mark.usefixtures('save_argv') -@pytest.mark.usefixtures('save_cwd') -class TestBuildRpm( - support.TempdirManager, -): - @mac_woes - @requires_zlib() - @pytest.mark.skipif("not shutil.which('rpm')") - @pytest.mark.skipif("not shutil.which('rpmbuild')") - def test_quiet(self): - # let's create a package - tmp_dir = self.mkdtemp() - os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation - pkg_dir = os.path.join(tmp_dir, 'foo') - os.mkdir(pkg_dir) - self.write_file((pkg_dir, 'setup.py'), SETUP_PY) - self.write_file((pkg_dir, 'foo.py'), '#') - self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py') - self.write_file((pkg_dir, 'README'), '') - - dist = Distribution({ - 'name': 'foo', - 'version': '0.1', - 'py_modules': ['foo'], - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - }) - dist.script_name = 'setup.py' - os.chdir(pkg_dir) - - sys.argv = ['setup.py'] - cmd = bdist_rpm(dist) - cmd.fix_python = True - - # running in quiet mode - cmd.quiet = True - cmd.ensure_finalized() - cmd.run() - - dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - assert 'foo-0.1-1.noarch.rpm' in dist_created - - # bug #2945: upload ignores bdist_rpm files - assert ('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm') in dist.dist_files - assert ('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm') in dist.dist_files - - @mac_woes - @requires_zlib() - # https://bugs.python.org/issue1533164 - @pytest.mark.skipif("not shutil.which('rpm')") - @pytest.mark.skipif("not shutil.which('rpmbuild')") - def test_no_optimize_flag(self): - # let's create a package that breaks bdist_rpm - tmp_dir = self.mkdtemp() - os.environ['HOME'] = tmp_dir # to confine dir '.rpmdb' creation - pkg_dir = os.path.join(tmp_dir, 'foo') - os.mkdir(pkg_dir) - self.write_file((pkg_dir, 'setup.py'), SETUP_PY) - self.write_file((pkg_dir, 'foo.py'), '#') - self.write_file((pkg_dir, 'MANIFEST.in'), 'include foo.py') - self.write_file((pkg_dir, 'README'), '') - - dist = Distribution({ - 'name': 'foo', - 'version': '0.1', - 'py_modules': ['foo'], - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - }) - dist.script_name = 'setup.py' - os.chdir(pkg_dir) - - sys.argv = ['setup.py'] - cmd = bdist_rpm(dist) - cmd.fix_python = True - - cmd.quiet = True - cmd.ensure_finalized() - cmd.run() - - dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - assert 'foo-0.1-1.noarch.rpm' in dist_created - - # bug #2945: upload ignores bdist_rpm files - assert ('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm') in dist.dist_files - assert ('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm') in dist.dist_files - - os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build.py deleted file mode 100644 index f7fe69a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build.py +++ /dev/null @@ -1,49 +0,0 @@ -"""Tests for distutils.command.build.""" - -import os -import sys -from distutils.command.build import build -from distutils.tests import support -from sysconfig import get_config_var, get_platform - - -class TestBuild(support.TempdirManager): - def test_finalize_options(self): - pkg_dir, dist = self.create_dist() - cmd = build(dist) - cmd.finalize_options() - - # if not specified, plat_name gets the current platform - assert cmd.plat_name == get_platform() - - # build_purelib is build + lib - wanted = os.path.join(cmd.build_base, 'lib') - assert cmd.build_purelib == wanted - - # build_platlib is 'build/lib.platform-cache_tag[-pydebug]' - # examples: - # build/lib.macosx-10.3-i386-cpython39 - plat_spec = f'.{cmd.plat_name}-{sys.implementation.cache_tag}' - if get_config_var('Py_GIL_DISABLED'): - plat_spec += 't' - if hasattr(sys, 'gettotalrefcount'): - assert cmd.build_platlib.endswith('-pydebug') - plat_spec += '-pydebug' - wanted = os.path.join(cmd.build_base, 'lib' + plat_spec) - assert cmd.build_platlib == wanted - - # by default, build_lib = build_purelib - assert cmd.build_lib == cmd.build_purelib - - # build_temp is build/temp. - wanted = os.path.join(cmd.build_base, 'temp' + plat_spec) - assert cmd.build_temp == wanted - - # build_scripts is build/scripts-x.x - wanted = os.path.join( - cmd.build_base, f'scripts-{sys.version_info.major}.{sys.version_info.minor}' - ) - assert cmd.build_scripts == wanted - - # executable is os.path.normpath(sys.executable) - assert cmd.executable == os.path.normpath(sys.executable) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_clib.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_clib.py deleted file mode 100644 index f76f26b..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_clib.py +++ /dev/null @@ -1,134 +0,0 @@ -"""Tests for distutils.command.build_clib.""" - -import os -from distutils.command.build_clib import build_clib -from distutils.errors import DistutilsSetupError -from distutils.tests import missing_compiler_executable, support - -import pytest - - -class TestBuildCLib(support.TempdirManager): - def test_check_library_dist(self): - pkg_dir, dist = self.create_dist() - cmd = build_clib(dist) - - # 'libraries' option must be a list - with pytest.raises(DistutilsSetupError): - cmd.check_library_list('foo') - - # each element of 'libraries' must a 2-tuple - with pytest.raises(DistutilsSetupError): - cmd.check_library_list(['foo1', 'foo2']) - - # first element of each tuple in 'libraries' - # must be a string (the library name) - with pytest.raises(DistutilsSetupError): - cmd.check_library_list([(1, 'foo1'), ('name', 'foo2')]) - - # library name may not contain directory separators - with pytest.raises(DistutilsSetupError): - cmd.check_library_list( - [('name', 'foo1'), ('another/name', 'foo2')], - ) - - # second element of each tuple must be a dictionary (build info) - with pytest.raises(DistutilsSetupError): - cmd.check_library_list( - [('name', {}), ('another', 'foo2')], - ) - - # those work - libs = [('name', {}), ('name', {'ok': 'good'})] - cmd.check_library_list(libs) - - def test_get_source_files(self): - pkg_dir, dist = self.create_dist() - cmd = build_clib(dist) - - # "in 'libraries' option 'sources' must be present and must be - # a list of source filenames - cmd.libraries = [('name', {})] - with pytest.raises(DistutilsSetupError): - cmd.get_source_files() - - cmd.libraries = [('name', {'sources': 1})] - with pytest.raises(DistutilsSetupError): - cmd.get_source_files() - - cmd.libraries = [('name', {'sources': ['a', 'b']})] - assert cmd.get_source_files() == ['a', 'b'] - - cmd.libraries = [('name', {'sources': ('a', 'b')})] - assert cmd.get_source_files() == ['a', 'b'] - - cmd.libraries = [ - ('name', {'sources': ('a', 'b')}), - ('name2', {'sources': ['c', 'd']}), - ] - assert cmd.get_source_files() == ['a', 'b', 'c', 'd'] - - def test_build_libraries(self): - pkg_dir, dist = self.create_dist() - cmd = build_clib(dist) - - class FakeCompiler: - def compile(*args, **kw): - pass - - create_static_lib = compile - - cmd.compiler = FakeCompiler() - - # build_libraries is also doing a bit of typo checking - lib = [('name', {'sources': 'notvalid'})] - with pytest.raises(DistutilsSetupError): - cmd.build_libraries(lib) - - lib = [('name', {'sources': list()})] - cmd.build_libraries(lib) - - lib = [('name', {'sources': tuple()})] - cmd.build_libraries(lib) - - def test_finalize_options(self): - pkg_dir, dist = self.create_dist() - cmd = build_clib(dist) - - cmd.include_dirs = 'one-dir' - cmd.finalize_options() - assert cmd.include_dirs == ['one-dir'] - - cmd.include_dirs = None - cmd.finalize_options() - assert cmd.include_dirs == [] - - cmd.distribution.libraries = 'WONTWORK' - with pytest.raises(DistutilsSetupError): - cmd.finalize_options() - - @pytest.mark.skipif('platform.system() == "Windows"') - def test_run(self): - pkg_dir, dist = self.create_dist() - cmd = build_clib(dist) - - foo_c = os.path.join(pkg_dir, 'foo.c') - self.write_file(foo_c, 'int main(void) { return 1;}\n') - cmd.libraries = [('foo', {'sources': [foo_c]})] - - build_temp = os.path.join(pkg_dir, 'build') - os.mkdir(build_temp) - cmd.build_temp = build_temp - cmd.build_clib = build_temp - - # Before we run the command, we want to make sure - # all commands are present on the system. - ccmd = missing_compiler_executable() - if ccmd is not None: - self.skipTest(f'The {ccmd!r} command is not found') - - # this should work - cmd.run() - - # let's check the result - assert 'libfoo.a' in os.listdir(build_temp) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_ext.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_ext.py deleted file mode 100644 index dab0507..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_ext.py +++ /dev/null @@ -1,628 +0,0 @@ -import contextlib -import glob -import importlib -import os.path -import platform -import re -import shutil -import site -import subprocess -import sys -import tempfile -import textwrap -import time -from distutils import sysconfig -from distutils.command.build_ext import build_ext -from distutils.core import Distribution -from distutils.errors import ( - CompileError, - DistutilsPlatformError, - DistutilsSetupError, - UnknownFileError, -) -from distutils.extension import Extension -from distutils.tests import missing_compiler_executable -from distutils.tests.support import TempdirManager, copy_xxmodule_c, fixup_build_ext -from io import StringIO - -import jaraco.path -import path -import pytest -from test import support - -from .compat import py39 as import_helper - - -@pytest.fixture() -def user_site_dir(request): - self = request.instance - self.tmp_dir = self.mkdtemp() - self.tmp_path = path.Path(self.tmp_dir) - from distutils.command import build_ext - - orig_user_base = site.USER_BASE - - site.USER_BASE = self.mkdtemp() - build_ext.USER_BASE = site.USER_BASE - - # bpo-30132: On Windows, a .pdb file may be created in the current - # working directory. Create a temporary working directory to cleanup - # everything at the end of the test. - with self.tmp_path: - yield - - site.USER_BASE = orig_user_base - build_ext.USER_BASE = orig_user_base - - if sys.platform == 'cygwin': - time.sleep(1) - - -@contextlib.contextmanager -def safe_extension_import(name, path): - with import_helper.CleanImport(name): - with extension_redirect(name, path) as new_path: - with import_helper.DirsOnSysPath(new_path): - yield - - -@contextlib.contextmanager -def extension_redirect(mod, path): - """ - Tests will fail to tear down an extension module if it's been imported. - - Before importing, copy the file to a temporary directory that won't - be cleaned up. Yield the new path. - """ - if platform.system() != "Windows" and sys.platform != "cygwin": - yield path - return - with import_helper.DirsOnSysPath(path): - spec = importlib.util.find_spec(mod) - filename = os.path.basename(spec.origin) - trash_dir = tempfile.mkdtemp(prefix='deleteme') - dest = os.path.join(trash_dir, os.path.basename(filename)) - shutil.copy(spec.origin, dest) - yield trash_dir - # TODO: can the file be scheduled for deletion? - - -@pytest.mark.usefixtures('user_site_dir') -class TestBuildExt(TempdirManager): - def build_ext(self, *args, **kwargs): - return build_ext(*args, **kwargs) - - @pytest.mark.parametrize("copy_so", [False]) - def test_build_ext(self, copy_so): - missing_compiler_executable() - copy_xxmodule_c(self.tmp_dir) - xx_c = os.path.join(self.tmp_dir, 'xxmodule.c') - xx_ext = Extension('xx', [xx_c]) - if sys.platform != "win32": - if not copy_so: - xx_ext = Extension( - 'xx', - [xx_c], - library_dirs=['/usr/lib'], - libraries=['z'], - runtime_library_dirs=['/usr/lib'], - ) - elif sys.platform == 'linux': - libz_so = { - os.path.realpath(name) for name in glob.iglob('/usr/lib*/libz.so*') - } - libz_so = sorted(libz_so, key=lambda lib_path: len(lib_path)) - shutil.copyfile(libz_so[-1], '/tmp/libxx_z.so') - - xx_ext = Extension( - 'xx', - [xx_c], - library_dirs=['/tmp'], - libraries=['xx_z'], - runtime_library_dirs=['/tmp'], - ) - dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]}) - dist.package_dir = self.tmp_dir - cmd = self.build_ext(dist) - fixup_build_ext(cmd) - cmd.build_lib = self.tmp_dir - cmd.build_temp = self.tmp_dir - - old_stdout = sys.stdout - if not support.verbose: - # silence compiler output - sys.stdout = StringIO() - try: - cmd.ensure_finalized() - cmd.run() - finally: - sys.stdout = old_stdout - - with safe_extension_import('xx', self.tmp_dir): - self._test_xx(copy_so) - - if sys.platform == 'linux' and copy_so: - os.unlink('/tmp/libxx_z.so') - - @staticmethod - def _test_xx(copy_so): - import xx # type: ignore[import-not-found] # Module generated for tests - - for attr in ('error', 'foo', 'new', 'roj'): - assert hasattr(xx, attr) - - assert xx.foo(2, 5) == 7 - assert xx.foo(13, 15) == 28 - assert xx.new().demo() is None - if support.HAVE_DOCSTRINGS: - doc = 'This is a template module just for instruction.' - assert xx.__doc__ == doc - assert isinstance(xx.Null(), xx.Null) - assert isinstance(xx.Str(), xx.Str) - - if sys.platform == 'linux': - so_headers = subprocess.check_output( - ["readelf", "-d", xx.__file__], universal_newlines=True - ) - import pprint - - pprint.pprint(so_headers) - rpaths = [ - rpath - for line in so_headers.split("\n") - if "RPATH" in line or "RUNPATH" in line - for rpath in line.split()[2][1:-1].split(":") - ] - if not copy_so: - pprint.pprint(rpaths) - # Linked against a library in /usr/lib{,64} - assert "/usr/lib" not in rpaths and "/usr/lib64" not in rpaths - else: - # Linked against a library in /tmp - assert "/tmp" in rpaths - # The import is the real test here - - def test_solaris_enable_shared(self): - dist = Distribution({'name': 'xx'}) - cmd = self.build_ext(dist) - old = sys.platform - - sys.platform = 'sunos' # fooling finalize_options - from distutils.sysconfig import _config_vars - - old_var = _config_vars.get('Py_ENABLE_SHARED') - _config_vars['Py_ENABLE_SHARED'] = True - try: - cmd.ensure_finalized() - finally: - sys.platform = old - if old_var is None: - del _config_vars['Py_ENABLE_SHARED'] - else: - _config_vars['Py_ENABLE_SHARED'] = old_var - - # make sure we get some library dirs under solaris - assert len(cmd.library_dirs) > 0 - - def test_user_site(self): - import site - - dist = Distribution({'name': 'xx'}) - cmd = self.build_ext(dist) - - # making sure the user option is there - options = [name for name, short, label in cmd.user_options] - assert 'user' in options - - # setting a value - cmd.user = True - - # setting user based lib and include - lib = os.path.join(site.USER_BASE, 'lib') - incl = os.path.join(site.USER_BASE, 'include') - os.mkdir(lib) - os.mkdir(incl) - - # let's run finalize - cmd.ensure_finalized() - - # see if include_dirs and library_dirs - # were set - assert lib in cmd.library_dirs - assert lib in cmd.rpath - assert incl in cmd.include_dirs - - def test_optional_extension(self): - # this extension will fail, but let's ignore this failure - # with the optional argument. - modules = [Extension('foo', ['xxx'], optional=False)] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.ensure_finalized() - with pytest.raises((UnknownFileError, CompileError)): - cmd.run() # should raise an error - - modules = [Extension('foo', ['xxx'], optional=True)] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.ensure_finalized() - cmd.run() # should pass - - def test_finalize_options(self): - # Make sure Python's include directories (for Python.h, pyconfig.h, - # etc.) are in the include search path. - modules = [Extension('foo', ['xxx'], optional=False)] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.finalize_options() - - py_include = sysconfig.get_python_inc() - for p in py_include.split(os.path.pathsep): - assert p in cmd.include_dirs - - plat_py_include = sysconfig.get_python_inc(plat_specific=True) - for p in plat_py_include.split(os.path.pathsep): - assert p in cmd.include_dirs - - # make sure cmd.libraries is turned into a list - # if it's a string - cmd = self.build_ext(dist) - cmd.libraries = 'my_lib, other_lib lastlib' - cmd.finalize_options() - assert cmd.libraries == ['my_lib', 'other_lib', 'lastlib'] - - # make sure cmd.library_dirs is turned into a list - # if it's a string - cmd = self.build_ext(dist) - cmd.library_dirs = f'my_lib_dir{os.pathsep}other_lib_dir' - cmd.finalize_options() - assert 'my_lib_dir' in cmd.library_dirs - assert 'other_lib_dir' in cmd.library_dirs - - # make sure rpath is turned into a list - # if it's a string - cmd = self.build_ext(dist) - cmd.rpath = f'one{os.pathsep}two' - cmd.finalize_options() - assert cmd.rpath == ['one', 'two'] - - # make sure cmd.link_objects is turned into a list - # if it's a string - cmd = build_ext(dist) - cmd.link_objects = 'one two,three' - cmd.finalize_options() - assert cmd.link_objects == ['one', 'two', 'three'] - - # XXX more tests to perform for win32 - - # make sure define is turned into 2-tuples - # strings if they are ','-separated strings - cmd = self.build_ext(dist) - cmd.define = 'one,two' - cmd.finalize_options() - assert cmd.define == [('one', '1'), ('two', '1')] - - # make sure undef is turned into a list of - # strings if they are ','-separated strings - cmd = self.build_ext(dist) - cmd.undef = 'one,two' - cmd.finalize_options() - assert cmd.undef == ['one', 'two'] - - # make sure swig_opts is turned into a list - cmd = self.build_ext(dist) - cmd.swig_opts = None - cmd.finalize_options() - assert cmd.swig_opts == [] - - cmd = self.build_ext(dist) - cmd.swig_opts = '1 2' - cmd.finalize_options() - assert cmd.swig_opts == ['1', '2'] - - def test_check_extensions_list(self): - dist = Distribution() - cmd = self.build_ext(dist) - cmd.finalize_options() - - # 'extensions' option must be a list of Extension instances - with pytest.raises(DistutilsSetupError): - cmd.check_extensions_list('foo') - - # each element of 'ext_modules' option must be an - # Extension instance or 2-tuple - exts = [('bar', 'foo', 'bar'), 'foo'] - with pytest.raises(DistutilsSetupError): - cmd.check_extensions_list(exts) - - # first element of each tuple in 'ext_modules' - # must be the extension name (a string) and match - # a python dotted-separated name - exts = [('foo-bar', '')] - with pytest.raises(DistutilsSetupError): - cmd.check_extensions_list(exts) - - # second element of each tuple in 'ext_modules' - # must be a dictionary (build info) - exts = [('foo.bar', '')] - with pytest.raises(DistutilsSetupError): - cmd.check_extensions_list(exts) - - # ok this one should pass - exts = [('foo.bar', {'sources': [''], 'libraries': 'foo', 'some': 'bar'})] - cmd.check_extensions_list(exts) - ext = exts[0] - assert isinstance(ext, Extension) - - # check_extensions_list adds in ext the values passed - # when they are in ('include_dirs', 'library_dirs', 'libraries' - # 'extra_objects', 'extra_compile_args', 'extra_link_args') - assert ext.libraries == 'foo' - assert not hasattr(ext, 'some') - - # 'macros' element of build info dict must be 1- or 2-tuple - exts = [ - ( - 'foo.bar', - { - 'sources': [''], - 'libraries': 'foo', - 'some': 'bar', - 'macros': [('1', '2', '3'), 'foo'], - }, - ) - ] - with pytest.raises(DistutilsSetupError): - cmd.check_extensions_list(exts) - - exts[0][1]['macros'] = [('1', '2'), ('3',)] - cmd.check_extensions_list(exts) - assert exts[0].undef_macros == ['3'] - assert exts[0].define_macros == [('1', '2')] - - def test_get_source_files(self): - modules = [Extension('foo', ['xxx'], optional=False)] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.ensure_finalized() - assert cmd.get_source_files() == ['xxx'] - - def test_unicode_module_names(self): - modules = [ - Extension('foo', ['aaa'], optional=False), - Extension('föö', ['uuu'], optional=False), - ] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.ensure_finalized() - assert re.search(r'foo(_d)?\..*', cmd.get_ext_filename(modules[0].name)) - assert re.search(r'föö(_d)?\..*', cmd.get_ext_filename(modules[1].name)) - assert cmd.get_export_symbols(modules[0]) == ['PyInit_foo'] - assert cmd.get_export_symbols(modules[1]) == ['PyInitU_f_1gaa'] - - def test_export_symbols__init__(self): - # https://github.com/python/cpython/issues/80074 - # https://github.com/pypa/setuptools/issues/4826 - modules = [ - Extension('foo.__init__', ['aaa']), - Extension('föö.__init__', ['uuu']), - ] - dist = Distribution({'name': 'xx', 'ext_modules': modules}) - cmd = self.build_ext(dist) - cmd.ensure_finalized() - assert cmd.get_export_symbols(modules[0]) == ['PyInit_foo'] - assert cmd.get_export_symbols(modules[1]) == ['PyInitU_f_1gaa'] - - def test_compiler_option(self): - # cmd.compiler is an option and - # should not be overridden by a compiler instance - # when the command is run - dist = Distribution() - cmd = self.build_ext(dist) - cmd.compiler = 'unix' - cmd.ensure_finalized() - cmd.run() - assert cmd.compiler == 'unix' - - def test_get_outputs(self): - missing_compiler_executable() - tmp_dir = self.mkdtemp() - c_file = os.path.join(tmp_dir, 'foo.c') - self.write_file(c_file, 'void PyInit_foo(void) {}\n') - ext = Extension('foo', [c_file], optional=False) - dist = Distribution({'name': 'xx', 'ext_modules': [ext]}) - cmd = self.build_ext(dist) - fixup_build_ext(cmd) - cmd.ensure_finalized() - assert len(cmd.get_outputs()) == 1 - - cmd.build_lib = os.path.join(self.tmp_dir, 'build') - cmd.build_temp = os.path.join(self.tmp_dir, 'tempt') - - # issue #5977 : distutils build_ext.get_outputs - # returns wrong result with --inplace - other_tmp_dir = os.path.realpath(self.mkdtemp()) - old_wd = os.getcwd() - os.chdir(other_tmp_dir) - try: - cmd.inplace = True - cmd.run() - so_file = cmd.get_outputs()[0] - finally: - os.chdir(old_wd) - assert os.path.exists(so_file) - ext_suffix = sysconfig.get_config_var('EXT_SUFFIX') - assert so_file.endswith(ext_suffix) - so_dir = os.path.dirname(so_file) - assert so_dir == other_tmp_dir - - cmd.inplace = False - cmd.compiler = None - cmd.run() - so_file = cmd.get_outputs()[0] - assert os.path.exists(so_file) - assert so_file.endswith(ext_suffix) - so_dir = os.path.dirname(so_file) - assert so_dir == cmd.build_lib - - # inplace = False, cmd.package = 'bar' - build_py = cmd.get_finalized_command('build_py') - build_py.package_dir = {'': 'bar'} - path = cmd.get_ext_fullpath('foo') - # checking that the last directory is the build_dir - path = os.path.split(path)[0] - assert path == cmd.build_lib - - # inplace = True, cmd.package = 'bar' - cmd.inplace = True - other_tmp_dir = os.path.realpath(self.mkdtemp()) - old_wd = os.getcwd() - os.chdir(other_tmp_dir) - try: - path = cmd.get_ext_fullpath('foo') - finally: - os.chdir(old_wd) - # checking that the last directory is bar - path = os.path.split(path)[0] - lastdir = os.path.split(path)[-1] - assert lastdir == 'bar' - - def test_ext_fullpath(self): - ext = sysconfig.get_config_var('EXT_SUFFIX') - # building lxml.etree inplace - # etree_c = os.path.join(self.tmp_dir, 'lxml.etree.c') - # etree_ext = Extension('lxml.etree', [etree_c]) - # dist = Distribution({'name': 'lxml', 'ext_modules': [etree_ext]}) - dist = Distribution() - cmd = self.build_ext(dist) - cmd.inplace = True - cmd.distribution.package_dir = {'': 'src'} - cmd.distribution.packages = ['lxml', 'lxml.html'] - curdir = os.getcwd() - wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext) - path = cmd.get_ext_fullpath('lxml.etree') - assert wanted == path - - # building lxml.etree not inplace - cmd.inplace = False - cmd.build_lib = os.path.join(curdir, 'tmpdir') - wanted = os.path.join(curdir, 'tmpdir', 'lxml', 'etree' + ext) - path = cmd.get_ext_fullpath('lxml.etree') - assert wanted == path - - # building twisted.runner.portmap not inplace - build_py = cmd.get_finalized_command('build_py') - build_py.package_dir = {} - cmd.distribution.packages = ['twisted', 'twisted.runner.portmap'] - path = cmd.get_ext_fullpath('twisted.runner.portmap') - wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner', 'portmap' + ext) - assert wanted == path - - # building twisted.runner.portmap inplace - cmd.inplace = True - path = cmd.get_ext_fullpath('twisted.runner.portmap') - wanted = os.path.join(curdir, 'twisted', 'runner', 'portmap' + ext) - assert wanted == path - - @pytest.mark.skipif('platform.system() != "Darwin"') - @pytest.mark.usefixtures('save_env') - def test_deployment_target_default(self): - # Issue 9516: Test that, in the absence of the environment variable, - # an extension module is compiled with the same deployment target as - # the interpreter. - self._try_compile_deployment_target('==', None) - - @pytest.mark.skipif('platform.system() != "Darwin"') - @pytest.mark.usefixtures('save_env') - def test_deployment_target_too_low(self): - # Issue 9516: Test that an extension module is not allowed to be - # compiled with a deployment target less than that of the interpreter. - with pytest.raises(DistutilsPlatformError): - self._try_compile_deployment_target('>', '10.1') - - @pytest.mark.skipif('platform.system() != "Darwin"') - @pytest.mark.usefixtures('save_env') - def test_deployment_target_higher_ok(self): # pragma: no cover - # Issue 9516: Test that an extension module can be compiled with a - # deployment target higher than that of the interpreter: the ext - # module may depend on some newer OS feature. - deptarget = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') - if deptarget: - # increment the minor version number (i.e. 10.6 -> 10.7) - deptarget = [int(x) for x in deptarget.split('.')] - deptarget[-1] += 1 - deptarget = '.'.join(str(i) for i in deptarget) - self._try_compile_deployment_target('<', deptarget) - - def _try_compile_deployment_target(self, operator, target): # pragma: no cover - if target is None: - if os.environ.get('MACOSX_DEPLOYMENT_TARGET'): - del os.environ['MACOSX_DEPLOYMENT_TARGET'] - else: - os.environ['MACOSX_DEPLOYMENT_TARGET'] = target - - jaraco.path.build( - { - 'deptargetmodule.c': textwrap.dedent(f"""\ - #include - - int dummy; - - #if TARGET {operator} MAC_OS_X_VERSION_MIN_REQUIRED - #else - #error "Unexpected target" - #endif - - """), - }, - self.tmp_path, - ) - - # get the deployment target that the interpreter was built with - target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET') - target = tuple(map(int, target.split('.')[0:2])) - # format the target value as defined in the Apple - # Availability Macros. We can't use the macro names since - # at least one value we test with will not exist yet. - if target[:2] < (10, 10): - # for 10.1 through 10.9.x -> "10n0" - tmpl = '{:02}{:01}0' - else: - # for 10.10 and beyond -> "10nn00" - if len(target) >= 2: - tmpl = '{:02}{:02}00' - else: - # 11 and later can have no minor version (11 instead of 11.0) - tmpl = '{:02}0000' - target = tmpl.format(*target) - deptarget_ext = Extension( - 'deptarget', - [self.tmp_path / 'deptargetmodule.c'], - extra_compile_args=[f'-DTARGET={target}'], - ) - dist = Distribution({'name': 'deptarget', 'ext_modules': [deptarget_ext]}) - dist.package_dir = self.tmp_dir - cmd = self.build_ext(dist) - cmd.build_lib = self.tmp_dir - cmd.build_temp = self.tmp_dir - - try: - old_stdout = sys.stdout - if not support.verbose: - # silence compiler output - sys.stdout = StringIO() - try: - cmd.ensure_finalized() - cmd.run() - finally: - sys.stdout = old_stdout - - except CompileError: - self.fail("Wrong deployment target during compilation") - - -class TestParallelBuildExt(TestBuildExt): - def build_ext(self, *args, **kwargs): - build_ext = super().build_ext(*args, **kwargs) - build_ext.parallel = True - return build_ext diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_py.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_py.py deleted file mode 100644 index b316ed4..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_py.py +++ /dev/null @@ -1,196 +0,0 @@ -"""Tests for distutils.command.build_py.""" - -import os -import sys -from distutils.command.build_py import build_py -from distutils.core import Distribution -from distutils.errors import DistutilsFileError -from distutils.tests import support - -import jaraco.path -import pytest - - -@support.combine_markers -class TestBuildPy(support.TempdirManager): - def test_package_data(self): - sources = self.mkdtemp() - jaraco.path.build( - { - '__init__.py': "# Pretend this is a package.", - 'README.txt': 'Info about this package', - }, - sources, - ) - - destination = self.mkdtemp() - - dist = Distribution({"packages": ["pkg"], "package_dir": {"pkg": sources}}) - # script_name need not exist, it just need to be initialized - dist.script_name = os.path.join(sources, "setup.py") - dist.command_obj["build"] = support.DummyCommand( - force=False, build_lib=destination - ) - dist.packages = ["pkg"] - dist.package_data = {"pkg": ["README.txt"]} - dist.package_dir = {"pkg": sources} - - cmd = build_py(dist) - cmd.compile = True - cmd.ensure_finalized() - assert cmd.package_data == dist.package_data - - cmd.run() - - # This makes sure the list of outputs includes byte-compiled - # files for Python modules but not for package data files - # (there shouldn't *be* byte-code files for those!). - assert len(cmd.get_outputs()) == 3 - pkgdest = os.path.join(destination, "pkg") - files = os.listdir(pkgdest) - pycache_dir = os.path.join(pkgdest, "__pycache__") - assert "__init__.py" in files - assert "README.txt" in files - if sys.dont_write_bytecode: - assert not os.path.exists(pycache_dir) - else: - pyc_files = os.listdir(pycache_dir) - assert f"__init__.{sys.implementation.cache_tag}.pyc" in pyc_files - - def test_empty_package_dir(self): - # See bugs #1668596/#1720897 - sources = self.mkdtemp() - jaraco.path.build({'__init__.py': '', 'doc': {'testfile': ''}}, sources) - - os.chdir(sources) - dist = Distribution({ - "packages": ["pkg"], - "package_dir": {"pkg": ""}, - "package_data": {"pkg": ["doc/*"]}, - }) - # script_name need not exist, it just need to be initialized - dist.script_name = os.path.join(sources, "setup.py") - dist.script_args = ["build"] - dist.parse_command_line() - - try: - dist.run_commands() - except DistutilsFileError: - self.fail("failed package_data test when package_dir is ''") - - @pytest.mark.skipif('sys.dont_write_bytecode') - def test_byte_compile(self): - project_dir, dist = self.create_dist(py_modules=['boiledeggs']) - os.chdir(project_dir) - self.write_file('boiledeggs.py', 'import antigravity') - cmd = build_py(dist) - cmd.compile = True - cmd.build_lib = 'here' - cmd.finalize_options() - cmd.run() - - found = os.listdir(cmd.build_lib) - assert sorted(found) == ['__pycache__', 'boiledeggs.py'] - found = os.listdir(os.path.join(cmd.build_lib, '__pycache__')) - assert found == [f'boiledeggs.{sys.implementation.cache_tag}.pyc'] - - @pytest.mark.skipif('sys.dont_write_bytecode') - def test_byte_compile_optimized(self): - project_dir, dist = self.create_dist(py_modules=['boiledeggs']) - os.chdir(project_dir) - self.write_file('boiledeggs.py', 'import antigravity') - cmd = build_py(dist) - cmd.compile = False - cmd.optimize = 1 - cmd.build_lib = 'here' - cmd.finalize_options() - cmd.run() - - found = os.listdir(cmd.build_lib) - assert sorted(found) == ['__pycache__', 'boiledeggs.py'] - found = os.listdir(os.path.join(cmd.build_lib, '__pycache__')) - expect = f'boiledeggs.{sys.implementation.cache_tag}.opt-1.pyc' - assert sorted(found) == [expect] - - def test_dir_in_package_data(self): - """ - A directory in package_data should not be added to the filelist. - """ - # See bug 19286 - sources = self.mkdtemp() - jaraco.path.build( - { - 'pkg': { - '__init__.py': '', - 'doc': { - 'testfile': '', - # create a directory that could be incorrectly detected as a file - 'otherdir': {}, - }, - } - }, - sources, - ) - - os.chdir(sources) - dist = Distribution({"packages": ["pkg"], "package_data": {"pkg": ["doc/*"]}}) - # script_name need not exist, it just need to be initialized - dist.script_name = os.path.join(sources, "setup.py") - dist.script_args = ["build"] - dist.parse_command_line() - - try: - dist.run_commands() - except DistutilsFileError: - self.fail("failed package_data when data dir includes a dir") - - def test_dont_write_bytecode(self, caplog): - # makes sure byte_compile is not used - dist = self.create_dist()[1] - cmd = build_py(dist) - cmd.compile = True - cmd.optimize = 1 - - old_dont_write_bytecode = sys.dont_write_bytecode - sys.dont_write_bytecode = True - try: - cmd.byte_compile([]) - finally: - sys.dont_write_bytecode = old_dont_write_bytecode - - assert 'byte-compiling is disabled' in caplog.records[0].message - - def test_namespace_package_does_not_warn(self, caplog): - """ - Originally distutils implementation did not account for PEP 420 - and included warns for package directories that did not contain - ``__init__.py`` files. - After the acceptance of PEP 420, these warnings don't make more sense - so we want to ensure there are not displayed to not confuse the users. - """ - # Create a fake project structure with a package namespace: - tmp = self.mkdtemp() - jaraco.path.build({'ns': {'pkg': {'module.py': ''}}}, tmp) - os.chdir(tmp) - - # Configure the package: - attrs = { - "name": "ns.pkg", - "packages": ["ns", "ns.pkg"], - "script_name": "setup.py", - } - dist = Distribution(attrs) - - # Run code paths that would trigger the trap: - cmd = dist.get_command_obj("build_py") - cmd.finalize_options() - modules = cmd.find_all_modules() - assert len(modules) == 1 - module_path = modules[0][-1] - assert module_path.replace(os.sep, "/") == "ns/pkg/module.py" - - cmd.run() - - assert not any( - "package init file" in msg and "not found" in msg for msg in caplog.messages - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_scripts.py deleted file mode 100644 index 3582f69..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_build_scripts.py +++ /dev/null @@ -1,96 +0,0 @@ -"""Tests for distutils.command.build_scripts.""" - -import os -import textwrap -from distutils import sysconfig -from distutils.command.build_scripts import build_scripts -from distutils.core import Distribution -from distutils.tests import support - -import jaraco.path - - -class TestBuildScripts(support.TempdirManager): - def test_default_settings(self): - cmd = self.get_build_scripts_cmd("/foo/bar", []) - assert not cmd.force - assert cmd.build_dir is None - - cmd.finalize_options() - - assert cmd.force - assert cmd.build_dir == "/foo/bar" - - def test_build(self): - source = self.mkdtemp() - target = self.mkdtemp() - expected = self.write_sample_scripts(source) - - cmd = self.get_build_scripts_cmd( - target, [os.path.join(source, fn) for fn in expected] - ) - cmd.finalize_options() - cmd.run() - - built = os.listdir(target) - for name in expected: - assert name in built - - def get_build_scripts_cmd(self, target, scripts): - import sys - - dist = Distribution() - dist.scripts = scripts - dist.command_obj["build"] = support.DummyCommand( - build_scripts=target, force=True, executable=sys.executable - ) - return build_scripts(dist) - - @staticmethod - def write_sample_scripts(dir): - spec = { - 'script1.py': textwrap.dedent(""" - #! /usr/bin/env python2.3 - # bogus script w/ Python sh-bang - pass - """).lstrip(), - 'script2.py': textwrap.dedent(""" - #!/usr/bin/python - # bogus script w/ Python sh-bang - pass - """).lstrip(), - 'shell.sh': textwrap.dedent(""" - #!/bin/sh - # bogus shell script w/ sh-bang - exit 0 - """).lstrip(), - } - jaraco.path.build(spec, dir) - return list(spec) - - def test_version_int(self): - source = self.mkdtemp() - target = self.mkdtemp() - expected = self.write_sample_scripts(source) - - cmd = self.get_build_scripts_cmd( - target, [os.path.join(source, fn) for fn in expected] - ) - cmd.finalize_options() - - # https://bugs.python.org/issue4524 - # - # On linux-g++-32 with command line `./configure --enable-ipv6 - # --with-suffix=3`, python is compiled okay but the build scripts - # failed when writing the name of the executable - old = sysconfig.get_config_vars().get('VERSION') - sysconfig._config_vars['VERSION'] = 4 - try: - cmd.run() - finally: - if old is not None: - sysconfig._config_vars['VERSION'] = old - - built = os.listdir(target) - for name in expected: - assert name in built diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_check.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_check.py deleted file mode 100644 index b672b1f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_check.py +++ /dev/null @@ -1,194 +0,0 @@ -"""Tests for distutils.command.check.""" - -import os -import textwrap -from distutils.command.check import check -from distutils.errors import DistutilsSetupError -from distutils.tests import support - -import pytest - -try: - import pygments -except ImportError: - pygments = None - - -HERE = os.path.dirname(__file__) - - -@support.combine_markers -class TestCheck(support.TempdirManager): - def _run(self, metadata=None, cwd=None, **options): - if metadata is None: - metadata = {} - if cwd is not None: - old_dir = os.getcwd() - os.chdir(cwd) - pkg_info, dist = self.create_dist(**metadata) - cmd = check(dist) - cmd.initialize_options() - for name, value in options.items(): - setattr(cmd, name, value) - cmd.ensure_finalized() - cmd.run() - if cwd is not None: - os.chdir(old_dir) - return cmd - - def test_check_metadata(self): - # let's run the command with no metadata at all - # by default, check is checking the metadata - # should have some warnings - cmd = self._run() - assert cmd._warnings == 1 - - # now let's add the required fields - # and run it again, to make sure we don't get - # any warning anymore - metadata = { - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - 'name': 'xxx', - 'version': 'xxx', - } - cmd = self._run(metadata) - assert cmd._warnings == 0 - - # now with the strict mode, we should - # get an error if there are missing metadata - with pytest.raises(DistutilsSetupError): - self._run({}, **{'strict': 1}) - - # and of course, no error when all metadata are present - cmd = self._run(metadata, strict=True) - assert cmd._warnings == 0 - - # now a test with non-ASCII characters - metadata = { - 'url': 'xxx', - 'author': '\u00c9ric', - 'author_email': 'xxx', - 'name': 'xxx', - 'version': 'xxx', - 'description': 'Something about esszet \u00df', - 'long_description': 'More things about esszet \u00df', - } - cmd = self._run(metadata) - assert cmd._warnings == 0 - - def test_check_author_maintainer(self): - for kind in ("author", "maintainer"): - # ensure no warning when author_email or maintainer_email is given - # (the spec allows these fields to take the form "Name ") - metadata = { - 'url': 'xxx', - kind + '_email': 'Name ', - 'name': 'xxx', - 'version': 'xxx', - } - cmd = self._run(metadata) - assert cmd._warnings == 0 - - # the check should not warn if only email is given - metadata[kind + '_email'] = 'name@email.com' - cmd = self._run(metadata) - assert cmd._warnings == 0 - - # the check should not warn if only the name is given - metadata[kind] = "Name" - del metadata[kind + '_email'] - cmd = self._run(metadata) - assert cmd._warnings == 0 - - def test_check_document(self): - pytest.importorskip('docutils') - pkg_info, dist = self.create_dist() - cmd = check(dist) - - # let's see if it detects broken rest - broken_rest = 'title\n===\n\ntest' - msgs = cmd._check_rst_data(broken_rest) - assert len(msgs) == 1 - - # and non-broken rest - rest = 'title\n=====\n\ntest' - msgs = cmd._check_rst_data(rest) - assert len(msgs) == 0 - - def test_check_restructuredtext(self): - pytest.importorskip('docutils') - # let's see if it detects broken rest in long_description - broken_rest = 'title\n===\n\ntest' - pkg_info, dist = self.create_dist(long_description=broken_rest) - cmd = check(dist) - cmd.check_restructuredtext() - assert cmd._warnings == 1 - - # let's see if we have an error with strict=True - metadata = { - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - 'name': 'xxx', - 'version': 'xxx', - 'long_description': broken_rest, - } - with pytest.raises(DistutilsSetupError): - self._run(metadata, **{'strict': 1, 'restructuredtext': 1}) - - # and non-broken rest, including a non-ASCII character to test #12114 - metadata['long_description'] = 'title\n=====\n\ntest \u00df' - cmd = self._run(metadata, strict=True, restructuredtext=True) - assert cmd._warnings == 0 - - # check that includes work to test #31292 - metadata['long_description'] = 'title\n=====\n\n.. include:: includetest.rst' - cmd = self._run(metadata, cwd=HERE, strict=True, restructuredtext=True) - assert cmd._warnings == 0 - - def test_check_restructuredtext_with_syntax_highlight(self): - pytest.importorskip('docutils') - # Don't fail if there is a `code` or `code-block` directive - - example_rst_docs = [ - textwrap.dedent( - """\ - Here's some code: - - .. code:: python - - def foo(): - pass - """ - ), - textwrap.dedent( - """\ - Here's some code: - - .. code-block:: python - - def foo(): - pass - """ - ), - ] - - for rest_with_code in example_rst_docs: - pkg_info, dist = self.create_dist(long_description=rest_with_code) - cmd = check(dist) - cmd.check_restructuredtext() - msgs = cmd._check_rst_data(rest_with_code) - if pygments is not None: - assert len(msgs) == 0 - else: - assert len(msgs) == 1 - assert ( - str(msgs[0][1]) - == 'Cannot analyze code. Pygments package not found.' - ) - - def test_check_all(self): - with pytest.raises(DistutilsSetupError): - self._run({}, **{'strict': 1, 'restructuredtext': 1}) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_clean.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_clean.py deleted file mode 100644 index cc78f30..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_clean.py +++ /dev/null @@ -1,45 +0,0 @@ -"""Tests for distutils.command.clean.""" - -import os -from distutils.command.clean import clean -from distutils.tests import support - - -class TestClean(support.TempdirManager): - def test_simple_run(self): - pkg_dir, dist = self.create_dist() - cmd = clean(dist) - - # let's add some elements clean should remove - dirs = [ - (d, os.path.join(pkg_dir, d)) - for d in ( - 'build_temp', - 'build_lib', - 'bdist_base', - 'build_scripts', - 'build_base', - ) - ] - - for name, path in dirs: - os.mkdir(path) - setattr(cmd, name, path) - if name == 'build_base': - continue - for f in ('one', 'two', 'three'): - self.write_file(os.path.join(path, f)) - - # let's run the command - cmd.all = 1 - cmd.ensure_finalized() - cmd.run() - - # make sure the files where removed - for _name, path in dirs: - assert not os.path.exists(path), f'{path} was not removed' - - # let's run the command again (should spit warnings but succeed) - cmd.all = 1 - cmd.ensure_finalized() - cmd.run() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_cmd.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_cmd.py deleted file mode 100644 index 76e8f59..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_cmd.py +++ /dev/null @@ -1,107 +0,0 @@ -"""Tests for distutils.cmd.""" - -import os -from distutils import debug -from distutils.cmd import Command -from distutils.dist import Distribution -from distutils.errors import DistutilsOptionError - -import pytest - - -class MyCmd(Command): - def initialize_options(self): - pass - - -@pytest.fixture -def cmd(request): - return MyCmd(Distribution()) - - -class TestCommand: - def test_ensure_string_list(self, cmd): - cmd.not_string_list = ['one', 2, 'three'] - cmd.yes_string_list = ['one', 'two', 'three'] - cmd.not_string_list2 = object() - cmd.yes_string_list2 = 'ok' - cmd.ensure_string_list('yes_string_list') - cmd.ensure_string_list('yes_string_list2') - - with pytest.raises(DistutilsOptionError): - cmd.ensure_string_list('not_string_list') - - with pytest.raises(DistutilsOptionError): - cmd.ensure_string_list('not_string_list2') - - cmd.option1 = 'ok,dok' - cmd.ensure_string_list('option1') - assert cmd.option1 == ['ok', 'dok'] - - cmd.option2 = ['xxx', 'www'] - cmd.ensure_string_list('option2') - - cmd.option3 = ['ok', 2] - with pytest.raises(DistutilsOptionError): - cmd.ensure_string_list('option3') - - def test_make_file(self, cmd): - # making sure it raises when infiles is not a string or a list/tuple - with pytest.raises(TypeError): - cmd.make_file(infiles=True, outfile='', func='func', args=()) - - # making sure execute gets called properly - def _execute(func, args, exec_msg, level): - assert exec_msg == 'generating out from in' - - cmd.force = True - cmd.execute = _execute - cmd.make_file(infiles='in', outfile='out', func='func', args=()) - - def test_dump_options(self, cmd): - msgs = [] - - def _announce(msg, level): - msgs.append(msg) - - cmd.announce = _announce - cmd.option1 = 1 - cmd.option2 = 1 - cmd.user_options = [('option1', '', ''), ('option2', '', '')] - cmd.dump_options() - - wanted = ["command options for 'MyCmd':", ' option1 = 1', ' option2 = 1'] - assert msgs == wanted - - def test_ensure_string(self, cmd): - cmd.option1 = 'ok' - cmd.ensure_string('option1') - - cmd.option2 = None - cmd.ensure_string('option2', 'xxx') - assert hasattr(cmd, 'option2') - - cmd.option3 = 1 - with pytest.raises(DistutilsOptionError): - cmd.ensure_string('option3') - - def test_ensure_filename(self, cmd): - cmd.option1 = __file__ - cmd.ensure_filename('option1') - cmd.option2 = 'xxx' - with pytest.raises(DistutilsOptionError): - cmd.ensure_filename('option2') - - def test_ensure_dirname(self, cmd): - cmd.option1 = os.path.dirname(__file__) or os.curdir - cmd.ensure_dirname('option1') - cmd.option2 = 'xxx' - with pytest.raises(DistutilsOptionError): - cmd.ensure_dirname('option2') - - def test_debug_print(self, cmd, capsys, monkeypatch): - cmd.debug_print('xxx') - assert capsys.readouterr().out == '' - monkeypatch.setattr(debug, 'DEBUG', True) - cmd.debug_print('xxx') - assert capsys.readouterr().out == 'xxx\n' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_config_cmd.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_config_cmd.py deleted file mode 100644 index ebee2ef..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_config_cmd.py +++ /dev/null @@ -1,87 +0,0 @@ -"""Tests for distutils.command.config.""" - -import os -import sys -from distutils._log import log -from distutils.command.config import config, dump_file -from distutils.tests import missing_compiler_executable, support - -import more_itertools -import path -import pytest - - -@pytest.fixture(autouse=True) -def info_log(request, monkeypatch): - self = request.instance - self._logs = [] - monkeypatch.setattr(log, 'info', self._info) - - -@support.combine_markers -class TestConfig(support.TempdirManager): - def _info(self, msg, *args): - for line in msg.splitlines(): - self._logs.append(line) - - def test_dump_file(self): - this_file = path.Path(__file__).with_suffix('.py') - with this_file.open(encoding='utf-8') as f: - numlines = more_itertools.ilen(f) - - dump_file(this_file, 'I am the header') - assert len(self._logs) == numlines + 1 - - @pytest.mark.skipif('platform.system() == "Windows"') - def test_search_cpp(self): - cmd = missing_compiler_executable(['preprocessor']) - if cmd is not None: - self.skipTest(f'The {cmd!r} command is not found') - pkg_dir, dist = self.create_dist() - cmd = config(dist) - cmd._check_compiler() - compiler = cmd.compiler - if sys.platform[:3] == "aix" and "xlc" in compiler.preprocessor[0].lower(): - self.skipTest( - 'xlc: The -E option overrides the -P, -o, and -qsyntaxonly options' - ) - - # simple pattern searches - match = cmd.search_cpp(pattern='xxx', body='/* xxx */') - assert match == 0 - - match = cmd.search_cpp(pattern='_configtest', body='/* xxx */') - assert match == 1 - - def test_finalize_options(self): - # finalize_options does a bit of transformation - # on options - pkg_dir, dist = self.create_dist() - cmd = config(dist) - cmd.include_dirs = f'one{os.pathsep}two' - cmd.libraries = 'one' - cmd.library_dirs = f'three{os.pathsep}four' - cmd.ensure_finalized() - - assert cmd.include_dirs == ['one', 'two'] - assert cmd.libraries == ['one'] - assert cmd.library_dirs == ['three', 'four'] - - def test_clean(self): - # _clean removes files - tmp_dir = self.mkdtemp() - f1 = os.path.join(tmp_dir, 'one') - f2 = os.path.join(tmp_dir, 'two') - - self.write_file(f1, 'xxx') - self.write_file(f2, 'xxx') - - for f in (f1, f2): - assert os.path.exists(f) - - pkg_dir, dist = self.create_dist() - cmd = config(dist) - cmd._clean(f1, f2) - - for f in (f1, f2): - assert not os.path.exists(f) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_core.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_core.py deleted file mode 100644 index bad3fb7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_core.py +++ /dev/null @@ -1,130 +0,0 @@ -"""Tests for distutils.core.""" - -import distutils.core -import io -import os -import sys -from distutils.dist import Distribution - -import pytest - -# setup script that uses __file__ -setup_using___file__ = """\ - -__file__ - -from distutils.core import setup -setup() -""" - -setup_prints_cwd = """\ - -import os -print(os.getcwd()) - -from distutils.core import setup -setup() -""" - -setup_does_nothing = """\ -from distutils.core import setup -setup() -""" - - -setup_defines_subclass = """\ -from distutils.core import setup -from distutils.command.install import install as _install - -class install(_install): - sub_commands = _install.sub_commands + ['cmd'] - -setup(cmdclass={'install': install}) -""" - -setup_within_if_main = """\ -from distutils.core import setup - -def main(): - return setup(name="setup_within_if_main") - -if __name__ == "__main__": - main() -""" - - -@pytest.fixture(autouse=True) -def save_stdout(monkeypatch): - monkeypatch.setattr(sys, 'stdout', sys.stdout) - - -@pytest.fixture -def temp_file(tmp_path): - return tmp_path / 'file' - - -@pytest.mark.usefixtures('save_env') -@pytest.mark.usefixtures('save_argv') -class TestCore: - def test_run_setup_provides_file(self, temp_file): - # Make sure the script can use __file__; if that's missing, the test - # setup.py script will raise NameError. - temp_file.write_text(setup_using___file__, encoding='utf-8') - distutils.core.run_setup(temp_file) - - def test_run_setup_preserves_sys_argv(self, temp_file): - # Make sure run_setup does not clobber sys.argv - argv_copy = sys.argv.copy() - temp_file.write_text(setup_does_nothing, encoding='utf-8') - distutils.core.run_setup(temp_file) - assert sys.argv == argv_copy - - def test_run_setup_defines_subclass(self, temp_file): - # Make sure the script can use __file__; if that's missing, the test - # setup.py script will raise NameError. - temp_file.write_text(setup_defines_subclass, encoding='utf-8') - dist = distutils.core.run_setup(temp_file) - install = dist.get_command_obj('install') - assert 'cmd' in install.sub_commands - - def test_run_setup_uses_current_dir(self, tmp_path): - """ - Test that the setup script is run with the current directory - as its own current directory. - """ - sys.stdout = io.StringIO() - cwd = os.getcwd() - - # Create a directory and write the setup.py file there: - setup_py = tmp_path / 'setup.py' - setup_py.write_text(setup_prints_cwd, encoding='utf-8') - distutils.core.run_setup(setup_py) - - output = sys.stdout.getvalue() - if output.endswith("\n"): - output = output[:-1] - assert cwd == output - - def test_run_setup_within_if_main(self, temp_file): - temp_file.write_text(setup_within_if_main, encoding='utf-8') - dist = distutils.core.run_setup(temp_file, stop_after="config") - assert isinstance(dist, Distribution) - assert dist.get_name() == "setup_within_if_main" - - def test_run_commands(self, temp_file): - sys.argv = ['setup.py', 'build'] - temp_file.write_text(setup_within_if_main, encoding='utf-8') - dist = distutils.core.run_setup(temp_file, stop_after="commandline") - assert 'build' not in dist.have_run - distutils.core.run_commands(dist) - assert 'build' in dist.have_run - - def test_debug_mode(self, capsys, monkeypatch): - # this covers the code called when DEBUG is set - sys.argv = ['setup.py', '--name'] - distutils.core.setup(name='bar') - assert capsys.readouterr().out == 'bar\n' - monkeypatch.setattr(distutils.core, 'DEBUG', True) - distutils.core.setup(name='bar') - wanted = "options (after parsing config files):\n" - assert capsys.readouterr().out.startswith(wanted) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dir_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dir_util.py deleted file mode 100644 index 326cb34..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dir_util.py +++ /dev/null @@ -1,139 +0,0 @@ -"""Tests for distutils.dir_util.""" - -import os -import pathlib -import stat -import sys -import unittest.mock as mock -from distutils import dir_util, errors -from distutils.dir_util import ( - copy_tree, - create_tree, - ensure_relative, - mkpath, - remove_tree, -) -from distutils.tests import support - -import jaraco.path -import path -import pytest - - -@pytest.fixture(autouse=True) -def stuff(request, monkeypatch, distutils_managed_tempdir): - self = request.instance - tmp_dir = self.mkdtemp() - self.root_target = os.path.join(tmp_dir, 'deep') - self.target = os.path.join(self.root_target, 'here') - self.target2 = os.path.join(tmp_dir, 'deep2') - - -class TestDirUtil(support.TempdirManager): - def test_mkpath_remove_tree_verbosity(self, caplog): - mkpath(self.target, verbose=False) - assert not caplog.records - remove_tree(self.root_target, verbose=False) - - mkpath(self.target, verbose=True) - wanted = [f'creating {self.target}'] - assert caplog.messages == wanted - caplog.clear() - - remove_tree(self.root_target, verbose=True) - wanted = [f"removing '{self.root_target}' (and everything under it)"] - assert caplog.messages == wanted - - @pytest.mark.skipif("platform.system() == 'Windows'") - def test_mkpath_with_custom_mode(self): - # Get and set the current umask value for testing mode bits. - umask = os.umask(0o002) - os.umask(umask) - mkpath(self.target, 0o700) - assert stat.S_IMODE(os.stat(self.target).st_mode) == 0o700 & ~umask - mkpath(self.target2, 0o555) - assert stat.S_IMODE(os.stat(self.target2).st_mode) == 0o555 & ~umask - - def test_create_tree_verbosity(self, caplog): - create_tree(self.root_target, ['one', 'two', 'three'], verbose=False) - assert caplog.messages == [] - remove_tree(self.root_target, verbose=False) - - wanted = [f'creating {self.root_target}'] - create_tree(self.root_target, ['one', 'two', 'three'], verbose=True) - assert caplog.messages == wanted - - remove_tree(self.root_target, verbose=False) - - def test_copy_tree_verbosity(self, caplog): - mkpath(self.target, verbose=False) - - copy_tree(self.target, self.target2, verbose=False) - assert caplog.messages == [] - - remove_tree(self.root_target, verbose=False) - - mkpath(self.target, verbose=False) - a_file = path.Path(self.target) / 'ok.txt' - jaraco.path.build({'ok.txt': 'some content'}, self.target) - - wanted = [f'copying {a_file} -> {self.target2}'] - copy_tree(self.target, self.target2, verbose=True) - assert caplog.messages == wanted - - remove_tree(self.root_target, verbose=False) - remove_tree(self.target2, verbose=False) - - def test_copy_tree_skips_nfs_temp_files(self): - mkpath(self.target, verbose=False) - - jaraco.path.build({'ok.txt': 'some content', '.nfs123abc': ''}, self.target) - - copy_tree(self.target, self.target2) - assert os.listdir(self.target2) == ['ok.txt'] - - remove_tree(self.root_target, verbose=False) - remove_tree(self.target2, verbose=False) - - def test_ensure_relative(self): - if os.sep == '/': - assert ensure_relative('/home/foo') == 'home/foo' - assert ensure_relative('some/path') == 'some/path' - else: # \\ - assert ensure_relative('c:\\home\\foo') == 'c:home\\foo' - assert ensure_relative('home\\foo') == 'home\\foo' - - def test_copy_tree_exception_in_listdir(self): - """ - An exception in listdir should raise a DistutilsFileError - """ - with ( - mock.patch("os.listdir", side_effect=OSError()), - pytest.raises(errors.DistutilsFileError), - ): - src = self.tempdirs[-1] - dir_util.copy_tree(src, None) - - def test_mkpath_exception_uncached(self, monkeypatch, tmp_path): - """ - Caching should not remember failed attempts. - - pypa/distutils#304 - """ - - class FailPath(pathlib.Path): - def mkdir(self, *args, **kwargs): - raise OSError("Failed to create directory") - - if sys.version_info < (3, 12): - _flavour = pathlib.Path()._flavour - - target = tmp_path / 'foodir' - - with pytest.raises(errors.DistutilsFileError): - mkpath(FailPath(target)) - - assert not target.exists() - - mkpath(target) - assert target.exists() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dist.py deleted file mode 100644 index 2c5beeb..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_dist.py +++ /dev/null @@ -1,552 +0,0 @@ -"""Tests for distutils.dist.""" - -import email -import email.generator -import email.policy -import functools -import io -import os -import sys -import textwrap -import unittest.mock as mock -import warnings -from distutils.cmd import Command -from distutils.dist import Distribution, fix_help_options -from distutils.tests import support -from typing import ClassVar - -import jaraco.path -import pytest - -pydistutils_cfg = '.' * (os.name == 'posix') + 'pydistutils.cfg' - - -class test_dist(Command): - """Sample distutils extension command.""" - - user_options: ClassVar[list[tuple[str, str, str]]] = [ - ("sample-option=", "S", "help text"), - ] - - def initialize_options(self): - self.sample_option = None - - -class TestDistribution(Distribution): - """Distribution subclasses that avoids the default search for - configuration files. - - The ._config_files attribute must be set before - .parse_config_files() is called. - """ - - def find_config_files(self): - return self._config_files - - -@pytest.fixture -def clear_argv(): - del sys.argv[1:] - - -@support.combine_markers -@pytest.mark.usefixtures('save_env') -@pytest.mark.usefixtures('save_argv') -class TestDistributionBehavior(support.TempdirManager): - def create_distribution(self, configfiles=()): - d = TestDistribution() - d._config_files = configfiles - d.parse_config_files() - d.parse_command_line() - return d - - def test_command_packages_unspecified(self, clear_argv): - sys.argv.append("build") - d = self.create_distribution() - assert d.get_command_packages() == ["distutils.command"] - - def test_command_packages_cmdline(self, clear_argv): - from distutils.tests.test_dist import test_dist - - sys.argv.extend([ - "--command-packages", - "foo.bar,distutils.tests", - "test_dist", - "-Ssometext", - ]) - d = self.create_distribution() - # let's actually try to load our test command: - assert d.get_command_packages() == [ - "distutils.command", - "foo.bar", - "distutils.tests", - ] - cmd = d.get_command_obj("test_dist") - assert isinstance(cmd, test_dist) - assert cmd.sample_option == "sometext" - - @pytest.mark.skipif( - 'distutils' not in Distribution.parse_config_files.__module__, - reason='Cannot test when virtualenv has monkey-patched Distribution', - ) - def test_venv_install_options(self, tmp_path, clear_argv): - sys.argv.append("install") - file = str(tmp_path / 'file') - - fakepath = '/somedir' - - jaraco.path.build({ - file: f""" - [install] - install-base = {fakepath} - install-platbase = {fakepath} - install-lib = {fakepath} - install-platlib = {fakepath} - install-purelib = {fakepath} - install-headers = {fakepath} - install-scripts = {fakepath} - install-data = {fakepath} - prefix = {fakepath} - exec-prefix = {fakepath} - home = {fakepath} - user = {fakepath} - root = {fakepath} - """, - }) - - # Base case: Not in a Virtual Environment - with mock.patch.multiple(sys, prefix='/a', base_prefix='/a'): - d = self.create_distribution([file]) - - option_tuple = (file, fakepath) - - result_dict = { - 'install_base': option_tuple, - 'install_platbase': option_tuple, - 'install_lib': option_tuple, - 'install_platlib': option_tuple, - 'install_purelib': option_tuple, - 'install_headers': option_tuple, - 'install_scripts': option_tuple, - 'install_data': option_tuple, - 'prefix': option_tuple, - 'exec_prefix': option_tuple, - 'home': option_tuple, - 'user': option_tuple, - 'root': option_tuple, - } - - assert sorted(d.command_options.get('install').keys()) == sorted( - result_dict.keys() - ) - - for key, value in d.command_options.get('install').items(): - assert value == result_dict[key] - - # Test case: In a Virtual Environment - with mock.patch.multiple(sys, prefix='/a', base_prefix='/b'): - d = self.create_distribution([file]) - - for key in result_dict.keys(): - assert key not in d.command_options.get('install', {}) - - def test_command_packages_configfile(self, tmp_path, clear_argv): - sys.argv.append("build") - file = str(tmp_path / "file") - jaraco.path.build({ - file: """ - [global] - command_packages = foo.bar, splat - """, - }) - - d = self.create_distribution([file]) - assert d.get_command_packages() == ["distutils.command", "foo.bar", "splat"] - - # ensure command line overrides config: - sys.argv[1:] = ["--command-packages", "spork", "build"] - d = self.create_distribution([file]) - assert d.get_command_packages() == ["distutils.command", "spork"] - - # Setting --command-packages to '' should cause the default to - # be used even if a config file specified something else: - sys.argv[1:] = ["--command-packages", "", "build"] - d = self.create_distribution([file]) - assert d.get_command_packages() == ["distutils.command"] - - def test_empty_options(self, request): - # an empty options dictionary should not stay in the - # list of attributes - - # catching warnings - warns = [] - - def _warn(msg): - warns.append(msg) - - request.addfinalizer( - functools.partial(setattr, warnings, 'warn', warnings.warn) - ) - warnings.warn = _warn - dist = Distribution( - attrs={ - 'author': 'xxx', - 'name': 'xxx', - 'version': 'xxx', - 'url': 'xxxx', - 'options': {}, - } - ) - - assert len(warns) == 0 - assert 'options' not in dir(dist) - - def test_finalize_options(self): - attrs = {'keywords': 'one,two', 'platforms': 'one,two'} - - dist = Distribution(attrs=attrs) - dist.finalize_options() - - # finalize_option splits platforms and keywords - assert dist.metadata.platforms == ['one', 'two'] - assert dist.metadata.keywords == ['one', 'two'] - - attrs = {'keywords': 'foo bar', 'platforms': 'foo bar'} - dist = Distribution(attrs=attrs) - dist.finalize_options() - assert dist.metadata.platforms == ['foo bar'] - assert dist.metadata.keywords == ['foo bar'] - - def test_get_command_packages(self): - dist = Distribution() - assert dist.command_packages is None - cmds = dist.get_command_packages() - assert cmds == ['distutils.command'] - assert dist.command_packages == ['distutils.command'] - - dist.command_packages = 'one,two' - cmds = dist.get_command_packages() - assert cmds == ['distutils.command', 'one', 'two'] - - def test_announce(self): - # make sure the level is known - dist = Distribution() - with pytest.raises(TypeError): - dist.announce('ok', level='ok2') - - def test_find_config_files_disable(self, temp_home): - # Ticket #1180: Allow user to disable their home config file. - jaraco.path.build({pydistutils_cfg: '[distutils]\n'}, temp_home) - - d = Distribution() - all_files = d.find_config_files() - - d = Distribution(attrs={'script_args': ['--no-user-cfg']}) - files = d.find_config_files() - - # make sure --no-user-cfg disables the user cfg file - assert len(all_files) - 1 == len(files) - - def test_script_args_list_coercion(self): - d = Distribution(attrs={'script_args': ('build', '--no-user-cfg')}) - - # make sure script_args is a list even if it started as a different iterable - assert d.script_args == ['build', '--no-user-cfg'] - - @pytest.mark.skipif( - 'platform.system() == "Windows"', - reason='Windows does not honor chmod 000', - ) - def test_find_config_files_permission_error(self, fake_home): - """ - Finding config files should not fail when directory is inaccessible. - """ - fake_home.joinpath(pydistutils_cfg).write_text('', encoding='utf-8') - fake_home.chmod(0o000) - Distribution().find_config_files() - - -@pytest.mark.usefixtures('save_env') -@pytest.mark.usefixtures('save_argv') -class TestMetadata(support.TempdirManager): - def format_metadata(self, dist): - sio = io.StringIO() - dist.metadata.write_pkg_file(sio) - return sio.getvalue() - - def test_simple_metadata(self): - attrs = {"name": "package", "version": "1.0"} - dist = Distribution(attrs) - meta = self.format_metadata(dist) - assert "Metadata-Version: 1.0" in meta - assert "provides:" not in meta.lower() - assert "requires:" not in meta.lower() - assert "obsoletes:" not in meta.lower() - - def test_provides(self): - attrs = { - "name": "package", - "version": "1.0", - "provides": ["package", "package.sub"], - } - dist = Distribution(attrs) - assert dist.metadata.get_provides() == ["package", "package.sub"] - assert dist.get_provides() == ["package", "package.sub"] - meta = self.format_metadata(dist) - assert "Metadata-Version: 1.1" in meta - assert "requires:" not in meta.lower() - assert "obsoletes:" not in meta.lower() - - def test_provides_illegal(self): - with pytest.raises(ValueError): - Distribution( - {"name": "package", "version": "1.0", "provides": ["my.pkg (splat)"]}, - ) - - def test_requires(self): - attrs = { - "name": "package", - "version": "1.0", - "requires": ["other", "another (==1.0)"], - } - dist = Distribution(attrs) - assert dist.metadata.get_requires() == ["other", "another (==1.0)"] - assert dist.get_requires() == ["other", "another (==1.0)"] - meta = self.format_metadata(dist) - assert "Metadata-Version: 1.1" in meta - assert "provides:" not in meta.lower() - assert "Requires: other" in meta - assert "Requires: another (==1.0)" in meta - assert "obsoletes:" not in meta.lower() - - def test_requires_illegal(self): - with pytest.raises(ValueError): - Distribution( - {"name": "package", "version": "1.0", "requires": ["my.pkg (splat)"]}, - ) - - def test_requires_to_list(self): - attrs = {"name": "package", "requires": iter(["other"])} - dist = Distribution(attrs) - assert isinstance(dist.metadata.requires, list) - - def test_obsoletes(self): - attrs = { - "name": "package", - "version": "1.0", - "obsoletes": ["other", "another (<1.0)"], - } - dist = Distribution(attrs) - assert dist.metadata.get_obsoletes() == ["other", "another (<1.0)"] - assert dist.get_obsoletes() == ["other", "another (<1.0)"] - meta = self.format_metadata(dist) - assert "Metadata-Version: 1.1" in meta - assert "provides:" not in meta.lower() - assert "requires:" not in meta.lower() - assert "Obsoletes: other" in meta - assert "Obsoletes: another (<1.0)" in meta - - def test_obsoletes_illegal(self): - with pytest.raises(ValueError): - Distribution( - {"name": "package", "version": "1.0", "obsoletes": ["my.pkg (splat)"]}, - ) - - def test_obsoletes_to_list(self): - attrs = {"name": "package", "obsoletes": iter(["other"])} - dist = Distribution(attrs) - assert isinstance(dist.metadata.obsoletes, list) - - def test_classifier(self): - attrs = { - 'name': 'Boa', - 'version': '3.0', - 'classifiers': ['Programming Language :: Python :: 3'], - } - dist = Distribution(attrs) - assert dist.get_classifiers() == ['Programming Language :: Python :: 3'] - meta = self.format_metadata(dist) - assert 'Metadata-Version: 1.1' in meta - - def test_classifier_invalid_type(self, caplog): - attrs = { - 'name': 'Boa', - 'version': '3.0', - 'classifiers': ('Programming Language :: Python :: 3',), - } - d = Distribution(attrs) - # should have warning about passing a non-list - assert 'should be a list' in caplog.messages[0] - # should be converted to a list - assert isinstance(d.metadata.classifiers, list) - assert d.metadata.classifiers == list(attrs['classifiers']) - - def test_keywords(self): - attrs = { - 'name': 'Monty', - 'version': '1.0', - 'keywords': ['spam', 'eggs', 'life of brian'], - } - dist = Distribution(attrs) - assert dist.get_keywords() == ['spam', 'eggs', 'life of brian'] - - def test_keywords_invalid_type(self, caplog): - attrs = { - 'name': 'Monty', - 'version': '1.0', - 'keywords': ('spam', 'eggs', 'life of brian'), - } - d = Distribution(attrs) - # should have warning about passing a non-list - assert 'should be a list' in caplog.messages[0] - # should be converted to a list - assert isinstance(d.metadata.keywords, list) - assert d.metadata.keywords == list(attrs['keywords']) - - def test_platforms(self): - attrs = { - 'name': 'Monty', - 'version': '1.0', - 'platforms': ['GNU/Linux', 'Some Evil Platform'], - } - dist = Distribution(attrs) - assert dist.get_platforms() == ['GNU/Linux', 'Some Evil Platform'] - - def test_platforms_invalid_types(self, caplog): - attrs = { - 'name': 'Monty', - 'version': '1.0', - 'platforms': ('GNU/Linux', 'Some Evil Platform'), - } - d = Distribution(attrs) - # should have warning about passing a non-list - assert 'should be a list' in caplog.messages[0] - # should be converted to a list - assert isinstance(d.metadata.platforms, list) - assert d.metadata.platforms == list(attrs['platforms']) - - def test_download_url(self): - attrs = { - 'name': 'Boa', - 'version': '3.0', - 'download_url': 'http://example.org/boa', - } - dist = Distribution(attrs) - meta = self.format_metadata(dist) - assert 'Metadata-Version: 1.1' in meta - - def test_long_description(self): - long_desc = textwrap.dedent( - """\ - example:: - We start here - and continue here - and end here.""" - ) - attrs = {"name": "package", "version": "1.0", "long_description": long_desc} - - dist = Distribution(attrs) - meta = self.format_metadata(dist) - meta = meta.replace('\n' + 8 * ' ', '\n') - assert long_desc in meta - - def test_custom_pydistutils(self, temp_home): - """ - pydistutils.cfg is found - """ - jaraco.path.build({pydistutils_cfg: ''}, temp_home) - config_path = temp_home / pydistutils_cfg - - assert str(config_path) in Distribution().find_config_files() - - def test_extra_pydistutils(self, monkeypatch, tmp_path): - jaraco.path.build({'overrides.cfg': ''}, tmp_path) - filename = tmp_path / 'overrides.cfg' - monkeypatch.setenv('DIST_EXTRA_CONFIG', str(filename)) - assert str(filename) in Distribution().find_config_files() - - def test_fix_help_options(self): - help_tuples = [('a', 'b', 'c', 'd'), (1, 2, 3, 4)] - fancy_options = fix_help_options(help_tuples) - assert fancy_options[0] == ('a', 'b', 'c') - assert fancy_options[1] == (1, 2, 3) - - def test_show_help(self, request, capsys): - # smoke test, just makes sure some help is displayed - dist = Distribution() - sys.argv = [] - dist.help = True - dist.script_name = 'setup.py' - dist.parse_command_line() - - output = [ - line for line in capsys.readouterr().out.split('\n') if line.strip() != '' - ] - assert output - - def test_read_metadata(self): - attrs = { - "name": "package", - "version": "1.0", - "long_description": "desc", - "description": "xxx", - "download_url": "http://example.com", - "keywords": ['one', 'two'], - "requires": ['foo'], - } - - dist = Distribution(attrs) - metadata = dist.metadata - - # write it then reloads it - PKG_INFO = io.StringIO() - metadata.write_pkg_file(PKG_INFO) - PKG_INFO.seek(0) - metadata.read_pkg_file(PKG_INFO) - - assert metadata.name == "package" - assert metadata.version == "1.0" - assert metadata.description == "xxx" - assert metadata.download_url == 'http://example.com' - assert metadata.keywords == ['one', 'two'] - assert metadata.platforms is None - assert metadata.obsoletes is None - assert metadata.requires == ['foo'] - - def test_round_trip_through_email_generator(self): - """ - In pypa/setuptools#4033, it was shown that once PKG-INFO is - re-generated using ``email.generator.Generator``, some control - characters might cause problems. - """ - # Given a PKG-INFO file ... - attrs = { - "name": "package", - "version": "1.0", - "long_description": "hello\x0b\nworld\n", - } - dist = Distribution(attrs) - metadata = dist.metadata - - with io.StringIO() as buffer: - metadata.write_pkg_file(buffer) - msg = buffer.getvalue() - - # ... when it is read and re-written using stdlib's email library, - orig = email.message_from_string(msg) - policy = email.policy.EmailPolicy( - utf8=True, - mangle_from_=False, - max_line_length=0, - ) - with io.StringIO() as buffer: - email.generator.Generator(buffer, policy=policy).flatten(orig) - - buffer.seek(0) - regen = email.message_from_file(buffer) - - # ... then it should be the same as the original - # (except for the specific line break characters) - orig_desc = set(orig["Description"].splitlines()) - regen_desc = set(regen["Description"].splitlines()) - assert regen_desc == orig_desc diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_extension.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_extension.py deleted file mode 100644 index 5e8e768..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_extension.py +++ /dev/null @@ -1,117 +0,0 @@ -"""Tests for distutils.extension.""" - -import os -import pathlib -import warnings -from distutils.extension import Extension, read_setup_file - -import pytest -from test.support.warnings_helper import check_warnings - - -class TestExtension: - def test_read_setup_file(self): - # trying to read a Setup file - # (sample extracted from the PyGame project) - setup = os.path.join(os.path.dirname(__file__), 'Setup.sample') - - exts = read_setup_file(setup) - names = [ext.name for ext in exts] - names.sort() - - # here are the extensions read_setup_file should have created - # out of the file - wanted = [ - '_arraysurfarray', - '_camera', - '_numericsndarray', - '_numericsurfarray', - 'base', - 'bufferproxy', - 'cdrom', - 'color', - 'constants', - 'display', - 'draw', - 'event', - 'fastevent', - 'font', - 'gfxdraw', - 'image', - 'imageext', - 'joystick', - 'key', - 'mask', - 'mixer', - 'mixer_music', - 'mouse', - 'movie', - 'overlay', - 'pixelarray', - 'pypm', - 'rect', - 'rwobject', - 'scrap', - 'surface', - 'surflock', - 'time', - 'transform', - ] - - assert names == wanted - - def test_extension_init(self): - # the first argument, which is the name, must be a string - with pytest.raises(TypeError): - Extension(1, []) - ext = Extension('name', []) - assert ext.name == 'name' - - # the second argument, which is the list of files, must - # be an iterable of strings or PathLike objects, and not a string - with pytest.raises(TypeError): - Extension('name', 'file') - with pytest.raises(TypeError): - Extension('name', ['file', 1]) - ext = Extension('name', ['file1', 'file2']) - assert ext.sources == ['file1', 'file2'] - ext = Extension('name', [pathlib.Path('file1'), pathlib.Path('file2')]) - assert ext.sources == ['file1', 'file2'] - - # any non-string iterable of strings or PathLike objects should work - ext = Extension('name', ('file1', 'file2')) # tuple - assert ext.sources == ['file1', 'file2'] - ext = Extension('name', {'file1', 'file2'}) # set - assert sorted(ext.sources) == ['file1', 'file2'] - ext = Extension('name', iter(['file1', 'file2'])) # iterator - assert ext.sources == ['file1', 'file2'] - ext = Extension('name', [pathlib.Path('file1'), 'file2']) # mixed types - assert ext.sources == ['file1', 'file2'] - - # others arguments have defaults - for attr in ( - 'include_dirs', - 'define_macros', - 'undef_macros', - 'library_dirs', - 'libraries', - 'runtime_library_dirs', - 'extra_objects', - 'extra_compile_args', - 'extra_link_args', - 'export_symbols', - 'swig_opts', - 'depends', - ): - assert getattr(ext, attr) == [] - - assert ext.language is None - assert ext.optional is None - - # if there are unknown keyword options, warn about them - with check_warnings() as w: - warnings.simplefilter('always') - ext = Extension('name', ['file1', 'file2'], chic=True) - - assert len(w.warnings) == 1 - assert str(w.warnings[0].message) == "Unknown Extension options: 'chic'" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_file_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_file_util.py deleted file mode 100644 index a75d4a0..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_file_util.py +++ /dev/null @@ -1,95 +0,0 @@ -"""Tests for distutils.file_util.""" - -import errno -import os -import unittest.mock as mock -from distutils.errors import DistutilsFileError -from distutils.file_util import copy_file, move_file - -import jaraco.path -import pytest - - -@pytest.fixture(autouse=True) -def stuff(request, tmp_path): - self = request.instance - self.source = tmp_path / 'f1' - self.target = tmp_path / 'f2' - self.target_dir = tmp_path / 'd1' - - -class TestFileUtil: - def test_move_file_verbosity(self, caplog): - jaraco.path.build({self.source: 'some content'}) - - move_file(self.source, self.target, verbose=False) - assert not caplog.messages - - # back to original state - move_file(self.target, self.source, verbose=False) - - move_file(self.source, self.target, verbose=True) - wanted = [f'moving {self.source} -> {self.target}'] - assert caplog.messages == wanted - - # back to original state - move_file(self.target, self.source, verbose=False) - - caplog.clear() - # now the target is a dir - os.mkdir(self.target_dir) - move_file(self.source, self.target_dir, verbose=True) - wanted = [f'moving {self.source} -> {self.target_dir}'] - assert caplog.messages == wanted - - def test_move_file_exception_unpacking_rename(self): - # see issue 22182 - with ( - mock.patch("os.rename", side_effect=OSError("wrong", 1)), - pytest.raises(DistutilsFileError), - ): - jaraco.path.build({self.source: 'spam eggs'}) - move_file(self.source, self.target, verbose=False) - - def test_move_file_exception_unpacking_unlink(self): - # see issue 22182 - with ( - mock.patch("os.rename", side_effect=OSError(errno.EXDEV, "wrong")), - mock.patch("os.unlink", side_effect=OSError("wrong", 1)), - pytest.raises(DistutilsFileError), - ): - jaraco.path.build({self.source: 'spam eggs'}) - move_file(self.source, self.target, verbose=False) - - def test_copy_file_hard_link(self): - jaraco.path.build({self.source: 'some content'}) - # Check first that copy_file() will not fall back on copying the file - # instead of creating the hard link. - try: - os.link(self.source, self.target) - except OSError as e: - self.skipTest(f'os.link: {e}') - else: - self.target.unlink() - st = os.stat(self.source) - copy_file(self.source, self.target, link='hard') - st2 = os.stat(self.source) - st3 = os.stat(self.target) - assert os.path.samestat(st, st2), (st, st2) - assert os.path.samestat(st2, st3), (st2, st3) - assert self.source.read_text(encoding='utf-8') == 'some content' - - def test_copy_file_hard_link_failure(self): - # If hard linking fails, copy_file() falls back on copying file - # (some special filesystems don't support hard linking even under - # Unix, see issue #8876). - jaraco.path.build({self.source: 'some content'}) - st = os.stat(self.source) - with mock.patch("os.link", side_effect=OSError(0, "linking unsupported")): - copy_file(self.source, self.target, link='hard') - st2 = os.stat(self.source) - st3 = os.stat(self.target) - assert os.path.samestat(st, st2), (st, st2) - assert not os.path.samestat(st2, st3), (st2, st3) - for fn in (self.source, self.target): - assert fn.read_text(encoding='utf-8') == 'some content' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_filelist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_filelist.py deleted file mode 100644 index 130e6fb..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_filelist.py +++ /dev/null @@ -1,336 +0,0 @@ -"""Tests for distutils.filelist.""" - -import logging -import os -import re -from distutils import debug, filelist -from distutils.errors import DistutilsTemplateError -from distutils.filelist import FileList, glob_to_re, translate_pattern - -import jaraco.path -import pytest - -from .compat import py39 as os_helper - -MANIFEST_IN = """\ -include ok -include xo -exclude xo -include foo.tmp -include buildout.cfg -global-include *.x -global-include *.txt -global-exclude *.tmp -recursive-include f *.oo -recursive-exclude global *.x -graft dir -prune dir3 -""" - - -def make_local_path(s): - """Converts '/' in a string to os.sep""" - return s.replace('/', os.sep) - - -class TestFileList: - def assertNoWarnings(self, caplog): - warnings = [rec for rec in caplog.records if rec.levelno == logging.WARNING] - assert not warnings - caplog.clear() - - def assertWarnings(self, caplog): - warnings = [rec for rec in caplog.records if rec.levelno == logging.WARNING] - assert warnings - caplog.clear() - - def test_glob_to_re(self): - sep = os.sep - if os.sep == '\\': - sep = re.escape(os.sep) - - for glob, regex in ( - # simple cases - ('foo*', r'(?s:foo[^%(sep)s]*)\Z'), - ('foo?', r'(?s:foo[^%(sep)s])\Z'), - ('foo??', r'(?s:foo[^%(sep)s][^%(sep)s])\Z'), - # special cases - (r'foo\\*', r'(?s:foo\\\\[^%(sep)s]*)\Z'), - (r'foo\\\*', r'(?s:foo\\\\\\[^%(sep)s]*)\Z'), - ('foo????', r'(?s:foo[^%(sep)s][^%(sep)s][^%(sep)s][^%(sep)s])\Z'), - (r'foo\\??', r'(?s:foo\\\\[^%(sep)s][^%(sep)s])\Z'), - ): - regex = regex % {'sep': sep} - assert glob_to_re(glob) == regex - - def test_process_template_line(self): - # testing all MANIFEST.in template patterns - file_list = FileList() - mlp = make_local_path - - # simulated file list - file_list.allfiles = [ - 'foo.tmp', - 'ok', - 'xo', - 'four.txt', - 'buildout.cfg', - # filelist does not filter out VCS directories, - # it's sdist that does - mlp('.hg/last-message.txt'), - mlp('global/one.txt'), - mlp('global/two.txt'), - mlp('global/files.x'), - mlp('global/here.tmp'), - mlp('f/o/f.oo'), - mlp('dir/graft-one'), - mlp('dir/dir2/graft2'), - mlp('dir3/ok'), - mlp('dir3/sub/ok.txt'), - ] - - for line in MANIFEST_IN.split('\n'): - if line.strip() == '': - continue - file_list.process_template_line(line) - - wanted = [ - 'ok', - 'buildout.cfg', - 'four.txt', - mlp('.hg/last-message.txt'), - mlp('global/one.txt'), - mlp('global/two.txt'), - mlp('f/o/f.oo'), - mlp('dir/graft-one'), - mlp('dir/dir2/graft2'), - ] - - assert file_list.files == wanted - - def test_debug_print(self, capsys, monkeypatch): - file_list = FileList() - file_list.debug_print('xxx') - assert capsys.readouterr().out == '' - - monkeypatch.setattr(debug, 'DEBUG', True) - file_list.debug_print('xxx') - assert capsys.readouterr().out == 'xxx\n' - - def test_set_allfiles(self): - file_list = FileList() - files = ['a', 'b', 'c'] - file_list.set_allfiles(files) - assert file_list.allfiles == files - - def test_remove_duplicates(self): - file_list = FileList() - file_list.files = ['a', 'b', 'a', 'g', 'c', 'g'] - # files must be sorted beforehand (sdist does it) - file_list.sort() - file_list.remove_duplicates() - assert file_list.files == ['a', 'b', 'c', 'g'] - - def test_translate_pattern(self): - # not regex - assert hasattr(translate_pattern('a', anchor=True, is_regex=False), 'search') - - # is a regex - regex = re.compile('a') - assert translate_pattern(regex, anchor=True, is_regex=True) == regex - - # plain string flagged as regex - assert hasattr(translate_pattern('a', anchor=True, is_regex=True), 'search') - - # glob support - assert translate_pattern('*.py', anchor=True, is_regex=False).search( - 'filelist.py' - ) - - def test_exclude_pattern(self): - # return False if no match - file_list = FileList() - assert not file_list.exclude_pattern('*.py') - - # return True if files match - file_list = FileList() - file_list.files = ['a.py', 'b.py'] - assert file_list.exclude_pattern('*.py') - - # test excludes - file_list = FileList() - file_list.files = ['a.py', 'a.txt'] - file_list.exclude_pattern('*.py') - assert file_list.files == ['a.txt'] - - def test_include_pattern(self): - # return False if no match - file_list = FileList() - file_list.set_allfiles([]) - assert not file_list.include_pattern('*.py') - - # return True if files match - file_list = FileList() - file_list.set_allfiles(['a.py', 'b.txt']) - assert file_list.include_pattern('*.py') - - # test * matches all files - file_list = FileList() - assert file_list.allfiles is None - file_list.set_allfiles(['a.py', 'b.txt']) - file_list.include_pattern('*') - assert file_list.allfiles == ['a.py', 'b.txt'] - - def test_process_template(self, caplog): - mlp = make_local_path - # invalid lines - file_list = FileList() - for action in ( - 'include', - 'exclude', - 'global-include', - 'global-exclude', - 'recursive-include', - 'recursive-exclude', - 'graft', - 'prune', - 'blarg', - ): - with pytest.raises(DistutilsTemplateError): - file_list.process_template_line(action) - - # include - file_list = FileList() - file_list.set_allfiles(['a.py', 'b.txt', mlp('d/c.py')]) - - file_list.process_template_line('include *.py') - assert file_list.files == ['a.py'] - self.assertNoWarnings(caplog) - - file_list.process_template_line('include *.rb') - assert file_list.files == ['a.py'] - self.assertWarnings(caplog) - - # exclude - file_list = FileList() - file_list.files = ['a.py', 'b.txt', mlp('d/c.py')] - - file_list.process_template_line('exclude *.py') - assert file_list.files == ['b.txt', mlp('d/c.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('exclude *.rb') - assert file_list.files == ['b.txt', mlp('d/c.py')] - self.assertWarnings(caplog) - - # global-include - file_list = FileList() - file_list.set_allfiles(['a.py', 'b.txt', mlp('d/c.py')]) - - file_list.process_template_line('global-include *.py') - assert file_list.files == ['a.py', mlp('d/c.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('global-include *.rb') - assert file_list.files == ['a.py', mlp('d/c.py')] - self.assertWarnings(caplog) - - # global-exclude - file_list = FileList() - file_list.files = ['a.py', 'b.txt', mlp('d/c.py')] - - file_list.process_template_line('global-exclude *.py') - assert file_list.files == ['b.txt'] - self.assertNoWarnings(caplog) - - file_list.process_template_line('global-exclude *.rb') - assert file_list.files == ['b.txt'] - self.assertWarnings(caplog) - - # recursive-include - file_list = FileList() - file_list.set_allfiles(['a.py', mlp('d/b.py'), mlp('d/c.txt'), mlp('d/d/e.py')]) - - file_list.process_template_line('recursive-include d *.py') - assert file_list.files == [mlp('d/b.py'), mlp('d/d/e.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('recursive-include e *.py') - assert file_list.files == [mlp('d/b.py'), mlp('d/d/e.py')] - self.assertWarnings(caplog) - - # recursive-exclude - file_list = FileList() - file_list.files = ['a.py', mlp('d/b.py'), mlp('d/c.txt'), mlp('d/d/e.py')] - - file_list.process_template_line('recursive-exclude d *.py') - assert file_list.files == ['a.py', mlp('d/c.txt')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('recursive-exclude e *.py') - assert file_list.files == ['a.py', mlp('d/c.txt')] - self.assertWarnings(caplog) - - # graft - file_list = FileList() - file_list.set_allfiles(['a.py', mlp('d/b.py'), mlp('d/d/e.py'), mlp('f/f.py')]) - - file_list.process_template_line('graft d') - assert file_list.files == [mlp('d/b.py'), mlp('d/d/e.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('graft e') - assert file_list.files == [mlp('d/b.py'), mlp('d/d/e.py')] - self.assertWarnings(caplog) - - # prune - file_list = FileList() - file_list.files = ['a.py', mlp('d/b.py'), mlp('d/d/e.py'), mlp('f/f.py')] - - file_list.process_template_line('prune d') - assert file_list.files == ['a.py', mlp('f/f.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('prune e') - assert file_list.files == ['a.py', mlp('f/f.py')] - self.assertWarnings(caplog) - - -class TestFindAll: - @os_helper.skip_unless_symlink - def test_missing_symlink(self, temp_cwd): - os.symlink('foo', 'bar') - assert filelist.findall() == [] - - def test_basic_discovery(self, temp_cwd): - """ - When findall is called with no parameters or with - '.' as the parameter, the dot should be omitted from - the results. - """ - jaraco.path.build({'foo': {'file1.txt': ''}, 'bar': {'file2.txt': ''}}) - file1 = os.path.join('foo', 'file1.txt') - file2 = os.path.join('bar', 'file2.txt') - expected = [file2, file1] - assert sorted(filelist.findall()) == expected - - def test_non_local_discovery(self, tmp_path): - """ - When findall is called with another path, the full - path name should be returned. - """ - jaraco.path.build({'file1.txt': ''}, tmp_path) - expected = [str(tmp_path / 'file1.txt')] - assert filelist.findall(tmp_path) == expected - - @os_helper.skip_unless_symlink - def test_symlink_loop(self, tmp_path): - jaraco.path.build( - { - 'link-to-parent': jaraco.path.Symlink('.'), - 'somefile': '', - }, - tmp_path, - ) - files = filelist.findall(tmp_path) - assert len(files) == 1 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install.py deleted file mode 100644 index b3ffb2e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install.py +++ /dev/null @@ -1,245 +0,0 @@ -"""Tests for distutils.command.install.""" - -import logging -import os -import pathlib -import site -import sys -from distutils import sysconfig -from distutils.command import install as install_module -from distutils.command.build_ext import build_ext -from distutils.command.install import INSTALL_SCHEMES, install -from distutils.core import Distribution -from distutils.errors import DistutilsOptionError -from distutils.extension import Extension -from distutils.tests import missing_compiler_executable, support -from distutils.util import is_mingw - -import pytest - - -def _make_ext_name(modname): - return modname + sysconfig.get_config_var('EXT_SUFFIX') - - -@support.combine_markers -@pytest.mark.usefixtures('save_env') -class TestInstall( - support.TempdirManager, -): - @pytest.mark.xfail( - 'platform.system() == "Windows" and sys.version_info > (3, 11)', - reason="pypa/distutils#148", - ) - def test_home_installation_scheme(self): - # This ensure two things: - # - that --home generates the desired set of directory names - # - test --home is supported on all platforms - builddir = self.mkdtemp() - destination = os.path.join(builddir, "installation") - - dist = Distribution({"name": "foopkg"}) - # script_name need not exist, it just need to be initialized - dist.script_name = os.path.join(builddir, "setup.py") - dist.command_obj["build"] = support.DummyCommand( - build_base=builddir, - build_lib=os.path.join(builddir, "lib"), - ) - - cmd = install(dist) - cmd.home = destination - cmd.ensure_finalized() - - assert cmd.install_base == destination - assert cmd.install_platbase == destination - - def check_path(got, expected): - got = os.path.normpath(got) - expected = os.path.normpath(expected) - assert got == expected - - impl_name = sys.implementation.name.replace("cpython", "python") - libdir = os.path.join(destination, "lib", impl_name) - check_path(cmd.install_lib, libdir) - _platlibdir = getattr(sys, "platlibdir", "lib") - platlibdir = os.path.join(destination, _platlibdir, impl_name) - check_path(cmd.install_platlib, platlibdir) - check_path(cmd.install_purelib, libdir) - check_path( - cmd.install_headers, - os.path.join(destination, "include", impl_name, "foopkg"), - ) - check_path(cmd.install_scripts, os.path.join(destination, "bin")) - check_path(cmd.install_data, destination) - - def test_user_site(self, monkeypatch): - # test install with --user - # preparing the environment for the test - self.tmpdir = self.mkdtemp() - orig_site = site.USER_SITE - orig_base = site.USER_BASE - monkeypatch.setattr(site, 'USER_BASE', os.path.join(self.tmpdir, 'B')) - monkeypatch.setattr(site, 'USER_SITE', os.path.join(self.tmpdir, 'S')) - monkeypatch.setattr(install_module, 'USER_BASE', site.USER_BASE) - monkeypatch.setattr(install_module, 'USER_SITE', site.USER_SITE) - - def _expanduser(path): - if path.startswith('~'): - return os.path.normpath(self.tmpdir + path[1:]) - return path - - monkeypatch.setattr(os.path, 'expanduser', _expanduser) - - for key in ('nt_user', 'posix_user'): - assert key in INSTALL_SCHEMES - - dist = Distribution({'name': 'xx'}) - cmd = install(dist) - - # making sure the user option is there - options = [name for name, short, label in cmd.user_options] - assert 'user' in options - - # setting a value - cmd.user = True - - # user base and site shouldn't be created yet - assert not os.path.exists(site.USER_BASE) - assert not os.path.exists(site.USER_SITE) - - # let's run finalize - cmd.ensure_finalized() - - # now they should - assert os.path.exists(site.USER_BASE) - assert os.path.exists(site.USER_SITE) - - assert 'userbase' in cmd.config_vars - assert 'usersite' in cmd.config_vars - - actual_headers = os.path.relpath(cmd.install_headers, site.USER_BASE) - if os.name == 'nt' and not is_mingw(): - site_path = os.path.relpath(os.path.dirname(orig_site), orig_base) - include = os.path.join(site_path, 'Include') - else: - include = sysconfig.get_python_inc(0, '') - expect_headers = os.path.join(include, 'xx') - - assert os.path.normcase(actual_headers) == os.path.normcase(expect_headers) - - def test_handle_extra_path(self): - dist = Distribution({'name': 'xx', 'extra_path': 'path,dirs'}) - cmd = install(dist) - - # two elements - cmd.handle_extra_path() - assert cmd.extra_path == ['path', 'dirs'] - assert cmd.extra_dirs == 'dirs' - assert cmd.path_file == 'path' - - # one element - cmd.extra_path = ['path'] - cmd.handle_extra_path() - assert cmd.extra_path == ['path'] - assert cmd.extra_dirs == 'path' - assert cmd.path_file == 'path' - - # none - dist.extra_path = cmd.extra_path = None - cmd.handle_extra_path() - assert cmd.extra_path is None - assert cmd.extra_dirs == '' - assert cmd.path_file is None - - # three elements (no way !) - cmd.extra_path = 'path,dirs,again' - with pytest.raises(DistutilsOptionError): - cmd.handle_extra_path() - - def test_finalize_options(self): - dist = Distribution({'name': 'xx'}) - cmd = install(dist) - - # must supply either prefix/exec-prefix/home or - # install-base/install-platbase -- not both - cmd.prefix = 'prefix' - cmd.install_base = 'base' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - - # must supply either home or prefix/exec-prefix -- not both - cmd.install_base = None - cmd.home = 'home' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - - # can't combine user with prefix/exec_prefix/home or - # install_(plat)base - cmd.prefix = None - cmd.user = 'user' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - - def test_record(self): - install_dir = self.mkdtemp() - project_dir, dist = self.create_dist(py_modules=['hello'], scripts=['sayhi']) - os.chdir(project_dir) - self.write_file('hello.py', "def main(): print('o hai')") - self.write_file('sayhi', 'from hello import main; main()') - - cmd = install(dist) - dist.command_obj['install'] = cmd - cmd.root = install_dir - cmd.record = os.path.join(project_dir, 'filelist') - cmd.ensure_finalized() - cmd.run() - - content = pathlib.Path(cmd.record).read_text(encoding='utf-8') - - found = [pathlib.Path(line).name for line in content.splitlines()] - expected = [ - 'hello.py', - f'hello.{sys.implementation.cache_tag}.pyc', - 'sayhi', - 'UNKNOWN-0.0.0-py{}.{}.egg-info'.format(*sys.version_info[:2]), - ] - assert found == expected - - def test_record_extensions(self): - cmd = missing_compiler_executable() - if cmd is not None: - pytest.skip(f'The {cmd!r} command is not found') - install_dir = self.mkdtemp() - project_dir, dist = self.create_dist( - ext_modules=[Extension('xx', ['xxmodule.c'])] - ) - os.chdir(project_dir) - support.copy_xxmodule_c(project_dir) - - buildextcmd = build_ext(dist) - support.fixup_build_ext(buildextcmd) - buildextcmd.ensure_finalized() - - cmd = install(dist) - dist.command_obj['install'] = cmd - dist.command_obj['build_ext'] = buildextcmd - cmd.root = install_dir - cmd.record = os.path.join(project_dir, 'filelist') - cmd.ensure_finalized() - cmd.run() - - content = pathlib.Path(cmd.record).read_text(encoding='utf-8') - - found = [pathlib.Path(line).name for line in content.splitlines()] - expected = [ - _make_ext_name('xx'), - 'UNKNOWN-0.0.0-py{}.{}.egg-info'.format(*sys.version_info[:2]), - ] - assert found == expected - - def test_debug_mode(self, caplog, monkeypatch): - # this covers the code called when DEBUG is set - monkeypatch.setattr(install_module, 'DEBUG', True) - caplog.set_level(logging.DEBUG) - self.test_record() - assert any(rec for rec in caplog.records if rec.levelno == logging.DEBUG) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_data.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_data.py deleted file mode 100644 index c800f86..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_data.py +++ /dev/null @@ -1,74 +0,0 @@ -"""Tests for distutils.command.install_data.""" - -import os -import pathlib -from distutils.command.install_data import install_data -from distutils.tests import support - -import pytest - - -@pytest.mark.usefixtures('save_env') -class TestInstallData( - support.TempdirManager, -): - def test_simple_run(self): - pkg_dir, dist = self.create_dist() - cmd = install_data(dist) - cmd.install_dir = inst = os.path.join(pkg_dir, 'inst') - - # data_files can contain - # - simple files - # - a Path object - # - a tuple with a path, and a list of file - one = os.path.join(pkg_dir, 'one') - self.write_file(one, 'xxx') - inst2 = os.path.join(pkg_dir, 'inst2') - two = os.path.join(pkg_dir, 'two') - self.write_file(two, 'xxx') - three = pathlib.Path(pkg_dir) / 'three' - self.write_file(three, 'xxx') - - cmd.data_files = [one, (inst2, [two]), three] - assert cmd.get_inputs() == [one, (inst2, [two]), three] - - # let's run the command - cmd.ensure_finalized() - cmd.run() - - # let's check the result - assert len(cmd.get_outputs()) == 3 - rthree = os.path.split(one)[-1] - assert os.path.exists(os.path.join(inst, rthree)) - rtwo = os.path.split(two)[-1] - assert os.path.exists(os.path.join(inst2, rtwo)) - rone = os.path.split(one)[-1] - assert os.path.exists(os.path.join(inst, rone)) - cmd.outfiles = [] - - # let's try with warn_dir one - cmd.warn_dir = True - cmd.ensure_finalized() - cmd.run() - - # let's check the result - assert len(cmd.get_outputs()) == 3 - assert os.path.exists(os.path.join(inst, rthree)) - assert os.path.exists(os.path.join(inst2, rtwo)) - assert os.path.exists(os.path.join(inst, rone)) - cmd.outfiles = [] - - # now using root and empty dir - cmd.root = os.path.join(pkg_dir, 'root') - inst5 = os.path.join(pkg_dir, 'inst5') - four = os.path.join(cmd.install_dir, 'four') - self.write_file(four, 'xx') - cmd.data_files = [one, (inst2, [two]), three, ('inst5', [four]), (inst5, [])] - cmd.ensure_finalized() - cmd.run() - - # let's check the result - assert len(cmd.get_outputs()) == 5 - assert os.path.exists(os.path.join(inst, rthree)) - assert os.path.exists(os.path.join(inst2, rtwo)) - assert os.path.exists(os.path.join(inst, rone)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_headers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_headers.py deleted file mode 100644 index 2c74f06..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_headers.py +++ /dev/null @@ -1,33 +0,0 @@ -"""Tests for distutils.command.install_headers.""" - -import os -from distutils.command.install_headers import install_headers -from distutils.tests import support - -import pytest - - -@pytest.mark.usefixtures('save_env') -class TestInstallHeaders( - support.TempdirManager, -): - def test_simple_run(self): - # we have two headers - header_list = self.mkdtemp() - header1 = os.path.join(header_list, 'header1') - header2 = os.path.join(header_list, 'header2') - self.write_file(header1) - self.write_file(header2) - headers = [header1, header2] - - pkg_dir, dist = self.create_dist(headers=headers) - cmd = install_headers(dist) - assert cmd.get_inputs() == headers - - # let's run the command - cmd.install_dir = os.path.join(pkg_dir, 'inst') - cmd.ensure_finalized() - cmd.run() - - # let's check the results - assert len(cmd.get_outputs()) == 2 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_lib.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_lib.py deleted file mode 100644 index f685a57..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_lib.py +++ /dev/null @@ -1,110 +0,0 @@ -"""Tests for distutils.command.install_data.""" - -import importlib.util -import os -import sys -from distutils.command.install_lib import install_lib -from distutils.errors import DistutilsOptionError -from distutils.extension import Extension -from distutils.tests import support - -import pytest - - -@support.combine_markers -@pytest.mark.usefixtures('save_env') -class TestInstallLib( - support.TempdirManager, -): - def test_finalize_options(self): - dist = self.create_dist()[1] - cmd = install_lib(dist) - - cmd.finalize_options() - assert cmd.compile == 1 - assert cmd.optimize == 0 - - # optimize must be 0, 1, or 2 - cmd.optimize = 'foo' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - cmd.optimize = '4' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - - cmd.optimize = '2' - cmd.finalize_options() - assert cmd.optimize == 2 - - @pytest.mark.skipif('sys.dont_write_bytecode') - def test_byte_compile(self): - project_dir, dist = self.create_dist() - os.chdir(project_dir) - cmd = install_lib(dist) - cmd.compile = cmd.optimize = 1 - - f = os.path.join(project_dir, 'foo.py') - self.write_file(f, '# python file') - cmd.byte_compile([f]) - pyc_file = importlib.util.cache_from_source('foo.py', optimization='') - pyc_opt_file = importlib.util.cache_from_source( - 'foo.py', optimization=cmd.optimize - ) - assert os.path.exists(pyc_file) - assert os.path.exists(pyc_opt_file) - - def test_get_outputs(self): - project_dir, dist = self.create_dist() - os.chdir(project_dir) - os.mkdir('spam') - cmd = install_lib(dist) - - # setting up a dist environment - cmd.compile = cmd.optimize = 1 - cmd.install_dir = self.mkdtemp() - f = os.path.join(project_dir, 'spam', '__init__.py') - self.write_file(f, '# python package') - cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] - cmd.distribution.packages = ['spam'] - cmd.distribution.script_name = 'setup.py' - - # get_outputs should return 4 elements: spam/__init__.py and .pyc, - # foo.import-tag-abiflags.so / foo.pyd - outputs = cmd.get_outputs() - assert len(outputs) == 4, outputs - - def test_get_inputs(self): - project_dir, dist = self.create_dist() - os.chdir(project_dir) - os.mkdir('spam') - cmd = install_lib(dist) - - # setting up a dist environment - cmd.compile = cmd.optimize = 1 - cmd.install_dir = self.mkdtemp() - f = os.path.join(project_dir, 'spam', '__init__.py') - self.write_file(f, '# python package') - cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] - cmd.distribution.packages = ['spam'] - cmd.distribution.script_name = 'setup.py' - - # get_inputs should return 2 elements: spam/__init__.py and - # foo.import-tag-abiflags.so / foo.pyd - inputs = cmd.get_inputs() - assert len(inputs) == 2, inputs - - def test_dont_write_bytecode(self, caplog): - # makes sure byte_compile is not used - dist = self.create_dist()[1] - cmd = install_lib(dist) - cmd.compile = True - cmd.optimize = 1 - - old_dont_write_bytecode = sys.dont_write_bytecode - sys.dont_write_bytecode = True - try: - cmd.byte_compile([]) - finally: - sys.dont_write_bytecode = old_dont_write_bytecode - - assert 'byte-compiling is disabled' in caplog.messages[0] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_scripts.py deleted file mode 100644 index 868b1c2..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_install_scripts.py +++ /dev/null @@ -1,52 +0,0 @@ -"""Tests for distutils.command.install_scripts.""" - -import os -from distutils.command.install_scripts import install_scripts -from distutils.core import Distribution -from distutils.tests import support - -from . import test_build_scripts - - -class TestInstallScripts(support.TempdirManager): - def test_default_settings(self): - dist = Distribution() - dist.command_obj["build"] = support.DummyCommand(build_scripts="/foo/bar") - dist.command_obj["install"] = support.DummyCommand( - install_scripts="/splat/funk", - force=True, - skip_build=True, - ) - cmd = install_scripts(dist) - assert not cmd.force - assert not cmd.skip_build - assert cmd.build_dir is None - assert cmd.install_dir is None - - cmd.finalize_options() - - assert cmd.force - assert cmd.skip_build - assert cmd.build_dir == "/foo/bar" - assert cmd.install_dir == "/splat/funk" - - def test_installation(self): - source = self.mkdtemp() - - expected = test_build_scripts.TestBuildScripts.write_sample_scripts(source) - - target = self.mkdtemp() - dist = Distribution() - dist.command_obj["build"] = support.DummyCommand(build_scripts=source) - dist.command_obj["install"] = support.DummyCommand( - install_scripts=target, - force=True, - skip_build=True, - ) - cmd = install_scripts(dist) - cmd.finalize_options() - cmd.run() - - installed = os.listdir(target) - for name in expected: - assert name in installed diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_log.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_log.py deleted file mode 100644 index d67779f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_log.py +++ /dev/null @@ -1,12 +0,0 @@ -"""Tests for distutils.log""" - -import logging -from distutils._log import log - - -class TestLog: - def test_non_ascii(self, caplog): - caplog.set_level(logging.DEBUG) - log.debug('Dεbug\tMėssãge') - log.fatal('Fαtal\tÈrrōr') - assert caplog.messages == ['Dεbug\tMėssãge', 'Fαtal\tÈrrōr'] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_modified.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_modified.py deleted file mode 100644 index e35cec2..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_modified.py +++ /dev/null @@ -1,126 +0,0 @@ -"""Tests for distutils._modified.""" - -import os -import types -from distutils._modified import newer, newer_group, newer_pairwise, newer_pairwise_group -from distutils.errors import DistutilsFileError -from distutils.tests import support - -import pytest - - -class TestDepUtil(support.TempdirManager): - def test_newer(self): - tmpdir = self.mkdtemp() - new_file = os.path.join(tmpdir, 'new') - old_file = os.path.abspath(__file__) - - # Raise DistutilsFileError if 'new_file' does not exist. - with pytest.raises(DistutilsFileError): - newer(new_file, old_file) - - # Return true if 'new_file' exists and is more recently modified than - # 'old_file', or if 'new_file' exists and 'old_file' doesn't. - self.write_file(new_file) - assert newer(new_file, 'I_dont_exist') - assert newer(new_file, old_file) - - # Return false if both exist and 'old_file' is the same age or younger - # than 'new_file'. - assert not newer(old_file, new_file) - - def _setup_1234(self): - tmpdir = self.mkdtemp() - sources = os.path.join(tmpdir, 'sources') - targets = os.path.join(tmpdir, 'targets') - os.mkdir(sources) - os.mkdir(targets) - one = os.path.join(sources, 'one') - two = os.path.join(sources, 'two') - three = os.path.abspath(__file__) # I am the old file - four = os.path.join(targets, 'four') - self.write_file(one) - self.write_file(two) - self.write_file(four) - return one, two, three, four - - def test_newer_pairwise(self): - one, two, three, four = self._setup_1234() - - assert newer_pairwise([one, two], [three, four]) == ([one], [three]) - - def test_newer_pairwise_mismatch(self): - one, two, three, four = self._setup_1234() - - with pytest.raises(ValueError): - newer_pairwise([one], [three, four]) - - with pytest.raises(ValueError): - newer_pairwise([one, two], [three]) - - def test_newer_pairwise_empty(self): - assert newer_pairwise([], []) == ([], []) - - def test_newer_pairwise_fresh(self): - one, two, three, four = self._setup_1234() - - assert newer_pairwise([one, three], [two, four]) == ([], []) - - def test_newer_group(self): - tmpdir = self.mkdtemp() - sources = os.path.join(tmpdir, 'sources') - os.mkdir(sources) - one = os.path.join(sources, 'one') - two = os.path.join(sources, 'two') - three = os.path.join(sources, 'three') - old_file = os.path.abspath(__file__) - - # return true if 'old_file' is out-of-date with respect to any file - # listed in 'sources'. - self.write_file(one) - self.write_file(two) - self.write_file(three) - assert newer_group([one, two, three], old_file) - assert not newer_group([one, two, old_file], three) - - # missing handling - os.remove(one) - with pytest.raises(OSError): - newer_group([one, two, old_file], three) - - assert not newer_group([one, two, old_file], three, missing='ignore') - - assert newer_group([one, two, old_file], three, missing='newer') - - -@pytest.fixture -def groups_target(tmp_path): - """ - Set up some older sources, a target, and newer sources. - - Returns a simple namespace with these values. - """ - filenames = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h'] - paths = [tmp_path / name for name in filenames] - - for mtime, path in enumerate(paths): - path.write_text('', encoding='utf-8') - - # make sure modification times are sequential - os.utime(path, (mtime, mtime)) - - return types.SimpleNamespace(older=paths[:2], target=paths[2], newer=paths[3:]) - - -def test_newer_pairwise_group(groups_target): - older = newer_pairwise_group([groups_target.older], [groups_target.target]) - newer = newer_pairwise_group([groups_target.newer], [groups_target.target]) - assert older == ([], []) - assert newer == ([groups_target.newer], [groups_target.target]) - - -def test_newer_group_no_sources_no_target(tmp_path): - """ - Consider no sources and no target "newer". - """ - assert newer_group([], str(tmp_path / 'does-not-exist')) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sdist.py deleted file mode 100644 index 6b1a376..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sdist.py +++ /dev/null @@ -1,470 +0,0 @@ -"""Tests for distutils.command.sdist.""" - -import os -import pathlib -import shutil # noqa: F401 -import tarfile -import zipfile -from distutils.archive_util import ARCHIVE_FORMATS -from distutils.command.sdist import sdist, show_formats -from distutils.core import Distribution -from distutils.errors import DistutilsOptionError -from distutils.filelist import FileList -from os.path import join -from textwrap import dedent - -import jaraco.path -import path -import pytest -from more_itertools import ilen - -from . import support -from .unix_compat import grp, pwd, require_uid_0, require_unix_id - -SETUP_PY = """ -from distutils.core import setup -import somecode - -setup(name='fake') -""" - -MANIFEST = """\ -# file GENERATED by distutils, do NOT edit -README -buildout.cfg -inroot.txt -setup.py -data%(sep)sdata.dt -scripts%(sep)sscript.py -some%(sep)sfile.txt -some%(sep)sother_file.txt -somecode%(sep)s__init__.py -somecode%(sep)sdoc.dat -somecode%(sep)sdoc.txt -""" - - -@pytest.fixture(autouse=True) -def project_dir(request, distutils_managed_tempdir): - self = request.instance - self.tmp_dir = self.mkdtemp() - jaraco.path.build( - { - 'somecode': { - '__init__.py': '#', - }, - 'README': 'xxx', - 'setup.py': SETUP_PY, - }, - self.tmp_dir, - ) - with path.Path(self.tmp_dir): - yield - - -def clean_lines(filepath): - with pathlib.Path(filepath).open(encoding='utf-8') as f: - yield from filter(None, map(str.strip, f)) - - -class TestSDist(support.TempdirManager): - def get_cmd(self, metadata=None): - """Returns a cmd""" - if metadata is None: - metadata = { - 'name': 'ns.fake--pkg', - 'version': '1.0', - 'url': 'xxx', - 'author': 'xxx', - 'author_email': 'xxx', - } - dist = Distribution(metadata) - dist.script_name = 'setup.py' - dist.packages = ['somecode'] - dist.include_package_data = True - cmd = sdist(dist) - cmd.dist_dir = 'dist' - return dist, cmd - - @pytest.mark.usefixtures('needs_zlib') - def test_prune_file_list(self): - # this test creates a project with some VCS dirs and an NFS rename - # file, then launches sdist to check they get pruned on all systems - - # creating VCS directories with some files in them - os.mkdir(join(self.tmp_dir, 'somecode', '.svn')) - self.write_file((self.tmp_dir, 'somecode', '.svn', 'ok.py'), 'xxx') - - os.mkdir(join(self.tmp_dir, 'somecode', '.hg')) - self.write_file((self.tmp_dir, 'somecode', '.hg', 'ok'), 'xxx') - - os.mkdir(join(self.tmp_dir, 'somecode', '.git')) - self.write_file((self.tmp_dir, 'somecode', '.git', 'ok'), 'xxx') - - self.write_file((self.tmp_dir, 'somecode', '.nfs0001'), 'xxx') - - # now building a sdist - dist, cmd = self.get_cmd() - - # zip is available universally - # (tar might not be installed under win32) - cmd.formats = ['zip'] - - cmd.ensure_finalized() - cmd.run() - - # now let's check what we have - dist_folder = join(self.tmp_dir, 'dist') - files = os.listdir(dist_folder) - assert files == ['ns_fake_pkg-1.0.zip'] - - zip_file = zipfile.ZipFile(join(dist_folder, 'ns_fake_pkg-1.0.zip')) - try: - content = zip_file.namelist() - finally: - zip_file.close() - - # making sure everything has been pruned correctly - expected = [ - '', - 'PKG-INFO', - 'README', - 'setup.py', - 'somecode/', - 'somecode/__init__.py', - ] - assert sorted(content) == ['ns_fake_pkg-1.0/' + x for x in expected] - - @pytest.mark.usefixtures('needs_zlib') - @pytest.mark.skipif("not shutil.which('tar')") - @pytest.mark.skipif("not shutil.which('gzip')") - def test_make_distribution(self): - # now building a sdist - dist, cmd = self.get_cmd() - - # creating a gztar then a tar - cmd.formats = ['gztar', 'tar'] - cmd.ensure_finalized() - cmd.run() - - # making sure we have two files - dist_folder = join(self.tmp_dir, 'dist') - result = os.listdir(dist_folder) - result.sort() - assert result == ['ns_fake_pkg-1.0.tar', 'ns_fake_pkg-1.0.tar.gz'] - - os.remove(join(dist_folder, 'ns_fake_pkg-1.0.tar')) - os.remove(join(dist_folder, 'ns_fake_pkg-1.0.tar.gz')) - - # now trying a tar then a gztar - cmd.formats = ['tar', 'gztar'] - - cmd.ensure_finalized() - cmd.run() - - result = os.listdir(dist_folder) - result.sort() - assert result == ['ns_fake_pkg-1.0.tar', 'ns_fake_pkg-1.0.tar.gz'] - - @pytest.mark.usefixtures('needs_zlib') - def test_add_defaults(self): - # https://bugs.python.org/issue2279 - - # add_default should also include - # data_files and package_data - dist, cmd = self.get_cmd() - - # filling data_files by pointing files - # in package_data - dist.package_data = {'': ['*.cfg', '*.dat'], 'somecode': ['*.txt']} - self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#') - self.write_file((self.tmp_dir, 'somecode', 'doc.dat'), '#') - - # adding some data in data_files - data_dir = join(self.tmp_dir, 'data') - os.mkdir(data_dir) - self.write_file((data_dir, 'data.dt'), '#') - some_dir = join(self.tmp_dir, 'some') - os.mkdir(some_dir) - # make sure VCS directories are pruned (#14004) - hg_dir = join(self.tmp_dir, '.hg') - os.mkdir(hg_dir) - self.write_file((hg_dir, 'last-message.txt'), '#') - # a buggy regex used to prevent this from working on windows (#6884) - self.write_file((self.tmp_dir, 'buildout.cfg'), '#') - self.write_file((self.tmp_dir, 'inroot.txt'), '#') - self.write_file((some_dir, 'file.txt'), '#') - self.write_file((some_dir, 'other_file.txt'), '#') - - dist.data_files = [ - ('data', ['data/data.dt', 'buildout.cfg', 'inroot.txt', 'notexisting']), - 'some/file.txt', - 'some/other_file.txt', - ] - - # adding a script - script_dir = join(self.tmp_dir, 'scripts') - os.mkdir(script_dir) - self.write_file((script_dir, 'script.py'), '#') - dist.scripts = [join('scripts', 'script.py')] - - cmd.formats = ['zip'] - cmd.use_defaults = True - - cmd.ensure_finalized() - cmd.run() - - # now let's check what we have - dist_folder = join(self.tmp_dir, 'dist') - files = os.listdir(dist_folder) - assert files == ['ns_fake_pkg-1.0.zip'] - - zip_file = zipfile.ZipFile(join(dist_folder, 'ns_fake_pkg-1.0.zip')) - try: - content = zip_file.namelist() - finally: - zip_file.close() - - # making sure everything was added - expected = [ - '', - 'PKG-INFO', - 'README', - 'buildout.cfg', - 'data/', - 'data/data.dt', - 'inroot.txt', - 'scripts/', - 'scripts/script.py', - 'setup.py', - 'some/', - 'some/file.txt', - 'some/other_file.txt', - 'somecode/', - 'somecode/__init__.py', - 'somecode/doc.dat', - 'somecode/doc.txt', - ] - assert sorted(content) == ['ns_fake_pkg-1.0/' + x for x in expected] - - # checking the MANIFEST - manifest = pathlib.Path(self.tmp_dir, 'MANIFEST').read_text(encoding='utf-8') - assert manifest == MANIFEST % {'sep': os.sep} - - @staticmethod - def warnings(messages, prefix='warning: '): - return [msg for msg in messages if msg.startswith(prefix)] - - @pytest.mark.usefixtures('needs_zlib') - def test_metadata_check_option(self, caplog): - # testing the `medata-check` option - dist, cmd = self.get_cmd(metadata={}) - - # this should raise some warnings ! - # with the `check` subcommand - cmd.ensure_finalized() - cmd.run() - assert len(self.warnings(caplog.messages, 'warning: check: ')) == 1 - - # trying with a complete set of metadata - caplog.clear() - dist, cmd = self.get_cmd() - cmd.ensure_finalized() - cmd.metadata_check = False - cmd.run() - assert len(self.warnings(caplog.messages, 'warning: check: ')) == 0 - - def test_show_formats(self, capsys): - show_formats() - - # the output should be a header line + one line per format - num_formats = len(ARCHIVE_FORMATS.keys()) - output = [ - line - for line in capsys.readouterr().out.split('\n') - if line.strip().startswith('--formats=') - ] - assert len(output) == num_formats - - def test_finalize_options(self): - dist, cmd = self.get_cmd() - cmd.finalize_options() - - # default options set by finalize - assert cmd.manifest == 'MANIFEST' - assert cmd.template == 'MANIFEST.in' - assert cmd.dist_dir == 'dist' - - # formats has to be a string splitable on (' ', ',') or - # a stringlist - cmd.formats = 1 - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - cmd.formats = ['zip'] - cmd.finalize_options() - - # formats has to be known - cmd.formats = 'supazipa' - with pytest.raises(DistutilsOptionError): - cmd.finalize_options() - - # the following tests make sure there is a nice error message instead - # of a traceback when parsing an invalid manifest template - - def _check_template(self, content, caplog): - dist, cmd = self.get_cmd() - os.chdir(self.tmp_dir) - self.write_file('MANIFEST.in', content) - cmd.ensure_finalized() - cmd.filelist = FileList() - cmd.read_template() - assert len(self.warnings(caplog.messages)) == 1 - - def test_invalid_template_unknown_command(self, caplog): - self._check_template('taunt knights *', caplog) - - def test_invalid_template_wrong_arguments(self, caplog): - # this manifest command takes one argument - self._check_template('prune', caplog) - - @pytest.mark.skipif("platform.system() != 'Windows'") - def test_invalid_template_wrong_path(self, caplog): - # on Windows, trailing slashes are not allowed - # this used to crash instead of raising a warning: #8286 - self._check_template('include examples/', caplog) - - @pytest.mark.usefixtures('needs_zlib') - def test_get_file_list(self): - # make sure MANIFEST is recalculated - dist, cmd = self.get_cmd() - - # filling data_files by pointing files in package_data - dist.package_data = {'somecode': ['*.txt']} - self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#') - cmd.formats = ['gztar'] - cmd.ensure_finalized() - cmd.run() - - assert ilen(clean_lines(cmd.manifest)) == 5 - - # adding a file - self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#') - - # make sure build_py is reinitialized, like a fresh run - build_py = dist.get_command_obj('build_py') - build_py.finalized = False - build_py.ensure_finalized() - - cmd.run() - - manifest2 = list(clean_lines(cmd.manifest)) - - # do we have the new file in MANIFEST ? - assert len(manifest2) == 6 - assert 'doc2.txt' in manifest2[-1] - - @pytest.mark.usefixtures('needs_zlib') - def test_manifest_marker(self): - # check that autogenerated MANIFESTs have a marker - dist, cmd = self.get_cmd() - cmd.ensure_finalized() - cmd.run() - - assert ( - next(clean_lines(cmd.manifest)) - == '# file GENERATED by distutils, do NOT edit' - ) - - @pytest.mark.usefixtures('needs_zlib') - def test_manifest_comments(self): - # make sure comments don't cause exceptions or wrong includes - contents = dedent( - """\ - # bad.py - #bad.py - good.py - """ - ) - dist, cmd = self.get_cmd() - cmd.ensure_finalized() - self.write_file((self.tmp_dir, cmd.manifest), contents) - self.write_file((self.tmp_dir, 'good.py'), '# pick me!') - self.write_file((self.tmp_dir, 'bad.py'), "# don't pick me!") - self.write_file((self.tmp_dir, '#bad.py'), "# don't pick me!") - cmd.run() - assert cmd.filelist.files == ['good.py'] - - @pytest.mark.usefixtures('needs_zlib') - def test_manual_manifest(self): - # check that a MANIFEST without a marker is left alone - dist, cmd = self.get_cmd() - cmd.formats = ['gztar'] - cmd.ensure_finalized() - self.write_file((self.tmp_dir, cmd.manifest), 'README.manual') - self.write_file( - (self.tmp_dir, 'README.manual'), - 'This project maintains its MANIFEST file itself.', - ) - cmd.run() - assert cmd.filelist.files == ['README.manual'] - - assert list(clean_lines(cmd.manifest)) == ['README.manual'] - - archive_name = join(self.tmp_dir, 'dist', 'ns_fake_pkg-1.0.tar.gz') - archive = tarfile.open(archive_name) - try: - filenames = [tarinfo.name for tarinfo in archive] - finally: - archive.close() - assert sorted(filenames) == [ - 'ns_fake_pkg-1.0', - 'ns_fake_pkg-1.0/PKG-INFO', - 'ns_fake_pkg-1.0/README.manual', - ] - - @pytest.mark.usefixtures('needs_zlib') - @require_unix_id - @require_uid_0 - @pytest.mark.skipif("not shutil.which('tar')") - @pytest.mark.skipif("not shutil.which('gzip')") - def test_make_distribution_owner_group(self): - # now building a sdist - dist, cmd = self.get_cmd() - - # creating a gztar and specifying the owner+group - cmd.formats = ['gztar'] - cmd.owner = pwd.getpwuid(0)[0] - cmd.group = grp.getgrgid(0)[0] - cmd.ensure_finalized() - cmd.run() - - # making sure we have the good rights - archive_name = join(self.tmp_dir, 'dist', 'ns_fake_pkg-1.0.tar.gz') - archive = tarfile.open(archive_name) - try: - for member in archive.getmembers(): - assert member.uid == 0 - assert member.gid == 0 - finally: - archive.close() - - # building a sdist again - dist, cmd = self.get_cmd() - - # creating a gztar - cmd.formats = ['gztar'] - cmd.ensure_finalized() - cmd.run() - - # making sure we have the good rights - archive_name = join(self.tmp_dir, 'dist', 'ns_fake_pkg-1.0.tar.gz') - archive = tarfile.open(archive_name) - - # note that we are not testing the group ownership here - # because, depending on the platforms and the container - # rights (see #7408) - try: - for member in archive.getmembers(): - assert member.uid == os.getuid() - finally: - archive.close() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_spawn.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_spawn.py deleted file mode 100644 index 3b9fc92..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_spawn.py +++ /dev/null @@ -1,141 +0,0 @@ -"""Tests for distutils.spawn.""" - -import os -import stat -import sys -import unittest.mock as mock -from distutils.errors import DistutilsExecError -from distutils.spawn import find_executable, spawn -from distutils.tests import support - -import path -import pytest -from test.support import unix_shell - -from .compat import py39 as os_helper - - -class TestSpawn(support.TempdirManager): - @pytest.mark.skipif("os.name not in ('nt', 'posix')") - def test_spawn(self): - tmpdir = self.mkdtemp() - - # creating something executable - # through the shell that returns 1 - if sys.platform != 'win32': - exe = os.path.join(tmpdir, 'foo.sh') - self.write_file(exe, f'#!{unix_shell}\nexit 1') - else: - exe = os.path.join(tmpdir, 'foo.bat') - self.write_file(exe, 'exit 1') - - os.chmod(exe, 0o777) - with pytest.raises(DistutilsExecError): - spawn([exe]) - - # now something that works - if sys.platform != 'win32': - exe = os.path.join(tmpdir, 'foo.sh') - self.write_file(exe, f'#!{unix_shell}\nexit 0') - else: - exe = os.path.join(tmpdir, 'foo.bat') - self.write_file(exe, 'exit 0') - - os.chmod(exe, 0o777) - spawn([exe]) # should work without any error - - def test_find_executable(self, tmp_path): - program_path = self._make_executable(tmp_path, '.exe') - program = program_path.name - program_noeext = program_path.with_suffix('').name - filename = str(program_path) - tmp_dir = path.Path(tmp_path) - - # test path parameter - rv = find_executable(program, path=tmp_dir) - assert rv == filename - - if sys.platform == 'win32': - # test without ".exe" extension - rv = find_executable(program_noeext, path=tmp_dir) - assert rv == filename - - # test find in the current directory - with tmp_dir: - rv = find_executable(program) - assert rv == program - - # test non-existent program - dont_exist_program = "dontexist_" + program - rv = find_executable(dont_exist_program, path=tmp_dir) - assert rv is None - - # PATH='': no match, except in the current directory - with os_helper.EnvironmentVarGuard() as env: - env['PATH'] = '' - with ( - mock.patch( - 'distutils.spawn.os.confstr', return_value=tmp_dir, create=True - ), - mock.patch('distutils.spawn.os.defpath', tmp_dir), - ): - rv = find_executable(program) - assert rv is None - - # look in current directory - with tmp_dir: - rv = find_executable(program) - assert rv == program - - # PATH=':': explicitly looks in the current directory - with os_helper.EnvironmentVarGuard() as env: - env['PATH'] = os.pathsep - with ( - mock.patch('distutils.spawn.os.confstr', return_value='', create=True), - mock.patch('distutils.spawn.os.defpath', ''), - ): - rv = find_executable(program) - assert rv is None - - # look in current directory - with tmp_dir: - rv = find_executable(program) - assert rv == program - - # missing PATH: test os.confstr("CS_PATH") and os.defpath - with os_helper.EnvironmentVarGuard() as env: - env.pop('PATH', None) - - # without confstr - with ( - mock.patch( - 'distutils.spawn.os.confstr', side_effect=ValueError, create=True - ), - mock.patch('distutils.spawn.os.defpath', tmp_dir), - ): - rv = find_executable(program) - assert rv == filename - - # with confstr - with ( - mock.patch( - 'distutils.spawn.os.confstr', return_value=tmp_dir, create=True - ), - mock.patch('distutils.spawn.os.defpath', ''), - ): - rv = find_executable(program) - assert rv == filename - - @staticmethod - def _make_executable(tmp_path, ext): - # Give the temporary program a suffix regardless of platform. - # It's needed on Windows and not harmful on others. - program = tmp_path.joinpath('program').with_suffix(ext) - program.write_text("", encoding='utf-8') - program.chmod(stat.S_IXUSR) - return program - - def test_spawn_missing_exe(self): - with pytest.raises(DistutilsExecError) as ctx: - spawn(['does-not-exist']) - assert "command 'does-not-exist' failed" in str(ctx.value) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sysconfig.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sysconfig.py deleted file mode 100644 index 43d77c2..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_sysconfig.py +++ /dev/null @@ -1,319 +0,0 @@ -"""Tests for distutils.sysconfig.""" - -import contextlib -import distutils -import os -import pathlib -import subprocess -import sys -from distutils import sysconfig -from distutils.ccompiler import new_compiler # noqa: F401 -from distutils.unixccompiler import UnixCCompiler - -import jaraco.envs -import path -import pytest -from jaraco.text import trim -from test.support import swap_item - - -def _gen_makefile(root, contents): - jaraco.path.build({'Makefile': trim(contents)}, root) - return root / 'Makefile' - - -@pytest.mark.usefixtures('save_env') -class TestSysconfig: - def test_get_config_h_filename(self): - config_h = sysconfig.get_config_h_filename() - assert os.path.isfile(config_h) - - @pytest.mark.skipif("platform.system() == 'Windows'") - @pytest.mark.skipif("sys.implementation.name != 'cpython'") - def test_get_makefile_filename(self): - makefile = sysconfig.get_makefile_filename() - assert os.path.isfile(makefile) - - def test_get_python_lib(self, tmp_path): - assert sysconfig.get_python_lib() != sysconfig.get_python_lib(prefix=tmp_path) - - def test_get_config_vars(self): - cvars = sysconfig.get_config_vars() - assert isinstance(cvars, dict) - assert cvars - - @pytest.mark.skipif('sysconfig.IS_PYPY') - @pytest.mark.skipif('sysconfig.python_build') - @pytest.mark.xfail('platform.system() == "Windows"') - def test_srcdir_simple(self): - # See #15364. - srcdir = pathlib.Path(sysconfig.get_config_var('srcdir')) - - assert srcdir.absolute() - assert srcdir.is_dir() - - makefile = pathlib.Path(sysconfig.get_makefile_filename()) - assert makefile.parent.samefile(srcdir) - - @pytest.mark.skipif('sysconfig.IS_PYPY') - @pytest.mark.skipif('not sysconfig.python_build') - def test_srcdir_python_build(self): - # See #15364. - srcdir = pathlib.Path(sysconfig.get_config_var('srcdir')) - - # The python executable has not been installed so srcdir - # should be a full source checkout. - Python_h = srcdir.joinpath('Include', 'Python.h') - assert Python_h.is_file() - assert sysconfig._is_python_source_dir(srcdir) - assert sysconfig._is_python_source_dir(str(srcdir)) - - def test_srcdir_independent_of_cwd(self): - """ - srcdir should be independent of the current working directory - """ - # See #15364. - srcdir = sysconfig.get_config_var('srcdir') - with path.Path('..'): - srcdir2 = sysconfig.get_config_var('srcdir') - assert srcdir == srcdir2 - - def customize_compiler(self): - # make sure AR gets caught - class compiler: - compiler_type = 'unix' - executables = UnixCCompiler.executables - - def __init__(self): - self.exes = {} - - def set_executables(self, **kw): - for k, v in kw.items(): - self.exes[k] = v - - sysconfig_vars = { - 'AR': 'sc_ar', - 'CC': 'sc_cc', - 'CXX': 'sc_cxx', - 'ARFLAGS': '--sc-arflags', - 'CFLAGS': '--sc-cflags', - 'CCSHARED': '--sc-ccshared', - 'LDSHARED': 'sc_ldshared', - 'SHLIB_SUFFIX': 'sc_shutil_suffix', - } - - comp = compiler() - with contextlib.ExitStack() as cm: - for key, value in sysconfig_vars.items(): - cm.enter_context(swap_item(sysconfig._config_vars, key, value)) - sysconfig.customize_compiler(comp) - - return comp - - @pytest.mark.skipif("not isinstance(new_compiler(), UnixCCompiler)") - @pytest.mark.usefixtures('disable_macos_customization') - def test_customize_compiler(self): - # Make sure that sysconfig._config_vars is initialized - sysconfig.get_config_vars() - - os.environ['AR'] = 'env_ar' - os.environ['CC'] = 'env_cc' - os.environ['CPP'] = 'env_cpp' - os.environ['CXX'] = 'env_cxx --env-cxx-flags' - os.environ['LDSHARED'] = 'env_ldshared' - os.environ['LDFLAGS'] = '--env-ldflags' - os.environ['ARFLAGS'] = '--env-arflags' - os.environ['CFLAGS'] = '--env-cflags' - os.environ['CPPFLAGS'] = '--env-cppflags' - os.environ['RANLIB'] = 'env_ranlib' - - comp = self.customize_compiler() - assert comp.exes['archiver'] == 'env_ar --env-arflags' - assert comp.exes['preprocessor'] == 'env_cpp --env-cppflags' - assert comp.exes['compiler'] == 'env_cc --env-cflags --env-cppflags' - assert comp.exes['compiler_so'] == ( - 'env_cc --env-cflags --env-cppflags --sc-ccshared' - ) - assert ( - comp.exes['compiler_cxx'] - == 'env_cxx --env-cxx-flags --sc-cflags --env-cppflags' - ) - assert comp.exes['linker_exe'] == 'env_cc' - assert comp.exes['linker_so'] == ( - 'env_ldshared --env-ldflags --env-cflags --env-cppflags' - ) - assert comp.shared_lib_extension == 'sc_shutil_suffix' - - if sys.platform == "darwin": - assert comp.exes['ranlib'] == 'env_ranlib' - else: - assert 'ranlib' not in comp.exes - - del os.environ['AR'] - del os.environ['CC'] - del os.environ['CPP'] - del os.environ['CXX'] - del os.environ['LDSHARED'] - del os.environ['LDFLAGS'] - del os.environ['ARFLAGS'] - del os.environ['CFLAGS'] - del os.environ['CPPFLAGS'] - del os.environ['RANLIB'] - - comp = self.customize_compiler() - assert comp.exes['archiver'] == 'sc_ar --sc-arflags' - assert comp.exes['preprocessor'] == 'sc_cc -E' - assert comp.exes['compiler'] == 'sc_cc --sc-cflags' - assert comp.exes['compiler_so'] == 'sc_cc --sc-cflags --sc-ccshared' - assert comp.exes['compiler_cxx'] == 'sc_cxx --sc-cflags' - assert comp.exes['linker_exe'] == 'sc_cc' - assert comp.exes['linker_so'] == 'sc_ldshared' - assert comp.shared_lib_extension == 'sc_shutil_suffix' - assert 'ranlib' not in comp.exes - - def test_parse_makefile_base(self, tmp_path): - makefile = _gen_makefile( - tmp_path, - """ - CONFIG_ARGS= '--arg1=optarg1' 'ENV=LIB' - VAR=$OTHER - OTHER=foo - """, - ) - d = sysconfig.parse_makefile(makefile) - assert d == {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'", 'OTHER': 'foo'} - - def test_parse_makefile_literal_dollar(self, tmp_path): - makefile = _gen_makefile( - tmp_path, - """ - CONFIG_ARGS= '--arg1=optarg1' 'ENV=\\$$LIB' - VAR=$OTHER - OTHER=foo - """, - ) - d = sysconfig.parse_makefile(makefile) - assert d == {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'", 'OTHER': 'foo'} - - def test_sysconfig_module(self): - import sysconfig as global_sysconfig - - assert global_sysconfig.get_config_var('CFLAGS') == sysconfig.get_config_var( - 'CFLAGS' - ) - assert global_sysconfig.get_config_var('LDFLAGS') == sysconfig.get_config_var( - 'LDFLAGS' - ) - - # On macOS, binary installers support extension module building on - # various levels of the operating system with differing Xcode - # configurations, requiring customization of some of the - # compiler configuration directives to suit the environment on - # the installed machine. Some of these customizations may require - # running external programs and are thus deferred until needed by - # the first extension module build. Only - # the Distutils version of sysconfig is used for extension module - # builds, which happens earlier in the Distutils tests. This may - # cause the following tests to fail since no tests have caused - # the global version of sysconfig to call the customization yet. - # The solution for now is to simply skip this test in this case. - # The longer-term solution is to only have one version of sysconfig. - @pytest.mark.skipif("sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER')") - def test_sysconfig_compiler_vars(self): - import sysconfig as global_sysconfig - - if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'): - pytest.skip('compiler flags customized') - assert global_sysconfig.get_config_var('LDSHARED') == sysconfig.get_config_var( - 'LDSHARED' - ) - assert global_sysconfig.get_config_var('CC') == sysconfig.get_config_var('CC') - - @pytest.mark.skipif("not sysconfig.get_config_var('EXT_SUFFIX')") - def test_SO_deprecation(self): - with pytest.warns(DeprecationWarning): - sysconfig.get_config_var('SO') - - def test_customize_compiler_before_get_config_vars(self, tmp_path): - # Issue #21923: test that a Distribution compiler - # instance can be called without an explicit call to - # get_config_vars(). - jaraco.path.build( - { - 'file': trim(""" - from distutils.core import Distribution - config = Distribution().get_command_obj('config') - # try_compile may pass or it may fail if no compiler - # is found but it should not raise an exception. - rc = config.try_compile('int x;') - """) - }, - tmp_path, - ) - p = subprocess.Popen( - [sys.executable, tmp_path / 'file'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True, - encoding='utf-8', - ) - outs, errs = p.communicate() - assert 0 == p.returncode, "Subprocess failed: " + outs - - def test_parse_config_h(self): - config_h = sysconfig.get_config_h_filename() - input = {} - with open(config_h, encoding="utf-8") as f: - result = sysconfig.parse_config_h(f, g=input) - assert input is result - with open(config_h, encoding="utf-8") as f: - result = sysconfig.parse_config_h(f) - assert isinstance(result, dict) - - @pytest.mark.skipif("platform.system() != 'Windows'") - @pytest.mark.skipif("sys.implementation.name != 'cpython'") - def test_win_ext_suffix(self): - assert sysconfig.get_config_var("EXT_SUFFIX").endswith(".pyd") - assert sysconfig.get_config_var("EXT_SUFFIX") != ".pyd" - - @pytest.mark.skipif("platform.system() != 'Windows'") - @pytest.mark.skipif("sys.implementation.name != 'cpython'") - @pytest.mark.skipif( - '\\PCbuild\\'.casefold() not in sys.executable.casefold(), - reason='Need sys.executable to be in a source tree', - ) - def test_win_build_venv_from_source_tree(self, tmp_path): - """Ensure distutils.sysconfig detects venvs from source tree builds.""" - env = jaraco.envs.VEnv() - env.create_opts = env.clean_opts - env.root = tmp_path - env.ensure_env() - cmd = [ - env.exe(), - "-c", - "import distutils.sysconfig; print(distutils.sysconfig.python_build)", - ] - distutils_path = os.path.dirname(os.path.dirname(distutils.__file__)) - out = subprocess.check_output( - cmd, env={**os.environ, "PYTHONPATH": distutils_path} - ) - assert out == "True" - - def test_get_python_inc_missing_config_dir(self, monkeypatch): - """ - In portable Python installations, the sysconfig will be broken, - pointing to the directories where the installation was built and - not where it currently is. In this case, ensure that the missing - directory isn't used for get_python_inc. - - See pypa/distutils#178. - """ - - def override(name): - if name == 'INCLUDEPY': - return '/does-not-exist' - return sysconfig.get_config_var(name) - - monkeypatch.setattr(sysconfig, 'get_config_var', override) - - assert os.path.exists(sysconfig.get_python_inc()) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_text_file.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_text_file.py deleted file mode 100644 index f511156..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_text_file.py +++ /dev/null @@ -1,127 +0,0 @@ -"""Tests for distutils.text_file.""" - -from distutils.tests import support -from distutils.text_file import TextFile - -import jaraco.path -import path - -TEST_DATA = """# test file - -line 3 \\ -# intervening comment - continues on next line -""" - - -class TestTextFile(support.TempdirManager): - def test_class(self): - # old tests moved from text_file.__main__ - # so they are really called by the buildbots - - # result 1: no fancy options - result1 = [ - '# test file\n', - '\n', - 'line 3 \\\n', - '# intervening comment\n', - ' continues on next line\n', - ] - - # result 2: just strip comments - result2 = ["\n", "line 3 \\\n", " continues on next line\n"] - - # result 3: just strip blank lines - result3 = [ - "# test file\n", - "line 3 \\\n", - "# intervening comment\n", - " continues on next line\n", - ] - - # result 4: default, strip comments, blank lines, - # and trailing whitespace - result4 = ["line 3 \\", " continues on next line"] - - # result 5: strip comments and blanks, plus join lines (but don't - # "collapse" joined lines - result5 = ["line 3 continues on next line"] - - # result 6: strip comments and blanks, plus join lines (and - # "collapse" joined lines - result6 = ["line 3 continues on next line"] - - def test_input(count, description, file, expected_result): - result = file.readlines() - assert result == expected_result - - tmp_path = path.Path(self.mkdtemp()) - filename = tmp_path / 'test.txt' - jaraco.path.build({filename.name: TEST_DATA}, tmp_path) - - in_file = TextFile( - filename, - strip_comments=False, - skip_blanks=False, - lstrip_ws=False, - rstrip_ws=False, - ) - try: - test_input(1, "no processing", in_file, result1) - finally: - in_file.close() - - in_file = TextFile( - filename, - strip_comments=True, - skip_blanks=False, - lstrip_ws=False, - rstrip_ws=False, - ) - try: - test_input(2, "strip comments", in_file, result2) - finally: - in_file.close() - - in_file = TextFile( - filename, - strip_comments=False, - skip_blanks=True, - lstrip_ws=False, - rstrip_ws=False, - ) - try: - test_input(3, "strip blanks", in_file, result3) - finally: - in_file.close() - - in_file = TextFile(filename) - try: - test_input(4, "default processing", in_file, result4) - finally: - in_file.close() - - in_file = TextFile( - filename, - strip_comments=True, - skip_blanks=True, - join_lines=True, - rstrip_ws=True, - ) - try: - test_input(5, "join lines without collapsing", in_file, result5) - finally: - in_file.close() - - in_file = TextFile( - filename, - strip_comments=True, - skip_blanks=True, - join_lines=True, - rstrip_ws=True, - collapse_join=True, - ) - try: - test_input(6, "join lines with collapsing", in_file, result6) - finally: - in_file.close() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_util.py deleted file mode 100644 index 00c9743..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_util.py +++ /dev/null @@ -1,243 +0,0 @@ -"""Tests for distutils.util.""" - -import email -import email.generator -import email.policy -import io -import os -import pathlib -import sys -import sysconfig as stdlib_sysconfig -import unittest.mock as mock -from copy import copy -from distutils import sysconfig, util -from distutils.errors import DistutilsByteCompileError, DistutilsPlatformError -from distutils.util import ( - byte_compile, - change_root, - check_environ, - convert_path, - get_host_platform, - get_platform, - grok_environment_error, - rfc822_escape, - split_quoted, - strtobool, -) - -import pytest - - -@pytest.fixture(autouse=True) -def environment(monkeypatch): - monkeypatch.setattr(os, 'name', os.name) - monkeypatch.setattr(sys, 'platform', sys.platform) - monkeypatch.setattr(sys, 'version', sys.version) - monkeypatch.setattr(os, 'sep', os.sep) - monkeypatch.setattr(os.path, 'join', os.path.join) - monkeypatch.setattr(os.path, 'isabs', os.path.isabs) - monkeypatch.setattr(os.path, 'splitdrive', os.path.splitdrive) - monkeypatch.setattr(sysconfig, '_config_vars', copy(sysconfig._config_vars)) - - -@pytest.mark.usefixtures('save_env') -class TestUtil: - def test_get_host_platform(self): - with mock.patch('os.name', 'nt'): - with mock.patch('sys.version', '... [... (ARM64)]'): - assert get_host_platform() == 'win-arm64' - with mock.patch('sys.version', '... [... (ARM)]'): - assert get_host_platform() == 'win-arm32' - - with mock.patch('sys.version_info', (3, 9, 0, 'final', 0)): - assert get_host_platform() == stdlib_sysconfig.get_platform() - - def test_get_platform(self): - with mock.patch('os.name', 'nt'): - with mock.patch.dict('os.environ', {'VSCMD_ARG_TGT_ARCH': 'x86'}): - assert get_platform() == 'win32' - with mock.patch.dict('os.environ', {'VSCMD_ARG_TGT_ARCH': 'x64'}): - assert get_platform() == 'win-amd64' - with mock.patch.dict('os.environ', {'VSCMD_ARG_TGT_ARCH': 'arm'}): - assert get_platform() == 'win-arm32' - with mock.patch.dict('os.environ', {'VSCMD_ARG_TGT_ARCH': 'arm64'}): - assert get_platform() == 'win-arm64' - - def test_convert_path(self): - expected = os.sep.join(('', 'home', 'to', 'my', 'stuff')) - assert convert_path('/home/to/my/stuff') == expected - assert convert_path(pathlib.Path('/home/to/my/stuff')) == expected - assert convert_path('.') == os.curdir - - def test_change_root(self): - # linux/mac - os.name = 'posix' - - def _isabs(path): - return path[0] == '/' - - os.path.isabs = _isabs - - def _join(*path): - return '/'.join(path) - - os.path.join = _join - - assert change_root('/root', '/old/its/here') == '/root/old/its/here' - assert change_root('/root', 'its/here') == '/root/its/here' - - # windows - os.name = 'nt' - os.sep = '\\' - - def _isabs(path): - return path.startswith('c:\\') - - os.path.isabs = _isabs - - def _splitdrive(path): - if path.startswith('c:'): - return ('', path.replace('c:', '')) - return ('', path) - - os.path.splitdrive = _splitdrive - - def _join(*path): - return '\\'.join(path) - - os.path.join = _join - - assert ( - change_root('c:\\root', 'c:\\old\\its\\here') == 'c:\\root\\old\\its\\here' - ) - assert change_root('c:\\root', 'its\\here') == 'c:\\root\\its\\here' - - # BugsBunny os (it's a great os) - os.name = 'BugsBunny' - with pytest.raises(DistutilsPlatformError): - change_root('c:\\root', 'its\\here') - - # XXX platforms to be covered: mac - - def test_check_environ(self): - util.check_environ.cache_clear() - os.environ.pop('HOME', None) - - check_environ() - - assert os.environ['PLAT'] == get_platform() - - @pytest.mark.skipif("os.name != 'posix'") - def test_check_environ_getpwuid(self): - util.check_environ.cache_clear() - os.environ.pop('HOME', None) - - import pwd - - # only set pw_dir field, other fields are not used - result = pwd.struct_passwd(( - None, - None, - None, - None, - None, - '/home/distutils', - None, - )) - with mock.patch.object(pwd, 'getpwuid', return_value=result): - check_environ() - assert os.environ['HOME'] == '/home/distutils' - - util.check_environ.cache_clear() - os.environ.pop('HOME', None) - - # bpo-10496: Catch pwd.getpwuid() error - with mock.patch.object(pwd, 'getpwuid', side_effect=KeyError): - check_environ() - assert 'HOME' not in os.environ - - def test_split_quoted(self): - assert split_quoted('""one"" "two" \'three\' \\four') == [ - 'one', - 'two', - 'three', - 'four', - ] - - def test_strtobool(self): - yes = ('y', 'Y', 'yes', 'True', 't', 'true', 'True', 'On', 'on', '1') - no = ('n', 'no', 'f', 'false', 'off', '0', 'Off', 'No', 'N') - - for y in yes: - assert strtobool(y) - - for n in no: - assert not strtobool(n) - - indent = 8 * ' ' - - @pytest.mark.parametrize( - "given,wanted", - [ - # 0x0b, 0x0c, ..., etc are also considered a line break by Python - ("hello\x0b\nworld\n", f"hello\x0b{indent}\n{indent}world\n{indent}"), - ("hello\x1eworld", f"hello\x1e{indent}world"), - ("", ""), - ( - "I am a\npoor\nlonesome\nheader\n", - f"I am a\n{indent}poor\n{indent}lonesome\n{indent}header\n{indent}", - ), - ], - ) - def test_rfc822_escape(self, given, wanted): - """ - We want to ensure a multi-line header parses correctly. - - For interoperability, the escaped value should also "round-trip" over - `email.generator.Generator.flatten` and `email.message_from_*` - (see pypa/setuptools#4033). - - The main issue is that internally `email.policy.EmailPolicy` uses - `splitlines` which will split on some control chars. If all the new lines - are not prefixed with spaces, the parser will interrupt reading - the current header and produce an incomplete value, while - incorrectly interpreting the rest of the headers as part of the payload. - """ - res = rfc822_escape(given) - - policy = email.policy.EmailPolicy( - utf8=True, - mangle_from_=False, - max_line_length=0, - ) - with io.StringIO() as buffer: - raw = f"header: {res}\nother-header: 42\n\npayload\n" - orig = email.message_from_string(raw) - email.generator.Generator(buffer, policy=policy).flatten(orig) - buffer.seek(0) - regen = email.message_from_file(buffer) - - for msg in (orig, regen): - assert msg.get_payload() == "payload\n" - assert msg["other-header"] == "42" - # Generator may replace control chars with `\n` - assert set(msg["header"].splitlines()) == set(res.splitlines()) - - assert res == wanted - - def test_dont_write_bytecode(self): - # makes sure byte_compile raise a DistutilsError - # if sys.dont_write_bytecode is True - old_dont_write_bytecode = sys.dont_write_bytecode - sys.dont_write_bytecode = True - try: - with pytest.raises(DistutilsByteCompileError): - byte_compile([]) - finally: - sys.dont_write_bytecode = old_dont_write_bytecode - - def test_grok_environment_error(self): - # test obsolete function to ensure backward compat (#4931) - exc = OSError("Unable to find batch file") - msg = grok_environment_error(exc) - assert msg == "error: Unable to find batch file" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_version.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_version.py deleted file mode 100644 index b68f097..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_version.py +++ /dev/null @@ -1,80 +0,0 @@ -"""Tests for distutils.version.""" - -import distutils -from distutils.version import LooseVersion, StrictVersion - -import pytest - - -@pytest.fixture(autouse=True) -def suppress_deprecation(): - with distutils.version.suppress_known_deprecation(): - yield - - -class TestVersion: - def test_prerelease(self): - version = StrictVersion('1.2.3a1') - assert version.version == (1, 2, 3) - assert version.prerelease == ('a', 1) - assert str(version) == '1.2.3a1' - - version = StrictVersion('1.2.0') - assert str(version) == '1.2' - - def test_cmp_strict(self): - versions = ( - ('1.5.1', '1.5.2b2', -1), - ('161', '3.10a', ValueError), - ('8.02', '8.02', 0), - ('3.4j', '1996.07.12', ValueError), - ('3.2.pl0', '3.1.1.6', ValueError), - ('2g6', '11g', ValueError), - ('0.9', '2.2', -1), - ('1.2.1', '1.2', 1), - ('1.1', '1.2.2', -1), - ('1.2', '1.1', 1), - ('1.2.1', '1.2.2', -1), - ('1.2.2', '1.2', 1), - ('1.2', '1.2.2', -1), - ('0.4.0', '0.4', 0), - ('1.13++', '5.5.kw', ValueError), - ) - - for v1, v2, wanted in versions: - try: - res = StrictVersion(v1)._cmp(StrictVersion(v2)) - except ValueError: - if wanted is ValueError: - continue - else: - raise AssertionError(f"cmp({v1}, {v2}) shouldn't raise ValueError") - assert res == wanted, f'cmp({v1}, {v2}) should be {wanted}, got {res}' - res = StrictVersion(v1)._cmp(v2) - assert res == wanted, f'cmp({v1}, {v2}) should be {wanted}, got {res}' - res = StrictVersion(v1)._cmp(object()) - assert res is NotImplemented, ( - f'cmp({v1}, {v2}) should be NotImplemented, got {res}' - ) - - def test_cmp(self): - versions = ( - ('1.5.1', '1.5.2b2', -1), - ('161', '3.10a', 1), - ('8.02', '8.02', 0), - ('3.4j', '1996.07.12', -1), - ('3.2.pl0', '3.1.1.6', 1), - ('2g6', '11g', -1), - ('0.960923', '2.2beta29', -1), - ('1.13++', '5.5.kw', -1), - ) - - for v1, v2, wanted in versions: - res = LooseVersion(v1)._cmp(LooseVersion(v2)) - assert res == wanted, f'cmp({v1}, {v2}) should be {wanted}, got {res}' - res = LooseVersion(v1)._cmp(v2) - assert res == wanted, f'cmp({v1}, {v2}) should be {wanted}, got {res}' - res = LooseVersion(v1)._cmp(object()) - assert res is NotImplemented, ( - f'cmp({v1}, {v2}) should be NotImplemented, got {res}' - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_versionpredicate.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/test_versionpredicate.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/unix_compat.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/unix_compat.py deleted file mode 100644 index a5d9ee4..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/tests/unix_compat.py +++ /dev/null @@ -1,17 +0,0 @@ -import sys - -try: - import grp - import pwd -except ImportError: - grp = pwd = None - -import pytest - -UNIX_ID_SUPPORT = grp and pwd -UID_0_SUPPORT = UNIX_ID_SUPPORT and sys.platform != "cygwin" - -require_unix_id = pytest.mark.skipif( - not UNIX_ID_SUPPORT, reason="Requires grp and pwd support" -) -require_uid_0 = pytest.mark.skipif(not UID_0_SUPPORT, reason="Requires UID 0 support") diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/text_file.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/text_file.py index 89d9048..7274d4b 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/text_file.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/text_file.py @@ -97,7 +97,7 @@ class TextFile: # sanity check client option hash for opt in options.keys(): if opt not in self.default_options: - raise KeyError(f"invalid TextFile option '{opt}'") + raise KeyError("invalid TextFile option '%s'" % opt) if file is None: self.open(filename) @@ -115,7 +115,7 @@ class TextFile: """Open a new file named 'filename'. This overrides both the 'filename' and 'file' arguments to the constructor.""" self.filename = filename - self.file = open(self.filename, errors=self.errors, encoding='utf-8') + self.file = open(self.filename, errors=self.errors) self.current_line = 0 def close(self): @@ -133,9 +133,9 @@ class TextFile: line = self.current_line outmsg.append(self.filename + ", ") if isinstance(line, (list, tuple)): - outmsg.append("lines {}-{}: ".format(*line)) + outmsg.append("lines %d-%d: " % tuple(line)) else: - outmsg.append(f"line {int(line)}: ") + outmsg.append("line %d: " % line) outmsg.append(str(msg)) return "".join(outmsg) @@ -180,6 +180,7 @@ class TextFile: line = None if self.strip_comments and line: + # Look for the first "#" in the line. If none, never # mind. If we find one and it's the first character, or # is not preceded by "\", then it starts a comment -- @@ -220,7 +221,7 @@ class TextFile: if self.join_lines and buildup_line: # oops: end of file if line is None: - self.warn("continuation line immediately precedes end-of-file") + self.warn("continuation line immediately precedes " "end-of-file") return buildup_line if self.collapse_join: @@ -254,7 +255,7 @@ class TextFile: # blank line (whether we rstrip'ed or not)? skip to next line # if appropriate - if line in ('', '\n') and self.skip_blanks: + if (line == '' or line == '\n') and self.skip_blanks: continue if self.join_lines: diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/unixccompiler.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/unixccompiler.py index 20b8ce6..4ab771a 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/unixccompiler.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/unixccompiler.py @@ -1,9 +1,401 @@ -import importlib +"""distutils.unixccompiler -from .compilers.C import unix +Contains the UnixCCompiler class, a subclass of CCompiler that handles +the "typical" Unix-style command-line C compiler: + * macros defined with -Dname[=value] + * macros undefined with -Uname + * include search directories specified with -Idir + * libraries specified with -lllib + * library search directories specified with -Ldir + * compile handled by 'cc' (or similar) executable with -c option: + compiles .c to .o + * link static library handled by 'ar' command (possibly with 'ranlib') + * link shared library handled by 'cc -shared' +""" -UnixCCompiler = unix.Compiler +import os +import sys +import re +import shlex +import itertools -# ensure import of unixccompiler implies ccompiler imported -# (pypa/setuptools#4871) -importlib.import_module('distutils.ccompiler') +from distutils import sysconfig +from distutils.dep_util import newer +from distutils.ccompiler import CCompiler, gen_preprocess_options, gen_lib_options +from distutils.errors import DistutilsExecError, CompileError, LibError, LinkError +from distutils import log +from ._macos_compat import compiler_fixup + +# XXX Things not currently handled: +# * optimization/debug/warning flags; we just use whatever's in Python's +# Makefile and live with it. Is this adequate? If not, we might +# have to have a bunch of subclasses GNUCCompiler, SGICCompiler, +# SunCCompiler, and I suspect down that road lies madness. +# * even if we don't know a warning flag from an optimization flag, +# we need some way for outsiders to feed preprocessor/compiler/linker +# flags in to us -- eg. a sysadmin might want to mandate certain flags +# via a site config file, or a user might want to set something for +# compiling this module distribution only via the setup.py command +# line, whatever. As long as these options come from something on the +# current system, they can be as system-dependent as they like, and we +# should just happily stuff them into the preprocessor/compiler/linker +# options and carry on. + + +def _split_env(cmd): + """ + For macOS, split command into 'env' portion (if any) + and the rest of the linker command. + + >>> _split_env(['a', 'b', 'c']) + ([], ['a', 'b', 'c']) + >>> _split_env(['/usr/bin/env', 'A=3', 'gcc']) + (['/usr/bin/env', 'A=3'], ['gcc']) + """ + pivot = 0 + if os.path.basename(cmd[0]) == "env": + pivot = 1 + while '=' in cmd[pivot]: + pivot += 1 + return cmd[:pivot], cmd[pivot:] + + +def _split_aix(cmd): + """ + AIX platforms prefix the compiler with the ld_so_aix + script, so split that from the linker command. + + >>> _split_aix(['a', 'b', 'c']) + ([], ['a', 'b', 'c']) + >>> _split_aix(['/bin/foo/ld_so_aix', 'gcc']) + (['/bin/foo/ld_so_aix'], ['gcc']) + """ + pivot = os.path.basename(cmd[0]) == 'ld_so_aix' + return cmd[:pivot], cmd[pivot:] + + +def _linker_params(linker_cmd, compiler_cmd): + """ + The linker command usually begins with the compiler + command (possibly multiple elements), followed by zero or more + params for shared library building. + + If the LDSHARED env variable overrides the linker command, + however, the commands may not match. + + Return the best guess of the linker parameters by stripping + the linker command. If the compiler command does not + match the linker command, assume the linker command is + just the first element. + + >>> _linker_params('gcc foo bar'.split(), ['gcc']) + ['foo', 'bar'] + >>> _linker_params('gcc foo bar'.split(), ['other']) + ['foo', 'bar'] + >>> _linker_params('ccache gcc foo bar'.split(), 'ccache gcc'.split()) + ['foo', 'bar'] + >>> _linker_params(['gcc'], ['gcc']) + [] + """ + c_len = len(compiler_cmd) + pivot = c_len if linker_cmd[:c_len] == compiler_cmd else 1 + return linker_cmd[pivot:] + + +class UnixCCompiler(CCompiler): + + compiler_type = 'unix' + + # These are used by CCompiler in two places: the constructor sets + # instance attributes 'preprocessor', 'compiler', etc. from them, and + # 'set_executable()' allows any of these to be set. The defaults here + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). + executables = { + 'preprocessor': None, + 'compiler': ["cc"], + 'compiler_so': ["cc"], + 'compiler_cxx': ["cc"], + 'linker_so': ["cc", "-shared"], + 'linker_exe': ["cc"], + 'archiver': ["ar", "-cr"], + 'ranlib': None, + } + + if sys.platform[:6] == "darwin": + executables['ranlib'] = ["ranlib"] + + # Needed for the filename generation methods provided by the base + # class, CCompiler. NB. whoever instantiates/uses a particular + # UnixCCompiler instance should set 'shared_lib_ext' -- we set a + # reasonable common default here, but it's not necessarily used on all + # Unices! + + src_extensions = [".c", ".C", ".cc", ".cxx", ".cpp", ".m"] + obj_extension = ".o" + static_lib_extension = ".a" + shared_lib_extension = ".so" + dylib_lib_extension = ".dylib" + xcode_stub_lib_extension = ".tbd" + static_lib_format = shared_lib_format = dylib_lib_format = "lib%s%s" + xcode_stub_lib_format = dylib_lib_format + if sys.platform == "cygwin": + exe_extension = ".exe" + + def preprocess( + self, + source, + output_file=None, + macros=None, + include_dirs=None, + extra_preargs=None, + extra_postargs=None, + ): + fixed_args = self._fix_compile_args(None, macros, include_dirs) + ignore, macros, include_dirs = fixed_args + pp_opts = gen_preprocess_options(macros, include_dirs) + pp_args = self.preprocessor + pp_opts + if output_file: + pp_args.extend(['-o', output_file]) + if extra_preargs: + pp_args[:0] = extra_preargs + if extra_postargs: + pp_args.extend(extra_postargs) + pp_args.append(source) + + # reasons to preprocess: + # - force is indicated + # - output is directed to stdout + # - source file is newer than the target + preprocess = self.force or output_file is None or newer(source, output_file) + if not preprocess: + return + + if output_file: + self.mkpath(os.path.dirname(output_file)) + + try: + self.spawn(pp_args) + except DistutilsExecError as msg: + raise CompileError(msg) + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) + try: + self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) + except DistutilsExecError as msg: + raise CompileError(msg) + + def create_static_lib( + self, objects, output_libname, output_dir=None, debug=0, target_lang=None + ): + objects, output_dir = self._fix_object_args(objects, output_dir) + + output_filename = self.library_filename(output_libname, output_dir=output_dir) + + if self._need_link(objects, output_filename): + self.mkpath(os.path.dirname(output_filename)) + self.spawn(self.archiver + [output_filename] + objects + self.objects) + + # Not many Unices required ranlib anymore -- SunOS 4.x is, I + # think the only major Unix that does. Maybe we need some + # platform intelligence here to skip ranlib if it's not + # needed -- or maybe Python's configure script took care of + # it for us, hence the check for leading colon. + if self.ranlib: + try: + self.spawn(self.ranlib + [output_filename]) + except DistutilsExecError as msg: + raise LibError(msg) + else: + log.debug("skipping %s (up-to-date)", output_filename) + + def link( + self, + target_desc, + objects, + output_filename, + output_dir=None, + libraries=None, + library_dirs=None, + runtime_library_dirs=None, + export_symbols=None, + debug=0, + extra_preargs=None, + extra_postargs=None, + build_temp=None, + target_lang=None, + ): + objects, output_dir = self._fix_object_args(objects, output_dir) + fixed_args = self._fix_lib_args(libraries, library_dirs, runtime_library_dirs) + libraries, library_dirs, runtime_library_dirs = fixed_args + + lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries) + if not isinstance(output_dir, (str, type(None))): + raise TypeError("'output_dir' must be a string or None") + if output_dir is not None: + output_filename = os.path.join(output_dir, output_filename) + + if self._need_link(objects, output_filename): + ld_args = objects + self.objects + lib_opts + ['-o', output_filename] + if debug: + ld_args[:0] = ['-g'] + if extra_preargs: + ld_args[:0] = extra_preargs + if extra_postargs: + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: + # Select a linker based on context: linker_exe when + # building an executable or linker_so (with shared options) + # when building a shared library. + building_exe = target_desc == CCompiler.EXECUTABLE + linker = (self.linker_exe if building_exe else self.linker_so)[:] + + if target_lang == "c++" and self.compiler_cxx: + env, linker_ne = _split_env(linker) + aix, linker_na = _split_aix(linker_ne) + _, compiler_cxx_ne = _split_env(self.compiler_cxx) + _, linker_exe_ne = _split_env(self.linker_exe) + + params = _linker_params(linker_na, linker_exe_ne) + linker = env + aix + compiler_cxx_ne + params + + linker = compiler_fixup(linker, ld_args) + + self.spawn(linker + ld_args) + except DistutilsExecError as msg: + raise LinkError(msg) + else: + log.debug("skipping %s (up-to-date)", output_filename) + + # -- Miscellaneous methods ----------------------------------------- + # These are all used by the 'gen_lib_options() function, in + # ccompiler.py. + + def library_dir_option(self, dir): + return "-L" + dir + + def _is_gcc(self): + cc_var = sysconfig.get_config_var("CC") + compiler = os.path.basename(shlex.split(cc_var)[0]) + return "gcc" in compiler or "g++" in compiler + + def runtime_library_dir_option(self, dir): + # XXX Hackish, at the very least. See Python bug #445902: + # http://sourceforge.net/tracker/index.php + # ?func=detail&aid=445902&group_id=5470&atid=105470 + # Linkers on different platforms need different options to + # specify that directories need to be added to the list of + # directories searched for dependencies when a dynamic library + # is sought. GCC on GNU systems (Linux, FreeBSD, ...) has to + # be told to pass the -R option through to the linker, whereas + # other compilers and gcc on other systems just know this. + # Other compilers may need something slightly different. At + # this time, there's no way to determine this information from + # the configuration data stored in the Python installation, so + # we use this hack. + if sys.platform[:6] == "darwin": + from distutils.util import get_macosx_target_ver, split_version + + macosx_target_ver = get_macosx_target_ver() + if macosx_target_ver and split_version(macosx_target_ver) >= [10, 5]: + return "-Wl,-rpath," + dir + else: # no support for -rpath on earlier macOS versions + return "-L" + dir + elif sys.platform[:7] == "freebsd": + return "-Wl,-rpath=" + dir + elif sys.platform[:5] == "hp-ux": + return [ + "-Wl,+s" if self._is_gcc() else "+s", + "-L" + dir, + ] + + # For all compilers, `-Wl` is the presumed way to + # pass a compiler option to the linker and `-R` is + # the way to pass an RPATH. + if sysconfig.get_config_var("GNULD") == "yes": + # GNU ld needs an extra option to get a RUNPATH + # instead of just an RPATH. + return "-Wl,--enable-new-dtags,-R" + dir + else: + return "-Wl,-R" + dir + + def library_option(self, lib): + return "-l" + lib + + @staticmethod + def _library_root(dir): + """ + macOS users can specify an alternate SDK using'-isysroot'. + Calculate the SDK root if it is specified. + + Note that, as of Xcode 7, Apple SDKs may contain textual stub + libraries with .tbd extensions rather than the normal .dylib + shared libraries installed in /. The Apple compiler tool + chain handles this transparently but it can cause problems + for programs that are being built with an SDK and searching + for specific libraries. Callers of find_library_file need to + keep in mind that the base filename of the returned SDK library + file might have a different extension from that of the library + file installed on the running system, for example: + /Applications/Xcode.app/Contents/Developer/Platforms/ + MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/ + usr/lib/libedit.tbd + vs + /usr/lib/libedit.dylib + """ + cflags = sysconfig.get_config_var('CFLAGS') + match = re.search(r'-isysroot\s*(\S+)', cflags) + + apply_root = ( + sys.platform == 'darwin' + and match + and ( + dir.startswith('/System/') + or (dir.startswith('/usr/') and not dir.startswith('/usr/local/')) + ) + ) + + return os.path.join(match.group(1), dir[1:]) if apply_root else dir + + def find_library_file(self, dirs, lib, debug=0): + r""" + Second-guess the linker with not much hard + data to go on: GCC seems to prefer the shared library, so + assume that *all* Unix C compilers do, + ignoring even GCC's "-static" option. + + >>> compiler = UnixCCompiler() + >>> compiler._library_root = lambda dir: dir + >>> monkeypatch = getfixture('monkeypatch') + >>> monkeypatch.setattr(os.path, 'exists', lambda d: 'existing' in d) + >>> dirs = ('/foo/bar/missing', '/foo/bar/existing') + >>> compiler.find_library_file(dirs, 'abc').replace('\\', '/') + '/foo/bar/existing/libabc.dylib' + >>> compiler.find_library_file(reversed(dirs), 'abc').replace('\\', '/') + '/foo/bar/existing/libabc.dylib' + >>> monkeypatch.setattr(os.path, 'exists', + ... lambda d: 'existing' in d and '.a' in d) + >>> compiler.find_library_file(dirs, 'abc').replace('\\', '/') + '/foo/bar/existing/libabc.a' + >>> compiler.find_library_file(reversed(dirs), 'abc').replace('\\', '/') + '/foo/bar/existing/libabc.a' + """ + lib_names = ( + self.library_filename(lib, lib_type=type) + for type in 'dylib xcode_stub shared static'.split() + ) + + roots = map(self._library_root, dirs) + + searched = ( + os.path.join(root, lib_name) + for root, lib_name in itertools.product(roots, lib_names) + ) + + found = filter(os.path.exists, searched) + + # Return None if it could not be found in any dir. + return next(found, None) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/util.py index 6dbe049..4763202 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/util.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/util.py @@ -4,35 +4,22 @@ Miscellaneous utility functions -- anything that doesn't fit into one of the other *util.py modules. """ -from __future__ import annotations - -import functools import importlib.util import os -import pathlib import re import string import subprocess import sys import sysconfig -import tempfile -from collections.abc import Callable, Iterable, Mapping -from typing import TYPE_CHECKING, AnyStr +import functools -from jaraco.functools import pass_none - -from ._log import log -from ._modified import newer -from .errors import DistutilsByteCompileError, DistutilsPlatformError -from .spawn import spawn - -if TYPE_CHECKING: - from typing_extensions import TypeVarTuple, Unpack - - _Ts = TypeVarTuple("_Ts") +from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError +from distutils.dep_util import newer +from distutils.spawn import spawn +from distutils import log -def get_host_platform() -> str: +def get_host_platform(): """ Return a string that identifies the current platform. Use this function to distinguish platform-specific build directories and @@ -41,12 +28,27 @@ def get_host_platform() -> str: # This function initially exposed platforms as defined in Python 3.9 # even with older Python versions when distutils was split out. - # Now it delegates to stdlib sysconfig. + # Now it delegates to stdlib sysconfig, but maintains compatibility. + + if sys.version_info < (3, 8): + if os.name == 'nt': + if '(arm)' in sys.version.lower(): + return 'win-arm32' + if '(arm64)' in sys.version.lower(): + return 'win-arm64' + + if sys.version_info < (3, 9): + if os.name == "posix" and hasattr(os, 'uname'): + osname, host, release, version, machine = os.uname() + if osname[:3] == "aix": + from .py38compat import aix_platform + + return aix_platform(osname, version, release) return sysconfig.get_platform() -def get_platform() -> str: +def get_platform(): if os.name == 'nt': TARGET_TO_PLAT = { 'x86': 'win32', @@ -107,41 +109,49 @@ def get_macosx_target_ver(): ): my_msg = ( '$' + MACOSX_VERSION_VAR + ' mismatch: ' - f'now "{env_ver}" but "{syscfg_ver}" during configure; ' - 'must use 10.3 or later' + 'now "%s" but "%s" during configure; ' + 'must use 10.3 or later' % (env_ver, syscfg_ver) ) raise DistutilsPlatformError(my_msg) return env_ver return syscfg_ver -def split_version(s: str) -> list[int]: +def split_version(s): """Convert a dot-separated string into a list of numbers for comparisons""" return [int(n) for n in s.split('.')] -@pass_none -def convert_path(pathname: str | os.PathLike[str]) -> str: - r""" - Allow for pathlib.Path inputs, coax to a native path string. - - If None is passed, will just pass it through as - Setuptools relies on this behavior. - - >>> convert_path(None) is None - True - - Removes empty paths. - - >>> convert_path('foo/./bar').replace('\\', '/') - 'foo/bar' +def convert_path(pathname): + """Return 'pathname' as a name that will work on the native filesystem, + i.e. split it on '/' and put it back together again using the current + directory separator. Needed because filenames in the setup script are + always supplied in Unix style, and have to be converted to the local + convention before we can actually use them in the filesystem. Raises + ValueError on non-Unix-ish systems if 'pathname' either starts or + ends with a slash. """ - return os.fspath(pathlib.PurePath(pathname)) + if os.sep == '/': + return pathname + if not pathname: + return pathname + if pathname[0] == '/': + raise ValueError("path '%s' cannot be absolute" % pathname) + if pathname[-1] == '/': + raise ValueError("path '%s' cannot end with '/'" % pathname) + + paths = pathname.split('/') + while '.' in paths: + paths.remove('.') + if not paths: + return os.curdir + return os.path.join(*paths) -def change_root( - new_root: AnyStr | os.PathLike[AnyStr], pathname: AnyStr | os.PathLike[AnyStr] -) -> AnyStr: +# convert_path () + + +def change_root(new_root, pathname): """Return 'pathname' with 'new_root' prepended. If 'pathname' is relative, this is equivalent to "os.path.join(new_root,pathname)". Otherwise, it requires making 'pathname' relative and then joining the @@ -155,15 +165,15 @@ def change_root( elif os.name == 'nt': (drive, path) = os.path.splitdrive(pathname) - if path[0] == os.sep: + if path[0] == '\\': path = path[1:] return os.path.join(new_root, path) raise DistutilsPlatformError(f"nothing known about platform '{os.name}'") -@functools.lru_cache -def check_environ() -> None: +@functools.lru_cache() +def check_environ(): """Ensure that 'os.environ' has all the environment variables we guarantee that users can use in config files, command-line options, etc. Currently this includes: @@ -185,7 +195,7 @@ def check_environ() -> None: os.environ['PLAT'] = get_platform() -def subst_vars(s, local_vars: Mapping[str, object]) -> str: +def subst_vars(s, local_vars): """ Perform variable substitution on 'string'. Variables are indicated by format-style braces ("{var}"). @@ -218,13 +228,13 @@ def _subst_compat(s): import warnings warnings.warn( - "shell/Perl-style substitutions are deprecated", + "shell/Perl-style substitions are deprecated", DeprecationWarning, ) return repl -def grok_environment_error(exc: object, prefix: str = "error: ") -> str: +def grok_environment_error(exc, prefix="error: "): # Function kept for backward compatibility. # Used to try clever things with EnvironmentErrors, # but nowadays str(exception) produces good messages. @@ -237,12 +247,12 @@ _wordchars_re = _squote_re = _dquote_re = None def _init_regex(): global _wordchars_re, _squote_re, _dquote_re - _wordchars_re = re.compile(rf'[^\\\'\"{string.whitespace} ]*') + _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace) _squote_re = re.compile(r"'(?:[^'\\]|\\.)*'") _dquote_re = re.compile(r'"(?:[^"\\]|\\.)*"') -def split_quoted(s: str) -> list[str]: +def split_quoted(s): """Split a string up according to Unix shell-like rules for quotes and backslashes. In short: words are delimited by spaces, as long as those spaces are not escaped by a backslash, or inside a quoted string. @@ -289,10 +299,10 @@ def split_quoted(s: str) -> list[str]: elif s[end] == '"': # slurp doubly-quoted string m = _dquote_re.match(s, end) else: - raise RuntimeError(f"this can't happen (bad char '{s[end]}')") + raise RuntimeError("this can't happen (bad char '%c')" % s[end]) if m is None: - raise ValueError(f"bad string (mismatched {s[end]} quotes?)") + raise ValueError("bad string (mismatched %s quotes?)" % s[end]) (beg, end) = m.span() s = s[:beg] + s[beg + 1 : end - 1] + s[end:] @@ -308,24 +318,17 @@ def split_quoted(s: str) -> list[str]: # split_quoted () -def execute( - func: Callable[[Unpack[_Ts]], object], - args: tuple[Unpack[_Ts]], - msg: object = None, - verbose: bool = False, - dry_run: bool = False, -) -> None: - """ - Perform some action that affects the outside world (e.g. by - writing to the filesystem). Such actions are special because they - are disabled by the 'dry_run' flag. This method handles that - complication; simply supply the +def execute(func, args, msg=None, verbose=0, dry_run=0): + """Perform some action that affects the outside world (eg. by + writing to the filesystem). Such actions are special because they + are disabled by the 'dry_run' flag. This method takes care of all + that bureaucracy for you; all you have to do is supply the function to call and an argument tuple for it (to embody the - "external action" being performed) and an optional message to - emit. + "external action" being performed), and an optional message to + print. """ if msg is None: - msg = f"{func.__name__}{args!r}" + msg = "{}{!r}".format(func.__name__, args) if msg[-2:] == ',)': # correct for singleton tuple msg = msg[0:-2] + ')' @@ -334,7 +337,7 @@ def execute( func(*args) -def strtobool(val: str) -> bool: +def strtobool(val): """Convert a string representation of truth to true (1) or false (0). True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values @@ -343,23 +346,23 @@ def strtobool(val: str) -> bool: """ val = val.lower() if val in ('y', 'yes', 't', 'true', 'on', '1'): - return True + return 1 elif val in ('n', 'no', 'f', 'false', 'off', '0'): - return False + return 0 else: - raise ValueError(f"invalid truth value {val!r}") + raise ValueError("invalid truth value {!r}".format(val)) def byte_compile( # noqa: C901 - py_files: Iterable[str], - optimize: int = 0, - force: bool = False, - prefix: str | None = None, - base_dir: str | None = None, - verbose: bool = True, - dry_run: bool = False, - direct: bool | None = None, -) -> None: + py_files, + optimize=0, + force=0, + prefix=None, + base_dir=None, + verbose=1, + dry_run=0, + direct=None, +): """Byte-compile a collection of Python source files to .pyc files in a __pycache__ subdirectory. 'py_files' is a list of files to compile; any files that don't end in ".py" are silently @@ -409,10 +412,20 @@ def byte_compile( # noqa: C901 # "Indirect" byte-compilation: write a temporary script and then # run it with the appropriate flags. if not direct: - (script_fd, script_name) = tempfile.mkstemp(".py") + try: + from tempfile import mkstemp + + (script_fd, script_name) = mkstemp(".py") + except ImportError: + from tempfile import mktemp + + (script_fd, script_name) = None, mktemp(".py") log.info("writing byte-compilation script '%s'", script_name) if not dry_run: - script = os.fdopen(script_fd, "w", encoding='utf-8') + if script_fd is not None: + script = os.fdopen(script_fd, "w") + else: + script = open(script_name, "w") with script: script.write( @@ -434,19 +447,20 @@ files = [ script.write(",\n".join(map(repr, py_files)) + "]\n") script.write( - f""" -byte_compile(files, optimize={optimize!r}, force={force!r}, - prefix={prefix!r}, base_dir={base_dir!r}, - verbose={verbose!r}, dry_run=False, - direct=True) + """ +byte_compile(files, optimize=%r, force=%r, + prefix=%r, base_dir=%r, + verbose=%r, dry_run=0, + direct=1) """ + % (optimize, force, prefix, base_dir, verbose) ) cmd = [sys.executable] cmd.extend(subprocess._optim_args_from_interpreter_flags()) cmd.append(script_name) spawn(cmd, dry_run=dry_run) - execute(os.remove, (script_name,), f"removing {script_name}", dry_run=dry_run) + execute(os.remove, (script_name,), "removing %s" % script_name, dry_run=dry_run) # "Direct" byte-compilation: use the py_compile module to compile # right here, right now. Note that the script generated in indirect @@ -473,7 +487,8 @@ byte_compile(files, optimize={optimize!r}, force={force!r}, if prefix: if file[: len(prefix)] != prefix: raise ValueError( - f"invalid prefix: filename {file!r} doesn't start with {prefix!r}" + "invalid prefix: filename %r doesn't start with %r" + % (file, prefix) ) dfile = dfile[len(prefix) :] if base_dir: @@ -489,30 +504,10 @@ byte_compile(files, optimize={optimize!r}, force={force!r}, log.debug("skipping byte-compilation of %s to %s", file, cfile_base) -def rfc822_escape(header: str) -> str: +def rfc822_escape(header): """Return a version of the string escaped for inclusion in an RFC-822 header, by ensuring there are 8 spaces space after each newline. """ - indent = 8 * " " - lines = header.splitlines(keepends=True) - - # Emulate the behaviour of `str.split` - # (the terminal line break in `splitlines` does not result in an extra line): - ends_in_newline = lines and lines[-1].splitlines()[0] != lines[-1] - suffix = indent if ends_in_newline else "" - - return indent.join(lines) + suffix - - -def is_mingw() -> bool: - """Returns True if the current platform is mingw. - - Python compiled with Mingw-w64 has sys.platform == 'win32' and - get_platform() starts with 'mingw'. - """ - return sys.platform == 'win32' and get_platform().startswith('mingw') - - -def is_freethreaded(): - """Return True if the Python interpreter is built with free threading support.""" - return bool(sysconfig.get_config_var('Py_GIL_DISABLED')) + lines = header.split('\n') + sep = '\n' + 8 * ' ' + return sep.join(lines) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/version.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/version.py index 2223ee9..e29e265 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/version.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/version.py @@ -26,9 +26,9 @@ Every version number class implements the following interface: of the same class, thus must follow the same rules) """ -import contextlib import re import warnings +import contextlib @contextlib.contextmanager @@ -53,13 +53,14 @@ class Version: if vstring: self.parse(vstring) warnings.warn( - "distutils Version classes are deprecated. Use packaging.version instead.", + "distutils Version classes are deprecated. " + "Use packaging.version instead.", DeprecationWarning, stacklevel=2, ) def __repr__(self): - return f"{self.__class__.__name__} ('{self}')" + return "{} ('{}')".format(self.__class__.__name__, str(self)) def __eq__(self, other): c = self._cmp(other) @@ -110,6 +111,7 @@ class Version: class StrictVersion(Version): + """Version numbering for anal retentives and software idealists. Implements the standard interface for version number classes as described above. A version number consists of two or three @@ -152,7 +154,7 @@ class StrictVersion(Version): def parse(self, vstring): match = self.version_re.match(vstring) if not match: - raise ValueError(f"invalid version number '{vstring}'") + raise ValueError("invalid version number '%s'" % vstring) (major, minor, patch, prerelease, prerelease_num) = match.group(1, 2, 4, 5, 6) @@ -167,6 +169,7 @@ class StrictVersion(Version): self.prerelease = None def __str__(self): + if self.version[2] == 0: vstring = '.'.join(map(str, self.version[0:2])) else: @@ -177,36 +180,42 @@ class StrictVersion(Version): return vstring - def _cmp(self, other): + def _cmp(self, other): # noqa: C901 if isinstance(other, str): with suppress_known_deprecation(): other = StrictVersion(other) elif not isinstance(other, StrictVersion): return NotImplemented - if self.version == other.version: - # versions match; pre-release drives the comparison - return self._cmp_prerelease(other) + if self.version != other.version: + # numeric versions don't match + # prerelease stuff doesn't matter + if self.version < other.version: + return -1 + else: + return 1 - return -1 if self.version < other.version else 1 + # have to compare prerelease + # case 1: neither has prerelease; they're equal + # case 2: self has prerelease, other doesn't; other is greater + # case 3: self doesn't have prerelease, other does: self is greater + # case 4: both have prerelease: must compare them! - def _cmp_prerelease(self, other): - """ - case 1: self has prerelease, other doesn't; other is greater - case 2: self doesn't have prerelease, other does: self is greater - case 3: both or neither have prerelease: compare them! - """ - if self.prerelease and not other.prerelease: + if not self.prerelease and not other.prerelease: + return 0 + elif self.prerelease and not other.prerelease: return -1 elif not self.prerelease and other.prerelease: return 1 - - if self.prerelease == other.prerelease: - return 0 - elif self.prerelease < other.prerelease: - return -1 + elif self.prerelease and other.prerelease: + if self.prerelease == other.prerelease: + return 0 + elif self.prerelease < other.prerelease: + return -1 + else: + return 1 else: - return 1 + assert False, "never get here" # end class StrictVersion @@ -278,6 +287,7 @@ class StrictVersion(Version): class LooseVersion(Version): + """Version numbering for anarchists and software realists. Implements the standard interface for version number classes as described above. A version number consists of a series of numbers, @@ -329,7 +339,7 @@ class LooseVersion(Version): return self.vstring def __repr__(self): - return f"LooseVersion ('{self}')" + return "LooseVersion ('%s')" % str(self) def _cmp(self, other): if isinstance(other, str): diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/versionpredicate.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/versionpredicate.py index fe31b0e..6ea1192 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/versionpredicate.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/versionpredicate.py @@ -1,9 +1,9 @@ -"""Module for parsing and testing package version predicate strings.""" - -import operator +"""Module for parsing and testing package version predicate strings. +""" import re +import distutils.version +import operator -from . import version re_validPackage = re.compile(r"(?i)^\s*([a-z_]\w*(?:\.[a-z_]\w*)*)(.*)", re.ASCII) # (package) (rest) @@ -20,10 +20,10 @@ def splitUp(pred): """ res = re_splitComparison.match(pred) if not res: - raise ValueError(f"bad package restriction syntax: {pred!r}") + raise ValueError("bad package restriction syntax: %r" % pred) comp, verStr = res.groups() - with version.suppress_known_deprecation(): - other = version.StrictVersion(verStr) + with distutils.version.suppress_known_deprecation(): + other = distutils.version.StrictVersion(verStr) return (comp, other) @@ -113,17 +113,17 @@ class VersionPredicate: raise ValueError("empty package restriction") match = re_validPackage.match(versionPredicateStr) if not match: - raise ValueError(f"bad package name in {versionPredicateStr!r}") + raise ValueError("bad package name in %r" % versionPredicateStr) self.name, paren = match.groups() paren = paren.strip() if paren: match = re_paren.match(paren) if not match: - raise ValueError(f"expected parenthesized list: {paren!r}") + raise ValueError("expected parenthesized list: %r" % paren) str = match.groups()[0] self.pred = [splitUp(aPred) for aPred in str.split(",")] if not self.pred: - raise ValueError(f"empty parenthesized list in {versionPredicateStr!r}") + raise ValueError("empty parenthesized list in %r" % versionPredicateStr) else: self.pred = [] @@ -167,9 +167,9 @@ def split_provision(value): value = value.strip() m = _provision_rx.match(value) if not m: - raise ValueError(f"illegal provides specification: {value!r}") + raise ValueError("illegal provides specification: %r" % value) ver = m.group(2) or None if ver: - with version.suppress_known_deprecation(): - ver = version.StrictVersion(ver) + with distutils.version.suppress_known_deprecation(): + ver = distutils.version.StrictVersion(ver) return m.group(1), ver diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/zosccompiler.py b/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/zosccompiler.py deleted file mode 100644 index e49630a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_distutils/zosccompiler.py +++ /dev/null @@ -1,3 +0,0 @@ -from .compilers.C import zos - -zOSCCompiler = zos.Compiler diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_entry_points.py b/server/.venv/lib/python3.11/site-packages/setuptools/_entry_points.py index e785fc7..f087681 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_entry_points.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_entry_points.py @@ -1,14 +1,12 @@ import functools -import itertools import operator +import itertools -from jaraco.functools import pass_none -from jaraco.text import yield_lines -from more_itertools import consume - +from .extern.jaraco.text import yield_lines +from .extern.jaraco.functools import pass_none from ._importlib import metadata from ._itertools import ensure_unique -from .errors import OptionError +from .extern.more_itertools import consume def ensure_valid(ep): @@ -16,15 +14,7 @@ def ensure_valid(ep): Exercise one of the dynamic properties to trigger the pattern match. """ - try: - ep.extras - except (AttributeError, AssertionError) as ex: - # Why both? See https://github.com/python/importlib_metadata/issues/488 - msg = ( - f"Problems to parse {ep}.\nPlease ensure entry-point follows the spec: " - "https://packaging.python.org/en/latest/specifications/entry-points/" - ) - raise OptionError(msg) from ex + ep.extras def load_group(value, group): @@ -56,8 +46,8 @@ def load(eps): Given a Distribution.entry_points, produce EntryPoints. """ groups = itertools.chain.from_iterable( - load_group(value, group) for group, value in eps.items() - ) + load_group(value, group) + for group, value in eps.items()) return validate(metadata.EntryPoints(groups)) @@ -83,8 +73,14 @@ def render(eps: metadata.EntryPoints): by_group = operator.attrgetter('group') groups = itertools.groupby(sorted(eps, key=by_group), by_group) - return '\n'.join(f'[{group}]\n{render_items(items)}\n' for group, items in groups) + return '\n'.join( + f'[{group}]\n{render_items(items)}\n' + for group, items in groups + ) def render_items(eps): - return '\n'.join(f'{ep.name} = {ep.value}' for ep in sorted(eps)) + return '\n'.join( + f'{ep.name} = {ep.value}' + for ep in sorted(eps) + ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_imp.py b/server/.venv/lib/python3.11/site-packages/setuptools/_imp.py index f1d9f29..47efd79 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_imp.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_imp.py @@ -3,11 +3,12 @@ Re-implementation of find_module and get_frozen_object from the deprecated imp module. """ -import importlib.machinery -import importlib.util import os -import tokenize -from importlib.util import module_from_spec +import importlib.util +import importlib.machinery + +from .py34compat import module_from_spec + PY_SOURCE = 1 PY_COMPILED = 2 @@ -19,8 +20,8 @@ PY_FROZEN = 7 def find_spec(module, paths): finder = ( importlib.machinery.PathFinder().find_spec - if isinstance(paths, list) - else importlib.util.find_spec + if isinstance(paths, list) else + importlib.util.find_spec ) return finder(module, paths) @@ -29,26 +30,20 @@ def find_module(module, paths=None): """Just like 'imp.find_module()', but with package support""" spec = find_spec(module, paths) if spec is None: - raise ImportError(f"Can't find {module}") + raise ImportError("Can't find %s" % module) if not spec.has_location and hasattr(spec, 'submodule_search_locations'): spec = importlib.util.spec_from_loader('__init__.py', spec.loader) kind = -1 file = None static = isinstance(spec.loader, type) - if ( - spec.origin == 'frozen' - or static - and issubclass(spec.loader, importlib.machinery.FrozenImporter) - ): + if spec.origin == 'frozen' or static and issubclass( + spec.loader, importlib.machinery.FrozenImporter): kind = PY_FROZEN path = None # imp compabilty suffix = mode = '' # imp compatibility - elif ( - spec.origin == 'built-in' - or static - and issubclass(spec.loader, importlib.machinery.BuiltinImporter) - ): + elif spec.origin == 'built-in' or static and issubclass( + spec.loader, importlib.machinery.BuiltinImporter): kind = C_BUILTIN path = None # imp compabilty suffix = mode = '' # imp compatibility @@ -59,13 +54,13 @@ def find_module(module, paths=None): if suffix in importlib.machinery.SOURCE_SUFFIXES: kind = PY_SOURCE - file = tokenize.open(path) elif suffix in importlib.machinery.BYTECODE_SUFFIXES: kind = PY_COMPILED - file = open(path, 'rb') elif suffix in importlib.machinery.EXTENSION_SUFFIXES: kind = C_EXTENSION + if kind in {PY_SOURCE, PY_COMPILED}: + file = open(path, mode) else: path = None suffix = mode = '' @@ -76,12 +71,12 @@ def find_module(module, paths=None): def get_frozen_object(module, paths=None): spec = find_spec(module, paths) if not spec: - raise ImportError(f"Can't find {module}") + raise ImportError("Can't find %s" % module) return spec.loader.get_code(module) def get_module(module, paths, info): spec = find_spec(module, paths) if not spec: - raise ImportError(f"Can't find {module}") + raise ImportError("Can't find %s" % module) return module_from_spec(spec) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_importlib.py b/server/.venv/lib/python3.11/site-packages/setuptools/_importlib.py index ce0fd52..819bf5d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_importlib.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_importlib.py @@ -1,9 +1,47 @@ import sys + +def disable_importlib_metadata_finder(metadata): + """ + Ensure importlib_metadata doesn't provide older, incompatible + Distributions. + + Workaround for #3102. + """ + try: + import importlib_metadata + except ImportError: + return + except AttributeError: + import warnings + + msg = ( + "`importlib-metadata` version is incompatible with `setuptools`.\n" + "This problem is likely to be solved by installing an updated version of " + "`importlib-metadata`." + ) + warnings.warn(msg) # Ensure a descriptive message is shown. + raise # This exception can be suppressed by _distutils_hack + + if importlib_metadata is metadata: + return + to_remove = [ + ob + for ob in sys.meta_path + if isinstance(ob, importlib_metadata.MetadataPathFinder) + ] + for item in to_remove: + sys.meta_path.remove(item) + + if sys.version_info < (3, 10): - import importlib_metadata as metadata # pragma: no cover + from setuptools.extern import importlib_metadata as metadata + disable_importlib_metadata_finder(metadata) else: import importlib.metadata as metadata # noqa: F401 -import importlib.resources as resources # noqa: F401 +if sys.version_info < (3, 9): + from setuptools.extern import importlib_resources as resources +else: + import importlib.resources as resources # noqa: F401 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_itertools.py b/server/.venv/lib/python3.11/site-packages/setuptools/_itertools.py index d6ca841..b8bf6d2 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_itertools.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_itertools.py @@ -1,4 +1,4 @@ -from more_itertools import consume # noqa: F401 +from setuptools.extern.more_itertools import consume # noqa: F401 # copied from jaraco.itertools 6.1 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_normalization.py b/server/.venv/lib/python3.11/site-packages/setuptools/_normalization.py deleted file mode 100644 index 0937a4f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_normalization.py +++ /dev/null @@ -1,179 +0,0 @@ -""" -Helpers for normalization as expected in wheel/sdist/module file names -and core metadata -""" - -import re -from typing import TYPE_CHECKING - -import packaging - -# https://packaging.python.org/en/latest/specifications/core-metadata/#name -_VALID_NAME = re.compile(r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.I) -_UNSAFE_NAME_CHARS = re.compile(r"[^A-Z0-9._-]+", re.I) -_NON_ALPHANUMERIC = re.compile(r"[^A-Z0-9]+", re.I) -_PEP440_FALLBACK = re.compile(r"^v?(?P(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I) - - -def safe_identifier(name: str) -> str: - """Make a string safe to be used as Python identifier. - >>> safe_identifier("12abc") - '_12abc' - >>> safe_identifier("__editable__.myns.pkg-78.9.3_local") - '__editable___myns_pkg_78_9_3_local' - """ - safe = re.sub(r'\W|^(?=\d)', '_', name) - assert safe.isidentifier() - return safe - - -def safe_name(component: str) -> str: - """Escape a component used as a project name according to Core Metadata. - >>> safe_name("hello world") - 'hello-world' - >>> safe_name("hello?world") - 'hello-world' - >>> safe_name("hello_world") - 'hello_world' - """ - # See pkg_resources.safe_name - return _UNSAFE_NAME_CHARS.sub("-", component) - - -def safe_version(version: str) -> str: - """Convert an arbitrary string into a valid version string. - Can still raise an ``InvalidVersion`` exception. - To avoid exceptions use ``best_effort_version``. - >>> safe_version("1988 12 25") - '1988.12.25' - >>> safe_version("v0.2.1") - '0.2.1' - >>> safe_version("v0.2?beta") - '0.2b0' - >>> safe_version("v0.2 beta") - '0.2b0' - >>> safe_version("ubuntu lts") - Traceback (most recent call last): - ... - packaging.version.InvalidVersion: Invalid version: 'ubuntu.lts' - """ - v = version.replace(' ', '.') - try: - return str(packaging.version.Version(v)) - except packaging.version.InvalidVersion: - attempt = _UNSAFE_NAME_CHARS.sub("-", v) - return str(packaging.version.Version(attempt)) - - -def best_effort_version(version: str) -> str: - """Convert an arbitrary string into a version-like string. - Fallback when ``safe_version`` is not safe enough. - >>> best_effort_version("v0.2 beta") - '0.2b0' - >>> best_effort_version("ubuntu lts") - '0.dev0+sanitized.ubuntu.lts' - >>> best_effort_version("0.23ubuntu1") - '0.23.dev0+sanitized.ubuntu1' - >>> best_effort_version("0.23-") - '0.23.dev0+sanitized' - >>> best_effort_version("0.-_") - '0.dev0+sanitized' - >>> best_effort_version("42.+?1") - '42.dev0+sanitized.1' - """ - # See pkg_resources._forgiving_version - try: - return safe_version(version) - except packaging.version.InvalidVersion: - v = version.replace(' ', '.') - match = _PEP440_FALLBACK.search(v) - if match: - safe = match["safe"] - rest = v[len(safe) :] - else: - safe = "0" - rest = version - safe_rest = _NON_ALPHANUMERIC.sub(".", rest).strip(".") - local = f"sanitized.{safe_rest}".strip(".") - return safe_version(f"{safe}.dev0+{local}") - - -def safe_extra(extra: str) -> str: - """Normalize extra name according to PEP 685 - >>> safe_extra("_FrIeNdLy-._.-bArD") - 'friendly-bard' - >>> safe_extra("FrIeNdLy-._.-bArD__._-") - 'friendly-bard' - """ - return _NON_ALPHANUMERIC.sub("-", extra).strip("-").lower() - - -def filename_component(value: str) -> str: - """Normalize each component of a filename (e.g. distribution/version part of wheel) - Note: ``value`` needs to be already normalized. - >>> filename_component("my-pkg") - 'my_pkg' - """ - return value.replace("-", "_").strip("_") - - -def filename_component_broken(value: str) -> str: - """ - Produce the incorrect filename component for compatibility. - - See pypa/setuptools#4167 for detailed analysis. - - TODO: replace this with filename_component after pip 24 is - nearly-ubiquitous. - - >>> filename_component_broken('foo_bar-baz') - 'foo-bar-baz' - """ - return value.replace('_', '-') - - -def safer_name(value: str) -> str: - """Like ``safe_name`` but can be used as filename component for wheel""" - # See bdist_wheel.safer_name - return ( - # Per https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization - re.sub(r"[-_.]+", "-", safe_name(value)) - .lower() - # Per https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode - .replace("-", "_") - ) - - -def safer_best_effort_version(value: str) -> str: - """Like ``best_effort_version`` but can be used as filename component for wheel""" - # See bdist_wheel.safer_verion - # TODO: Replace with only safe_version in the future (no need for best effort) - return filename_component(best_effort_version(value)) - - -def _missing_canonicalize_license_expression(expression: str) -> str: - """ - Defer import error to affect only users that actually use it - https://github.com/pypa/setuptools/issues/4894 - >>> _missing_canonicalize_license_expression("a OR b") - Traceback (most recent call last): - ... - ImportError: ...Cannot import `packaging.licenses`... - """ - raise ImportError( - "Cannot import `packaging.licenses`." - """ - Setuptools>=77.0.0 requires "packaging>=24.2" to work properly. - Please make sure you have a suitable version installed. - """ - ) - - -try: - from packaging.licenses import ( - canonicalize_license_expression as _canonicalize_license_expression, - ) -except ImportError: # pragma: nocover - if not TYPE_CHECKING: - # XXX: pyright is still upset even with # pyright: ignore[reportAssignmentType] - _canonicalize_license_expression = _missing_canonicalize_license_expression diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_path.py b/server/.venv/lib/python3.11/site-packages/setuptools/_path.py index 0d99b0f..3767523 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_path.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_path.py @@ -1,17 +1,7 @@ -from __future__ import annotations - -import contextlib import os -import sys -from typing import TYPE_CHECKING, TypeVar, Union +from typing import Union -from more_itertools import unique_everseen - -if TYPE_CHECKING: - from typing_extensions import TypeAlias - -StrPath: TypeAlias = Union[str, os.PathLike[str]] # Same as _typeshed.StrPath -StrPathT = TypeVar("StrPathT", bound=Union[str, os.PathLike[str]]) +_Path = Union[str, os.PathLike] def ensure_directory(path): @@ -20,7 +10,7 @@ def ensure_directory(path): os.makedirs(dirname, exist_ok=True) -def same_path(p1: StrPath, p2: StrPath) -> bool: +def same_path(p1: _Path, p2: _Path) -> bool: """Differs from os.path.samefile because it does not require paths to exist. Purely string based (no comparison between i-nodes). >>> same_path("a/b", "./a/b") @@ -36,49 +26,4 @@ def same_path(p1: StrPath, p2: StrPath) -> bool: >>> same_path("a", "a/b") False """ - return normpath(p1) == normpath(p2) - - -def normpath(filename: StrPath) -> str: - """Normalize a file/dir name for comparison purposes.""" - # See pkg_resources.normalize_path for notes about cygwin - file = os.path.abspath(filename) if sys.platform == 'cygwin' else filename - return os.path.normcase(os.path.realpath(os.path.normpath(file))) - - -@contextlib.contextmanager -def paths_on_pythonpath(paths): - """ - Add the indicated paths to the head of the PYTHONPATH environment - variable so that subprocesses will also see the packages at - these paths. - - Do this in a context that restores the value on exit. - - >>> getfixture('monkeypatch').setenv('PYTHONPATH', 'anything') - >>> with paths_on_pythonpath(['foo', 'bar']): - ... assert 'foo' in os.environ['PYTHONPATH'] - ... assert 'anything' in os.environ['PYTHONPATH'] - >>> os.environ['PYTHONPATH'] - 'anything' - - >>> getfixture('monkeypatch').delenv('PYTHONPATH') - >>> with paths_on_pythonpath(['foo', 'bar']): - ... assert 'foo' in os.environ['PYTHONPATH'] - >>> os.environ.get('PYTHONPATH') - """ - nothing = object() - orig_pythonpath = os.environ.get('PYTHONPATH', nothing) - current_pythonpath = os.environ.get('PYTHONPATH', '') - try: - prefix = os.pathsep.join(unique_everseen(paths)) - to_join = filter(None, [prefix, current_pythonpath]) - new_path = os.pathsep.join(to_join) - if new_path: - os.environ['PYTHONPATH'] = new_path - yield - finally: - if orig_pythonpath is nothing: - os.environ.pop('PYTHONPATH', None) - else: - os.environ['PYTHONPATH'] = orig_pythonpath + return os.path.normpath(p1) == os.path.normpath(p2) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_reqs.py b/server/.venv/lib/python3.11/site-packages/setuptools/_reqs.py index c793be4..ca72417 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_reqs.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_reqs.py @@ -1,26 +1,9 @@ -from __future__ import annotations +import setuptools.extern.jaraco.text as text -from collections.abc import Iterable, Iterator -from functools import lru_cache -from typing import TYPE_CHECKING, Callable, TypeVar, Union, overload - -import jaraco.text as text -from packaging.requirements import Requirement - -if TYPE_CHECKING: - from typing_extensions import TypeAlias - -_T = TypeVar("_T") -_StrOrIter: TypeAlias = Union[str, Iterable[str]] +from pkg_resources import Requirement -parse_req: Callable[[str], Requirement] = lru_cache()(Requirement) -# Setuptools parses the same requirement many times -# (e.g. first for validation than for normalisation), -# so it might be worth to cache. - - -def parse_strings(strs: _StrOrIter) -> Iterator[str]: +def parse_strings(strs): """ Yield requirement strings for each specification in `strs`. @@ -29,14 +12,8 @@ def parse_strings(strs: _StrOrIter) -> Iterator[str]: return text.join_continuation(map(text.drop_comment, text.yield_lines(strs))) -# These overloads are only needed because of a mypy false-positive, pyright gets it right -# https://github.com/python/mypy/issues/3737 -@overload -def parse(strs: _StrOrIter) -> Iterator[Requirement]: ... -@overload -def parse(strs: _StrOrIter, parser: Callable[[str], _T]) -> Iterator[_T]: ... -def parse(strs: _StrOrIter, parser: Callable[[str], _T] = parse_req) -> Iterator[_T]: # type: ignore[assignment] +def parse(strs): """ - Replacement for ``pkg_resources.parse_requirements`` that uses ``packaging``. + Deprecated drop-in replacement for pkg_resources.parse_requirements. """ - return map(parser, parse_strings(strs)) + return map(Requirement, parse_strings(strs)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_shutil.py b/server/.venv/lib/python3.11/site-packages/setuptools/_shutil.py deleted file mode 100644 index 6acbb42..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_shutil.py +++ /dev/null @@ -1,53 +0,0 @@ -"""Convenience layer on top of stdlib's shutil and os""" - -import os -import stat -from typing import Callable, TypeVar - -from .compat import py311 - -from distutils import log - -try: - from os import chmod # pyright: ignore[reportAssignmentType] - # Losing type-safety w/ pyright, but that's ok -except ImportError: # pragma: no cover - # Jython compatibility - def chmod(*args: object, **kwargs: object) -> None: # type: ignore[misc] # Mypy reuses the imported definition anyway - pass - - -_T = TypeVar("_T") - - -def attempt_chmod_verbose(path, mode): - log.debug("changing mode of %s to %o", path, mode) - try: - chmod(path, mode) - except OSError as e: # pragma: no cover - log.debug("chmod failed: %s", e) - - -# Must match shutil._OnExcCallback -def _auto_chmod( - func: Callable[..., _T], arg: str, exc: BaseException -) -> _T: # pragma: no cover - """shutils onexc callback to automatically call chmod for certain functions.""" - # Only retry for scenarios known to have an issue - if func in [os.unlink, os.remove] and os.name == 'nt': - attempt_chmod_verbose(arg, stat.S_IWRITE) - return func(arg) - raise exc - - -def rmtree(path, ignore_errors=False, onexc=_auto_chmod): - """ - Similar to ``shutil.rmtree`` but automatically executes ``chmod`` - for well know Windows failure scenarios. - """ - return py311.shutil_rmtree(path, ignore_errors, onexc) - - -def rmdir(path, **opts): - if os.path.isdir(path): - rmtree(path, **opts) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_static.py b/server/.venv/lib/python3.11/site-packages/setuptools/_static.py deleted file mode 100644 index af35862..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_static.py +++ /dev/null @@ -1,188 +0,0 @@ -from functools import wraps -from typing import TypeVar - -import packaging.specifiers - -from .warnings import SetuptoolsDeprecationWarning - - -class Static: - """ - Wrapper for built-in object types that are allow setuptools to identify - static core metadata (in opposition to ``Dynamic``, as defined :pep:`643`). - - The trick is to mark values with :class:`Static` when they come from - ``pyproject.toml`` or ``setup.cfg``, so if any plugin overwrite the value - with a built-in, setuptools will be able to recognise the change. - - We inherit from built-in classes, so that we don't need to change the existing - code base to deal with the new types. - We also should strive for immutability objects to avoid changes after the - initial parsing. - """ - - _mutated_: bool = False # TODO: Remove after deprecation warning is solved - - -def _prevent_modification(target: type, method: str, copying: str) -> None: - """ - Because setuptools is very flexible we cannot fully prevent - plugins and user customizations from modifying static values that were - parsed from config files. - But we can attempt to block "in-place" mutations and identify when they - were done. - """ - fn = getattr(target, method, None) - if fn is None: - return - - @wraps(fn) - def _replacement(self: Static, *args, **kwargs): - # TODO: After deprecation period raise NotImplementedError instead of warning - # which obviated the existence and checks of the `_mutated_` attribute. - self._mutated_ = True - SetuptoolsDeprecationWarning.emit( - "Direct modification of value will be disallowed", - f""" - In an effort to implement PEP 643, direct/in-place changes of static values - that come from configuration files are deprecated. - If you need to modify this value, please first create a copy with {copying} - and make sure conform to all relevant standards when overriding setuptools - functionality (https://packaging.python.org/en/latest/specifications/). - """, - due_date=(2025, 10, 10), # Initially introduced in 2024-09-06 - ) - return fn(self, *args, **kwargs) - - _replacement.__doc__ = "" # otherwise doctest may fail. - setattr(target, method, _replacement) - - -class Str(str, Static): - pass - - -class Tuple(tuple, Static): - pass - - -class List(list, Static): - """ - :meta private: - >>> x = List([1, 2, 3]) - >>> is_static(x) - True - >>> x += [0] # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - SetuptoolsDeprecationWarning: Direct modification ... - >>> is_static(x) # no longer static after modification - False - >>> y = list(x) - >>> y.clear() - >>> y - [] - >>> y == x - False - >>> is_static(List(y)) - True - """ - - -# Make `List` immutable-ish -# (certain places of setuptools/distutils issue a warn if we use tuple instead of list) -for _method in ( - '__delitem__', - '__iadd__', - '__setitem__', - 'append', - 'clear', - 'extend', - 'insert', - 'remove', - 'reverse', - 'pop', -): - _prevent_modification(List, _method, "`list(value)`") - - -class Dict(dict, Static): - """ - :meta private: - >>> x = Dict({'a': 1, 'b': 2}) - >>> is_static(x) - True - >>> x['c'] = 0 # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - SetuptoolsDeprecationWarning: Direct modification ... - >>> x._mutated_ - True - >>> is_static(x) # no longer static after modification - False - >>> y = dict(x) - >>> y.popitem() - ('b', 2) - >>> y == x - False - >>> is_static(Dict(y)) - True - """ - - -# Make `Dict` immutable-ish (we cannot inherit from types.MappingProxyType): -for _method in ( - '__delitem__', - '__ior__', - '__setitem__', - 'clear', - 'pop', - 'popitem', - 'setdefault', - 'update', -): - _prevent_modification(Dict, _method, "`dict(value)`") - - -class SpecifierSet(packaging.specifiers.SpecifierSet, Static): - """Not exactly a built-in type but useful for ``requires-python``""" - - -T = TypeVar("T") - - -def noop(value: T) -> T: - """ - >>> noop(42) - 42 - """ - return value - - -_CONVERSIONS = {str: Str, tuple: Tuple, list: List, dict: Dict} - - -def attempt_conversion(value: T) -> T: - """ - >>> is_static(attempt_conversion("hello")) - True - >>> is_static(object()) - False - """ - return _CONVERSIONS.get(type(value), noop)(value) # type: ignore[call-overload] - - -def is_static(value: object) -> bool: - """ - >>> is_static(a := Dict({'a': 1})) - True - >>> is_static(dict(a)) - False - >>> is_static(b := List([1, 2, 3])) - True - >>> is_static(list(b)) - False - """ - return isinstance(value, Static) and not value._mutated_ - - -EMPTY_LIST = List() -EMPTY_DICT = Dict() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/__pycache__/typing_extensions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/__pycache__/typing_extensions.cpython-311.pyc index 0a78f17..f9055c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/__pycache__/typing_extensions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/__pycache__/typing_extensions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/LICENSE deleted file mode 100644 index b49c3af..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/LICENSE +++ /dev/null @@ -1,166 +0,0 @@ -GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/METADATA deleted file mode 100644 index 32214fb..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/METADATA +++ /dev/null @@ -1,420 +0,0 @@ -Metadata-Version: 2.1 -Name: autocommand -Version: 2.2.2 -Summary: A library to create a command-line program from a function -Home-page: https://github.com/Lucretiel/autocommand -Author: Nathan West -License: LGPLv3 -Project-URL: Homepage, https://github.com/Lucretiel/autocommand -Project-URL: Bug Tracker, https://github.com/Lucretiel/autocommand/issues -Platform: any -Classifier: Development Status :: 6 - Mature -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3) -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Topic :: Software Development -Classifier: Topic :: Software Development :: Libraries -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Requires-Python: >=3.7 -Description-Content-Type: text/markdown -License-File: LICENSE - -[![PyPI version](https://badge.fury.io/py/autocommand.svg)](https://badge.fury.io/py/autocommand) - -# autocommand - -A library to automatically generate and run simple argparse parsers from function signatures. - -## Installation - -Autocommand is installed via pip: - -``` -$ pip install autocommand -``` - -## Usage - -Autocommand turns a function into a command-line program. It converts the function's parameter signature into command-line arguments, and automatically runs the function if the module was called as `__main__`. In effect, it lets your create a smart main function. - -```python -from autocommand import autocommand - -# This program takes exactly one argument and echos it. -@autocommand(__name__) -def echo(thing): - print(thing) -``` - -``` -$ python echo.py hello -hello -$ python echo.py -h -usage: echo [-h] thing - -positional arguments: - thing - -optional arguments: - -h, --help show this help message and exit -$ python echo.py hello world # too many arguments -usage: echo.py [-h] thing -echo.py: error: unrecognized arguments: world -``` - -As you can see, autocommand converts the signature of the function into an argument spec. When you run the file as a program, autocommand collects the command-line arguments and turns them into function arguments. The function is executed with these arguments, and then the program exits with the return value of the function, via `sys.exit`. Autocommand also automatically creates a usage message, which can be invoked with `-h` or `--help`, and automatically prints an error message when provided with invalid arguments. - -### Types - -You can use a type annotation to give an argument a type. Any type (or in fact any callable) that returns an object when given a string argument can be used, though there are a few special cases that are described later. - -```python -@autocommand(__name__) -def net_client(host, port: int): - ... -``` - -Autocommand will catch `TypeErrors` raised by the type during argument parsing, so you can supply a callable and do some basic argument validation as well. - -### Trailing Arguments - -You can add a `*args` parameter to your function to give it trailing arguments. The command will collect 0 or more trailing arguments and supply them to `args` as a tuple. If a type annotation is supplied, the type is applied to each argument. - -```python -# Write the contents of each file, one by one -@autocommand(__name__) -def cat(*files): - for filename in files: - with open(filename) as file: - for line in file: - print(line.rstrip()) -``` - -``` -$ python cat.py -h -usage: ipython [-h] [file [file ...]] - -positional arguments: - file - -optional arguments: - -h, --help show this help message and exit -``` - -### Options - -To create `--option` switches, just assign a default. Autocommand will automatically create `--long` and `-s`hort switches. - -```python -@autocommand(__name__) -def do_with_config(argument, config='~/foo.conf'): - pass -``` - -``` -$ python example.py -h -usage: example.py [-h] [-c CONFIG] argument - -positional arguments: - argument - -optional arguments: - -h, --help show this help message and exit - -c CONFIG, --config CONFIG -``` - -The option's type is automatically deduced from the default, unless one is explicitly given in an annotation: - -```python -@autocommand(__name__) -def http_connect(host, port=80): - print('{}:{}'.format(host, port)) -``` - -``` -$ python http.py -h -usage: http.py [-h] [-p PORT] host - -positional arguments: - host - -optional arguments: - -h, --help show this help message and exit - -p PORT, --port PORT -$ python http.py localhost -localhost:80 -$ python http.py localhost -p 8080 -localhost:8080 -$ python http.py localhost -p blah -usage: http.py [-h] [-p PORT] host -http.py: error: argument -p/--port: invalid int value: 'blah' -``` - -#### None - -If an option is given a default value of `None`, it reads in a value as normal, but supplies `None` if the option isn't provided. - -#### Switches - -If an argument is given a default value of `True` or `False`, or -given an explicit `bool` type, it becomes an option switch. - -```python - @autocommand(__name__) - def example(verbose=False, quiet=False): - pass -``` - -``` -$ python example.py -h -usage: example.py [-h] [-v] [-q] - -optional arguments: - -h, --help show this help message and exit - -v, --verbose - -q, --quiet -``` - -Autocommand attempts to do the "correct thing" in these cases- if the default is `True`, then supplying the switch makes the argument `False`; if the type is `bool` and the default is some other `True` value, then supplying the switch makes the argument `False`, while not supplying the switch makes the argument the default value. - -Autocommand also supports the creation of switch inverters. Pass `add_nos=True` to `autocommand` to enable this. - -``` - @autocommand(__name__, add_nos=True) - def example(verbose=False): - pass -``` - -``` -$ python example.py -h -usage: ipython [-h] [-v] [--no-verbose] - -optional arguments: - -h, --help show this help message and exit - -v, --verbose - --no-verbose -``` - -Using the `--no-` version of a switch will pass the opposite value in as a function argument. If multiple switches are present, the last one takes precedence. - -#### Files - -If the default value is a file object, such as `sys.stdout`, then autocommand just looks for a string, for a file path. It doesn't do any special checking on the string, though (such as checking if the file exists); it's better to let the client decide how to handle errors in this case. Instead, it provides a special context manager called `smart_open`, which behaves exactly like `open` if a filename or other openable type is provided, but also lets you use already open files: - -```python -from autocommand import autocommand, smart_open -import sys - -# Write the contents of stdin, or a file, to stdout -@autocommand(__name__) -def write_out(infile=sys.stdin): - with smart_open(infile) as f: - for line in f: - print(line.rstrip()) - # If a file was opened, it is closed here. If it was just stdin, it is untouched. -``` - -``` -$ echo "Hello World!" | python write_out.py | tee hello.txt -Hello World! -$ python write_out.py --infile hello.txt -Hello World! -``` - -### Descriptions and docstrings - -The `autocommand` decorator accepts `description` and `epilog` kwargs, corresponding to the `description `_ and `epilog `_ of the `ArgumentParser`. If no description is given, but the decorated function has a docstring, then it is taken as the `description` for the `ArgumentParser`. You can also provide both the description and epilog in the docstring by splitting it into two sections with 4 or more - characters. - -```python -@autocommand(__name__) -def copy(infile=sys.stdin, outfile=sys.stdout): - ''' - Copy an the contents of a file (or stdin) to another file (or stdout) - ---------- - Some extra documentation in the epilog - ''' - with smart_open(infile) as istr: - with smart_open(outfile, 'w') as ostr: - for line in istr: - ostr.write(line) -``` - -``` -$ python copy.py -h -usage: copy.py [-h] [-i INFILE] [-o OUTFILE] - -Copy an the contents of a file (or stdin) to another file (or stdout) - -optional arguments: - -h, --help show this help message and exit - -i INFILE, --infile INFILE - -o OUTFILE, --outfile OUTFILE - -Some extra documentation in the epilog -$ echo "Hello World" | python copy.py --outfile hello.txt -$ python copy.py --infile hello.txt --outfile hello2.txt -$ python copy.py --infile hello2.txt -Hello World -``` - -### Parameter descriptions - -You can also attach description text to individual parameters in the annotation. To attach both a type and a description, supply them both in any order in a tuple - -```python -@autocommand(__name__) -def copy_net( - infile: 'The name of the file to send', - host: 'The host to send the file to', - port: (int, 'The port to connect to')): - - ''' - Copy a file over raw TCP to a remote destination. - ''' - # Left as an exercise to the reader -``` - -### Decorators and wrappers - -Autocommand automatically follows wrapper chains created by `@functools.wraps`. This means that you can apply other wrapping decorators to your main function, and autocommand will still correctly detect the signature. - -```python -from functools import wraps -from autocommand import autocommand - -def print_yielded(func): - ''' - Convert a generator into a function that prints all yielded elements - ''' - @wraps(func) - def wrapper(*args, **kwargs): - for thing in func(*args, **kwargs): - print(thing) - return wrapper - -@autocommand(__name__, - description= 'Print all the values from START to STOP, inclusive, in steps of STEP', - epilog= 'STOP and STEP default to 1') -@print_yielded -def seq(stop, start=1, step=1): - for i in range(start, stop + 1, step): - yield i -``` - -``` -$ seq.py -h -usage: seq.py [-h] [-s START] [-S STEP] stop - -Print all the values from START to STOP, inclusive, in steps of STEP - -positional arguments: - stop - -optional arguments: - -h, --help show this help message and exit - -s START, --start START - -S STEP, --step STEP - -STOP and STEP default to 1 -``` - -Even though autocommand is being applied to the `wrapper` returned by `print_yielded`, it still retreives the signature of the underlying `seq` function to create the argument parsing. - -### Custom Parser - -While autocommand's automatic parser generator is a powerful convenience, it doesn't cover all of the different features that argparse provides. If you need these features, you can provide your own parser as a kwarg to `autocommand`: - -```python -from argparse import ArgumentParser -from autocommand import autocommand - -parser = ArgumentParser() -# autocommand can't do optional positonal parameters -parser.add_argument('arg', nargs='?') -# or mutually exclusive options -group = parser.add_mutually_exclusive_group() -group.add_argument('-v', '--verbose', action='store_true') -group.add_argument('-q', '--quiet', action='store_true') - -@autocommand(__name__, parser=parser) -def main(arg, verbose, quiet): - print(arg, verbose, quiet) -``` - -``` -$ python parser.py -h -usage: write_file.py [-h] [-v | -q] [arg] - -positional arguments: - arg - -optional arguments: - -h, --help show this help message and exit - -v, --verbose - -q, --quiet -$ python parser.py -None False False -$ python parser.py hello -hello False False -$ python parser.py -v -None True False -$ python parser.py -q -None False True -$ python parser.py -vq -usage: parser.py [-h] [-v | -q] [arg] -parser.py: error: argument -q/--quiet: not allowed with argument -v/--verbose -``` - -Any parser should work fine, so long as each of the parser's arguments has a corresponding parameter in the decorated main function. The order of parameters doesn't matter, as long as they are all present. Note that when using a custom parser, autocommand doesn't modify the parser or the retrieved arguments. This means that no description/epilog will be added, and the function's type annotations and defaults (if present) will be ignored. - -## Testing and Library use - -The decorated function is only called and exited from if the first argument to `autocommand` is `'__main__'` or `True`. If it is neither of these values, or no argument is given, then a new main function is created by the decorator. This function has the signature `main(argv=None)`, and is intended to be called with arguments as if via `main(sys.argv[1:])`. The function has the attributes `parser` and `main`, which are the generated `ArgumentParser` and the original main function that was decorated. This is to facilitate testing and library use of your main. Calling the function triggers a `parse_args()` with the supplied arguments, and returns the result of the main function. Note that, while it returns instead of calling `sys.exit`, the `parse_args()` function will raise a `SystemExit` in the event of a parsing error or `-h/--help` argument. - -```python - @autocommand() - def test_prog(arg1, arg2: int, quiet=False, verbose=False): - if not quiet: - print(arg1, arg2) - if verbose: - print("LOUD NOISES") - - return 0 - - print(test_prog(['-v', 'hello', '80'])) -``` - -``` -$ python test_prog.py -hello 80 -LOUD NOISES -0 -``` - -If the function is called with no arguments, `sys.argv[1:]` is used. This is to allow the autocommand function to be used as a setuptools entry point. - -## Exceptions and limitations - -- There are a few possible exceptions that `autocommand` can raise. All of them derive from `autocommand.AutocommandError`. - - - If an invalid annotation is given (that is, it isn't a `type`, `str`, `(type, str)`, or `(str, type)`, an `AnnotationError` is raised. The `type` may be any callable, as described in the `Types`_ section. - - If the function has a `**kwargs` parameter, a `KWargError` is raised. - - If, somehow, the function has a positional-only parameter, a `PositionalArgError` is raised. This means that the argument doesn't have a name, which is currently not possible with a plain `def` or `lambda`, though many built-in functions have this kind of parameter. - -- There are a few argparse features that are not supported by autocommand. - - - It isn't possible to have an optional positional argument (as opposed to a `--option`). POSIX thinks this is bad form anyway. - - It isn't possible to have mutually exclusive arguments or options - - It isn't possible to have subcommands or subparsers, though I'm working on a few solutions involving classes or nested function definitions to allow this. - -## Development - -Autocommand cannot be important from the project root; this is to enforce separation of concerns and prevent accidental importing of `setup.py` or tests. To develop, install the project in editable mode: - -``` -$ python setup.py develop -``` - -This will create a link to the source files in the deployment directory, so that any source changes are reflected when it is imported. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/RECORD deleted file mode 100644 index e6e12ea..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/RECORD +++ /dev/null @@ -1,18 +0,0 @@ -autocommand-2.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -autocommand-2.2.2.dist-info/LICENSE,sha256=reeNBJgtaZctREqOFKlPh6IzTdOFXMgDSOqOJAqg3y0,7634 -autocommand-2.2.2.dist-info/METADATA,sha256=OADZuR3O6iBlpu1ieTgzYul6w4uOVrk0P0BO5TGGAJk,15006 -autocommand-2.2.2.dist-info/RECORD,, -autocommand-2.2.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92 -autocommand-2.2.2.dist-info/top_level.txt,sha256=AzfhgKKS8EdAwWUTSF8mgeVQbXOY9kokHB6kSqwwqu0,12 -autocommand/__init__.py,sha256=zko5Rnvolvb-UXjCx_2ArPTGBWwUK5QY4LIQIKYR7As,1037 -autocommand/__pycache__/__init__.cpython-312.pyc,, -autocommand/__pycache__/autoasync.cpython-312.pyc,, -autocommand/__pycache__/autocommand.cpython-312.pyc,, -autocommand/__pycache__/automain.cpython-312.pyc,, -autocommand/__pycache__/autoparse.cpython-312.pyc,, -autocommand/__pycache__/errors.cpython-312.pyc,, -autocommand/autoasync.py,sha256=AMdyrxNS4pqWJfP_xuoOcImOHWD-qT7x06wmKN1Vp-U,5680 -autocommand/autocommand.py,sha256=hmkEmQ72HtL55gnURVjDOnsfYlGd5lLXbvT4KG496Qw,2505 -autocommand/automain.py,sha256=A2b8i754Mxc_DjU9WFr6vqYDWlhz0cn8miu8d8EsxV8,2076 -autocommand/autoparse.py,sha256=WVWmZJPcbzUKXP40raQw_0HD8qPJ2V9VG1eFFmmnFxw,11642 -autocommand/errors.py,sha256=7aa3roh9Herd6nIKpQHNWEslWE8oq7GiHYVUuRqORnA,886 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/WHEEL deleted file mode 100644 index 57e3d84..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.38.4) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/top_level.txt deleted file mode 100644 index dda5158..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand-2.2.2.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -autocommand diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__init__.py deleted file mode 100644 index 73fbfca..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2014-2016 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - -# flake8 flags all these imports as unused, hence the NOQAs everywhere. - -from .automain import automain # NOQA -from .autoparse import autoparse, smart_open # NOQA -from .autocommand import autocommand # NOQA - -try: - from .autoasync import autoasync # NOQA -except ImportError: # pragma: no cover - pass diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 169332d..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoasync.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoasync.cpython-311.pyc deleted file mode 100644 index 6a71ae7..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoasync.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autocommand.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autocommand.cpython-311.pyc deleted file mode 100644 index ec6439c..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autocommand.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/automain.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/automain.cpython-311.pyc deleted file mode 100644 index cad5108..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/automain.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoparse.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoparse.cpython-311.pyc deleted file mode 100644 index ff8ce95..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/autoparse.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/errors.cpython-311.pyc deleted file mode 100644 index 720e492..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/__pycache__/errors.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoasync.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoasync.py deleted file mode 100644 index 688f7e0..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoasync.py +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 2014-2015 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - -from asyncio import get_event_loop, iscoroutine -from functools import wraps -from inspect import signature - - -async def _run_forever_coro(coro, args, kwargs, loop): - ''' - This helper function launches an async main function that was tagged with - forever=True. There are two possibilities: - - - The function is a normal function, which handles initializing the event - loop, which is then run forever - - The function is a coroutine, which needs to be scheduled in the event - loop, which is then run forever - - There is also the possibility that the function is a normal function - wrapping a coroutine function - - The function is therefore called unconditionally and scheduled in the event - loop if the return value is a coroutine object. - - The reason this is a separate function is to make absolutely sure that all - the objects created are garbage collected after all is said and done; we - do this to ensure that any exceptions raised in the tasks are collected - ASAP. - ''' - - # Personal note: I consider this an antipattern, as it relies on the use of - # unowned resources. The setup function dumps some stuff into the event - # loop where it just whirls in the ether without a well defined owner or - # lifetime. For this reason, there's a good chance I'll remove the - # forever=True feature from autoasync at some point in the future. - thing = coro(*args, **kwargs) - if iscoroutine(thing): - await thing - - -def autoasync(coro=None, *, loop=None, forever=False, pass_loop=False): - ''' - Convert an asyncio coroutine into a function which, when called, is - evaluted in an event loop, and the return value returned. This is intented - to make it easy to write entry points into asyncio coroutines, which - otherwise need to be explictly evaluted with an event loop's - run_until_complete. - - If `loop` is given, it is used as the event loop to run the coro in. If it - is None (the default), the loop is retreived using asyncio.get_event_loop. - This call is defered until the decorated function is called, so that - callers can install custom event loops or event loop policies after - @autoasync is applied. - - If `forever` is True, the loop is run forever after the decorated coroutine - is finished. Use this for servers created with asyncio.start_server and the - like. - - If `pass_loop` is True, the event loop object is passed into the coroutine - as the `loop` kwarg when the wrapper function is called. In this case, the - wrapper function's __signature__ is updated to remove this parameter, so - that autoparse can still be used on it without generating a parameter for - `loop`. - - This coroutine can be called with ( @autoasync(...) ) or without - ( @autoasync ) arguments. - - Examples: - - @autoasync - def get_file(host, port): - reader, writer = yield from asyncio.open_connection(host, port) - data = reader.read() - sys.stdout.write(data.decode()) - - get_file(host, port) - - @autoasync(forever=True, pass_loop=True) - def server(host, port, loop): - yield_from loop.create_server(Proto, host, port) - - server('localhost', 8899) - - ''' - if coro is None: - return lambda c: autoasync( - c, loop=loop, - forever=forever, - pass_loop=pass_loop) - - # The old and new signatures are required to correctly bind the loop - # parameter in 100% of cases, even if it's a positional parameter. - # NOTE: A future release will probably require the loop parameter to be - # a kwonly parameter. - if pass_loop: - old_sig = signature(coro) - new_sig = old_sig.replace(parameters=( - param for name, param in old_sig.parameters.items() - if name != "loop")) - - @wraps(coro) - def autoasync_wrapper(*args, **kwargs): - # Defer the call to get_event_loop so that, if a custom policy is - # installed after the autoasync decorator, it is respected at call time - local_loop = get_event_loop() if loop is None else loop - - # Inject the 'loop' argument. We have to use this signature binding to - # ensure it's injected in the correct place (positional, keyword, etc) - if pass_loop: - bound_args = old_sig.bind_partial() - bound_args.arguments.update( - loop=local_loop, - **new_sig.bind(*args, **kwargs).arguments) - args, kwargs = bound_args.args, bound_args.kwargs - - if forever: - local_loop.create_task(_run_forever_coro( - coro, args, kwargs, local_loop - )) - local_loop.run_forever() - else: - return local_loop.run_until_complete(coro(*args, **kwargs)) - - # Attach the updated signature. This allows 'pass_loop' to be used with - # autoparse - if pass_loop: - autoasync_wrapper.__signature__ = new_sig - - return autoasync_wrapper diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autocommand.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autocommand.py deleted file mode 100644 index 097e86d..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autocommand.py +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2014-2015 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - -from .autoparse import autoparse -from .automain import automain -try: - from .autoasync import autoasync -except ImportError: # pragma: no cover - pass - - -def autocommand( - module, *, - description=None, - epilog=None, - add_nos=False, - parser=None, - loop=None, - forever=False, - pass_loop=False): - - if callable(module): - raise TypeError('autocommand requires a module name argument') - - def autocommand_decorator(func): - # Step 1: if requested, run it all in an asyncio event loop. autoasync - # patches the __signature__ of the decorated function, so that in the - # event that pass_loop is True, the `loop` parameter of the original - # function will *not* be interpreted as a command-line argument by - # autoparse - if loop is not None or forever or pass_loop: - func = autoasync( - func, - loop=None if loop is True else loop, - pass_loop=pass_loop, - forever=forever) - - # Step 2: create parser. We do this second so that the arguments are - # parsed and passed *before* entering the asyncio event loop, if it - # exists. This simplifies the stack trace and ensures errors are - # reported earlier. It also ensures that errors raised during parsing & - # passing are still raised if `forever` is True. - func = autoparse( - func, - description=description, - epilog=epilog, - add_nos=add_nos, - parser=parser) - - # Step 3: call the function automatically if __name__ == '__main__' (or - # if True was provided) - func = automain(module)(func) - - return func - - return autocommand_decorator diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/automain.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/automain.py deleted file mode 100644 index 6cc45db..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/automain.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2014-2015 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - -import sys -from .errors import AutocommandError - - -class AutomainRequiresModuleError(AutocommandError, TypeError): - pass - - -def automain(module, *, args=(), kwargs=None): - ''' - This decorator automatically invokes a function if the module is being run - as the "__main__" module. Optionally, provide args or kwargs with which to - call the function. If `module` is "__main__", the function is called, and - the program is `sys.exit`ed with the return value. You can also pass `True` - to cause the function to be called unconditionally. If the function is not - called, it is returned unchanged by the decorator. - - Usage: - - @automain(__name__) # Pass __name__ to check __name__=="__main__" - def main(): - ... - - If __name__ is "__main__" here, the main function is called, and then - sys.exit called with the return value. - ''' - - # Check that @automain(...) was called, rather than @automain - if callable(module): - raise AutomainRequiresModuleError(module) - - if module == '__main__' or module is True: - if kwargs is None: - kwargs = {} - - # Use a function definition instead of a lambda for a neater traceback - def automain_decorator(main): - sys.exit(main(*args, **kwargs)) - - return automain_decorator - else: - return lambda main: main diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoparse.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoparse.py deleted file mode 100644 index 0276a3f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/autoparse.py +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 2014-2015 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - -import sys -from re import compile as compile_regex -from inspect import signature, getdoc, Parameter -from argparse import ArgumentParser -from contextlib import contextmanager -from functools import wraps -from io import IOBase -from autocommand.errors import AutocommandError - - -_empty = Parameter.empty - - -class AnnotationError(AutocommandError): - '''Annotation error: annotation must be a string, type, or tuple of both''' - - -class PositionalArgError(AutocommandError): - ''' - Postional Arg Error: autocommand can't handle postional-only parameters - ''' - - -class KWArgError(AutocommandError): - '''kwarg Error: autocommand can't handle a **kwargs parameter''' - - -class DocstringError(AutocommandError): - '''Docstring error''' - - -class TooManySplitsError(DocstringError): - ''' - The docstring had too many ---- section splits. Currently we only support - using up to a single split, to split the docstring into description and - epilog parts. - ''' - - -def _get_type_description(annotation): - ''' - Given an annotation, return the (type, description) for the parameter. - If you provide an annotation that is somehow both a string and a callable, - the behavior is undefined. - ''' - if annotation is _empty: - return None, None - elif callable(annotation): - return annotation, None - elif isinstance(annotation, str): - return None, annotation - elif isinstance(annotation, tuple): - try: - arg1, arg2 = annotation - except ValueError as e: - raise AnnotationError(annotation) from e - else: - if callable(arg1) and isinstance(arg2, str): - return arg1, arg2 - elif isinstance(arg1, str) and callable(arg2): - return arg2, arg1 - - raise AnnotationError(annotation) - - -def _add_arguments(param, parser, used_char_args, add_nos): - ''' - Add the argument(s) to an ArgumentParser (using add_argument) for a given - parameter. used_char_args is the set of -short options currently already in - use, and is updated (if necessary) by this function. If add_nos is True, - this will also add an inverse switch for all boolean options. For - instance, for the boolean parameter "verbose", this will create --verbose - and --no-verbose. - ''' - - # Impl note: This function is kept separate from make_parser because it's - # already very long and I wanted to separate out as much as possible into - # its own call scope, to prevent even the possibility of suble mutation - # bugs. - if param.kind is param.POSITIONAL_ONLY: - raise PositionalArgError(param) - elif param.kind is param.VAR_KEYWORD: - raise KWArgError(param) - - # These are the kwargs for the add_argument function. - arg_spec = {} - is_option = False - - # Get the type and default from the annotation. - arg_type, description = _get_type_description(param.annotation) - - # Get the default value - default = param.default - - # If there is no explicit type, and the default is present and not None, - # infer the type from the default. - if arg_type is None and default not in {_empty, None}: - arg_type = type(default) - - # Add default. The presence of a default means this is an option, not an - # argument. - if default is not _empty: - arg_spec['default'] = default - is_option = True - - # Add the type - if arg_type is not None: - # Special case for bool: make it just a --switch - if arg_type is bool: - if not default or default is _empty: - arg_spec['action'] = 'store_true' - else: - arg_spec['action'] = 'store_false' - - # Switches are always options - is_option = True - - # Special case for file types: make it a string type, for filename - elif isinstance(default, IOBase): - arg_spec['type'] = str - - # TODO: special case for list type. - # - How to specificy type of list members? - # - param: [int] - # - param: int =[] - # - action='append' vs nargs='*' - - else: - arg_spec['type'] = arg_type - - # nargs: if the signature includes *args, collect them as trailing CLI - # arguments in a list. *args can't have a default value, so it can never be - # an option. - if param.kind is param.VAR_POSITIONAL: - # TODO: consider depluralizing metavar/name here. - arg_spec['nargs'] = '*' - - # Add description. - if description is not None: - arg_spec['help'] = description - - # Get the --flags - flags = [] - name = param.name - - if is_option: - # Add the first letter as a -short option. - for letter in name[0], name[0].swapcase(): - if letter not in used_char_args: - used_char_args.add(letter) - flags.append('-{}'.format(letter)) - break - - # If the parameter is a --long option, or is a -short option that - # somehow failed to get a flag, add it. - if len(name) > 1 or not flags: - flags.append('--{}'.format(name)) - - arg_spec['dest'] = name - else: - flags.append(name) - - parser.add_argument(*flags, **arg_spec) - - # Create the --no- version for boolean switches - if add_nos and arg_type is bool: - parser.add_argument( - '--no-{}'.format(name), - action='store_const', - dest=name, - const=default if default is not _empty else False) - - -def make_parser(func_sig, description, epilog, add_nos): - ''' - Given the signature of a function, create an ArgumentParser - ''' - parser = ArgumentParser(description=description, epilog=epilog) - - used_char_args = {'h'} - - # Arange the params so that single-character arguments are first. This - # esnures they don't have to get --long versions. sorted is stable, so the - # parameters will otherwise still be in relative order. - params = sorted( - func_sig.parameters.values(), - key=lambda param: len(param.name) > 1) - - for param in params: - _add_arguments(param, parser, used_char_args, add_nos) - - return parser - - -_DOCSTRING_SPLIT = compile_regex(r'\n\s*-{4,}\s*\n') - - -def parse_docstring(docstring): - ''' - Given a docstring, parse it into a description and epilog part - ''' - if docstring is None: - return '', '' - - parts = _DOCSTRING_SPLIT.split(docstring) - - if len(parts) == 1: - return docstring, '' - elif len(parts) == 2: - return parts[0], parts[1] - else: - raise TooManySplitsError() - - -def autoparse( - func=None, *, - description=None, - epilog=None, - add_nos=False, - parser=None): - ''' - This decorator converts a function that takes normal arguments into a - function which takes a single optional argument, argv, parses it using an - argparse.ArgumentParser, and calls the underlying function with the parsed - arguments. If it is not given, sys.argv[1:] is used. This is so that the - function can be used as a setuptools entry point, as well as a normal main - function. sys.argv[1:] is not evaluated until the function is called, to - allow injecting different arguments for testing. - - It uses the argument signature of the function to create an - ArgumentParser. Parameters without defaults become positional parameters, - while parameters *with* defaults become --options. Use annotations to set - the type of the parameter. - - The `desctiption` and `epilog` parameters corrospond to the same respective - argparse parameters. If no description is given, it defaults to the - decorated functions's docstring, if present. - - If add_nos is True, every boolean option (that is, every parameter with a - default of True/False or a type of bool) will have a --no- version created - as well, which inverts the option. For instance, the --verbose option will - have a --no-verbose counterpart. These are not mutually exclusive- - whichever one appears last in the argument list will have precedence. - - If a parser is given, it is used instead of one generated from the function - signature. In this case, no parser is created; instead, the given parser is - used to parse the argv argument. The parser's results' argument names must - match up with the parameter names of the decorated function. - - The decorated function is attached to the result as the `func` attribute, - and the parser is attached as the `parser` attribute. - ''' - - # If @autoparse(...) is used instead of @autoparse - if func is None: - return lambda f: autoparse( - f, description=description, - epilog=epilog, - add_nos=add_nos, - parser=parser) - - func_sig = signature(func) - - docstr_description, docstr_epilog = parse_docstring(getdoc(func)) - - if parser is None: - parser = make_parser( - func_sig, - description or docstr_description, - epilog or docstr_epilog, - add_nos) - - @wraps(func) - def autoparse_wrapper(argv=None): - if argv is None: - argv = sys.argv[1:] - - # Get empty argument binding, to fill with parsed arguments. This - # object does all the heavy lifting of turning named arguments into - # into correctly bound *args and **kwargs. - parsed_args = func_sig.bind_partial() - parsed_args.arguments.update(vars(parser.parse_args(argv))) - - return func(*parsed_args.args, **parsed_args.kwargs) - - # TODO: attach an updated __signature__ to autoparse_wrapper, just in case. - - # Attach the wrapped function and parser, and return the wrapper. - autoparse_wrapper.func = func - autoparse_wrapper.parser = parser - return autoparse_wrapper - - -@contextmanager -def smart_open(filename_or_file, *args, **kwargs): - ''' - This context manager allows you to open a filename, if you want to default - some already-existing file object, like sys.stdout, which shouldn't be - closed at the end of the context. If the filename argument is a str, bytes, - or int, the file object is created via a call to open with the given *args - and **kwargs, sent to the context, and closed at the end of the context, - just like "with open(filename) as f:". If it isn't one of the openable - types, the object simply sent to the context unchanged, and left unclosed - at the end of the context. Example: - - def work_with_file(name=sys.stdout): - with smart_open(name) as f: - # Works correctly if name is a str filename or sys.stdout - print("Some stuff", file=f) - # If it was a filename, f is closed at the end here. - ''' - if isinstance(filename_or_file, (str, bytes, int)): - with open(filename_or_file, *args, **kwargs) as file: - yield file - else: - yield filename_or_file diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/errors.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/errors.py deleted file mode 100644 index 2570607..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/autocommand/errors.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2014-2016 Nathan West -# -# This file is part of autocommand. -# -# autocommand is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# autocommand is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with autocommand. If not, see . - - -class AutocommandError(Exception): - '''Base class for autocommand exceptions''' - pass - -# Individual modules will define errors specific to that module. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/METADATA deleted file mode 100644 index db0a2dc..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/METADATA +++ /dev/null @@ -1,46 +0,0 @@ -Metadata-Version: 2.1 -Name: backports.tarfile -Version: 1.2.0 -Summary: Backport of CPython tarfile module -Author-email: "Jason R. Coombs" -Project-URL: Homepage, https://github.com/jaraco/backports.tarfile -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Provides-Extra: docs -Requires-Dist: sphinx >=3.5 ; extra == 'docs' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'docs' -Requires-Dist: rst.linker >=1.9 ; extra == 'docs' -Requires-Dist: furo ; extra == 'docs' -Requires-Dist: sphinx-lint ; extra == 'docs' -Provides-Extra: testing -Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'testing' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'testing' -Requires-Dist: pytest-cov ; extra == 'testing' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'testing' -Requires-Dist: jaraco.test ; extra == 'testing' -Requires-Dist: pytest !=8.0.* ; extra == 'testing' - -.. image:: https://img.shields.io/pypi/v/backports.tarfile.svg - :target: https://pypi.org/project/backports.tarfile - -.. image:: https://img.shields.io/pypi/pyversions/backports.tarfile.svg - -.. image:: https://github.com/jaraco/backports.tarfile/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/backports.tarfile/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. .. image:: https://readthedocs.org/projects/backportstarfile/badge/?version=latest -.. :target: https://backportstarfile.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/RECORD deleted file mode 100644 index 536dc2f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/RECORD +++ /dev/null @@ -1,17 +0,0 @@ -backports.tarfile-1.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -backports.tarfile-1.2.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -backports.tarfile-1.2.0.dist-info/METADATA,sha256=ghXFTq132dxaEIolxr3HK1mZqm9iyUmaRANZQSr6WlE,2020 -backports.tarfile-1.2.0.dist-info/RECORD,, -backports.tarfile-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -backports.tarfile-1.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -backports.tarfile-1.2.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10 -backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81 -backports/__pycache__/__init__.cpython-312.pyc,, -backports/tarfile/__init__.py,sha256=Pwf2qUIfB0SolJPCKcx3vz3UEu_aids4g4sAfxy94qg,108491 -backports/tarfile/__main__.py,sha256=Yw2oGT1afrz2eBskzdPYL8ReB_3liApmhFkN2EbDmc4,59 -backports/tarfile/__pycache__/__init__.cpython-312.pyc,, -backports/tarfile/__pycache__/__main__.cpython-312.pyc,, -backports/tarfile/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -backports/tarfile/compat/__pycache__/__init__.cpython-312.pyc,, -backports/tarfile/compat/__pycache__/py38.cpython-312.pyc,, -backports/tarfile/compat/py38.py,sha256=iYkyt_gvWjLzGUTJD9TuTfMMjOk-ersXZmRlvQYN2qE,568 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/WHEEL deleted file mode 100644 index bab98d6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.43.0) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/top_level.txt deleted file mode 100644 index 99d2be5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports.tarfile-1.2.0.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -backports diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__init__.py deleted file mode 100644 index 0d1f7ed..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type: ignore diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 4dd58ee..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__init__.py deleted file mode 100644 index 8c16881..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__init__.py +++ /dev/null @@ -1,2937 +0,0 @@ -#------------------------------------------------------------------- -# tarfile.py -#------------------------------------------------------------------- -# Copyright (C) 2002 Lars Gustaebel -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -"""Read from and write to tar format archives. -""" - -version = "0.9.0" -__author__ = "Lars Gust\u00e4bel (lars@gustaebel.de)" -__credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend." - -#--------- -# Imports -#--------- -from builtins import open as bltn_open -import sys -import os -import io -import shutil -import stat -import time -import struct -import copy -import re - -from .compat.py38 import removesuffix - -try: - import pwd -except ImportError: - pwd = None -try: - import grp -except ImportError: - grp = None - -# os.symlink on Windows prior to 6.0 raises NotImplementedError -# OSError (winerror=1314) will be raised if the caller does not hold the -# SeCreateSymbolicLinkPrivilege privilege -symlink_exception = (AttributeError, NotImplementedError, OSError) - -# from tarfile import * -__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError", - "CompressionError", "StreamError", "ExtractError", "HeaderError", - "ENCODING", "USTAR_FORMAT", "GNU_FORMAT", "PAX_FORMAT", - "DEFAULT_FORMAT", "open","fully_trusted_filter", "data_filter", - "tar_filter", "FilterError", "AbsoluteLinkError", - "OutsideDestinationError", "SpecialFileError", "AbsolutePathError", - "LinkOutsideDestinationError"] - - -#--------------------------------------------------------- -# tar constants -#--------------------------------------------------------- -NUL = b"\0" # the null character -BLOCKSIZE = 512 # length of processing blocks -RECORDSIZE = BLOCKSIZE * 20 # length of records -GNU_MAGIC = b"ustar \0" # magic gnu tar string -POSIX_MAGIC = b"ustar\x0000" # magic posix tar string - -LENGTH_NAME = 100 # maximum length of a filename -LENGTH_LINK = 100 # maximum length of a linkname -LENGTH_PREFIX = 155 # maximum length of the prefix field - -REGTYPE = b"0" # regular file -AREGTYPE = b"\0" # regular file -LNKTYPE = b"1" # link (inside tarfile) -SYMTYPE = b"2" # symbolic link -CHRTYPE = b"3" # character special device -BLKTYPE = b"4" # block special device -DIRTYPE = b"5" # directory -FIFOTYPE = b"6" # fifo special device -CONTTYPE = b"7" # contiguous file - -GNUTYPE_LONGNAME = b"L" # GNU tar longname -GNUTYPE_LONGLINK = b"K" # GNU tar longlink -GNUTYPE_SPARSE = b"S" # GNU tar sparse file - -XHDTYPE = b"x" # POSIX.1-2001 extended header -XGLTYPE = b"g" # POSIX.1-2001 global header -SOLARIS_XHDTYPE = b"X" # Solaris extended header - -USTAR_FORMAT = 0 # POSIX.1-1988 (ustar) format -GNU_FORMAT = 1 # GNU tar format -PAX_FORMAT = 2 # POSIX.1-2001 (pax) format -DEFAULT_FORMAT = PAX_FORMAT - -#--------------------------------------------------------- -# tarfile constants -#--------------------------------------------------------- -# File types that tarfile supports: -SUPPORTED_TYPES = (REGTYPE, AREGTYPE, LNKTYPE, - SYMTYPE, DIRTYPE, FIFOTYPE, - CONTTYPE, CHRTYPE, BLKTYPE, - GNUTYPE_LONGNAME, GNUTYPE_LONGLINK, - GNUTYPE_SPARSE) - -# File types that will be treated as a regular file. -REGULAR_TYPES = (REGTYPE, AREGTYPE, - CONTTYPE, GNUTYPE_SPARSE) - -# File types that are part of the GNU tar format. -GNU_TYPES = (GNUTYPE_LONGNAME, GNUTYPE_LONGLINK, - GNUTYPE_SPARSE) - -# Fields from a pax header that override a TarInfo attribute. -PAX_FIELDS = ("path", "linkpath", "size", "mtime", - "uid", "gid", "uname", "gname") - -# Fields from a pax header that are affected by hdrcharset. -PAX_NAME_FIELDS = {"path", "linkpath", "uname", "gname"} - -# Fields in a pax header that are numbers, all other fields -# are treated as strings. -PAX_NUMBER_FIELDS = { - "atime": float, - "ctime": float, - "mtime": float, - "uid": int, - "gid": int, - "size": int -} - -#--------------------------------------------------------- -# initialization -#--------------------------------------------------------- -if os.name == "nt": - ENCODING = "utf-8" -else: - ENCODING = sys.getfilesystemencoding() - -#--------------------------------------------------------- -# Some useful functions -#--------------------------------------------------------- - -def stn(s, length, encoding, errors): - """Convert a string to a null-terminated bytes object. - """ - if s is None: - raise ValueError("metadata cannot contain None") - s = s.encode(encoding, errors) - return s[:length] + (length - len(s)) * NUL - -def nts(s, encoding, errors): - """Convert a null-terminated bytes object to a string. - """ - p = s.find(b"\0") - if p != -1: - s = s[:p] - return s.decode(encoding, errors) - -def nti(s): - """Convert a number field to a python number. - """ - # There are two possible encodings for a number field, see - # itn() below. - if s[0] in (0o200, 0o377): - n = 0 - for i in range(len(s) - 1): - n <<= 8 - n += s[i + 1] - if s[0] == 0o377: - n = -(256 ** (len(s) - 1) - n) - else: - try: - s = nts(s, "ascii", "strict") - n = int(s.strip() or "0", 8) - except ValueError: - raise InvalidHeaderError("invalid header") - return n - -def itn(n, digits=8, format=DEFAULT_FORMAT): - """Convert a python number to a number field. - """ - # POSIX 1003.1-1988 requires numbers to be encoded as a string of - # octal digits followed by a null-byte, this allows values up to - # (8**(digits-1))-1. GNU tar allows storing numbers greater than - # that if necessary. A leading 0o200 or 0o377 byte indicate this - # particular encoding, the following digits-1 bytes are a big-endian - # base-256 representation. This allows values up to (256**(digits-1))-1. - # A 0o200 byte indicates a positive number, a 0o377 byte a negative - # number. - original_n = n - n = int(n) - if 0 <= n < 8 ** (digits - 1): - s = bytes("%0*o" % (digits - 1, n), "ascii") + NUL - elif format == GNU_FORMAT and -256 ** (digits - 1) <= n < 256 ** (digits - 1): - if n >= 0: - s = bytearray([0o200]) - else: - s = bytearray([0o377]) - n = 256 ** digits + n - - for i in range(digits - 1): - s.insert(1, n & 0o377) - n >>= 8 - else: - raise ValueError("overflow in number field") - - return s - -def calc_chksums(buf): - """Calculate the checksum for a member's header by summing up all - characters except for the chksum field which is treated as if - it was filled with spaces. According to the GNU tar sources, - some tars (Sun and NeXT) calculate chksum with signed char, - which will be different if there are chars in the buffer with - the high bit set. So we calculate two checksums, unsigned and - signed. - """ - unsigned_chksum = 256 + sum(struct.unpack_from("148B8x356B", buf)) - signed_chksum = 256 + sum(struct.unpack_from("148b8x356b", buf)) - return unsigned_chksum, signed_chksum - -def copyfileobj(src, dst, length=None, exception=OSError, bufsize=None): - """Copy length bytes from fileobj src to fileobj dst. - If length is None, copy the entire content. - """ - bufsize = bufsize or 16 * 1024 - if length == 0: - return - if length is None: - shutil.copyfileobj(src, dst, bufsize) - return - - blocks, remainder = divmod(length, bufsize) - for b in range(blocks): - buf = src.read(bufsize) - if len(buf) < bufsize: - raise exception("unexpected end of data") - dst.write(buf) - - if remainder != 0: - buf = src.read(remainder) - if len(buf) < remainder: - raise exception("unexpected end of data") - dst.write(buf) - return - -def _safe_print(s): - encoding = getattr(sys.stdout, 'encoding', None) - if encoding is not None: - s = s.encode(encoding, 'backslashreplace').decode(encoding) - print(s, end=' ') - - -class TarError(Exception): - """Base exception.""" - pass -class ExtractError(TarError): - """General exception for extract errors.""" - pass -class ReadError(TarError): - """Exception for unreadable tar archives.""" - pass -class CompressionError(TarError): - """Exception for unavailable compression methods.""" - pass -class StreamError(TarError): - """Exception for unsupported operations on stream-like TarFiles.""" - pass -class HeaderError(TarError): - """Base exception for header errors.""" - pass -class EmptyHeaderError(HeaderError): - """Exception for empty headers.""" - pass -class TruncatedHeaderError(HeaderError): - """Exception for truncated headers.""" - pass -class EOFHeaderError(HeaderError): - """Exception for end of file headers.""" - pass -class InvalidHeaderError(HeaderError): - """Exception for invalid headers.""" - pass -class SubsequentHeaderError(HeaderError): - """Exception for missing and invalid extended headers.""" - pass - -#--------------------------- -# internal stream interface -#--------------------------- -class _LowLevelFile: - """Low-level file object. Supports reading and writing. - It is used instead of a regular file object for streaming - access. - """ - - def __init__(self, name, mode): - mode = { - "r": os.O_RDONLY, - "w": os.O_WRONLY | os.O_CREAT | os.O_TRUNC, - }[mode] - if hasattr(os, "O_BINARY"): - mode |= os.O_BINARY - self.fd = os.open(name, mode, 0o666) - - def close(self): - os.close(self.fd) - - def read(self, size): - return os.read(self.fd, size) - - def write(self, s): - os.write(self.fd, s) - -class _Stream: - """Class that serves as an adapter between TarFile and - a stream-like object. The stream-like object only - needs to have a read() or write() method that works with bytes, - and the method is accessed blockwise. - Use of gzip or bzip2 compression is possible. - A stream-like object could be for example: sys.stdin.buffer, - sys.stdout.buffer, a socket, a tape device etc. - - _Stream is intended to be used only internally. - """ - - def __init__(self, name, mode, comptype, fileobj, bufsize, - compresslevel): - """Construct a _Stream object. - """ - self._extfileobj = True - if fileobj is None: - fileobj = _LowLevelFile(name, mode) - self._extfileobj = False - - if comptype == '*': - # Enable transparent compression detection for the - # stream interface - fileobj = _StreamProxy(fileobj) - comptype = fileobj.getcomptype() - - self.name = name or "" - self.mode = mode - self.comptype = comptype - self.fileobj = fileobj - self.bufsize = bufsize - self.buf = b"" - self.pos = 0 - self.closed = False - - try: - if comptype == "gz": - try: - import zlib - except ImportError: - raise CompressionError("zlib module is not available") from None - self.zlib = zlib - self.crc = zlib.crc32(b"") - if mode == "r": - self.exception = zlib.error - self._init_read_gz() - else: - self._init_write_gz(compresslevel) - - elif comptype == "bz2": - try: - import bz2 - except ImportError: - raise CompressionError("bz2 module is not available") from None - if mode == "r": - self.dbuf = b"" - self.cmp = bz2.BZ2Decompressor() - self.exception = OSError - else: - self.cmp = bz2.BZ2Compressor(compresslevel) - - elif comptype == "xz": - try: - import lzma - except ImportError: - raise CompressionError("lzma module is not available") from None - if mode == "r": - self.dbuf = b"" - self.cmp = lzma.LZMADecompressor() - self.exception = lzma.LZMAError - else: - self.cmp = lzma.LZMACompressor() - - elif comptype != "tar": - raise CompressionError("unknown compression type %r" % comptype) - - except: - if not self._extfileobj: - self.fileobj.close() - self.closed = True - raise - - def __del__(self): - if hasattr(self, "closed") and not self.closed: - self.close() - - def _init_write_gz(self, compresslevel): - """Initialize for writing with gzip compression. - """ - self.cmp = self.zlib.compressobj(compresslevel, - self.zlib.DEFLATED, - -self.zlib.MAX_WBITS, - self.zlib.DEF_MEM_LEVEL, - 0) - timestamp = struct.pack(" self.bufsize: - self.fileobj.write(self.buf[:self.bufsize]) - self.buf = self.buf[self.bufsize:] - - def close(self): - """Close the _Stream object. No operation should be - done on it afterwards. - """ - if self.closed: - return - - self.closed = True - try: - if self.mode == "w" and self.comptype != "tar": - self.buf += self.cmp.flush() - - if self.mode == "w" and self.buf: - self.fileobj.write(self.buf) - self.buf = b"" - if self.comptype == "gz": - self.fileobj.write(struct.pack("= 0: - blocks, remainder = divmod(pos - self.pos, self.bufsize) - for i in range(blocks): - self.read(self.bufsize) - self.read(remainder) - else: - raise StreamError("seeking backwards is not allowed") - return self.pos - - def read(self, size): - """Return the next size number of bytes from the stream.""" - assert size is not None - buf = self._read(size) - self.pos += len(buf) - return buf - - def _read(self, size): - """Return size bytes from the stream. - """ - if self.comptype == "tar": - return self.__read(size) - - c = len(self.dbuf) - t = [self.dbuf] - while c < size: - # Skip underlying buffer to avoid unaligned double buffering. - if self.buf: - buf = self.buf - self.buf = b"" - else: - buf = self.fileobj.read(self.bufsize) - if not buf: - break - try: - buf = self.cmp.decompress(buf) - except self.exception as e: - raise ReadError("invalid compressed data") from e - t.append(buf) - c += len(buf) - t = b"".join(t) - self.dbuf = t[size:] - return t[:size] - - def __read(self, size): - """Return size bytes from stream. If internal buffer is empty, - read another block from the stream. - """ - c = len(self.buf) - t = [self.buf] - while c < size: - buf = self.fileobj.read(self.bufsize) - if not buf: - break - t.append(buf) - c += len(buf) - t = b"".join(t) - self.buf = t[size:] - return t[:size] -# class _Stream - -class _StreamProxy(object): - """Small proxy class that enables transparent compression - detection for the Stream interface (mode 'r|*'). - """ - - def __init__(self, fileobj): - self.fileobj = fileobj - self.buf = self.fileobj.read(BLOCKSIZE) - - def read(self, size): - self.read = self.fileobj.read - return self.buf - - def getcomptype(self): - if self.buf.startswith(b"\x1f\x8b\x08"): - return "gz" - elif self.buf[0:3] == b"BZh" and self.buf[4:10] == b"1AY&SY": - return "bz2" - elif self.buf.startswith((b"\x5d\x00\x00\x80", b"\xfd7zXZ")): - return "xz" - else: - return "tar" - - def close(self): - self.fileobj.close() -# class StreamProxy - -#------------------------ -# Extraction file object -#------------------------ -class _FileInFile(object): - """A thin wrapper around an existing file object that - provides a part of its data as an individual file - object. - """ - - def __init__(self, fileobj, offset, size, name, blockinfo=None): - self.fileobj = fileobj - self.offset = offset - self.size = size - self.position = 0 - self.name = name - self.closed = False - - if blockinfo is None: - blockinfo = [(0, size)] - - # Construct a map with data and zero blocks. - self.map_index = 0 - self.map = [] - lastpos = 0 - realpos = self.offset - for offset, size in blockinfo: - if offset > lastpos: - self.map.append((False, lastpos, offset, None)) - self.map.append((True, offset, offset + size, realpos)) - realpos += size - lastpos = offset + size - if lastpos < self.size: - self.map.append((False, lastpos, self.size, None)) - - def flush(self): - pass - - @property - def mode(self): - return 'rb' - - def readable(self): - return True - - def writable(self): - return False - - def seekable(self): - return self.fileobj.seekable() - - def tell(self): - """Return the current file position. - """ - return self.position - - def seek(self, position, whence=io.SEEK_SET): - """Seek to a position in the file. - """ - if whence == io.SEEK_SET: - self.position = min(max(position, 0), self.size) - elif whence == io.SEEK_CUR: - if position < 0: - self.position = max(self.position + position, 0) - else: - self.position = min(self.position + position, self.size) - elif whence == io.SEEK_END: - self.position = max(min(self.size + position, self.size), 0) - else: - raise ValueError("Invalid argument") - return self.position - - def read(self, size=None): - """Read data from the file. - """ - if size is None: - size = self.size - self.position - else: - size = min(size, self.size - self.position) - - buf = b"" - while size > 0: - while True: - data, start, stop, offset = self.map[self.map_index] - if start <= self.position < stop: - break - else: - self.map_index += 1 - if self.map_index == len(self.map): - self.map_index = 0 - length = min(size, stop - self.position) - if data: - self.fileobj.seek(offset + (self.position - start)) - b = self.fileobj.read(length) - if len(b) != length: - raise ReadError("unexpected end of data") - buf += b - else: - buf += NUL * length - size -= length - self.position += length - return buf - - def readinto(self, b): - buf = self.read(len(b)) - b[:len(buf)] = buf - return len(buf) - - def close(self): - self.closed = True -#class _FileInFile - -class ExFileObject(io.BufferedReader): - - def __init__(self, tarfile, tarinfo): - fileobj = _FileInFile(tarfile.fileobj, tarinfo.offset_data, - tarinfo.size, tarinfo.name, tarinfo.sparse) - super().__init__(fileobj) -#class ExFileObject - - -#----------------------------- -# extraction filters (PEP 706) -#----------------------------- - -class FilterError(TarError): - pass - -class AbsolutePathError(FilterError): - def __init__(self, tarinfo): - self.tarinfo = tarinfo - super().__init__(f'member {tarinfo.name!r} has an absolute path') - -class OutsideDestinationError(FilterError): - def __init__(self, tarinfo, path): - self.tarinfo = tarinfo - self._path = path - super().__init__(f'{tarinfo.name!r} would be extracted to {path!r}, ' - + 'which is outside the destination') - -class SpecialFileError(FilterError): - def __init__(self, tarinfo): - self.tarinfo = tarinfo - super().__init__(f'{tarinfo.name!r} is a special file') - -class AbsoluteLinkError(FilterError): - def __init__(self, tarinfo): - self.tarinfo = tarinfo - super().__init__(f'{tarinfo.name!r} is a link to an absolute path') - -class LinkOutsideDestinationError(FilterError): - def __init__(self, tarinfo, path): - self.tarinfo = tarinfo - self._path = path - super().__init__(f'{tarinfo.name!r} would link to {path!r}, ' - + 'which is outside the destination') - -def _get_filtered_attrs(member, dest_path, for_data=True): - new_attrs = {} - name = member.name - dest_path = os.path.realpath(dest_path) - # Strip leading / (tar's directory separator) from filenames. - # Include os.sep (target OS directory separator) as well. - if name.startswith(('/', os.sep)): - name = new_attrs['name'] = member.path.lstrip('/' + os.sep) - if os.path.isabs(name): - # Path is absolute even after stripping. - # For example, 'C:/foo' on Windows. - raise AbsolutePathError(member) - # Ensure we stay in the destination - target_path = os.path.realpath(os.path.join(dest_path, name)) - if os.path.commonpath([target_path, dest_path]) != dest_path: - raise OutsideDestinationError(member, target_path) - # Limit permissions (no high bits, and go-w) - mode = member.mode - if mode is not None: - # Strip high bits & group/other write bits - mode = mode & 0o755 - if for_data: - # For data, handle permissions & file types - if member.isreg() or member.islnk(): - if not mode & 0o100: - # Clear executable bits if not executable by user - mode &= ~0o111 - # Ensure owner can read & write - mode |= 0o600 - elif member.isdir() or member.issym(): - # Ignore mode for directories & symlinks - mode = None - else: - # Reject special files - raise SpecialFileError(member) - if mode != member.mode: - new_attrs['mode'] = mode - if for_data: - # Ignore ownership for 'data' - if member.uid is not None: - new_attrs['uid'] = None - if member.gid is not None: - new_attrs['gid'] = None - if member.uname is not None: - new_attrs['uname'] = None - if member.gname is not None: - new_attrs['gname'] = None - # Check link destination for 'data' - if member.islnk() or member.issym(): - if os.path.isabs(member.linkname): - raise AbsoluteLinkError(member) - if member.issym(): - target_path = os.path.join(dest_path, - os.path.dirname(name), - member.linkname) - else: - target_path = os.path.join(dest_path, - member.linkname) - target_path = os.path.realpath(target_path) - if os.path.commonpath([target_path, dest_path]) != dest_path: - raise LinkOutsideDestinationError(member, target_path) - return new_attrs - -def fully_trusted_filter(member, dest_path): - return member - -def tar_filter(member, dest_path): - new_attrs = _get_filtered_attrs(member, dest_path, False) - if new_attrs: - return member.replace(**new_attrs, deep=False) - return member - -def data_filter(member, dest_path): - new_attrs = _get_filtered_attrs(member, dest_path, True) - if new_attrs: - return member.replace(**new_attrs, deep=False) - return member - -_NAMED_FILTERS = { - "fully_trusted": fully_trusted_filter, - "tar": tar_filter, - "data": data_filter, -} - -#------------------ -# Exported Classes -#------------------ - -# Sentinel for replace() defaults, meaning "don't change the attribute" -_KEEP = object() - -class TarInfo(object): - """Informational class which holds the details about an - archive member given by a tar header block. - TarInfo objects are returned by TarFile.getmember(), - TarFile.getmembers() and TarFile.gettarinfo() and are - usually created internally. - """ - - __slots__ = dict( - name = 'Name of the archive member.', - mode = 'Permission bits.', - uid = 'User ID of the user who originally stored this member.', - gid = 'Group ID of the user who originally stored this member.', - size = 'Size in bytes.', - mtime = 'Time of last modification.', - chksum = 'Header checksum.', - type = ('File type. type is usually one of these constants: ' - 'REGTYPE, AREGTYPE, LNKTYPE, SYMTYPE, DIRTYPE, FIFOTYPE, ' - 'CONTTYPE, CHRTYPE, BLKTYPE, GNUTYPE_SPARSE.'), - linkname = ('Name of the target file name, which is only present ' - 'in TarInfo objects of type LNKTYPE and SYMTYPE.'), - uname = 'User name.', - gname = 'Group name.', - devmajor = 'Device major number.', - devminor = 'Device minor number.', - offset = 'The tar header starts here.', - offset_data = "The file's data starts here.", - pax_headers = ('A dictionary containing key-value pairs of an ' - 'associated pax extended header.'), - sparse = 'Sparse member information.', - _tarfile = None, - _sparse_structs = None, - _link_target = None, - ) - - def __init__(self, name=""): - """Construct a TarInfo object. name is the optional name - of the member. - """ - self.name = name # member name - self.mode = 0o644 # file permissions - self.uid = 0 # user id - self.gid = 0 # group id - self.size = 0 # file size - self.mtime = 0 # modification time - self.chksum = 0 # header checksum - self.type = REGTYPE # member type - self.linkname = "" # link name - self.uname = "" # user name - self.gname = "" # group name - self.devmajor = 0 # device major number - self.devminor = 0 # device minor number - - self.offset = 0 # the tar header starts here - self.offset_data = 0 # the file's data starts here - - self.sparse = None # sparse member information - self.pax_headers = {} # pax header information - - @property - def tarfile(self): - import warnings - warnings.warn( - 'The undocumented "tarfile" attribute of TarInfo objects ' - + 'is deprecated and will be removed in Python 3.16', - DeprecationWarning, stacklevel=2) - return self._tarfile - - @tarfile.setter - def tarfile(self, tarfile): - import warnings - warnings.warn( - 'The undocumented "tarfile" attribute of TarInfo objects ' - + 'is deprecated and will be removed in Python 3.16', - DeprecationWarning, stacklevel=2) - self._tarfile = tarfile - - @property - def path(self): - 'In pax headers, "name" is called "path".' - return self.name - - @path.setter - def path(self, name): - self.name = name - - @property - def linkpath(self): - 'In pax headers, "linkname" is called "linkpath".' - return self.linkname - - @linkpath.setter - def linkpath(self, linkname): - self.linkname = linkname - - def __repr__(self): - return "<%s %r at %#x>" % (self.__class__.__name__,self.name,id(self)) - - def replace(self, *, - name=_KEEP, mtime=_KEEP, mode=_KEEP, linkname=_KEEP, - uid=_KEEP, gid=_KEEP, uname=_KEEP, gname=_KEEP, - deep=True, _KEEP=_KEEP): - """Return a deep copy of self with the given attributes replaced. - """ - if deep: - result = copy.deepcopy(self) - else: - result = copy.copy(self) - if name is not _KEEP: - result.name = name - if mtime is not _KEEP: - result.mtime = mtime - if mode is not _KEEP: - result.mode = mode - if linkname is not _KEEP: - result.linkname = linkname - if uid is not _KEEP: - result.uid = uid - if gid is not _KEEP: - result.gid = gid - if uname is not _KEEP: - result.uname = uname - if gname is not _KEEP: - result.gname = gname - return result - - def get_info(self): - """Return the TarInfo's attributes as a dictionary. - """ - if self.mode is None: - mode = None - else: - mode = self.mode & 0o7777 - info = { - "name": self.name, - "mode": mode, - "uid": self.uid, - "gid": self.gid, - "size": self.size, - "mtime": self.mtime, - "chksum": self.chksum, - "type": self.type, - "linkname": self.linkname, - "uname": self.uname, - "gname": self.gname, - "devmajor": self.devmajor, - "devminor": self.devminor - } - - if info["type"] == DIRTYPE and not info["name"].endswith("/"): - info["name"] += "/" - - return info - - def tobuf(self, format=DEFAULT_FORMAT, encoding=ENCODING, errors="surrogateescape"): - """Return a tar header as a string of 512 byte blocks. - """ - info = self.get_info() - for name, value in info.items(): - if value is None: - raise ValueError("%s may not be None" % name) - - if format == USTAR_FORMAT: - return self.create_ustar_header(info, encoding, errors) - elif format == GNU_FORMAT: - return self.create_gnu_header(info, encoding, errors) - elif format == PAX_FORMAT: - return self.create_pax_header(info, encoding) - else: - raise ValueError("invalid format") - - def create_ustar_header(self, info, encoding, errors): - """Return the object as a ustar header block. - """ - info["magic"] = POSIX_MAGIC - - if len(info["linkname"].encode(encoding, errors)) > LENGTH_LINK: - raise ValueError("linkname is too long") - - if len(info["name"].encode(encoding, errors)) > LENGTH_NAME: - info["prefix"], info["name"] = self._posix_split_name(info["name"], encoding, errors) - - return self._create_header(info, USTAR_FORMAT, encoding, errors) - - def create_gnu_header(self, info, encoding, errors): - """Return the object as a GNU header block sequence. - """ - info["magic"] = GNU_MAGIC - - buf = b"" - if len(info["linkname"].encode(encoding, errors)) > LENGTH_LINK: - buf += self._create_gnu_long_header(info["linkname"], GNUTYPE_LONGLINK, encoding, errors) - - if len(info["name"].encode(encoding, errors)) > LENGTH_NAME: - buf += self._create_gnu_long_header(info["name"], GNUTYPE_LONGNAME, encoding, errors) - - return buf + self._create_header(info, GNU_FORMAT, encoding, errors) - - def create_pax_header(self, info, encoding): - """Return the object as a ustar header block. If it cannot be - represented this way, prepend a pax extended header sequence - with supplement information. - """ - info["magic"] = POSIX_MAGIC - pax_headers = self.pax_headers.copy() - - # Test string fields for values that exceed the field length or cannot - # be represented in ASCII encoding. - for name, hname, length in ( - ("name", "path", LENGTH_NAME), ("linkname", "linkpath", LENGTH_LINK), - ("uname", "uname", 32), ("gname", "gname", 32)): - - if hname in pax_headers: - # The pax header has priority. - continue - - # Try to encode the string as ASCII. - try: - info[name].encode("ascii", "strict") - except UnicodeEncodeError: - pax_headers[hname] = info[name] - continue - - if len(info[name]) > length: - pax_headers[hname] = info[name] - - # Test number fields for values that exceed the field limit or values - # that like to be stored as float. - for name, digits in (("uid", 8), ("gid", 8), ("size", 12), ("mtime", 12)): - needs_pax = False - - val = info[name] - val_is_float = isinstance(val, float) - val_int = round(val) if val_is_float else val - if not 0 <= val_int < 8 ** (digits - 1): - # Avoid overflow. - info[name] = 0 - needs_pax = True - elif val_is_float: - # Put rounded value in ustar header, and full - # precision value in pax header. - info[name] = val_int - needs_pax = True - - # The existing pax header has priority. - if needs_pax and name not in pax_headers: - pax_headers[name] = str(val) - - # Create a pax extended header if necessary. - if pax_headers: - buf = self._create_pax_generic_header(pax_headers, XHDTYPE, encoding) - else: - buf = b"" - - return buf + self._create_header(info, USTAR_FORMAT, "ascii", "replace") - - @classmethod - def create_pax_global_header(cls, pax_headers): - """Return the object as a pax global header block sequence. - """ - return cls._create_pax_generic_header(pax_headers, XGLTYPE, "utf-8") - - def _posix_split_name(self, name, encoding, errors): - """Split a name longer than 100 chars into a prefix - and a name part. - """ - components = name.split("/") - for i in range(1, len(components)): - prefix = "/".join(components[:i]) - name = "/".join(components[i:]) - if len(prefix.encode(encoding, errors)) <= LENGTH_PREFIX and \ - len(name.encode(encoding, errors)) <= LENGTH_NAME: - break - else: - raise ValueError("name is too long") - - return prefix, name - - @staticmethod - def _create_header(info, format, encoding, errors): - """Return a header block. info is a dictionary with file - information, format must be one of the *_FORMAT constants. - """ - has_device_fields = info.get("type") in (CHRTYPE, BLKTYPE) - if has_device_fields: - devmajor = itn(info.get("devmajor", 0), 8, format) - devminor = itn(info.get("devminor", 0), 8, format) - else: - devmajor = stn("", 8, encoding, errors) - devminor = stn("", 8, encoding, errors) - - # None values in metadata should cause ValueError. - # itn()/stn() do this for all fields except type. - filetype = info.get("type", REGTYPE) - if filetype is None: - raise ValueError("TarInfo.type must not be None") - - parts = [ - stn(info.get("name", ""), 100, encoding, errors), - itn(info.get("mode", 0) & 0o7777, 8, format), - itn(info.get("uid", 0), 8, format), - itn(info.get("gid", 0), 8, format), - itn(info.get("size", 0), 12, format), - itn(info.get("mtime", 0), 12, format), - b" ", # checksum field - filetype, - stn(info.get("linkname", ""), 100, encoding, errors), - info.get("magic", POSIX_MAGIC), - stn(info.get("uname", ""), 32, encoding, errors), - stn(info.get("gname", ""), 32, encoding, errors), - devmajor, - devminor, - stn(info.get("prefix", ""), 155, encoding, errors) - ] - - buf = struct.pack("%ds" % BLOCKSIZE, b"".join(parts)) - chksum = calc_chksums(buf[-BLOCKSIZE:])[0] - buf = buf[:-364] + bytes("%06o\0" % chksum, "ascii") + buf[-357:] - return buf - - @staticmethod - def _create_payload(payload): - """Return the string payload filled with zero bytes - up to the next 512 byte border. - """ - blocks, remainder = divmod(len(payload), BLOCKSIZE) - if remainder > 0: - payload += (BLOCKSIZE - remainder) * NUL - return payload - - @classmethod - def _create_gnu_long_header(cls, name, type, encoding, errors): - """Return a GNUTYPE_LONGNAME or GNUTYPE_LONGLINK sequence - for name. - """ - name = name.encode(encoding, errors) + NUL - - info = {} - info["name"] = "././@LongLink" - info["type"] = type - info["size"] = len(name) - info["magic"] = GNU_MAGIC - - # create extended header + name blocks. - return cls._create_header(info, USTAR_FORMAT, encoding, errors) + \ - cls._create_payload(name) - - @classmethod - def _create_pax_generic_header(cls, pax_headers, type, encoding): - """Return a POSIX.1-2008 extended or global header sequence - that contains a list of keyword, value pairs. The values - must be strings. - """ - # Check if one of the fields contains surrogate characters and thereby - # forces hdrcharset=BINARY, see _proc_pax() for more information. - binary = False - for keyword, value in pax_headers.items(): - try: - value.encode("utf-8", "strict") - except UnicodeEncodeError: - binary = True - break - - records = b"" - if binary: - # Put the hdrcharset field at the beginning of the header. - records += b"21 hdrcharset=BINARY\n" - - for keyword, value in pax_headers.items(): - keyword = keyword.encode("utf-8") - if binary: - # Try to restore the original byte representation of 'value'. - # Needless to say, that the encoding must match the string. - value = value.encode(encoding, "surrogateescape") - else: - value = value.encode("utf-8") - - l = len(keyword) + len(value) + 3 # ' ' + '=' + '\n' - n = p = 0 - while True: - n = l + len(str(p)) - if n == p: - break - p = n - records += bytes(str(p), "ascii") + b" " + keyword + b"=" + value + b"\n" - - # We use a hardcoded "././@PaxHeader" name like star does - # instead of the one that POSIX recommends. - info = {} - info["name"] = "././@PaxHeader" - info["type"] = type - info["size"] = len(records) - info["magic"] = POSIX_MAGIC - - # Create pax header + record blocks. - return cls._create_header(info, USTAR_FORMAT, "ascii", "replace") + \ - cls._create_payload(records) - - @classmethod - def frombuf(cls, buf, encoding, errors): - """Construct a TarInfo object from a 512 byte bytes object. - """ - if len(buf) == 0: - raise EmptyHeaderError("empty header") - if len(buf) != BLOCKSIZE: - raise TruncatedHeaderError("truncated header") - if buf.count(NUL) == BLOCKSIZE: - raise EOFHeaderError("end of file header") - - chksum = nti(buf[148:156]) - if chksum not in calc_chksums(buf): - raise InvalidHeaderError("bad checksum") - - obj = cls() - obj.name = nts(buf[0:100], encoding, errors) - obj.mode = nti(buf[100:108]) - obj.uid = nti(buf[108:116]) - obj.gid = nti(buf[116:124]) - obj.size = nti(buf[124:136]) - obj.mtime = nti(buf[136:148]) - obj.chksum = chksum - obj.type = buf[156:157] - obj.linkname = nts(buf[157:257], encoding, errors) - obj.uname = nts(buf[265:297], encoding, errors) - obj.gname = nts(buf[297:329], encoding, errors) - obj.devmajor = nti(buf[329:337]) - obj.devminor = nti(buf[337:345]) - prefix = nts(buf[345:500], encoding, errors) - - # Old V7 tar format represents a directory as a regular - # file with a trailing slash. - if obj.type == AREGTYPE and obj.name.endswith("/"): - obj.type = DIRTYPE - - # The old GNU sparse format occupies some of the unused - # space in the buffer for up to 4 sparse structures. - # Save them for later processing in _proc_sparse(). - if obj.type == GNUTYPE_SPARSE: - pos = 386 - structs = [] - for i in range(4): - try: - offset = nti(buf[pos:pos + 12]) - numbytes = nti(buf[pos + 12:pos + 24]) - except ValueError: - break - structs.append((offset, numbytes)) - pos += 24 - isextended = bool(buf[482]) - origsize = nti(buf[483:495]) - obj._sparse_structs = (structs, isextended, origsize) - - # Remove redundant slashes from directories. - if obj.isdir(): - obj.name = obj.name.rstrip("/") - - # Reconstruct a ustar longname. - if prefix and obj.type not in GNU_TYPES: - obj.name = prefix + "/" + obj.name - return obj - - @classmethod - def fromtarfile(cls, tarfile): - """Return the next TarInfo object from TarFile object - tarfile. - """ - buf = tarfile.fileobj.read(BLOCKSIZE) - obj = cls.frombuf(buf, tarfile.encoding, tarfile.errors) - obj.offset = tarfile.fileobj.tell() - BLOCKSIZE - return obj._proc_member(tarfile) - - #-------------------------------------------------------------------------- - # The following are methods that are called depending on the type of a - # member. The entry point is _proc_member() which can be overridden in a - # subclass to add custom _proc_*() methods. A _proc_*() method MUST - # implement the following - # operations: - # 1. Set self.offset_data to the position where the data blocks begin, - # if there is data that follows. - # 2. Set tarfile.offset to the position where the next member's header will - # begin. - # 3. Return self or another valid TarInfo object. - def _proc_member(self, tarfile): - """Choose the right processing method depending on - the type and call it. - """ - if self.type in (GNUTYPE_LONGNAME, GNUTYPE_LONGLINK): - return self._proc_gnulong(tarfile) - elif self.type == GNUTYPE_SPARSE: - return self._proc_sparse(tarfile) - elif self.type in (XHDTYPE, XGLTYPE, SOLARIS_XHDTYPE): - return self._proc_pax(tarfile) - else: - return self._proc_builtin(tarfile) - - def _proc_builtin(self, tarfile): - """Process a builtin type or an unknown type which - will be treated as a regular file. - """ - self.offset_data = tarfile.fileobj.tell() - offset = self.offset_data - if self.isreg() or self.type not in SUPPORTED_TYPES: - # Skip the following data blocks. - offset += self._block(self.size) - tarfile.offset = offset - - # Patch the TarInfo object with saved global - # header information. - self._apply_pax_info(tarfile.pax_headers, tarfile.encoding, tarfile.errors) - - # Remove redundant slashes from directories. This is to be consistent - # with frombuf(). - if self.isdir(): - self.name = self.name.rstrip("/") - - return self - - def _proc_gnulong(self, tarfile): - """Process the blocks that hold a GNU longname - or longlink member. - """ - buf = tarfile.fileobj.read(self._block(self.size)) - - # Fetch the next header and process it. - try: - next = self.fromtarfile(tarfile) - except HeaderError as e: - raise SubsequentHeaderError(str(e)) from None - - # Patch the TarInfo object from the next header with - # the longname information. - next.offset = self.offset - if self.type == GNUTYPE_LONGNAME: - next.name = nts(buf, tarfile.encoding, tarfile.errors) - elif self.type == GNUTYPE_LONGLINK: - next.linkname = nts(buf, tarfile.encoding, tarfile.errors) - - # Remove redundant slashes from directories. This is to be consistent - # with frombuf(). - if next.isdir(): - next.name = removesuffix(next.name, "/") - - return next - - def _proc_sparse(self, tarfile): - """Process a GNU sparse header plus extra headers. - """ - # We already collected some sparse structures in frombuf(). - structs, isextended, origsize = self._sparse_structs - del self._sparse_structs - - # Collect sparse structures from extended header blocks. - while isextended: - buf = tarfile.fileobj.read(BLOCKSIZE) - pos = 0 - for i in range(21): - try: - offset = nti(buf[pos:pos + 12]) - numbytes = nti(buf[pos + 12:pos + 24]) - except ValueError: - break - if offset and numbytes: - structs.append((offset, numbytes)) - pos += 24 - isextended = bool(buf[504]) - self.sparse = structs - - self.offset_data = tarfile.fileobj.tell() - tarfile.offset = self.offset_data + self._block(self.size) - self.size = origsize - return self - - def _proc_pax(self, tarfile): - """Process an extended or global header as described in - POSIX.1-2008. - """ - # Read the header information. - buf = tarfile.fileobj.read(self._block(self.size)) - - # A pax header stores supplemental information for either - # the following file (extended) or all following files - # (global). - if self.type == XGLTYPE: - pax_headers = tarfile.pax_headers - else: - pax_headers = tarfile.pax_headers.copy() - - # Check if the pax header contains a hdrcharset field. This tells us - # the encoding of the path, linkpath, uname and gname fields. Normally, - # these fields are UTF-8 encoded but since POSIX.1-2008 tar - # implementations are allowed to store them as raw binary strings if - # the translation to UTF-8 fails. - match = re.search(br"\d+ hdrcharset=([^\n]+)\n", buf) - if match is not None: - pax_headers["hdrcharset"] = match.group(1).decode("utf-8") - - # For the time being, we don't care about anything other than "BINARY". - # The only other value that is currently allowed by the standard is - # "ISO-IR 10646 2000 UTF-8" in other words UTF-8. - hdrcharset = pax_headers.get("hdrcharset") - if hdrcharset == "BINARY": - encoding = tarfile.encoding - else: - encoding = "utf-8" - - # Parse pax header information. A record looks like that: - # "%d %s=%s\n" % (length, keyword, value). length is the size - # of the complete record including the length field itself and - # the newline. keyword and value are both UTF-8 encoded strings. - regex = re.compile(br"(\d+) ([^=]+)=") - pos = 0 - while match := regex.match(buf, pos): - length, keyword = match.groups() - length = int(length) - if length == 0: - raise InvalidHeaderError("invalid header") - value = buf[match.end(2) + 1:match.start(1) + length - 1] - - # Normally, we could just use "utf-8" as the encoding and "strict" - # as the error handler, but we better not take the risk. For - # example, GNU tar <= 1.23 is known to store filenames it cannot - # translate to UTF-8 as raw strings (unfortunately without a - # hdrcharset=BINARY header). - # We first try the strict standard encoding, and if that fails we - # fall back on the user's encoding and error handler. - keyword = self._decode_pax_field(keyword, "utf-8", "utf-8", - tarfile.errors) - if keyword in PAX_NAME_FIELDS: - value = self._decode_pax_field(value, encoding, tarfile.encoding, - tarfile.errors) - else: - value = self._decode_pax_field(value, "utf-8", "utf-8", - tarfile.errors) - - pax_headers[keyword] = value - pos += length - - # Fetch the next header. - try: - next = self.fromtarfile(tarfile) - except HeaderError as e: - raise SubsequentHeaderError(str(e)) from None - - # Process GNU sparse information. - if "GNU.sparse.map" in pax_headers: - # GNU extended sparse format version 0.1. - self._proc_gnusparse_01(next, pax_headers) - - elif "GNU.sparse.size" in pax_headers: - # GNU extended sparse format version 0.0. - self._proc_gnusparse_00(next, pax_headers, buf) - - elif pax_headers.get("GNU.sparse.major") == "1" and pax_headers.get("GNU.sparse.minor") == "0": - # GNU extended sparse format version 1.0. - self._proc_gnusparse_10(next, pax_headers, tarfile) - - if self.type in (XHDTYPE, SOLARIS_XHDTYPE): - # Patch the TarInfo object with the extended header info. - next._apply_pax_info(pax_headers, tarfile.encoding, tarfile.errors) - next.offset = self.offset - - if "size" in pax_headers: - # If the extended header replaces the size field, - # we need to recalculate the offset where the next - # header starts. - offset = next.offset_data - if next.isreg() or next.type not in SUPPORTED_TYPES: - offset += next._block(next.size) - tarfile.offset = offset - - return next - - def _proc_gnusparse_00(self, next, pax_headers, buf): - """Process a GNU tar extended sparse header, version 0.0. - """ - offsets = [] - for match in re.finditer(br"\d+ GNU.sparse.offset=(\d+)\n", buf): - offsets.append(int(match.group(1))) - numbytes = [] - for match in re.finditer(br"\d+ GNU.sparse.numbytes=(\d+)\n", buf): - numbytes.append(int(match.group(1))) - next.sparse = list(zip(offsets, numbytes)) - - def _proc_gnusparse_01(self, next, pax_headers): - """Process a GNU tar extended sparse header, version 0.1. - """ - sparse = [int(x) for x in pax_headers["GNU.sparse.map"].split(",")] - next.sparse = list(zip(sparse[::2], sparse[1::2])) - - def _proc_gnusparse_10(self, next, pax_headers, tarfile): - """Process a GNU tar extended sparse header, version 1.0. - """ - fields = None - sparse = [] - buf = tarfile.fileobj.read(BLOCKSIZE) - fields, buf = buf.split(b"\n", 1) - fields = int(fields) - while len(sparse) < fields * 2: - if b"\n" not in buf: - buf += tarfile.fileobj.read(BLOCKSIZE) - number, buf = buf.split(b"\n", 1) - sparse.append(int(number)) - next.offset_data = tarfile.fileobj.tell() - next.sparse = list(zip(sparse[::2], sparse[1::2])) - - def _apply_pax_info(self, pax_headers, encoding, errors): - """Replace fields with supplemental information from a previous - pax extended or global header. - """ - for keyword, value in pax_headers.items(): - if keyword == "GNU.sparse.name": - setattr(self, "path", value) - elif keyword == "GNU.sparse.size": - setattr(self, "size", int(value)) - elif keyword == "GNU.sparse.realsize": - setattr(self, "size", int(value)) - elif keyword in PAX_FIELDS: - if keyword in PAX_NUMBER_FIELDS: - try: - value = PAX_NUMBER_FIELDS[keyword](value) - except ValueError: - value = 0 - if keyword == "path": - value = value.rstrip("/") - setattr(self, keyword, value) - - self.pax_headers = pax_headers.copy() - - def _decode_pax_field(self, value, encoding, fallback_encoding, fallback_errors): - """Decode a single field from a pax record. - """ - try: - return value.decode(encoding, "strict") - except UnicodeDecodeError: - return value.decode(fallback_encoding, fallback_errors) - - def _block(self, count): - """Round up a byte count by BLOCKSIZE and return it, - e.g. _block(834) => 1024. - """ - blocks, remainder = divmod(count, BLOCKSIZE) - if remainder: - blocks += 1 - return blocks * BLOCKSIZE - - def isreg(self): - 'Return True if the Tarinfo object is a regular file.' - return self.type in REGULAR_TYPES - - def isfile(self): - 'Return True if the Tarinfo object is a regular file.' - return self.isreg() - - def isdir(self): - 'Return True if it is a directory.' - return self.type == DIRTYPE - - def issym(self): - 'Return True if it is a symbolic link.' - return self.type == SYMTYPE - - def islnk(self): - 'Return True if it is a hard link.' - return self.type == LNKTYPE - - def ischr(self): - 'Return True if it is a character device.' - return self.type == CHRTYPE - - def isblk(self): - 'Return True if it is a block device.' - return self.type == BLKTYPE - - def isfifo(self): - 'Return True if it is a FIFO.' - return self.type == FIFOTYPE - - def issparse(self): - return self.sparse is not None - - def isdev(self): - 'Return True if it is one of character device, block device or FIFO.' - return self.type in (CHRTYPE, BLKTYPE, FIFOTYPE) -# class TarInfo - -class TarFile(object): - """The TarFile Class provides an interface to tar archives. - """ - - debug = 0 # May be set from 0 (no msgs) to 3 (all msgs) - - dereference = False # If true, add content of linked file to the - # tar file, else the link. - - ignore_zeros = False # If true, skips empty or invalid blocks and - # continues processing. - - errorlevel = 1 # If 0, fatal errors only appear in debug - # messages (if debug >= 0). If > 0, errors - # are passed to the caller as exceptions. - - format = DEFAULT_FORMAT # The format to use when creating an archive. - - encoding = ENCODING # Encoding for 8-bit character strings. - - errors = None # Error handler for unicode conversion. - - tarinfo = TarInfo # The default TarInfo class to use. - - fileobject = ExFileObject # The file-object for extractfile(). - - extraction_filter = None # The default filter for extraction. - - def __init__(self, name=None, mode="r", fileobj=None, format=None, - tarinfo=None, dereference=None, ignore_zeros=None, encoding=None, - errors="surrogateescape", pax_headers=None, debug=None, - errorlevel=None, copybufsize=None, stream=False): - """Open an (uncompressed) tar archive 'name'. 'mode' is either 'r' to - read from an existing archive, 'a' to append data to an existing - file or 'w' to create a new file overwriting an existing one. 'mode' - defaults to 'r'. - If 'fileobj' is given, it is used for reading or writing data. If it - can be determined, 'mode' is overridden by 'fileobj's mode. - 'fileobj' is not closed, when TarFile is closed. - """ - modes = {"r": "rb", "a": "r+b", "w": "wb", "x": "xb"} - if mode not in modes: - raise ValueError("mode must be 'r', 'a', 'w' or 'x'") - self.mode = mode - self._mode = modes[mode] - - if not fileobj: - if self.mode == "a" and not os.path.exists(name): - # Create nonexistent files in append mode. - self.mode = "w" - self._mode = "wb" - fileobj = bltn_open(name, self._mode) - self._extfileobj = False - else: - if (name is None and hasattr(fileobj, "name") and - isinstance(fileobj.name, (str, bytes))): - name = fileobj.name - if hasattr(fileobj, "mode"): - self._mode = fileobj.mode - self._extfileobj = True - self.name = os.path.abspath(name) if name else None - self.fileobj = fileobj - - self.stream = stream - - # Init attributes. - if format is not None: - self.format = format - if tarinfo is not None: - self.tarinfo = tarinfo - if dereference is not None: - self.dereference = dereference - if ignore_zeros is not None: - self.ignore_zeros = ignore_zeros - if encoding is not None: - self.encoding = encoding - self.errors = errors - - if pax_headers is not None and self.format == PAX_FORMAT: - self.pax_headers = pax_headers - else: - self.pax_headers = {} - - if debug is not None: - self.debug = debug - if errorlevel is not None: - self.errorlevel = errorlevel - - # Init datastructures. - self.copybufsize = copybufsize - self.closed = False - self.members = [] # list of members as TarInfo objects - self._loaded = False # flag if all members have been read - self.offset = self.fileobj.tell() - # current position in the archive file - self.inodes = {} # dictionary caching the inodes of - # archive members already added - - try: - if self.mode == "r": - self.firstmember = None - self.firstmember = self.next() - - if self.mode == "a": - # Move to the end of the archive, - # before the first empty block. - while True: - self.fileobj.seek(self.offset) - try: - tarinfo = self.tarinfo.fromtarfile(self) - self.members.append(tarinfo) - except EOFHeaderError: - self.fileobj.seek(self.offset) - break - except HeaderError as e: - raise ReadError(str(e)) from None - - if self.mode in ("a", "w", "x"): - self._loaded = True - - if self.pax_headers: - buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy()) - self.fileobj.write(buf) - self.offset += len(buf) - except: - if not self._extfileobj: - self.fileobj.close() - self.closed = True - raise - - #-------------------------------------------------------------------------- - # Below are the classmethods which act as alternate constructors to the - # TarFile class. The open() method is the only one that is needed for - # public use; it is the "super"-constructor and is able to select an - # adequate "sub"-constructor for a particular compression using the mapping - # from OPEN_METH. - # - # This concept allows one to subclass TarFile without losing the comfort of - # the super-constructor. A sub-constructor is registered and made available - # by adding it to the mapping in OPEN_METH. - - @classmethod - def open(cls, name=None, mode="r", fileobj=None, bufsize=RECORDSIZE, **kwargs): - r"""Open a tar archive for reading, writing or appending. Return - an appropriate TarFile class. - - mode: - 'r' or 'r:\*' open for reading with transparent compression - 'r:' open for reading exclusively uncompressed - 'r:gz' open for reading with gzip compression - 'r:bz2' open for reading with bzip2 compression - 'r:xz' open for reading with lzma compression - 'a' or 'a:' open for appending, creating the file if necessary - 'w' or 'w:' open for writing without compression - 'w:gz' open for writing with gzip compression - 'w:bz2' open for writing with bzip2 compression - 'w:xz' open for writing with lzma compression - - 'x' or 'x:' create a tarfile exclusively without compression, raise - an exception if the file is already created - 'x:gz' create a gzip compressed tarfile, raise an exception - if the file is already created - 'x:bz2' create a bzip2 compressed tarfile, raise an exception - if the file is already created - 'x:xz' create an lzma compressed tarfile, raise an exception - if the file is already created - - 'r|\*' open a stream of tar blocks with transparent compression - 'r|' open an uncompressed stream of tar blocks for reading - 'r|gz' open a gzip compressed stream of tar blocks - 'r|bz2' open a bzip2 compressed stream of tar blocks - 'r|xz' open an lzma compressed stream of tar blocks - 'w|' open an uncompressed stream for writing - 'w|gz' open a gzip compressed stream for writing - 'w|bz2' open a bzip2 compressed stream for writing - 'w|xz' open an lzma compressed stream for writing - """ - - if not name and not fileobj: - raise ValueError("nothing to open") - - if mode in ("r", "r:*"): - # Find out which *open() is appropriate for opening the file. - def not_compressed(comptype): - return cls.OPEN_METH[comptype] == 'taropen' - error_msgs = [] - for comptype in sorted(cls.OPEN_METH, key=not_compressed): - func = getattr(cls, cls.OPEN_METH[comptype]) - if fileobj is not None: - saved_pos = fileobj.tell() - try: - return func(name, "r", fileobj, **kwargs) - except (ReadError, CompressionError) as e: - error_msgs.append(f'- method {comptype}: {e!r}') - if fileobj is not None: - fileobj.seek(saved_pos) - continue - error_msgs_summary = '\n'.join(error_msgs) - raise ReadError(f"file could not be opened successfully:\n{error_msgs_summary}") - - elif ":" in mode: - filemode, comptype = mode.split(":", 1) - filemode = filemode or "r" - comptype = comptype or "tar" - - # Select the *open() function according to - # given compression. - if comptype in cls.OPEN_METH: - func = getattr(cls, cls.OPEN_METH[comptype]) - else: - raise CompressionError("unknown compression type %r" % comptype) - return func(name, filemode, fileobj, **kwargs) - - elif "|" in mode: - filemode, comptype = mode.split("|", 1) - filemode = filemode or "r" - comptype = comptype or "tar" - - if filemode not in ("r", "w"): - raise ValueError("mode must be 'r' or 'w'") - - compresslevel = kwargs.pop("compresslevel", 9) - stream = _Stream(name, filemode, comptype, fileobj, bufsize, - compresslevel) - try: - t = cls(name, filemode, stream, **kwargs) - except: - stream.close() - raise - t._extfileobj = False - return t - - elif mode in ("a", "w", "x"): - return cls.taropen(name, mode, fileobj, **kwargs) - - raise ValueError("undiscernible mode") - - @classmethod - def taropen(cls, name, mode="r", fileobj=None, **kwargs): - """Open uncompressed tar archive name for reading or writing. - """ - if mode not in ("r", "a", "w", "x"): - raise ValueError("mode must be 'r', 'a', 'w' or 'x'") - return cls(name, mode, fileobj, **kwargs) - - @classmethod - def gzopen(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs): - """Open gzip compressed tar archive name for reading or writing. - Appending is not allowed. - """ - if mode not in ("r", "w", "x"): - raise ValueError("mode must be 'r', 'w' or 'x'") - - try: - from gzip import GzipFile - except ImportError: - raise CompressionError("gzip module is not available") from None - - try: - fileobj = GzipFile(name, mode + "b", compresslevel, fileobj) - except OSError as e: - if fileobj is not None and mode == 'r': - raise ReadError("not a gzip file") from e - raise - - try: - t = cls.taropen(name, mode, fileobj, **kwargs) - except OSError as e: - fileobj.close() - if mode == 'r': - raise ReadError("not a gzip file") from e - raise - except: - fileobj.close() - raise - t._extfileobj = False - return t - - @classmethod - def bz2open(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs): - """Open bzip2 compressed tar archive name for reading or writing. - Appending is not allowed. - """ - if mode not in ("r", "w", "x"): - raise ValueError("mode must be 'r', 'w' or 'x'") - - try: - from bz2 import BZ2File - except ImportError: - raise CompressionError("bz2 module is not available") from None - - fileobj = BZ2File(fileobj or name, mode, compresslevel=compresslevel) - - try: - t = cls.taropen(name, mode, fileobj, **kwargs) - except (OSError, EOFError) as e: - fileobj.close() - if mode == 'r': - raise ReadError("not a bzip2 file") from e - raise - except: - fileobj.close() - raise - t._extfileobj = False - return t - - @classmethod - def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs): - """Open lzma compressed tar archive name for reading or writing. - Appending is not allowed. - """ - if mode not in ("r", "w", "x"): - raise ValueError("mode must be 'r', 'w' or 'x'") - - try: - from lzma import LZMAFile, LZMAError - except ImportError: - raise CompressionError("lzma module is not available") from None - - fileobj = LZMAFile(fileobj or name, mode, preset=preset) - - try: - t = cls.taropen(name, mode, fileobj, **kwargs) - except (LZMAError, EOFError) as e: - fileobj.close() - if mode == 'r': - raise ReadError("not an lzma file") from e - raise - except: - fileobj.close() - raise - t._extfileobj = False - return t - - # All *open() methods are registered here. - OPEN_METH = { - "tar": "taropen", # uncompressed tar - "gz": "gzopen", # gzip compressed tar - "bz2": "bz2open", # bzip2 compressed tar - "xz": "xzopen" # lzma compressed tar - } - - #-------------------------------------------------------------------------- - # The public methods which TarFile provides: - - def close(self): - """Close the TarFile. In write-mode, two finishing zero blocks are - appended to the archive. - """ - if self.closed: - return - - self.closed = True - try: - if self.mode in ("a", "w", "x"): - self.fileobj.write(NUL * (BLOCKSIZE * 2)) - self.offset += (BLOCKSIZE * 2) - # fill up the end with zero-blocks - # (like option -b20 for tar does) - blocks, remainder = divmod(self.offset, RECORDSIZE) - if remainder > 0: - self.fileobj.write(NUL * (RECORDSIZE - remainder)) - finally: - if not self._extfileobj: - self.fileobj.close() - - def getmember(self, name): - """Return a TarInfo object for member 'name'. If 'name' can not be - found in the archive, KeyError is raised. If a member occurs more - than once in the archive, its last occurrence is assumed to be the - most up-to-date version. - """ - tarinfo = self._getmember(name.rstrip('/')) - if tarinfo is None: - raise KeyError("filename %r not found" % name) - return tarinfo - - def getmembers(self): - """Return the members of the archive as a list of TarInfo objects. The - list has the same order as the members in the archive. - """ - self._check() - if not self._loaded: # if we want to obtain a list of - self._load() # all members, we first have to - # scan the whole archive. - return self.members - - def getnames(self): - """Return the members of the archive as a list of their names. It has - the same order as the list returned by getmembers(). - """ - return [tarinfo.name for tarinfo in self.getmembers()] - - def gettarinfo(self, name=None, arcname=None, fileobj=None): - """Create a TarInfo object from the result of os.stat or equivalent - on an existing file. The file is either named by 'name', or - specified as a file object 'fileobj' with a file descriptor. If - given, 'arcname' specifies an alternative name for the file in the - archive, otherwise, the name is taken from the 'name' attribute of - 'fileobj', or the 'name' argument. The name should be a text - string. - """ - self._check("awx") - - # When fileobj is given, replace name by - # fileobj's real name. - if fileobj is not None: - name = fileobj.name - - # Building the name of the member in the archive. - # Backward slashes are converted to forward slashes, - # Absolute paths are turned to relative paths. - if arcname is None: - arcname = name - drv, arcname = os.path.splitdrive(arcname) - arcname = arcname.replace(os.sep, "/") - arcname = arcname.lstrip("/") - - # Now, fill the TarInfo object with - # information specific for the file. - tarinfo = self.tarinfo() - tarinfo._tarfile = self # To be removed in 3.16. - - # Use os.stat or os.lstat, depending on if symlinks shall be resolved. - if fileobj is None: - if not self.dereference: - statres = os.lstat(name) - else: - statres = os.stat(name) - else: - statres = os.fstat(fileobj.fileno()) - linkname = "" - - stmd = statres.st_mode - if stat.S_ISREG(stmd): - inode = (statres.st_ino, statres.st_dev) - if not self.dereference and statres.st_nlink > 1 and \ - inode in self.inodes and arcname != self.inodes[inode]: - # Is it a hardlink to an already - # archived file? - type = LNKTYPE - linkname = self.inodes[inode] - else: - # The inode is added only if its valid. - # For win32 it is always 0. - type = REGTYPE - if inode[0]: - self.inodes[inode] = arcname - elif stat.S_ISDIR(stmd): - type = DIRTYPE - elif stat.S_ISFIFO(stmd): - type = FIFOTYPE - elif stat.S_ISLNK(stmd): - type = SYMTYPE - linkname = os.readlink(name) - elif stat.S_ISCHR(stmd): - type = CHRTYPE - elif stat.S_ISBLK(stmd): - type = BLKTYPE - else: - return None - - # Fill the TarInfo object with all - # information we can get. - tarinfo.name = arcname - tarinfo.mode = stmd - tarinfo.uid = statres.st_uid - tarinfo.gid = statres.st_gid - if type == REGTYPE: - tarinfo.size = statres.st_size - else: - tarinfo.size = 0 - tarinfo.mtime = statres.st_mtime - tarinfo.type = type - tarinfo.linkname = linkname - if pwd: - try: - tarinfo.uname = pwd.getpwuid(tarinfo.uid)[0] - except KeyError: - pass - if grp: - try: - tarinfo.gname = grp.getgrgid(tarinfo.gid)[0] - except KeyError: - pass - - if type in (CHRTYPE, BLKTYPE): - if hasattr(os, "major") and hasattr(os, "minor"): - tarinfo.devmajor = os.major(statres.st_rdev) - tarinfo.devminor = os.minor(statres.st_rdev) - return tarinfo - - def list(self, verbose=True, *, members=None): - """Print a table of contents to sys.stdout. If 'verbose' is False, only - the names of the members are printed. If it is True, an 'ls -l'-like - output is produced. 'members' is optional and must be a subset of the - list returned by getmembers(). - """ - # Convert tarinfo type to stat type. - type2mode = {REGTYPE: stat.S_IFREG, SYMTYPE: stat.S_IFLNK, - FIFOTYPE: stat.S_IFIFO, CHRTYPE: stat.S_IFCHR, - DIRTYPE: stat.S_IFDIR, BLKTYPE: stat.S_IFBLK} - self._check() - - if members is None: - members = self - for tarinfo in members: - if verbose: - if tarinfo.mode is None: - _safe_print("??????????") - else: - modetype = type2mode.get(tarinfo.type, 0) - _safe_print(stat.filemode(modetype | tarinfo.mode)) - _safe_print("%s/%s" % (tarinfo.uname or tarinfo.uid, - tarinfo.gname or tarinfo.gid)) - if tarinfo.ischr() or tarinfo.isblk(): - _safe_print("%10s" % - ("%d,%d" % (tarinfo.devmajor, tarinfo.devminor))) - else: - _safe_print("%10d" % tarinfo.size) - if tarinfo.mtime is None: - _safe_print("????-??-?? ??:??:??") - else: - _safe_print("%d-%02d-%02d %02d:%02d:%02d" \ - % time.localtime(tarinfo.mtime)[:6]) - - _safe_print(tarinfo.name + ("/" if tarinfo.isdir() else "")) - - if verbose: - if tarinfo.issym(): - _safe_print("-> " + tarinfo.linkname) - if tarinfo.islnk(): - _safe_print("link to " + tarinfo.linkname) - print() - - def add(self, name, arcname=None, recursive=True, *, filter=None): - """Add the file 'name' to the archive. 'name' may be any type of file - (directory, fifo, symbolic link, etc.). If given, 'arcname' - specifies an alternative name for the file in the archive. - Directories are added recursively by default. This can be avoided by - setting 'recursive' to False. 'filter' is a function - that expects a TarInfo object argument and returns the changed - TarInfo object, if it returns None the TarInfo object will be - excluded from the archive. - """ - self._check("awx") - - if arcname is None: - arcname = name - - # Skip if somebody tries to archive the archive... - if self.name is not None and os.path.abspath(name) == self.name: - self._dbg(2, "tarfile: Skipped %r" % name) - return - - self._dbg(1, name) - - # Create a TarInfo object from the file. - tarinfo = self.gettarinfo(name, arcname) - - if tarinfo is None: - self._dbg(1, "tarfile: Unsupported type %r" % name) - return - - # Change or exclude the TarInfo object. - if filter is not None: - tarinfo = filter(tarinfo) - if tarinfo is None: - self._dbg(2, "tarfile: Excluded %r" % name) - return - - # Append the tar header and data to the archive. - if tarinfo.isreg(): - with bltn_open(name, "rb") as f: - self.addfile(tarinfo, f) - - elif tarinfo.isdir(): - self.addfile(tarinfo) - if recursive: - for f in sorted(os.listdir(name)): - self.add(os.path.join(name, f), os.path.join(arcname, f), - recursive, filter=filter) - - else: - self.addfile(tarinfo) - - def addfile(self, tarinfo, fileobj=None): - """Add the TarInfo object 'tarinfo' to the archive. If 'tarinfo' represents - a non zero-size regular file, the 'fileobj' argument should be a binary file, - and tarinfo.size bytes are read from it and added to the archive. - You can create TarInfo objects directly, or by using gettarinfo(). - """ - self._check("awx") - - if fileobj is None and tarinfo.isreg() and tarinfo.size != 0: - raise ValueError("fileobj not provided for non zero-size regular file") - - tarinfo = copy.copy(tarinfo) - - buf = tarinfo.tobuf(self.format, self.encoding, self.errors) - self.fileobj.write(buf) - self.offset += len(buf) - bufsize=self.copybufsize - # If there's data to follow, append it. - if fileobj is not None: - copyfileobj(fileobj, self.fileobj, tarinfo.size, bufsize=bufsize) - blocks, remainder = divmod(tarinfo.size, BLOCKSIZE) - if remainder > 0: - self.fileobj.write(NUL * (BLOCKSIZE - remainder)) - blocks += 1 - self.offset += blocks * BLOCKSIZE - - self.members.append(tarinfo) - - def _get_filter_function(self, filter): - if filter is None: - filter = self.extraction_filter - if filter is None: - import warnings - warnings.warn( - 'Python 3.14 will, by default, filter extracted tar ' - + 'archives and reject files or modify their metadata. ' - + 'Use the filter argument to control this behavior.', - DeprecationWarning, stacklevel=3) - return fully_trusted_filter - if isinstance(filter, str): - raise TypeError( - 'String names are not supported for ' - + 'TarFile.extraction_filter. Use a function such as ' - + 'tarfile.data_filter directly.') - return filter - if callable(filter): - return filter - try: - return _NAMED_FILTERS[filter] - except KeyError: - raise ValueError(f"filter {filter!r} not found") from None - - def extractall(self, path=".", members=None, *, numeric_owner=False, - filter=None): - """Extract all members from the archive to the current working - directory and set owner, modification time and permissions on - directories afterwards. 'path' specifies a different directory - to extract to. 'members' is optional and must be a subset of the - list returned by getmembers(). If 'numeric_owner' is True, only - the numbers for user/group names are used and not the names. - - The 'filter' function will be called on each member just - before extraction. - It can return a changed TarInfo or None to skip the member. - String names of common filters are accepted. - """ - directories = [] - - filter_function = self._get_filter_function(filter) - if members is None: - members = self - - for member in members: - tarinfo = self._get_extract_tarinfo(member, filter_function, path) - if tarinfo is None: - continue - if tarinfo.isdir(): - # For directories, delay setting attributes until later, - # since permissions can interfere with extraction and - # extracting contents can reset mtime. - directories.append(tarinfo) - self._extract_one(tarinfo, path, set_attrs=not tarinfo.isdir(), - numeric_owner=numeric_owner) - - # Reverse sort directories. - directories.sort(key=lambda a: a.name, reverse=True) - - # Set correct owner, mtime and filemode on directories. - for tarinfo in directories: - dirpath = os.path.join(path, tarinfo.name) - try: - self.chown(tarinfo, dirpath, numeric_owner=numeric_owner) - self.utime(tarinfo, dirpath) - self.chmod(tarinfo, dirpath) - except ExtractError as e: - self._handle_nonfatal_error(e) - - def extract(self, member, path="", set_attrs=True, *, numeric_owner=False, - filter=None): - """Extract a member from the archive to the current working directory, - using its full name. Its file information is extracted as accurately - as possible. 'member' may be a filename or a TarInfo object. You can - specify a different directory using 'path'. File attributes (owner, - mtime, mode) are set unless 'set_attrs' is False. If 'numeric_owner' - is True, only the numbers for user/group names are used and not - the names. - - The 'filter' function will be called before extraction. - It can return a changed TarInfo or None to skip the member. - String names of common filters are accepted. - """ - filter_function = self._get_filter_function(filter) - tarinfo = self._get_extract_tarinfo(member, filter_function, path) - if tarinfo is not None: - self._extract_one(tarinfo, path, set_attrs, numeric_owner) - - def _get_extract_tarinfo(self, member, filter_function, path): - """Get filtered TarInfo (or None) from member, which might be a str""" - if isinstance(member, str): - tarinfo = self.getmember(member) - else: - tarinfo = member - - unfiltered = tarinfo - try: - tarinfo = filter_function(tarinfo, path) - except (OSError, FilterError) as e: - self._handle_fatal_error(e) - except ExtractError as e: - self._handle_nonfatal_error(e) - if tarinfo is None: - self._dbg(2, "tarfile: Excluded %r" % unfiltered.name) - return None - # Prepare the link target for makelink(). - if tarinfo.islnk(): - tarinfo = copy.copy(tarinfo) - tarinfo._link_target = os.path.join(path, tarinfo.linkname) - return tarinfo - - def _extract_one(self, tarinfo, path, set_attrs, numeric_owner): - """Extract from filtered tarinfo to disk""" - self._check("r") - - try: - self._extract_member(tarinfo, os.path.join(path, tarinfo.name), - set_attrs=set_attrs, - numeric_owner=numeric_owner) - except OSError as e: - self._handle_fatal_error(e) - except ExtractError as e: - self._handle_nonfatal_error(e) - - def _handle_nonfatal_error(self, e): - """Handle non-fatal error (ExtractError) according to errorlevel""" - if self.errorlevel > 1: - raise - else: - self._dbg(1, "tarfile: %s" % e) - - def _handle_fatal_error(self, e): - """Handle "fatal" error according to self.errorlevel""" - if self.errorlevel > 0: - raise - elif isinstance(e, OSError): - if e.filename is None: - self._dbg(1, "tarfile: %s" % e.strerror) - else: - self._dbg(1, "tarfile: %s %r" % (e.strerror, e.filename)) - else: - self._dbg(1, "tarfile: %s %s" % (type(e).__name__, e)) - - def extractfile(self, member): - """Extract a member from the archive as a file object. 'member' may be - a filename or a TarInfo object. If 'member' is a regular file or - a link, an io.BufferedReader object is returned. For all other - existing members, None is returned. If 'member' does not appear - in the archive, KeyError is raised. - """ - self._check("r") - - if isinstance(member, str): - tarinfo = self.getmember(member) - else: - tarinfo = member - - if tarinfo.isreg() or tarinfo.type not in SUPPORTED_TYPES: - # Members with unknown types are treated as regular files. - return self.fileobject(self, tarinfo) - - elif tarinfo.islnk() or tarinfo.issym(): - if isinstance(self.fileobj, _Stream): - # A small but ugly workaround for the case that someone tries - # to extract a (sym)link as a file-object from a non-seekable - # stream of tar blocks. - raise StreamError("cannot extract (sym)link as file object") - else: - # A (sym)link's file object is its target's file object. - return self.extractfile(self._find_link_target(tarinfo)) - else: - # If there's no data associated with the member (directory, chrdev, - # blkdev, etc.), return None instead of a file object. - return None - - def _extract_member(self, tarinfo, targetpath, set_attrs=True, - numeric_owner=False): - """Extract the TarInfo object tarinfo to a physical - file called targetpath. - """ - # Fetch the TarInfo object for the given name - # and build the destination pathname, replacing - # forward slashes to platform specific separators. - targetpath = targetpath.rstrip("/") - targetpath = targetpath.replace("/", os.sep) - - # Create all upper directories. - upperdirs = os.path.dirname(targetpath) - if upperdirs and not os.path.exists(upperdirs): - # Create directories that are not part of the archive with - # default permissions. - os.makedirs(upperdirs, exist_ok=True) - - if tarinfo.islnk() or tarinfo.issym(): - self._dbg(1, "%s -> %s" % (tarinfo.name, tarinfo.linkname)) - else: - self._dbg(1, tarinfo.name) - - if tarinfo.isreg(): - self.makefile(tarinfo, targetpath) - elif tarinfo.isdir(): - self.makedir(tarinfo, targetpath) - elif tarinfo.isfifo(): - self.makefifo(tarinfo, targetpath) - elif tarinfo.ischr() or tarinfo.isblk(): - self.makedev(tarinfo, targetpath) - elif tarinfo.islnk() or tarinfo.issym(): - self.makelink(tarinfo, targetpath) - elif tarinfo.type not in SUPPORTED_TYPES: - self.makeunknown(tarinfo, targetpath) - else: - self.makefile(tarinfo, targetpath) - - if set_attrs: - self.chown(tarinfo, targetpath, numeric_owner) - if not tarinfo.issym(): - self.chmod(tarinfo, targetpath) - self.utime(tarinfo, targetpath) - - #-------------------------------------------------------------------------- - # Below are the different file methods. They are called via - # _extract_member() when extract() is called. They can be replaced in a - # subclass to implement other functionality. - - def makedir(self, tarinfo, targetpath): - """Make a directory called targetpath. - """ - try: - if tarinfo.mode is None: - # Use the system's default mode - os.mkdir(targetpath) - else: - # Use a safe mode for the directory, the real mode is set - # later in _extract_member(). - os.mkdir(targetpath, 0o700) - except FileExistsError: - if not os.path.isdir(targetpath): - raise - - def makefile(self, tarinfo, targetpath): - """Make a file called targetpath. - """ - source = self.fileobj - source.seek(tarinfo.offset_data) - bufsize = self.copybufsize - with bltn_open(targetpath, "wb") as target: - if tarinfo.sparse is not None: - for offset, size in tarinfo.sparse: - target.seek(offset) - copyfileobj(source, target, size, ReadError, bufsize) - target.seek(tarinfo.size) - target.truncate() - else: - copyfileobj(source, target, tarinfo.size, ReadError, bufsize) - - def makeunknown(self, tarinfo, targetpath): - """Make a file from a TarInfo object with an unknown type - at targetpath. - """ - self.makefile(tarinfo, targetpath) - self._dbg(1, "tarfile: Unknown file type %r, " \ - "extracted as regular file." % tarinfo.type) - - def makefifo(self, tarinfo, targetpath): - """Make a fifo called targetpath. - """ - if hasattr(os, "mkfifo"): - os.mkfifo(targetpath) - else: - raise ExtractError("fifo not supported by system") - - def makedev(self, tarinfo, targetpath): - """Make a character or block device called targetpath. - """ - if not hasattr(os, "mknod") or not hasattr(os, "makedev"): - raise ExtractError("special devices not supported by system") - - mode = tarinfo.mode - if mode is None: - # Use mknod's default - mode = 0o600 - if tarinfo.isblk(): - mode |= stat.S_IFBLK - else: - mode |= stat.S_IFCHR - - os.mknod(targetpath, mode, - os.makedev(tarinfo.devmajor, tarinfo.devminor)) - - def makelink(self, tarinfo, targetpath): - """Make a (symbolic) link called targetpath. If it cannot be created - (platform limitation), we try to make a copy of the referenced file - instead of a link. - """ - try: - # For systems that support symbolic and hard links. - if tarinfo.issym(): - if os.path.lexists(targetpath): - # Avoid FileExistsError on following os.symlink. - os.unlink(targetpath) - os.symlink(tarinfo.linkname, targetpath) - else: - if os.path.exists(tarinfo._link_target): - os.link(tarinfo._link_target, targetpath) - else: - self._extract_member(self._find_link_target(tarinfo), - targetpath) - except symlink_exception: - try: - self._extract_member(self._find_link_target(tarinfo), - targetpath) - except KeyError: - raise ExtractError("unable to resolve link inside archive") from None - - def chown(self, tarinfo, targetpath, numeric_owner): - """Set owner of targetpath according to tarinfo. If numeric_owner - is True, use .gid/.uid instead of .gname/.uname. If numeric_owner - is False, fall back to .gid/.uid when the search based on name - fails. - """ - if hasattr(os, "geteuid") and os.geteuid() == 0: - # We have to be root to do so. - g = tarinfo.gid - u = tarinfo.uid - if not numeric_owner: - try: - if grp and tarinfo.gname: - g = grp.getgrnam(tarinfo.gname)[2] - except KeyError: - pass - try: - if pwd and tarinfo.uname: - u = pwd.getpwnam(tarinfo.uname)[2] - except KeyError: - pass - if g is None: - g = -1 - if u is None: - u = -1 - try: - if tarinfo.issym() and hasattr(os, "lchown"): - os.lchown(targetpath, u, g) - else: - os.chown(targetpath, u, g) - except (OSError, OverflowError) as e: - # OverflowError can be raised if an ID doesn't fit in 'id_t' - raise ExtractError("could not change owner") from e - - def chmod(self, tarinfo, targetpath): - """Set file permissions of targetpath according to tarinfo. - """ - if tarinfo.mode is None: - return - try: - os.chmod(targetpath, tarinfo.mode) - except OSError as e: - raise ExtractError("could not change mode") from e - - def utime(self, tarinfo, targetpath): - """Set modification time of targetpath according to tarinfo. - """ - mtime = tarinfo.mtime - if mtime is None: - return - if not hasattr(os, 'utime'): - return - try: - os.utime(targetpath, (mtime, mtime)) - except OSError as e: - raise ExtractError("could not change modification time") from e - - #-------------------------------------------------------------------------- - def next(self): - """Return the next member of the archive as a TarInfo object, when - TarFile is opened for reading. Return None if there is no more - available. - """ - self._check("ra") - if self.firstmember is not None: - m = self.firstmember - self.firstmember = None - return m - - # Advance the file pointer. - if self.offset != self.fileobj.tell(): - if self.offset == 0: - return None - self.fileobj.seek(self.offset - 1) - if not self.fileobj.read(1): - raise ReadError("unexpected end of data") - - # Read the next block. - tarinfo = None - while True: - try: - tarinfo = self.tarinfo.fromtarfile(self) - except EOFHeaderError as e: - if self.ignore_zeros: - self._dbg(2, "0x%X: %s" % (self.offset, e)) - self.offset += BLOCKSIZE - continue - except InvalidHeaderError as e: - if self.ignore_zeros: - self._dbg(2, "0x%X: %s" % (self.offset, e)) - self.offset += BLOCKSIZE - continue - elif self.offset == 0: - raise ReadError(str(e)) from None - except EmptyHeaderError: - if self.offset == 0: - raise ReadError("empty file") from None - except TruncatedHeaderError as e: - if self.offset == 0: - raise ReadError(str(e)) from None - except SubsequentHeaderError as e: - raise ReadError(str(e)) from None - except Exception as e: - try: - import zlib - if isinstance(e, zlib.error): - raise ReadError(f'zlib error: {e}') from None - else: - raise e - except ImportError: - raise e - break - - if tarinfo is not None: - # if streaming the file we do not want to cache the tarinfo - if not self.stream: - self.members.append(tarinfo) - else: - self._loaded = True - - return tarinfo - - #-------------------------------------------------------------------------- - # Little helper methods: - - def _getmember(self, name, tarinfo=None, normalize=False): - """Find an archive member by name from bottom to top. - If tarinfo is given, it is used as the starting point. - """ - # Ensure that all members have been loaded. - members = self.getmembers() - - # Limit the member search list up to tarinfo. - skipping = False - if tarinfo is not None: - try: - index = members.index(tarinfo) - except ValueError: - # The given starting point might be a (modified) copy. - # We'll later skip members until we find an equivalent. - skipping = True - else: - # Happy fast path - members = members[:index] - - if normalize: - name = os.path.normpath(name) - - for member in reversed(members): - if skipping: - if tarinfo.offset == member.offset: - skipping = False - continue - if normalize: - member_name = os.path.normpath(member.name) - else: - member_name = member.name - - if name == member_name: - return member - - if skipping: - # Starting point was not found - raise ValueError(tarinfo) - - def _load(self): - """Read through the entire archive file and look for readable - members. This should not run if the file is set to stream. - """ - if not self.stream: - while self.next() is not None: - pass - self._loaded = True - - def _check(self, mode=None): - """Check if TarFile is still open, and if the operation's mode - corresponds to TarFile's mode. - """ - if self.closed: - raise OSError("%s is closed" % self.__class__.__name__) - if mode is not None and self.mode not in mode: - raise OSError("bad operation for mode %r" % self.mode) - - def _find_link_target(self, tarinfo): - """Find the target member of a symlink or hardlink member in the - archive. - """ - if tarinfo.issym(): - # Always search the entire archive. - linkname = "/".join(filter(None, (os.path.dirname(tarinfo.name), tarinfo.linkname))) - limit = None - else: - # Search the archive before the link, because a hard link is - # just a reference to an already archived file. - linkname = tarinfo.linkname - limit = tarinfo - - member = self._getmember(linkname, tarinfo=limit, normalize=True) - if member is None: - raise KeyError("linkname %r not found" % linkname) - return member - - def __iter__(self): - """Provide an iterator object. - """ - if self._loaded: - yield from self.members - return - - # Yield items using TarFile's next() method. - # When all members have been read, set TarFile as _loaded. - index = 0 - # Fix for SF #1100429: Under rare circumstances it can - # happen that getmembers() is called during iteration, - # which will have already exhausted the next() method. - if self.firstmember is not None: - tarinfo = self.next() - index += 1 - yield tarinfo - - while True: - if index < len(self.members): - tarinfo = self.members[index] - elif not self._loaded: - tarinfo = self.next() - if not tarinfo: - self._loaded = True - return - else: - return - index += 1 - yield tarinfo - - def _dbg(self, level, msg): - """Write debugging output to sys.stderr. - """ - if level <= self.debug: - print(msg, file=sys.stderr) - - def __enter__(self): - self._check() - return self - - def __exit__(self, type, value, traceback): - if type is None: - self.close() - else: - # An exception occurred. We must not call close() because - # it would try to write end-of-archive blocks and padding. - if not self._extfileobj: - self.fileobj.close() - self.closed = True - -#-------------------- -# exported functions -#-------------------- - -def is_tarfile(name): - """Return True if name points to a tar archive that we - are able to handle, else return False. - - 'name' should be a string, file, or file-like object. - """ - try: - if hasattr(name, "read"): - pos = name.tell() - t = open(fileobj=name) - name.seek(pos) - else: - t = open(name) - t.close() - return True - except TarError: - return False - -open = TarFile.open - - -def main(): - import argparse - - description = 'A simple command-line interface for tarfile module.' - parser = argparse.ArgumentParser(description=description) - parser.add_argument('-v', '--verbose', action='store_true', default=False, - help='Verbose output') - parser.add_argument('--filter', metavar='', - choices=_NAMED_FILTERS, - help='Filter for extraction') - - group = parser.add_mutually_exclusive_group(required=True) - group.add_argument('-l', '--list', metavar='', - help='Show listing of a tarfile') - group.add_argument('-e', '--extract', nargs='+', - metavar=('', ''), - help='Extract tarfile into target dir') - group.add_argument('-c', '--create', nargs='+', - metavar=('', ''), - help='Create tarfile from sources') - group.add_argument('-t', '--test', metavar='', - help='Test if a tarfile is valid') - - args = parser.parse_args() - - if args.filter and args.extract is None: - parser.exit(1, '--filter is only valid for extraction\n') - - if args.test is not None: - src = args.test - if is_tarfile(src): - with open(src, 'r') as tar: - tar.getmembers() - print(tar.getmembers(), file=sys.stderr) - if args.verbose: - print('{!r} is a tar archive.'.format(src)) - else: - parser.exit(1, '{!r} is not a tar archive.\n'.format(src)) - - elif args.list is not None: - src = args.list - if is_tarfile(src): - with TarFile.open(src, 'r:*') as tf: - tf.list(verbose=args.verbose) - else: - parser.exit(1, '{!r} is not a tar archive.\n'.format(src)) - - elif args.extract is not None: - if len(args.extract) == 1: - src = args.extract[0] - curdir = os.curdir - elif len(args.extract) == 2: - src, curdir = args.extract - else: - parser.exit(1, parser.format_help()) - - if is_tarfile(src): - with TarFile.open(src, 'r:*') as tf: - tf.extractall(path=curdir, filter=args.filter) - if args.verbose: - if curdir == '.': - msg = '{!r} file is extracted.'.format(src) - else: - msg = ('{!r} file is extracted ' - 'into {!r} directory.').format(src, curdir) - print(msg) - else: - parser.exit(1, '{!r} is not a tar archive.\n'.format(src)) - - elif args.create is not None: - tar_name = args.create.pop(0) - _, ext = os.path.splitext(tar_name) - compressions = { - # gz - '.gz': 'gz', - '.tgz': 'gz', - # xz - '.xz': 'xz', - '.txz': 'xz', - # bz2 - '.bz2': 'bz2', - '.tbz': 'bz2', - '.tbz2': 'bz2', - '.tb2': 'bz2', - } - tar_mode = 'w:' + compressions[ext] if ext in compressions else 'w' - tar_files = args.create - - with TarFile.open(tar_name, tar_mode) as tf: - for file_name in tar_files: - tf.add(file_name) - - if args.verbose: - print('{!r} file created.'.format(tar_name)) - -if __name__ == '__main__': - main() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__main__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__main__.py deleted file mode 100644 index daf5509..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__main__.py +++ /dev/null @@ -1,5 +0,0 @@ -from . import main - - -if __name__ == '__main__': - main() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index febab81..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__main__.cpython-311.pyc deleted file mode 100644 index 82ae5cc..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/__pycache__/__main__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index e23db04..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/py38.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/py38.cpython-311.pyc deleted file mode 100644 index b75e19f..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/__pycache__/py38.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/py38.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/py38.py deleted file mode 100644 index 20fbbfc..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/backports/tarfile/compat/py38.py +++ /dev/null @@ -1,24 +0,0 @@ -import sys - - -if sys.version_info < (3, 9): - - def removesuffix(self, suffix): - # suffix='' should not call self[:-0]. - if suffix and self.endswith(suffix): - return self[: -len(suffix)] - else: - return self[:] - - def removeprefix(self, prefix): - if self.startswith(prefix): - return self[len(prefix) :] - else: - return self[:] -else: - - def removesuffix(self, suffix): - return self.removesuffix(suffix) - - def removeprefix(self, prefix): - return self.removeprefix(prefix) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/LICENSE deleted file mode 100644 index d645695..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/METADATA deleted file mode 100644 index 85513e8..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/METADATA +++ /dev/null @@ -1,129 +0,0 @@ -Metadata-Version: 2.1 -Name: importlib_metadata -Version: 8.0.0 -Summary: Read metadata from Python packages -Author-email: "Jason R. Coombs" -Project-URL: Source, https://github.com/python/importlib_metadata -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Apache Software License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Requires-Dist: zipp >=0.5 -Requires-Dist: typing-extensions >=3.6.4 ; python_version < "3.8" -Provides-Extra: doc -Requires-Dist: sphinx >=3.5 ; extra == 'doc' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc' -Requires-Dist: rst.linker >=1.9 ; extra == 'doc' -Requires-Dist: furo ; extra == 'doc' -Requires-Dist: sphinx-lint ; extra == 'doc' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc' -Provides-Extra: perf -Requires-Dist: ipython ; extra == 'perf' -Provides-Extra: test -Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test' -Requires-Dist: pytest-cov ; extra == 'test' -Requires-Dist: pytest-mypy ; extra == 'test' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'test' -Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test' -Requires-Dist: packaging ; extra == 'test' -Requires-Dist: pyfakefs ; extra == 'test' -Requires-Dist: flufl.flake8 ; extra == 'test' -Requires-Dist: pytest-perf >=0.9.2 ; extra == 'test' -Requires-Dist: jaraco.test >=5.4 ; extra == 'test' -Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra == 'test' - -.. image:: https://img.shields.io/pypi/v/importlib_metadata.svg - :target: https://pypi.org/project/importlib_metadata - -.. image:: https://img.shields.io/pypi/pyversions/importlib_metadata.svg - -.. image:: https://github.com/python/importlib_metadata/actions/workflows/main.yml/badge.svg - :target: https://github.com/python/importlib_metadata/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/importlib-metadata/badge/?version=latest - :target: https://importlib-metadata.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/importlib-metadata - :target: https://tidelift.com/subscription/pkg/pypi-importlib-metadata?utm_source=pypi-importlib-metadata&utm_medium=readme - -Library to access the metadata for a Python package. - -This package supplies third-party access to the functionality of -`importlib.metadata `_ -including improvements added to subsequent Python versions. - - -Compatibility -============= - -New features are introduced in this third-party library and later merged -into CPython. The following table indicates which versions of this library -were contributed to different versions in the standard library: - -.. list-table:: - :header-rows: 1 - - * - importlib_metadata - - stdlib - * - 7.0 - - 3.13 - * - 6.5 - - 3.12 - * - 4.13 - - 3.11 - * - 4.6 - - 3.10 - * - 1.4 - - 3.8 - - -Usage -===== - -See the `online documentation `_ -for usage details. - -`Finder authors -`_ can -also add support for custom package installers. See the above documentation -for details. - - -Caveats -======= - -This project primarily supports third-party packages installed by PyPA -tools (or other conforming packages). It does not support: - -- Packages in the stdlib. -- Packages installed without metadata. - -Project details -=============== - - * Project home: https://github.com/python/importlib_metadata - * Report bugs at: https://github.com/python/importlib_metadata/issues - * Code hosting: https://github.com/python/importlib_metadata - * Documentation: https://importlib-metadata.readthedocs.io/ - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/RECORD deleted file mode 100644 index 07b7dc5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/RECORD +++ /dev/null @@ -1,32 +0,0 @@ -importlib_metadata-8.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -importlib_metadata-8.0.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358 -importlib_metadata-8.0.0.dist-info/METADATA,sha256=anuQ7_7h4J1bSEzfcjIBakPi2cyVQ7y7jklLHsBeH1k,4648 -importlib_metadata-8.0.0.dist-info/RECORD,, -importlib_metadata-8.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -importlib_metadata-8.0.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91 -importlib_metadata-8.0.0.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19 -importlib_metadata/__init__.py,sha256=tZNB-23h8Bixi9uCrQqj9Yf0aeC--Josdy3IZRIQeB0,33798 -importlib_metadata/__pycache__/__init__.cpython-312.pyc,, -importlib_metadata/__pycache__/_adapters.cpython-312.pyc,, -importlib_metadata/__pycache__/_collections.cpython-312.pyc,, -importlib_metadata/__pycache__/_compat.cpython-312.pyc,, -importlib_metadata/__pycache__/_functools.cpython-312.pyc,, -importlib_metadata/__pycache__/_itertools.cpython-312.pyc,, -importlib_metadata/__pycache__/_meta.cpython-312.pyc,, -importlib_metadata/__pycache__/_text.cpython-312.pyc,, -importlib_metadata/__pycache__/diagnose.cpython-312.pyc,, -importlib_metadata/_adapters.py,sha256=rIhWTwBvYA1bV7i-5FfVX38qEXDTXFeS5cb5xJtP3ks,2317 -importlib_metadata/_collections.py,sha256=CJ0OTCHIjWA0ZIVS4voORAsn2R4R2cQBEtPsZEJpASY,743 -importlib_metadata/_compat.py,sha256=73QKrN9KNoaZzhbX5yPCCZa-FaALwXe8TPlDR72JgBU,1314 -importlib_metadata/_functools.py,sha256=PsY2-4rrKX4RVeRC1oGp1lB1pmC9eKN88_f-bD9uOoA,2895 -importlib_metadata/_itertools.py,sha256=cvr_2v8BRbxcIl5x5ldfqdHjhI8Yi8s8yk50G_nm6jQ,2068 -importlib_metadata/_meta.py,sha256=nxZ7C8GVlcBFAKWyVOn_dn7ot_twBcbm1NmvjIetBHI,1801 -importlib_metadata/_text.py,sha256=HCsFksZpJLeTP3NEk_ngrAeXVRRtTrtyh9eOABoRP4A,2166 -importlib_metadata/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -importlib_metadata/compat/__pycache__/__init__.cpython-312.pyc,, -importlib_metadata/compat/__pycache__/py311.cpython-312.pyc,, -importlib_metadata/compat/__pycache__/py39.cpython-312.pyc,, -importlib_metadata/compat/py311.py,sha256=uqm-K-uohyj1042TH4a9Er_I5o7667DvulcD-gC_fSA,608 -importlib_metadata/compat/py39.py,sha256=cPkMv6-0ilK-0Jw_Tkn0xYbOKJZc4WJKQHow0c2T44w,1102 -importlib_metadata/diagnose.py,sha256=nkSRMiowlmkhLYhKhvCg9glmt_11Cox-EmLzEbqYTa8,379 -importlib_metadata/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/WHEEL deleted file mode 100644 index edf4ec7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: setuptools (70.1.1) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/top_level.txt deleted file mode 100644 index bbb0754..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata-8.0.0.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -importlib_metadata diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__init__.py index ed48135..292e0c6 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__init__.py @@ -1,28 +1,25 @@ -from __future__ import annotations - import os import re import abc +import csv import sys -import json -import zipp +from .. import zipp import email -import types -import inspect import pathlib import operator import textwrap +import warnings import functools import itertools import posixpath import collections -from . import _meta -from .compat import py39, py311 +from . import _adapters, _meta from ._collections import FreezableDefaultDict, Pair from ._compat import ( NullFinder, install, + pypy_partial, ) from ._functools import method_cache, pass_none from ._itertools import always_iterable, unique_everseen @@ -32,7 +29,8 @@ from contextlib import suppress from importlib import import_module from importlib.abc import MetaPathFinder from itertools import starmap -from typing import Any, Iterable, List, Mapping, Match, Optional, Set, cast +from typing import List, Mapping, Optional, Union + __all__ = [ 'Distribution', @@ -53,11 +51,11 @@ __all__ = [ class PackageNotFoundError(ModuleNotFoundError): """The package was not found.""" - def __str__(self) -> str: + def __str__(self): return f"No package metadata was found for {self.name}" @property - def name(self) -> str: # type: ignore[override] + def name(self): (name,) = self.args return name @@ -123,25 +121,42 @@ class Sectioned: yield Pair(name, value) @staticmethod - def valid(line: str): + def valid(line): return line and not line.startswith('#') -class EntryPoint: +class DeprecatedTuple: + """ + Provide subscript item access for backward compatibility. + + >>> recwarn = getfixture('recwarn') + >>> ep = EntryPoint(name='name', value='value', group='group') + >>> ep[:] + ('name', 'value', 'group') + >>> ep[0] + 'name' + >>> len(recwarn) + 1 + """ + + _warn = functools.partial( + warnings.warn, + "EntryPoint tuple interface is deprecated. Access members by name.", + DeprecationWarning, + stacklevel=pypy_partial(2), + ) + + def __getitem__(self, item): + self._warn() + return self._key()[item] + + +class EntryPoint(DeprecatedTuple): """An entry point as defined by Python packaging conventions. See `the packaging docs on entry points `_ for more information. - - >>> ep = EntryPoint( - ... name=None, group=None, value='package.module:attr [extra1, extra2]') - >>> ep.module - 'package.module' - >>> ep.attr - 'attr' - >>> ep.extras - ['extra1', 'extra2'] """ pattern = re.compile( @@ -165,67 +180,52 @@ class EntryPoint: following the attr, and following any extras. """ - name: str - value: str - group: str + dist: Optional['Distribution'] = None - dist: Optional[Distribution] = None - - def __init__(self, name: str, value: str, group: str) -> None: + def __init__(self, name, value, group): vars(self).update(name=name, value=value, group=group) - def load(self) -> Any: + def load(self): """Load the entry point from its definition. If only a module is indicated by the value, return that module. Otherwise, return the named object. """ - match = cast(Match, self.pattern.match(self.value)) + match = self.pattern.match(self.value) module = import_module(match.group('module')) attrs = filter(None, (match.group('attr') or '').split('.')) return functools.reduce(getattr, attrs, module) @property - def module(self) -> str: + def module(self): match = self.pattern.match(self.value) - assert match is not None return match.group('module') @property - def attr(self) -> str: + def attr(self): match = self.pattern.match(self.value) - assert match is not None return match.group('attr') @property - def extras(self) -> List[str]: + def extras(self): match = self.pattern.match(self.value) - assert match is not None - return re.findall(r'\w+', match.group('extras') or '') + return list(re.finditer(r'\w+', match.group('extras') or '')) def _for(self, dist): vars(self).update(dist=dist) return self - def matches(self, **params): + def __iter__(self): """ - EntryPoint matches the given parameters. + Supply iter so one may construct dicts of EntryPoints by name. + """ + msg = ( + "Construction of dict of EntryPoints is deprecated in " + "favor of EntryPoints." + ) + warnings.warn(msg, DeprecationWarning) + return iter((self.name, self)) - >>> ep = EntryPoint(group='foo', name='bar', value='bing:bong [extra1, extra2]') - >>> ep.matches(group='foo') - True - >>> ep.matches(name='bar', value='bing:bong [extra1, extra2]') - True - >>> ep.matches(group='foo', name='other') - False - >>> ep.matches() - True - >>> ep.matches(extras=['extra1', 'extra2']) - True - >>> ep.matches(module='bing') - True - >>> ep.matches(attr='bong') - True - """ + def matches(self, **params): attrs = (getattr(self, param) for param in params) return all(map(operator.eq, params.values(), attrs)) @@ -247,51 +247,126 @@ class EntryPoint: f'group={self.group!r})' ) - def __hash__(self) -> int: + def __hash__(self): return hash(self._key()) -class EntryPoints(tuple): +class DeprecatedList(list): + """ + Allow an otherwise immutable object to implement mutability + for compatibility. + + >>> recwarn = getfixture('recwarn') + >>> dl = DeprecatedList(range(3)) + >>> dl[0] = 1 + >>> dl.append(3) + >>> del dl[3] + >>> dl.reverse() + >>> dl.sort() + >>> dl.extend([4]) + >>> dl.pop(-1) + 4 + >>> dl.remove(1) + >>> dl += [5] + >>> dl + [6] + [1, 2, 5, 6] + >>> dl + (6,) + [1, 2, 5, 6] + >>> dl.insert(0, 0) + >>> dl + [0, 1, 2, 5] + >>> dl == [0, 1, 2, 5] + True + >>> dl == (0, 1, 2, 5) + True + >>> len(recwarn) + 1 + """ + + __slots__ = () + + _warn = functools.partial( + warnings.warn, + "EntryPoints list interface is deprecated. Cast to list if needed.", + DeprecationWarning, + stacklevel=pypy_partial(2), + ) + + def _wrap_deprecated_method(method_name: str): # type: ignore + def wrapped(self, *args, **kwargs): + self._warn() + return getattr(super(), method_name)(*args, **kwargs) + + return method_name, wrapped + + locals().update( + map( + _wrap_deprecated_method, + '__setitem__ __delitem__ append reverse extend pop remove ' + '__iadd__ insert sort'.split(), + ) + ) + + def __add__(self, other): + if not isinstance(other, tuple): + self._warn() + other = tuple(other) + return self.__class__(tuple(self) + other) + + def __eq__(self, other): + if not isinstance(other, tuple): + self._warn() + other = tuple(other) + + return tuple(self).__eq__(other) + + +class EntryPoints(DeprecatedList): """ An immutable collection of selectable EntryPoint objects. """ __slots__ = () - def __getitem__(self, name: str) -> EntryPoint: # type: ignore[override] + def __getitem__(self, name): # -> EntryPoint: """ Get the EntryPoint in self matching name. """ + if isinstance(name, int): + warnings.warn( + "Accessing entry points by index is deprecated. " + "Cast to tuple if needed.", + DeprecationWarning, + stacklevel=2, + ) + return super().__getitem__(name) try: return next(iter(self.select(name=name))) except StopIteration: raise KeyError(name) - def __repr__(self): - """ - Repr with classname and tuple constructor to - signal that we deviate from regular tuple behavior. - """ - return '%s(%r)' % (self.__class__.__name__, tuple(self)) - - def select(self, **params) -> EntryPoints: + def select(self, **params): """ Select entry points from self that match the given parameters (typically group and/or name). """ - return EntryPoints(ep for ep in self if py39.ep_matches(ep, **params)) + return EntryPoints(ep for ep in self if ep.matches(**params)) @property - def names(self) -> Set[str]: + def names(self): """ Return the set of all names of all entry points. """ return {ep.name for ep in self} @property - def groups(self) -> Set[str]: + def groups(self): """ Return the set of all groups of all entry points. + + For coverage while SelectableGroups is present. + >>> EntryPoints().groups + set() """ return {ep.group for ep in self} @@ -307,75 +382,145 @@ class EntryPoints(tuple): ) +class Deprecated: + """ + Compatibility add-in for mapping to indicate that + mapping behavior is deprecated. + + >>> recwarn = getfixture('recwarn') + >>> class DeprecatedDict(Deprecated, dict): pass + >>> dd = DeprecatedDict(foo='bar') + >>> dd.get('baz', None) + >>> dd['foo'] + 'bar' + >>> list(dd) + ['foo'] + >>> list(dd.keys()) + ['foo'] + >>> 'foo' in dd + True + >>> list(dd.values()) + ['bar'] + >>> len(recwarn) + 1 + """ + + _warn = functools.partial( + warnings.warn, + "SelectableGroups dict interface is deprecated. Use select.", + DeprecationWarning, + stacklevel=pypy_partial(2), + ) + + def __getitem__(self, name): + self._warn() + return super().__getitem__(name) + + def get(self, name, default=None): + self._warn() + return super().get(name, default) + + def __iter__(self): + self._warn() + return super().__iter__() + + def __contains__(self, *args): + self._warn() + return super().__contains__(*args) + + def keys(self): + self._warn() + return super().keys() + + def values(self): + self._warn() + return super().values() + + +class SelectableGroups(Deprecated, dict): + """ + A backward- and forward-compatible result from + entry_points that fully implements the dict interface. + """ + + @classmethod + def load(cls, eps): + by_group = operator.attrgetter('group') + ordered = sorted(eps, key=by_group) + grouped = itertools.groupby(ordered, by_group) + return cls((group, EntryPoints(eps)) for group, eps in grouped) + + @property + def _all(self): + """ + Reconstruct a list of all entrypoints from the groups. + """ + groups = super(Deprecated, self).values() + return EntryPoints(itertools.chain.from_iterable(groups)) + + @property + def groups(self): + return self._all.groups + + @property + def names(self): + """ + for coverage: + >>> SelectableGroups().names + set() + """ + return self._all.names + + def select(self, **params): + if not params: + return self + return self._all.select(**params) + + class PackagePath(pathlib.PurePosixPath): """A reference to a path in a package""" - hash: Optional[FileHash] - size: int - dist: Distribution + def read_text(self, encoding='utf-8'): + with self.locate().open(encoding=encoding) as stream: + return stream.read() - def read_text(self, encoding: str = 'utf-8') -> str: # type: ignore[override] - return self.locate().read_text(encoding=encoding) + def read_binary(self): + with self.locate().open('rb') as stream: + return stream.read() - def read_binary(self) -> bytes: - return self.locate().read_bytes() - - def locate(self) -> SimplePath: + def locate(self): """Return a path-like object for this path""" return self.dist.locate_file(self) class FileHash: - def __init__(self, spec: str) -> None: + def __init__(self, spec): self.mode, _, self.value = spec.partition('=') - def __repr__(self) -> str: + def __repr__(self): return f'' -class Distribution(metaclass=abc.ABCMeta): - """ - An abstract Python distribution package. - - Custom providers may derive from this class and define - the abstract methods to provide a concrete implementation - for their environment. Some providers may opt to override - the default implementation of some properties to bypass - the file-reading mechanism. - """ +class Distribution: + """A Python distribution package.""" @abc.abstractmethod - def read_text(self, filename) -> Optional[str]: + def read_text(self, filename): """Attempt to load metadata file given by the name. - Python distribution metadata is organized by blobs of text - typically represented as "files" in the metadata directory - (e.g. package-1.0.dist-info). These files include things - like: - - - METADATA: The distribution metadata including fields - like Name and Version and Description. - - entry_points.txt: A series of entry points as defined in - `the entry points spec `_. - - RECORD: A record of files according to - `this recording spec `_. - - A package may provide any set of files, including those - not listed here or none at all. - :param filename: The name of the file in the distribution info. :return: The text if found, otherwise None. """ @abc.abstractmethod - def locate_file(self, path: str | os.PathLike[str]) -> SimplePath: + def locate_file(self, path): """ - Given a path to a file in this distribution, return a SimplePath + Given a path to a file in this distribution, return a path to it. """ @classmethod - def from_name(cls, name: str) -> Distribution: + def from_name(cls, name): """Return the Distribution for the given package name. :param name: The name of the distribution package to search for. @@ -383,28 +528,26 @@ class Distribution(metaclass=abc.ABCMeta): package, if found. :raises PackageNotFoundError: When the named package's distribution metadata cannot be found. - :raises ValueError: When an invalid value is supplied for name. """ - if not name: - raise ValueError("A distribution name is required.") - try: - return next(iter(cls.discover(name=name))) - except StopIteration: + for resolver in cls._discover_resolvers(): + dists = resolver(DistributionFinder.Context(name=name)) + dist = next(iter(dists), None) + if dist is not None: + return dist + else: raise PackageNotFoundError(name) @classmethod - def discover( - cls, *, context: Optional[DistributionFinder.Context] = None, **kwargs - ) -> Iterable[Distribution]: + def discover(cls, **kwargs): """Return an iterable of Distribution objects for all packages. Pass a ``context`` or pass keyword arguments for constructing a context. :context: A ``DistributionFinder.Context`` object. - :return: Iterable of Distribution objects for packages matching - the context. + :return: Iterable of Distribution objects for all packages. """ + context = kwargs.pop('context', None) if context and kwargs: raise ValueError("cannot accept context and kwargs") context = context or DistributionFinder.Context(**kwargs) @@ -413,8 +556,8 @@ class Distribution(metaclass=abc.ABCMeta): ) @staticmethod - def at(path: str | os.PathLike[str]) -> Distribution: - """Return a Distribution for the indicated metadata path. + def at(path): + """Return a Distribution for the indicated metadata path :param path: a string or path-like object :return: a concrete Distribution instance for the path @@ -423,7 +566,7 @@ class Distribution(metaclass=abc.ABCMeta): @staticmethod def _discover_resolvers(): - """Search the meta_path for resolvers (MetadataPathFinders).""" + """Search the meta_path for resolvers.""" declared = ( getattr(finder, 'find_distributions', None) for finder in sys.meta_path ) @@ -434,16 +577,9 @@ class Distribution(metaclass=abc.ABCMeta): """Return the parsed metadata for this Distribution. The returned object will have keys that name the various bits of - metadata per the - `Core metadata specifications `_. - - Custom providers may provide the METADATA file or override this - property. + metadata. See PEP 566 for details. """ - # deferred for performance (python/cpython#109829) - from . import _adapters - - opt_text = ( + text = ( self.read_text('METADATA') or self.read_text('PKG-INFO') # This last clause is here to support old egg-info files. Its @@ -451,11 +587,10 @@ class Distribution(metaclass=abc.ABCMeta): # (which points to the egg-info file) attribute unchanged. or self.read_text('') ) - text = cast(str, opt_text) return _adapters.Message(email.message_from_string(text)) @property - def name(self) -> str: + def name(self): """Return the 'Name' metadata for the distribution package.""" return self.metadata['Name'] @@ -465,34 +600,24 @@ class Distribution(metaclass=abc.ABCMeta): return Prepared.normalize(self.name) @property - def version(self) -> str: + def version(self): """Return the 'Version' metadata for the distribution package.""" return self.metadata['Version'] @property - def entry_points(self) -> EntryPoints: - """ - Return EntryPoints for this distribution. - - Custom providers may provide the ``entry_points.txt`` file - or override this property. - """ + def entry_points(self): return EntryPoints._from_text_for(self.read_text('entry_points.txt'), self) @property - def files(self) -> Optional[List[PackagePath]]: + def files(self): """Files in this distribution. :return: List of PackagePath for this distribution or None Result is `None` if the metadata file that enumerates files - (i.e. RECORD for dist-info, or installed-files.txt or - SOURCES.txt for egg-info) is missing. + (i.e. RECORD for dist-info or SOURCES.txt for egg-info) is + missing. Result may be empty if the metadata exists but is empty. - - Custom providers are recommended to provide a "RECORD" file (in - ``read_text``) or override this property to allow for callers to be - able to resolve filenames provided by the package. """ def make_file(name, hash=None, size_str=None): @@ -504,75 +629,27 @@ class Distribution(metaclass=abc.ABCMeta): @pass_none def make_files(lines): - # Delay csv import, since Distribution.files is not as widely used - # as other parts of importlib.metadata - import csv + return list(starmap(make_file, csv.reader(lines))) - return starmap(make_file, csv.reader(lines)) - - @pass_none - def skip_missing_files(package_paths): - return list(filter(lambda path: path.locate().exists(), package_paths)) - - return skip_missing_files( - make_files( - self._read_files_distinfo() - or self._read_files_egginfo_installed() - or self._read_files_egginfo_sources() - ) - ) + return make_files(self._read_files_distinfo() or self._read_files_egginfo()) def _read_files_distinfo(self): """ - Read the lines of RECORD. + Read the lines of RECORD """ text = self.read_text('RECORD') return text and text.splitlines() - def _read_files_egginfo_installed(self): + def _read_files_egginfo(self): """ - Read installed-files.txt and return lines in a similar - CSV-parsable format as RECORD: each file must be placed - relative to the site-packages directory and must also be - quoted (since file names can contain literal commas). - - This file is written when the package is installed by pip, - but it might not be written for other installation methods. - Assume the file is accurate if it exists. - """ - text = self.read_text('installed-files.txt') - # Prepend the .egg-info/ subdir to the lines in this file. - # But this subdir is only available from PathDistribution's - # self._path. - subdir = getattr(self, '_path', None) - if not text or not subdir: - return - - paths = ( - py311.relative_fix((subdir / name).resolve()) - .relative_to(self.locate_file('').resolve(), walk_up=True) - .as_posix() - for name in text.splitlines() - ) - return map('"{}"'.format, paths) - - def _read_files_egginfo_sources(self): - """ - Read SOURCES.txt and return lines in a similar CSV-parsable - format as RECORD: each file name must be quoted (since it - might contain literal commas). - - Note that SOURCES.txt is not a reliable source for what - files are installed by a package. This file is generated - for a source archive, and the files that are present - there (e.g. setup.py) may not correctly reflect the files - that are present after the package has been installed. + SOURCES.txt might contain literal commas, so wrap each line + in quotes. """ text = self.read_text('SOURCES.txt') return text and map('"{}"'.format, text.splitlines()) @property - def requires(self) -> Optional[List[str]]: + def requires(self): """Generated requirements specified for this Distribution""" reqs = self._read_dist_info_reqs() or self._read_egg_info_reqs() return reqs and list(reqs) @@ -623,23 +700,10 @@ class Distribution(metaclass=abc.ABCMeta): space = url_req_space(section.value) yield section.value + space + quoted_marker(section.name) - @property - def origin(self): - return self._load_json('direct_url.json') - - def _load_json(self, filename): - return pass_none(json.loads)( - self.read_text(filename), - object_hook=lambda data: types.SimpleNamespace(**data), - ) - class DistributionFinder(MetaPathFinder): """ A MetaPathFinder capable of discovering installed distributions. - - Custom providers should implement this interface in order to - supply metadata. """ class Context: @@ -652,17 +716,6 @@ class DistributionFinder(MetaPathFinder): Each DistributionFinder may expect any parameters and should attempt to honor the canonical parameters defined below when appropriate. - - This mechanism gives a custom provider a means to - solicit additional details from the caller beyond - "name" and "path" when searching distributions. - For example, imagine a provider that exposes suites - of packages in either a "public" or "private" ``realm``. - A caller may wish to query only for distributions in - a particular realm and could call - ``distributions(realm="private")`` to signal to the - custom provider to only include distributions from that - realm. """ name = None @@ -675,7 +728,7 @@ class DistributionFinder(MetaPathFinder): vars(self).update(kwargs) @property - def path(self) -> List[str]: + def path(self): """ The sequence of directory path that a distribution finder should search. @@ -686,7 +739,7 @@ class DistributionFinder(MetaPathFinder): return vars(self).get('path', sys.path) @abc.abstractmethod - def find_distributions(self, context=Context()) -> Iterable[Distribution]: + def find_distributions(self, context=Context()): """ Find distributions. @@ -698,18 +751,11 @@ class DistributionFinder(MetaPathFinder): class FastPath: """ - Micro-optimized class for searching a root for children. - - Root is a path on the file system that may contain metadata - directories either as natural directories or within a zip file. + Micro-optimized class for searching a path for + children. >>> FastPath('').children() ['...'] - - FastPath objects are cached and recycled for any given root. - - >>> FastPath('foobar') is FastPath('foobar') - True """ @functools.lru_cache() # type: ignore @@ -717,7 +763,7 @@ class FastPath: return super().__new__(cls) def __init__(self, root): - self.root = root + self.root = str(root) def joinpath(self, child): return pathlib.Path(self.root, child) @@ -751,19 +797,7 @@ class FastPath: class Lookup: - """ - A micro-optimized class for searching a (fast) path for metadata. - """ - def __init__(self, path: FastPath): - """ - Calculate all of the children representing metadata. - - From the children in the path, calculate early all of the - children that appear to represent metadata (infos) or legacy - metadata (eggs). - """ - base = os.path.basename(path.root).lower() base_is_egg = base.endswith(".egg") self.infos = FreezableDefaultDict(list) @@ -784,10 +818,7 @@ class Lookup: self.infos.freeze() self.eggs.freeze() - def search(self, prepared: Prepared): - """ - Yield all infos and eggs matching the Prepared query. - """ + def search(self, prepared): infos = ( self.infos[prepared.normalized] if prepared @@ -803,28 +834,13 @@ class Lookup: class Prepared: """ - A prepared search query for metadata on a possibly-named package. - - Pre-calculates the normalization to prevent repeated operations. - - >>> none = Prepared(None) - >>> none.normalized - >>> none.legacy_normalized - >>> bool(none) - False - >>> sample = Prepared('Sample__Pkg-name.foo') - >>> sample.normalized - 'sample_pkg_name_foo' - >>> sample.legacy_normalized - 'sample__pkg_name.foo' - >>> bool(sample) - True + A prepared search for metadata on a possibly-named package. """ normalized = None legacy_normalized = None - def __init__(self, name: Optional[str]): + def __init__(self, name): self.name = name if name is None: return @@ -858,10 +874,7 @@ class MetadataPathFinder(NullFinder, DistributionFinder): of Python that do not have a PathFinder find_distributions(). """ - @classmethod - def find_distributions( - cls, context=DistributionFinder.Context() - ) -> Iterable[PathDistribution]: + def find_distributions(self, context=DistributionFinder.Context()): """ Find distributions. @@ -870,7 +883,7 @@ class MetadataPathFinder(NullFinder, DistributionFinder): (or all names if ``None`` indicated) along the paths in the list of directories ``context.path``. """ - found = cls._search_paths(context.name, context.path) + found = self._search_paths(context.name, context.path) return map(PathDistribution, found) @classmethod @@ -881,20 +894,19 @@ class MetadataPathFinder(NullFinder, DistributionFinder): path.search(prepared) for path in map(FastPath, paths) ) - @classmethod - def invalidate_caches(cls) -> None: + def invalidate_caches(cls): FastPath.__new__.cache_clear() class PathDistribution(Distribution): - def __init__(self, path: SimplePath) -> None: + def __init__(self, path: SimplePath): """Construct a distribution. :param path: SimplePath indicating the metadata directory. """ self._path = path - def read_text(self, filename: str | os.PathLike[str]) -> Optional[str]: + def read_text(self, filename): with suppress( FileNotFoundError, IsADirectoryError, @@ -904,11 +916,9 @@ class PathDistribution(Distribution): ): return self._path.joinpath(filename).read_text(encoding='utf-8') - return None - read_text.__doc__ = Distribution.read_text.__doc__ - def locate_file(self, path: str | os.PathLike[str]) -> SimplePath: + def locate_file(self, path): return self._path.parent / path @property @@ -918,30 +928,17 @@ class PathDistribution(Distribution): normalized name from the file system path. """ stem = os.path.basename(str(self._path)) - return ( - pass_none(Prepared.normalize)(self._name_from_stem(stem)) - or super()._normalized_name - ) + return self._name_from_stem(stem) or super()._normalized_name - @staticmethod - def _name_from_stem(stem): - """ - >>> PathDistribution._name_from_stem('foo-3.0.egg-info') - 'foo' - >>> PathDistribution._name_from_stem('CherryPy-3.0.dist-info') - 'CherryPy' - >>> PathDistribution._name_from_stem('face.egg-info') - 'face' - >>> PathDistribution._name_from_stem('foo.bar') - """ - filename, ext = os.path.splitext(stem) + def _name_from_stem(self, stem): + name, ext = os.path.splitext(stem) if ext not in ('.dist-info', '.egg-info'): return - name, sep, rest = filename.partition('-') + name, sep, rest = stem.partition('-') return name -def distribution(distribution_name: str) -> Distribution: +def distribution(distribution_name): """Get the ``Distribution`` instance for the named package. :param distribution_name: The name of the distribution package as a string. @@ -950,7 +947,7 @@ def distribution(distribution_name: str) -> Distribution: return Distribution.from_name(distribution_name) -def distributions(**kwargs) -> Iterable[Distribution]: +def distributions(**kwargs): """Get all ``Distribution`` instances in the current environment. :return: An iterable of ``Distribution`` instances. @@ -958,7 +955,7 @@ def distributions(**kwargs) -> Iterable[Distribution]: return Distribution.discover(**kwargs) -def metadata(distribution_name: str) -> _meta.PackageMetadata: +def metadata(distribution_name) -> _meta.PackageMetadata: """Get the metadata for the named package. :param distribution_name: The name of the distribution package to query. @@ -967,7 +964,7 @@ def metadata(distribution_name: str) -> _meta.PackageMetadata: return Distribution.from_name(distribution_name).metadata -def version(distribution_name: str) -> str: +def version(distribution_name): """Get the version string for the named package. :param distribution_name: The name of the distribution package to query. @@ -977,31 +974,32 @@ def version(distribution_name: str) -> str: return distribution(distribution_name).version -_unique = functools.partial( - unique_everseen, - key=py39.normalized_name, -) -""" -Wrapper for ``distributions`` to return unique distributions by name. -""" - - -def entry_points(**params) -> EntryPoints: +def entry_points(**params) -> Union[EntryPoints, SelectableGroups]: """Return EntryPoint objects for all installed packages. Pass selection parameters (group or name) to filter the result to entry points matching those properties (see EntryPoints.select()). - :return: EntryPoints for all installed packages. + For compatibility, returns ``SelectableGroups`` object unless + selection parameters are supplied. In the future, this function + will return ``EntryPoints`` instead of ``SelectableGroups`` + even when no selection parameters are supplied. + + For maximum future compatibility, pass selection parameters + or invoke ``.select`` with parameters on the result. + + :return: EntryPoints or SelectableGroups for all installed packages. """ + norm_name = operator.attrgetter('_normalized_name') + unique = functools.partial(unique_everseen, key=norm_name) eps = itertools.chain.from_iterable( - dist.entry_points for dist in _unique(distributions()) + dist.entry_points for dist in unique(distributions()) ) - return EntryPoints(eps).select(**params) + return SelectableGroups.load(eps).select(**params) -def files(distribution_name: str) -> Optional[List[PackagePath]]: +def files(distribution_name): """Return a list of files for the named package. :param distribution_name: The name of the distribution package to query. @@ -1010,11 +1008,11 @@ def files(distribution_name: str) -> Optional[List[PackagePath]]: return distribution(distribution_name).files -def requires(distribution_name: str) -> Optional[List[str]]: +def requires(distribution_name): """ Return a list of requirements for the named package. - :return: An iterable of requirements, suitable for + :return: An iterator of requirements, suitable for packaging.requirement.Requirement. """ return distribution(distribution_name).requires @@ -1041,43 +1039,9 @@ def _top_level_declared(dist): return (dist.read_text('top_level.txt') or '').split() -def _topmost(name: PackagePath) -> Optional[str]: - """ - Return the top-most parent as long as there is a parent. - """ - top, *rest = name.parts - return top if rest else None - - -def _get_toplevel_name(name: PackagePath) -> str: - """ - Infer a possibly importable module name from a name presumed on - sys.path. - - >>> _get_toplevel_name(PackagePath('foo.py')) - 'foo' - >>> _get_toplevel_name(PackagePath('foo')) - 'foo' - >>> _get_toplevel_name(PackagePath('foo.pyc')) - 'foo' - >>> _get_toplevel_name(PackagePath('foo/__init__.py')) - 'foo' - >>> _get_toplevel_name(PackagePath('foo.pth')) - 'foo.pth' - >>> _get_toplevel_name(PackagePath('foo.dist-info')) - 'foo.dist-info' - """ - return _topmost(name) or ( - # python/typeshed#10328 - inspect.getmodulename(name) # type: ignore - or str(name) - ) - - def _top_level_inferred(dist): - opt_names = set(map(_get_toplevel_name, always_iterable(dist.files))) - - def importable_name(name): - return '.' not in name - - return filter(importable_name, opt_names) + return { + f.parts[0] if len(f.parts) > 1 else f.with_suffix('').name + for f in always_iterable(dist.files) + if f.suffix == ".py" + } diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/__init__.cpython-311.pyc index 2959d03..2f5d465 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_adapters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_adapters.cpython-311.pyc index 1151ab2..79d3e23 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_adapters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_adapters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_collections.cpython-311.pyc index 4d9ef39..929c05c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_compat.cpython-311.pyc index 86845e0..5f88e29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_functools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_functools.cpython-311.pyc index 061c292..7105e33 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_functools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_functools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_itertools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_itertools.cpython-311.pyc index 9728fbd..04b5de0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_itertools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_itertools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_meta.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_meta.cpython-311.pyc index acba48c..aa559db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_meta.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_meta.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_text.cpython-311.pyc index 62bdb3a..b8618d4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_text.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/_text.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/diagnose.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/diagnose.cpython-311.pyc deleted file mode 100644 index cb3afff..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/__pycache__/diagnose.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_adapters.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_adapters.py index 6223263..aa460d3 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_adapters.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_adapters.py @@ -39,21 +39,6 @@ class Message(email.message.Message): def __iter__(self): return super().__iter__() - def __getitem__(self, item): - """ - Override parent behavior to typical dict behavior. - - ``email.message.Message`` will emit None values for missing - keys. Typical mappings, including this ``Message``, will raise - a key error for missing keys. - - Ref python/importlib_metadata#371. - """ - res = super().__getitem__(item) - if res is None: - raise KeyError(item) - return res - def _repair_headers(self): def redent(value): "Correct for RFC822 indentation" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_compat.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_compat.py index df312b1..ef3136f 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_compat.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_compat.py @@ -2,7 +2,13 @@ import sys import platform -__all__ = ['install', 'NullFinder'] +__all__ = ['install', 'NullFinder', 'Protocol'] + + +try: + from typing import Protocol +except ImportError: # pragma: no cover + from ..typing_extensions import Protocol # type: ignore def install(cls): @@ -38,7 +44,7 @@ def disable_stdlib_finder(): class NullFinder: """ - A "Finder" (aka "MetaPathFinder") that never finds any modules, + A "Finder" (aka "MetaClassFinder") that never finds any modules, but may find distributions. """ @@ -46,6 +52,14 @@ class NullFinder: def find_spec(*args, **kwargs): return None + # In Python 2, the import system requires finders + # to have a find_module() method, but this usage + # is deprecated in Python 3 in favor of find_spec(). + # For the purposes of this finder (i.e. being present + # on sys.meta_path but having no other import + # system functionality), the two methods are identical. + find_module = find_spec + def pypy_partial(val): """ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_meta.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_meta.py index 1927d0f..37ee43e 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_meta.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/_meta.py @@ -1,38 +1,24 @@ -from __future__ import annotations - -import os -from typing import Protocol -from typing import Any, Dict, Iterator, List, Optional, TypeVar, Union, overload +from ._compat import Protocol +from typing import Any, Dict, Iterator, List, TypeVar, Union _T = TypeVar("_T") class PackageMetadata(Protocol): - def __len__(self) -> int: ... # pragma: no cover + def __len__(self) -> int: + ... # pragma: no cover - def __contains__(self, item: str) -> bool: ... # pragma: no cover + def __contains__(self, item: str) -> bool: + ... # pragma: no cover - def __getitem__(self, key: str) -> str: ... # pragma: no cover + def __getitem__(self, key: str) -> str: + ... # pragma: no cover - def __iter__(self) -> Iterator[str]: ... # pragma: no cover + def __iter__(self) -> Iterator[str]: + ... # pragma: no cover - @overload - def get( - self, name: str, failobj: None = None - ) -> Optional[str]: ... # pragma: no cover - - @overload - def get(self, name: str, failobj: _T) -> Union[str, _T]: ... # pragma: no cover - - # overload per python/importlib_metadata#435 - @overload - def get_all( - self, name: str, failobj: None = None - ) -> Optional[List[Any]]: ... # pragma: no cover - - @overload - def get_all(self, name: str, failobj: _T) -> Union[List[Any], _T]: + def get_all(self, name: str, failobj: _T = ...) -> Union[List[Any], _T]: """ Return all values associated with a possibly multi-valued key. """ @@ -46,22 +32,17 @@ class PackageMetadata(Protocol): class SimplePath(Protocol): """ - A minimal subset of pathlib.Path required by Distribution. + A minimal subset of pathlib.Path required by PathDistribution. """ - def joinpath( - self, other: Union[str, os.PathLike[str]] - ) -> SimplePath: ... # pragma: no cover + def joinpath(self) -> 'SimplePath': + ... # pragma: no cover - def __truediv__( - self, other: Union[str, os.PathLike[str]] - ) -> SimplePath: ... # pragma: no cover + def __truediv__(self) -> 'SimplePath': + ... # pragma: no cover - @property - def parent(self) -> SimplePath: ... # pragma: no cover + def parent(self) -> 'SimplePath': + ... # pragma: no cover - def read_text(self, encoding=None) -> str: ... # pragma: no cover - - def read_bytes(self) -> bytes: ... # pragma: no cover - - def exists(self) -> bool: ... # pragma: no cover + def read_text(self) -> str: + ... # pragma: no cover diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index ee08db5..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py311.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py311.cpython-311.pyc deleted file mode 100644 index ebabb98..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py311.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py39.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py39.cpython-311.pyc deleted file mode 100644 index 8844ff3..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/__pycache__/py39.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py311.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py311.py deleted file mode 100644 index 3a53274..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py311.py +++ /dev/null @@ -1,22 +0,0 @@ -import os -import pathlib -import sys -import types - - -def wrap(path): # pragma: no cover - """ - Workaround for https://github.com/python/cpython/issues/84538 - to add backward compatibility for walk_up=True. - An example affected package is dask-labextension, which uses - jupyter-packaging to install JupyterLab javascript files outside - of site-packages. - """ - - def relative_to(root, *, walk_up=False): - return pathlib.Path(os.path.relpath(path, root)) - - return types.SimpleNamespace(relative_to=relative_to) - - -relative_fix = wrap if sys.version_info < (3, 12) else lambda x: x diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py39.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py39.py deleted file mode 100644 index 1f15bd9..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/compat/py39.py +++ /dev/null @@ -1,36 +0,0 @@ -""" -Compatibility layer with Python 3.8/3.9 -""" - -from typing import TYPE_CHECKING, Any, Optional - -if TYPE_CHECKING: # pragma: no cover - # Prevent circular imports on runtime. - from .. import Distribution, EntryPoint -else: - Distribution = EntryPoint = Any - - -def normalized_name(dist: Distribution) -> Optional[str]: - """ - Honor name normalization for distributions that don't provide ``_normalized_name``. - """ - try: - return dist._normalized_name - except AttributeError: - from .. import Prepared # -> delay to prevent circular imports. - - return Prepared.normalize(getattr(dist, "name", None) or dist.metadata['Name']) - - -def ep_matches(ep: EntryPoint, **params) -> bool: - """ - Workaround for ``EntryPoint`` objects without the ``matches`` method. - """ - try: - return ep.matches(**params) - except AttributeError: - from .. import EntryPoint # -> delay to prevent circular imports. - - # Reconstruct the EntryPoint object to make sure it is compatible. - return EntryPoint(ep.name, ep.value, ep.group).matches(**params) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/diagnose.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/diagnose.py deleted file mode 100644 index e405471..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/diagnose.py +++ /dev/null @@ -1,21 +0,0 @@ -import sys - -from . import Distribution - - -def inspect(path): - print("Inspecting", path) - dists = list(Distribution.discover(path=[path])) - if not dists: - return - print("Found", len(dists), "packages:", end=' ') - print(', '.join(dist.name for dist in dists)) - - -def run(): - for path in sys.path: - inspect(path) - - -if __name__ == '__main__': - run() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/importlib_metadata/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/METADATA deleted file mode 100644 index 9a2097a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/METADATA +++ /dev/null @@ -1,591 +0,0 @@ -Metadata-Version: 2.1 -Name: inflect -Version: 7.3.1 -Summary: Correctly generate plurals, singular nouns, ordinals, indefinite articles -Author-email: Paul Dyson -Maintainer-email: "Jason R. Coombs" -Project-URL: Source, https://github.com/jaraco/inflect -Keywords: plural,inflect,participle -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Natural Language :: English -Classifier: Operating System :: OS Independent -Classifier: Topic :: Software Development :: Libraries :: Python Modules -Classifier: Topic :: Text Processing :: Linguistic -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Requires-Dist: more-itertools >=8.5.0 -Requires-Dist: typeguard >=4.0.1 -Requires-Dist: typing-extensions ; python_version < "3.9" -Provides-Extra: doc -Requires-Dist: sphinx >=3.5 ; extra == 'doc' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc' -Requires-Dist: rst.linker >=1.9 ; extra == 'doc' -Requires-Dist: furo ; extra == 'doc' -Requires-Dist: sphinx-lint ; extra == 'doc' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc' -Provides-Extra: test -Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test' -Requires-Dist: pytest-cov ; extra == 'test' -Requires-Dist: pytest-mypy ; extra == 'test' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'test' -Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test' -Requires-Dist: pygments ; extra == 'test' - -.. image:: https://img.shields.io/pypi/v/inflect.svg - :target: https://pypi.org/project/inflect - -.. image:: https://img.shields.io/pypi/pyversions/inflect.svg - -.. image:: https://github.com/jaraco/inflect/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/inflect/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/inflect/badge/?version=latest - :target: https://inflect.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/inflect - :target: https://tidelift.com/subscription/pkg/pypi-inflect?utm_source=pypi-inflect&utm_medium=readme - -NAME -==== - -inflect.py - Correctly generate plurals, singular nouns, ordinals, indefinite articles; convert numbers to words. - -SYNOPSIS -======== - -.. code-block:: python - - import inflect - - p = inflect.engine() - - # METHODS: - - # plural plural_noun plural_verb plural_adj singular_noun no num - # compare compare_nouns compare_nouns compare_adjs - # a an - # present_participle - # ordinal number_to_words - # join - # inflect classical gender - # defnoun defverb defadj defa defan - - - # UNCONDITIONALLY FORM THE PLURAL - - print("The plural of ", word, " is ", p.plural(word)) - - - # CONDITIONALLY FORM THE PLURAL - - print("I saw", cat_count, p.plural("cat", cat_count)) - - - # FORM PLURALS FOR SPECIFIC PARTS OF SPEECH - - print( - p.plural_noun("I", N1), - p.plural_verb("saw", N1), - p.plural_adj("my", N2), - p.plural_noun("saw", N2), - ) - - - # FORM THE SINGULAR OF PLURAL NOUNS - - print("The singular of ", word, " is ", p.singular_noun(word)) - - # SELECT THE GENDER OF SINGULAR PRONOUNS - - print(p.singular_noun("they")) # 'it' - p.gender("feminine") - print(p.singular_noun("they")) # 'she' - - - # DEAL WITH "0/1/N" -> "no/1/N" TRANSLATION: - - print("There ", p.plural_verb("was", errors), p.no(" error", errors)) - - - # USE DEFAULT COUNTS: - - print( - p.num(N1, ""), - p.plural("I"), - p.plural_verb(" saw"), - p.num(N2), - p.plural_noun(" saw"), - ) - print("There ", p.num(errors, ""), p.plural_verb("was"), p.no(" error")) - - - # COMPARE TWO WORDS "NUMBER-INSENSITIVELY": - - if p.compare(word1, word2): - print("same") - if p.compare_nouns(word1, word2): - print("same noun") - if p.compare_verbs(word1, word2): - print("same verb") - if p.compare_adjs(word1, word2): - print("same adj.") - - - # ADD CORRECT "a" OR "an" FOR A GIVEN WORD: - - print("Did you want ", p.a(thing), " or ", p.an(idea)) - - - # CONVERT NUMERALS INTO ORDINALS (i.e. 1->1st, 2->2nd, 3->3rd, etc.) - - print("It was", p.ordinal(position), " from the left\n") - - # CONVERT NUMERALS TO WORDS (i.e. 1->"one", 101->"one hundred and one", etc.) - # RETURNS A SINGLE STRING... - - words = p.number_to_words(1234) - # "one thousand, two hundred and thirty-four" - words = p.number_to_words(p.ordinal(1234)) - # "one thousand, two hundred and thirty-fourth" - - - # GET BACK A LIST OF STRINGS, ONE FOR EACH "CHUNK"... - - words = p.number_to_words(1234, wantlist=True) - # ("one thousand","two hundred and thirty-four") - - - # OPTIONAL PARAMETERS CHANGE TRANSLATION: - - words = p.number_to_words(12345, group=1) - # "one, two, three, four, five" - - words = p.number_to_words(12345, group=2) - # "twelve, thirty-four, five" - - words = p.number_to_words(12345, group=3) - # "one twenty-three, forty-five" - - words = p.number_to_words(1234, andword="") - # "one thousand, two hundred thirty-four" - - words = p.number_to_words(1234, andword=", plus") - # "one thousand, two hundred, plus thirty-four" - # TODO: I get no comma before plus: check perl - - words = p.number_to_words(555_1202, group=1, zero="oh") - # "five, five, five, one, two, oh, two" - - words = p.number_to_words(555_1202, group=1, one="unity") - # "five, five, five, unity, two, oh, two" - - words = p.number_to_words(123.456, group=1, decimal="mark") - # "one two three mark four five six" - # TODO: DOCBUG: perl gives commas here as do I - - # LITERAL STYLE ONLY NAMES NUMBERS LESS THAN A CERTAIN THRESHOLD... - - words = p.number_to_words(9, threshold=10) # "nine" - words = p.number_to_words(10, threshold=10) # "ten" - words = p.number_to_words(11, threshold=10) # "11" - words = p.number_to_words(1000, threshold=10) # "1,000" - - # JOIN WORDS INTO A LIST: - - mylist = p.join(("apple", "banana", "carrot")) - # "apple, banana, and carrot" - - mylist = p.join(("apple", "banana")) - # "apple and banana" - - mylist = p.join(("apple", "banana", "carrot"), final_sep="") - # "apple, banana and carrot" - - - # REQUIRE "CLASSICAL" PLURALS (EG: "focus"->"foci", "cherub"->"cherubim") - - p.classical() # USE ALL CLASSICAL PLURALS - - p.classical(all=True) # USE ALL CLASSICAL PLURALS - p.classical(all=False) # SWITCH OFF CLASSICAL MODE - - p.classical(zero=True) # "no error" INSTEAD OF "no errors" - p.classical(zero=False) # "no errors" INSTEAD OF "no error" - - p.classical(herd=True) # "2 buffalo" INSTEAD OF "2 buffalos" - p.classical(herd=False) # "2 buffalos" INSTEAD OF "2 buffalo" - - p.classical(persons=True) # "2 chairpersons" INSTEAD OF "2 chairpeople" - p.classical(persons=False) # "2 chairpeople" INSTEAD OF "2 chairpersons" - - p.classical(ancient=True) # "2 formulae" INSTEAD OF "2 formulas" - p.classical(ancient=False) # "2 formulas" INSTEAD OF "2 formulae" - - - # INTERPOLATE "plural()", "plural_noun()", "plural_verb()", "plural_adj()", "singular_noun()", - # a()", "an()", "num()" AND "ordinal()" WITHIN STRINGS: - - print(p.inflect("The plural of {0} is plural('{0}')".format(word))) - print(p.inflect("The singular of {0} is singular_noun('{0}')".format(word))) - print(p.inflect("I saw {0} plural('cat',{0})".format(cat_count))) - print( - p.inflect( - "plural('I',{0}) " - "plural_verb('saw',{0}) " - "plural('a',{1}) " - "plural_noun('saw',{1})".format(N1, N2) - ) - ) - print( - p.inflect( - "num({0}, False)plural('I') " - "plural_verb('saw') " - "num({1}, False)plural('a') " - "plural_noun('saw')".format(N1, N2) - ) - ) - print(p.inflect("I saw num({0}) plural('cat')\nnum()".format(cat_count))) - print(p.inflect("There plural_verb('was',{0}) no('error',{0})".format(errors))) - print(p.inflect("There num({0}, False)plural_verb('was') no('error')".format(errors))) - print(p.inflect("Did you want a('{0}') or an('{1}')".format(thing, idea))) - print(p.inflect("It was ordinal('{0}') from the left".format(position))) - - - # ADD USER-DEFINED INFLECTIONS (OVERRIDING INBUILT RULES): - - p.defnoun("VAX", "VAXen") # SINGULAR => PLURAL - - p.defverb( - "will", # 1ST PERSON SINGULAR - "shall", # 1ST PERSON PLURAL - "will", # 2ND PERSON SINGULAR - "will", # 2ND PERSON PLURAL - "will", # 3RD PERSON SINGULAR - "will", # 3RD PERSON PLURAL - ) - - p.defadj("hir", "their") # SINGULAR => PLURAL - - p.defa("h") # "AY HALWAYS SEZ 'HAITCH'!" - - p.defan("horrendous.*") # "AN HORRENDOUS AFFECTATION" - - -DESCRIPTION -=========== - -The methods of the class ``engine`` in module ``inflect.py`` provide plural -inflections, singular noun inflections, "a"/"an" selection for English words, -and manipulation of numbers as words. - -Plural forms of all nouns, most verbs, and some adjectives are -provided. Where appropriate, "classical" variants (for example: "brother" -> -"brethren", "dogma" -> "dogmata", etc.) are also provided. - -Single forms of nouns are also provided. The gender of singular pronouns -can be chosen (for example "they" -> "it" or "she" or "he" or "they"). - -Pronunciation-based "a"/"an" selection is provided for all English -words, and most initialisms. - -It is also possible to inflect numerals (1,2,3) to ordinals (1st, 2nd, 3rd) -and to English words ("one", "two", "three"). - -In generating these inflections, ``inflect.py`` follows the Oxford -English Dictionary and the guidelines in Fowler's Modern English -Usage, preferring the former where the two disagree. - -The module is built around standard British spelling, but is designed -to cope with common American variants as well. Slang, jargon, and -other English dialects are *not* explicitly catered for. - -Where two or more inflected forms exist for a single word (typically a -"classical" form and a "modern" form), ``inflect.py`` prefers the -more common form (typically the "modern" one), unless "classical" -processing has been specified -(see `MODERN VS CLASSICAL INFLECTIONS`). - -FORMING PLURALS AND SINGULARS -============================= - -Inflecting Plurals and Singulars --------------------------------- - -All of the ``plural...`` plural inflection methods take the word to be -inflected as their first argument and return the corresponding inflection. -Note that all such methods expect the *singular* form of the word. The -results of passing a plural form are undefined (and unlikely to be correct). -Similarly, the ``si...`` singular inflection method expects the *plural* -form of the word. - -The ``plural...`` methods also take an optional second argument, -which indicates the grammatical "number" of the word (or of another word -with which the word being inflected must agree). If the "number" argument is -supplied and is not ``1`` (or ``"one"`` or ``"a"``, or some other adjective that -implies the singular), the plural form of the word is returned. If the -"number" argument *does* indicate singularity, the (uninflected) word -itself is returned. If the number argument is omitted, the plural form -is returned unconditionally. - -The ``si...`` method takes a second argument in a similar fashion. If it is -some form of the number ``1``, or is omitted, the singular form is returned. -Otherwise the plural is returned unaltered. - - -The various methods of ``inflect.engine`` are: - - - -``plural_noun(word, count=None)`` - - The method ``plural_noun()`` takes a *singular* English noun or - pronoun and returns its plural. Pronouns in the nominative ("I" -> - "we") and accusative ("me" -> "us") cases are handled, as are - possessive pronouns ("mine" -> "ours"). - - -``plural_verb(word, count=None)`` - - The method ``plural_verb()`` takes the *singular* form of a - conjugated verb (that is, one which is already in the correct "person" - and "mood") and returns the corresponding plural conjugation. - - -``plural_adj(word, count=None)`` - - The method ``plural_adj()`` takes the *singular* form of - certain types of adjectives and returns the corresponding plural form. - Adjectives that are correctly handled include: "numerical" adjectives - ("a" -> "some"), demonstrative adjectives ("this" -> "these", "that" -> - "those"), and possessives ("my" -> "our", "cat's" -> "cats'", "child's" - -> "childrens'", etc.) - - -``plural(word, count=None)`` - - The method ``plural()`` takes a *singular* English noun, - pronoun, verb, or adjective and returns its plural form. Where a word - has more than one inflection depending on its part of speech (for - example, the noun "thought" inflects to "thoughts", the verb "thought" - to "thought"), the (singular) noun sense is preferred to the (singular) - verb sense. - - Hence ``plural("knife")`` will return "knives" ("knife" having been treated - as a singular noun), whereas ``plural("knifes")`` will return "knife" - ("knifes" having been treated as a 3rd person singular verb). - - The inherent ambiguity of such cases suggests that, - where the part of speech is known, ``plural_noun``, ``plural_verb``, and - ``plural_adj`` should be used in preference to ``plural``. - - -``singular_noun(word, count=None)`` - - The method ``singular_noun()`` takes a *plural* English noun or - pronoun and returns its singular. Pronouns in the nominative ("we" -> - "I") and accusative ("us" -> "me") cases are handled, as are - possessive pronouns ("ours" -> "mine"). When third person - singular pronouns are returned they take the neuter gender by default - ("they" -> "it"), not ("they"-> "she") nor ("they" -> "he"). This can be - changed with ``gender()``. - -Note that all these methods ignore any whitespace surrounding the -word being inflected, but preserve that whitespace when the result is -returned. For example, ``plural(" cat ")`` returns " cats ". - - -``gender(genderletter)`` - - The third person plural pronoun takes the same form for the female, male and - neuter (e.g. "they"). The singular however, depends upon gender (e.g. "she", - "he", "it" and "they" -- "they" being the gender neutral form.) By default - ``singular_noun`` returns the neuter form, however, the gender can be selected with - the ``gender`` method. Pass the first letter of the gender to - ``gender`` to return the f(eminine), m(asculine), n(euter) or t(hey) - form of the singular. e.g. - gender('f') followed by singular_noun('themselves') returns 'herself'. - -Numbered plurals ----------------- - -The ``plural...`` methods return only the inflected word, not the count that -was used to inflect it. Thus, in order to produce "I saw 3 ducks", it -is necessary to use: - -.. code-block:: python - - print("I saw", N, p.plural_noun(animal, N)) - -Since the usual purpose of producing a plural is to make it agree with -a preceding count, inflect.py provides a method -(``no(word, count)``) which, given a word and a(n optional) count, returns the -count followed by the correctly inflected word. Hence the previous -example can be rewritten: - -.. code-block:: python - - print("I saw ", p.no(animal, N)) - -In addition, if the count is zero (or some other term which implies -zero, such as ``"zero"``, ``"nil"``, etc.) the count is replaced by the -word "no". Hence, if ``N`` had the value zero, the previous example -would print (the somewhat more elegant):: - - I saw no animals - -rather than:: - - I saw 0 animals - -Note that the name of the method is a pun: the method -returns either a number (a *No.*) or a ``"no"``, in front of the -inflected word. - - -Reducing the number of counts required --------------------------------------- - -In some contexts, the need to supply an explicit count to the various -``plural...`` methods makes for tiresome repetition. For example: - -.. code-block:: python - - print( - plural_adj("This", errors), - plural_noun(" error", errors), - plural_verb(" was", errors), - " fatal.", - ) - -inflect.py therefore provides a method -(``num(count=None, show=None)``) which may be used to set a persistent "default number" -value. If such a value is set, it is subsequently used whenever an -optional second "number" argument is omitted. The default value thus set -can subsequently be removed by calling ``num()`` with no arguments. -Hence we could rewrite the previous example: - -.. code-block:: python - - p.num(errors) - print(p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal.") - p.num() - -Normally, ``num()`` returns its first argument, so that it may also -be "inlined" in contexts like: - -.. code-block:: python - - print(p.num(errors), p.plural_noun(" error"), p.plural_verb(" was"), " detected.") - if severity > 1: - print( - p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal." - ) - -However, in certain contexts (see `INTERPOLATING INFLECTIONS IN STRINGS`) -it is preferable that ``num()`` return an empty string. Hence ``num()`` -provides an optional second argument. If that argument is supplied (that is, if -it is defined) and evaluates to false, ``num`` returns an empty string -instead of its first argument. For example: - -.. code-block:: python - - print(p.num(errors, 0), p.no("error"), p.plural_verb(" was"), " detected.") - if severity > 1: - print( - p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal." - ) - - - -Number-insensitive equality ---------------------------- - -inflect.py also provides a solution to the problem -of comparing words of differing plurality through the methods -``compare(word1, word2)``, ``compare_nouns(word1, word2)``, -``compare_verbs(word1, word2)``, and ``compare_adjs(word1, word2)``. -Each of these methods takes two strings, and compares them -using the corresponding plural-inflection method (``plural()``, ``plural_noun()``, -``plural_verb()``, and ``plural_adj()`` respectively). - -The comparison returns true if: - -- the strings are equal, or -- one string is equal to a plural form of the other, or -- the strings are two different plural forms of the one word. - - -Hence all of the following return true: - -.. code-block:: python - - p.compare("index", "index") # RETURNS "eq" - p.compare("index", "indexes") # RETURNS "s:p" - p.compare("index", "indices") # RETURNS "s:p" - p.compare("indexes", "index") # RETURNS "p:s" - p.compare("indices", "index") # RETURNS "p:s" - p.compare("indices", "indexes") # RETURNS "p:p" - p.compare("indexes", "indices") # RETURNS "p:p" - p.compare("indices", "indices") # RETURNS "eq" - -As indicated by the comments in the previous example, the actual value -returned by the various ``compare`` methods encodes which of the -three equality rules succeeded: "eq" is returned if the strings were -identical, "s:p" if the strings were singular and plural respectively, -"p:s" for plural and singular, and "p:p" for two distinct plurals. -Inequality is indicated by returning an empty string. - -It should be noted that two distinct singular words which happen to take -the same plural form are *not* considered equal, nor are cases where -one (singular) word's plural is the other (plural) word's singular. -Hence all of the following return false: - -.. code-block:: python - - p.compare("base", "basis") # ALTHOUGH BOTH -> "bases" - p.compare("syrinx", "syringe") # ALTHOUGH BOTH -> "syringes" - p.compare("she", "he") # ALTHOUGH BOTH -> "they" - - p.compare("opus", "operas") # ALTHOUGH "opus" -> "opera" -> "operas" - p.compare("taxi", "taxes") # ALTHOUGH "taxi" -> "taxis" -> "taxes" - -Note too that, although the comparison is "number-insensitive" it is *not* -case-insensitive (that is, ``plural("time","Times")`` returns false. To obtain -both number and case insensitivity, use the ``lower()`` method on both strings -(that is, ``plural("time".lower(), "Times".lower())`` returns true). - -Related Functionality -===================== - -Shout out to these libraries that provide related functionality: - -* `WordSet `_ - parses identifiers like variable names into sets of words suitable for re-assembling - in another form. - -* `word2number `_ converts words to - a number. - - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/RECORD deleted file mode 100644 index 73ff576..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/RECORD +++ /dev/null @@ -1,13 +0,0 @@ -inflect-7.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -inflect-7.3.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -inflect-7.3.1.dist-info/METADATA,sha256=ZgMNY0WAZRs-U8wZiV2SMfjSKqBrMngXyDMs_CAwMwg,21079 -inflect-7.3.1.dist-info/RECORD,, -inflect-7.3.1.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91 -inflect-7.3.1.dist-info/top_level.txt,sha256=m52ujdp10CqT6jh1XQxZT6kEntcnv-7Tl7UiGNTzWZA,8 -inflect/__init__.py,sha256=Jxy1HJXZiZ85kHeLAhkmvz6EMTdFqBe-duvt34R6IOc,103796 -inflect/__pycache__/__init__.cpython-312.pyc,, -inflect/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -inflect/compat/__pycache__/__init__.cpython-312.pyc,, -inflect/compat/__pycache__/py38.cpython-312.pyc,, -inflect/compat/py38.py,sha256=oObVfVnWX9_OpnOuEJn1mFbJxVhwyR5epbiTNXDDaso,160 -inflect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/WHEEL deleted file mode 100644 index 564c672..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: setuptools (70.2.0) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/top_level.txt deleted file mode 100644 index 0fd75fa..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect-7.3.1.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -inflect diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__init__.py deleted file mode 100644 index 3eec27f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__init__.py +++ /dev/null @@ -1,3986 +0,0 @@ -""" -inflect: english language inflection - - correctly generate plurals, ordinals, indefinite articles - - convert numbers to words - -Copyright (C) 2010 Paul Dyson - -Based upon the Perl module -`Lingua::EN::Inflect `_. - -methods: - classical inflect - plural plural_noun plural_verb plural_adj singular_noun no num a an - compare compare_nouns compare_verbs compare_adjs - present_participle - ordinal - number_to_words - join - defnoun defverb defadj defa defan - -INFLECTIONS: - classical inflect - plural plural_noun plural_verb plural_adj singular_noun compare - no num a an present_participle - -PLURALS: - classical inflect - plural plural_noun plural_verb plural_adj singular_noun no num - compare compare_nouns compare_verbs compare_adjs - -COMPARISONS: - classical - compare compare_nouns compare_verbs compare_adjs - -ARTICLES: - classical inflect num a an - -NUMERICAL: - ordinal number_to_words - -USER_DEFINED: - defnoun defverb defadj defa defan - -Exceptions: - UnknownClassicalModeError - BadNumValueError - BadChunkingOptionError - NumOutOfRangeError - BadUserDefinedPatternError - BadRcFileError - BadGenderError - -""" - -from __future__ import annotations - -import ast -import collections -import contextlib -import functools -import itertools -import re -from numbers import Number -from typing import ( - TYPE_CHECKING, - Any, - Callable, - Dict, - Iterable, - List, - Literal, - Match, - Optional, - Sequence, - Tuple, - Union, - cast, -) - -from more_itertools import windowed_complete -from typeguard import typechecked - -from .compat.py38 import Annotated - - -class UnknownClassicalModeError(Exception): - pass - - -class BadNumValueError(Exception): - pass - - -class BadChunkingOptionError(Exception): - pass - - -class NumOutOfRangeError(Exception): - pass - - -class BadUserDefinedPatternError(Exception): - pass - - -class BadRcFileError(Exception): - pass - - -class BadGenderError(Exception): - pass - - -def enclose(s: str) -> str: - return f"(?:{s})" - - -def joinstem(cutpoint: Optional[int] = 0, words: Optional[Iterable[str]] = None) -> str: - """ - Join stem of each word in words into a string for regex. - - Each word is truncated at cutpoint. - - Cutpoint is usually negative indicating the number of letters to remove - from the end of each word. - - >>> joinstem(-2, ["ephemeris", "iris", ".*itis"]) - '(?:ephemer|ir|.*it)' - - >>> joinstem(None, ["ephemeris"]) - '(?:ephemeris)' - - >>> joinstem(5, None) - '(?:)' - """ - return enclose("|".join(w[:cutpoint] for w in words or [])) - - -def bysize(words: Iterable[str]) -> Dict[int, set]: - """ - From a list of words, return a dict of sets sorted by word length. - - >>> words = ['ant', 'cat', 'dog', 'pig', 'frog', 'goat', 'horse', 'elephant'] - >>> ret = bysize(words) - >>> sorted(ret[3]) - ['ant', 'cat', 'dog', 'pig'] - >>> ret[5] - {'horse'} - """ - res: Dict[int, set] = collections.defaultdict(set) - for w in words: - res[len(w)].add(w) - return res - - -def make_pl_si_lists( - lst: Iterable[str], - plending: str, - siendingsize: Optional[int], - dojoinstem: bool = True, -): - """ - given a list of singular words: lst - - an ending to append to make the plural: plending - - the number of characters to remove from the singular - before appending plending: siendingsize - - a flag whether to create a joinstem: dojoinstem - - return: - a list of pluralised words: si_list (called si because this is what you need to - look for to make the singular) - - the pluralised words as a dict of sets sorted by word length: si_bysize - the singular words as a dict of sets sorted by word length: pl_bysize - if dojoinstem is True: a regular expression that matches any of the stems: stem - """ - if siendingsize is not None: - siendingsize = -siendingsize - si_list = [w[:siendingsize] + plending for w in lst] - pl_bysize = bysize(lst) - si_bysize = bysize(si_list) - if dojoinstem: - stem = joinstem(siendingsize, lst) - return si_list, si_bysize, pl_bysize, stem - else: - return si_list, si_bysize, pl_bysize - - -# 1. PLURALS - -pl_sb_irregular_s = { - "corpus": "corpuses|corpora", - "opus": "opuses|opera", - "genus": "genera", - "mythos": "mythoi", - "penis": "penises|penes", - "testis": "testes", - "atlas": "atlases|atlantes", - "yes": "yeses", -} - -pl_sb_irregular = { - "child": "children", - "chili": "chilis|chilies", - "brother": "brothers|brethren", - "infinity": "infinities|infinity", - "loaf": "loaves", - "lore": "lores|lore", - "hoof": "hoofs|hooves", - "beef": "beefs|beeves", - "thief": "thiefs|thieves", - "money": "monies", - "mongoose": "mongooses", - "ox": "oxen", - "cow": "cows|kine", - "graffito": "graffiti", - "octopus": "octopuses|octopodes", - "genie": "genies|genii", - "ganglion": "ganglions|ganglia", - "trilby": "trilbys", - "turf": "turfs|turves", - "numen": "numina", - "atman": "atmas", - "occiput": "occiputs|occipita", - "sabretooth": "sabretooths", - "sabertooth": "sabertooths", - "lowlife": "lowlifes", - "flatfoot": "flatfoots", - "tenderfoot": "tenderfoots", - "romany": "romanies", - "jerry": "jerries", - "mary": "maries", - "talouse": "talouses", - "rom": "roma", - "carmen": "carmina", -} - -pl_sb_irregular.update(pl_sb_irregular_s) -# pl_sb_irregular_keys = enclose('|'.join(pl_sb_irregular.keys())) - -pl_sb_irregular_caps = { - "Romany": "Romanies", - "Jerry": "Jerrys", - "Mary": "Marys", - "Rom": "Roma", -} - -pl_sb_irregular_compound = {"prima donna": "prima donnas|prime donne"} - -si_sb_irregular = {v: k for (k, v) in pl_sb_irregular.items()} -for k in list(si_sb_irregular): - if "|" in k: - k1, k2 = k.split("|") - si_sb_irregular[k1] = si_sb_irregular[k2] = si_sb_irregular[k] - del si_sb_irregular[k] -si_sb_irregular_caps = {v: k for (k, v) in pl_sb_irregular_caps.items()} -si_sb_irregular_compound = {v: k for (k, v) in pl_sb_irregular_compound.items()} -for k in list(si_sb_irregular_compound): - if "|" in k: - k1, k2 = k.split("|") - si_sb_irregular_compound[k1] = si_sb_irregular_compound[k2] = ( - si_sb_irregular_compound[k] - ) - del si_sb_irregular_compound[k] - -# si_sb_irregular_keys = enclose('|'.join(si_sb_irregular.keys())) - -# Z's that don't double - -pl_sb_z_zes_list = ("quartz", "topaz") -pl_sb_z_zes_bysize = bysize(pl_sb_z_zes_list) - -pl_sb_ze_zes_list = ("snooze",) -pl_sb_ze_zes_bysize = bysize(pl_sb_ze_zes_list) - - -# CLASSICAL "..is" -> "..ides" - -pl_sb_C_is_ides_complete = [ - # GENERAL WORDS... - "ephemeris", - "iris", - "clitoris", - "chrysalis", - "epididymis", -] - -pl_sb_C_is_ides_endings = [ - # INFLAMATIONS... - "itis" -] - -pl_sb_C_is_ides = joinstem( - -2, pl_sb_C_is_ides_complete + [f".*{w}" for w in pl_sb_C_is_ides_endings] -) - -pl_sb_C_is_ides_list = pl_sb_C_is_ides_complete + pl_sb_C_is_ides_endings - -( - si_sb_C_is_ides_list, - si_sb_C_is_ides_bysize, - pl_sb_C_is_ides_bysize, -) = make_pl_si_lists(pl_sb_C_is_ides_list, "ides", 2, dojoinstem=False) - - -# CLASSICAL "..a" -> "..ata" - -pl_sb_C_a_ata_list = ( - "anathema", - "bema", - "carcinoma", - "charisma", - "diploma", - "dogma", - "drama", - "edema", - "enema", - "enigma", - "lemma", - "lymphoma", - "magma", - "melisma", - "miasma", - "oedema", - "sarcoma", - "schema", - "soma", - "stigma", - "stoma", - "trauma", - "gumma", - "pragma", -) - -( - si_sb_C_a_ata_list, - si_sb_C_a_ata_bysize, - pl_sb_C_a_ata_bysize, - pl_sb_C_a_ata, -) = make_pl_si_lists(pl_sb_C_a_ata_list, "ata", 1) - -# UNCONDITIONAL "..a" -> "..ae" - -pl_sb_U_a_ae_list = ( - "alumna", - "alga", - "vertebra", - "persona", - "vita", -) -( - si_sb_U_a_ae_list, - si_sb_U_a_ae_bysize, - pl_sb_U_a_ae_bysize, - pl_sb_U_a_ae, -) = make_pl_si_lists(pl_sb_U_a_ae_list, "e", None) - -# CLASSICAL "..a" -> "..ae" - -pl_sb_C_a_ae_list = ( - "amoeba", - "antenna", - "formula", - "hyperbola", - "medusa", - "nebula", - "parabola", - "abscissa", - "hydra", - "nova", - "lacuna", - "aurora", - "umbra", - "flora", - "fauna", -) -( - si_sb_C_a_ae_list, - si_sb_C_a_ae_bysize, - pl_sb_C_a_ae_bysize, - pl_sb_C_a_ae, -) = make_pl_si_lists(pl_sb_C_a_ae_list, "e", None) - - -# CLASSICAL "..en" -> "..ina" - -pl_sb_C_en_ina_list = ("stamen", "foramen", "lumen") - -( - si_sb_C_en_ina_list, - si_sb_C_en_ina_bysize, - pl_sb_C_en_ina_bysize, - pl_sb_C_en_ina, -) = make_pl_si_lists(pl_sb_C_en_ina_list, "ina", 2) - - -# UNCONDITIONAL "..um" -> "..a" - -pl_sb_U_um_a_list = ( - "bacterium", - "agendum", - "desideratum", - "erratum", - "stratum", - "datum", - "ovum", - "extremum", - "candelabrum", -) -( - si_sb_U_um_a_list, - si_sb_U_um_a_bysize, - pl_sb_U_um_a_bysize, - pl_sb_U_um_a, -) = make_pl_si_lists(pl_sb_U_um_a_list, "a", 2) - -# CLASSICAL "..um" -> "..a" - -pl_sb_C_um_a_list = ( - "maximum", - "minimum", - "momentum", - "optimum", - "quantum", - "cranium", - "curriculum", - "dictum", - "phylum", - "aquarium", - "compendium", - "emporium", - "encomium", - "gymnasium", - "honorarium", - "interregnum", - "lustrum", - "memorandum", - "millennium", - "rostrum", - "spectrum", - "speculum", - "stadium", - "trapezium", - "ultimatum", - "medium", - "vacuum", - "velum", - "consortium", - "arboretum", -) - -( - si_sb_C_um_a_list, - si_sb_C_um_a_bysize, - pl_sb_C_um_a_bysize, - pl_sb_C_um_a, -) = make_pl_si_lists(pl_sb_C_um_a_list, "a", 2) - - -# UNCONDITIONAL "..us" -> "i" - -pl_sb_U_us_i_list = ( - "alumnus", - "alveolus", - "bacillus", - "bronchus", - "locus", - "nucleus", - "stimulus", - "meniscus", - "sarcophagus", -) -( - si_sb_U_us_i_list, - si_sb_U_us_i_bysize, - pl_sb_U_us_i_bysize, - pl_sb_U_us_i, -) = make_pl_si_lists(pl_sb_U_us_i_list, "i", 2) - -# CLASSICAL "..us" -> "..i" - -pl_sb_C_us_i_list = ( - "focus", - "radius", - "genius", - "incubus", - "succubus", - "nimbus", - "fungus", - "nucleolus", - "stylus", - "torus", - "umbilicus", - "uterus", - "hippopotamus", - "cactus", -) - -( - si_sb_C_us_i_list, - si_sb_C_us_i_bysize, - pl_sb_C_us_i_bysize, - pl_sb_C_us_i, -) = make_pl_si_lists(pl_sb_C_us_i_list, "i", 2) - - -# CLASSICAL "..us" -> "..us" (ASSIMILATED 4TH DECLENSION LATIN NOUNS) - -pl_sb_C_us_us = ( - "status", - "apparatus", - "prospectus", - "sinus", - "hiatus", - "impetus", - "plexus", -) -pl_sb_C_us_us_bysize = bysize(pl_sb_C_us_us) - -# UNCONDITIONAL "..on" -> "a" - -pl_sb_U_on_a_list = ( - "criterion", - "perihelion", - "aphelion", - "phenomenon", - "prolegomenon", - "noumenon", - "organon", - "asyndeton", - "hyperbaton", -) -( - si_sb_U_on_a_list, - si_sb_U_on_a_bysize, - pl_sb_U_on_a_bysize, - pl_sb_U_on_a, -) = make_pl_si_lists(pl_sb_U_on_a_list, "a", 2) - -# CLASSICAL "..on" -> "..a" - -pl_sb_C_on_a_list = ("oxymoron",) - -( - si_sb_C_on_a_list, - si_sb_C_on_a_bysize, - pl_sb_C_on_a_bysize, - pl_sb_C_on_a, -) = make_pl_si_lists(pl_sb_C_on_a_list, "a", 2) - - -# CLASSICAL "..o" -> "..i" (BUT NORMALLY -> "..os") - -pl_sb_C_o_i = [ - "solo", - "soprano", - "basso", - "alto", - "contralto", - "tempo", - "piano", - "virtuoso", -] # list not tuple so can concat for pl_sb_U_o_os - -pl_sb_C_o_i_bysize = bysize(pl_sb_C_o_i) -si_sb_C_o_i_bysize = bysize([f"{w[:-1]}i" for w in pl_sb_C_o_i]) - -pl_sb_C_o_i_stems = joinstem(-1, pl_sb_C_o_i) - -# ALWAYS "..o" -> "..os" - -pl_sb_U_o_os_complete = {"ado", "ISO", "NATO", "NCO", "NGO", "oto"} -si_sb_U_o_os_complete = {f"{w}s" for w in pl_sb_U_o_os_complete} - - -pl_sb_U_o_os_endings = [ - "aficionado", - "aggro", - "albino", - "allegro", - "ammo", - "Antananarivo", - "archipelago", - "armadillo", - "auto", - "avocado", - "Bamako", - "Barquisimeto", - "bimbo", - "bingo", - "Biro", - "bolero", - "Bolzano", - "bongo", - "Boto", - "burro", - "Cairo", - "canto", - "cappuccino", - "casino", - "cello", - "Chicago", - "Chimango", - "cilantro", - "cochito", - "coco", - "Colombo", - "Colorado", - "commando", - "concertino", - "contango", - "credo", - "crescendo", - "cyano", - "demo", - "ditto", - "Draco", - "dynamo", - "embryo", - "Esperanto", - "espresso", - "euro", - "falsetto", - "Faro", - "fiasco", - "Filipino", - "flamenco", - "furioso", - "generalissimo", - "Gestapo", - "ghetto", - "gigolo", - "gizmo", - "Greensboro", - "gringo", - "Guaiabero", - "guano", - "gumbo", - "gyro", - "hairdo", - "hippo", - "Idaho", - "impetigo", - "inferno", - "info", - "intermezzo", - "intertrigo", - "Iquico", - "jumbo", - "junto", - "Kakapo", - "kilo", - "Kinkimavo", - "Kokako", - "Kosovo", - "Lesotho", - "libero", - "libido", - "libretto", - "lido", - "Lilo", - "limbo", - "limo", - "lineno", - "lingo", - "lino", - "livedo", - "loco", - "logo", - "lumbago", - "macho", - "macro", - "mafioso", - "magneto", - "magnifico", - "Majuro", - "Malabo", - "manifesto", - "Maputo", - "Maracaibo", - "medico", - "memo", - "metro", - "Mexico", - "micro", - "Milano", - "Monaco", - "mono", - "Montenegro", - "Morocco", - "Muqdisho", - "myo", - "neutrino", - "Ningbo", - "octavo", - "oregano", - "Orinoco", - "Orlando", - "Oslo", - "panto", - "Paramaribo", - "Pardusco", - "pedalo", - "photo", - "pimento", - "pinto", - "pleco", - "Pluto", - "pogo", - "polo", - "poncho", - "Porto-Novo", - "Porto", - "pro", - "psycho", - "pueblo", - "quarto", - "Quito", - "repo", - "rhino", - "risotto", - "rococo", - "rondo", - "Sacramento", - "saddo", - "sago", - "salvo", - "Santiago", - "Sapporo", - "Sarajevo", - "scherzando", - "scherzo", - "silo", - "sirocco", - "sombrero", - "staccato", - "sterno", - "stucco", - "stylo", - "sumo", - "Taiko", - "techno", - "terrazzo", - "testudo", - "timpano", - "tiro", - "tobacco", - "Togo", - "Tokyo", - "torero", - "Torino", - "Toronto", - "torso", - "tremolo", - "typo", - "tyro", - "ufo", - "UNESCO", - "vaquero", - "vermicello", - "verso", - "vibrato", - "violoncello", - "Virgo", - "weirdo", - "WHO", - "WTO", - "Yamoussoukro", - "yo-yo", - "zero", - "Zibo", -] + pl_sb_C_o_i - -pl_sb_U_o_os_bysize = bysize(pl_sb_U_o_os_endings) -si_sb_U_o_os_bysize = bysize([f"{w}s" for w in pl_sb_U_o_os_endings]) - - -# UNCONDITIONAL "..ch" -> "..chs" - -pl_sb_U_ch_chs_list = ("czech", "eunuch", "stomach") - -( - si_sb_U_ch_chs_list, - si_sb_U_ch_chs_bysize, - pl_sb_U_ch_chs_bysize, - pl_sb_U_ch_chs, -) = make_pl_si_lists(pl_sb_U_ch_chs_list, "s", None) - - -# UNCONDITIONAL "..[ei]x" -> "..ices" - -pl_sb_U_ex_ices_list = ("codex", "murex", "silex") -( - si_sb_U_ex_ices_list, - si_sb_U_ex_ices_bysize, - pl_sb_U_ex_ices_bysize, - pl_sb_U_ex_ices, -) = make_pl_si_lists(pl_sb_U_ex_ices_list, "ices", 2) - -pl_sb_U_ix_ices_list = ("radix", "helix") -( - si_sb_U_ix_ices_list, - si_sb_U_ix_ices_bysize, - pl_sb_U_ix_ices_bysize, - pl_sb_U_ix_ices, -) = make_pl_si_lists(pl_sb_U_ix_ices_list, "ices", 2) - -# CLASSICAL "..[ei]x" -> "..ices" - -pl_sb_C_ex_ices_list = ( - "vortex", - "vertex", - "cortex", - "latex", - "pontifex", - "apex", - "index", - "simplex", -) - -( - si_sb_C_ex_ices_list, - si_sb_C_ex_ices_bysize, - pl_sb_C_ex_ices_bysize, - pl_sb_C_ex_ices, -) = make_pl_si_lists(pl_sb_C_ex_ices_list, "ices", 2) - - -pl_sb_C_ix_ices_list = ("appendix",) - -( - si_sb_C_ix_ices_list, - si_sb_C_ix_ices_bysize, - pl_sb_C_ix_ices_bysize, - pl_sb_C_ix_ices, -) = make_pl_si_lists(pl_sb_C_ix_ices_list, "ices", 2) - - -# ARABIC: ".." -> "..i" - -pl_sb_C_i_list = ("afrit", "afreet", "efreet") - -(si_sb_C_i_list, si_sb_C_i_bysize, pl_sb_C_i_bysize, pl_sb_C_i) = make_pl_si_lists( - pl_sb_C_i_list, "i", None -) - - -# HEBREW: ".." -> "..im" - -pl_sb_C_im_list = ("goy", "seraph", "cherub") - -(si_sb_C_im_list, si_sb_C_im_bysize, pl_sb_C_im_bysize, pl_sb_C_im) = make_pl_si_lists( - pl_sb_C_im_list, "im", None -) - - -# UNCONDITIONAL "..man" -> "..mans" - -pl_sb_U_man_mans_list = """ - ataman caiman cayman ceriman - desman dolman farman harman hetman - human leman ottoman shaman talisman -""".split() -pl_sb_U_man_mans_caps_list = """ - Alabaman Bahaman Burman German - Hiroshiman Liman Nakayaman Norman Oklahoman - Panaman Roman Selman Sonaman Tacoman Yakiman - Yokohaman Yuman -""".split() - -( - si_sb_U_man_mans_list, - si_sb_U_man_mans_bysize, - pl_sb_U_man_mans_bysize, -) = make_pl_si_lists(pl_sb_U_man_mans_list, "s", None, dojoinstem=False) -( - si_sb_U_man_mans_caps_list, - si_sb_U_man_mans_caps_bysize, - pl_sb_U_man_mans_caps_bysize, -) = make_pl_si_lists(pl_sb_U_man_mans_caps_list, "s", None, dojoinstem=False) - -# UNCONDITIONAL "..louse" -> "..lice" -pl_sb_U_louse_lice_list = ("booklouse", "grapelouse", "louse", "woodlouse") - -( - si_sb_U_louse_lice_list, - si_sb_U_louse_lice_bysize, - pl_sb_U_louse_lice_bysize, -) = make_pl_si_lists(pl_sb_U_louse_lice_list, "lice", 5, dojoinstem=False) - -pl_sb_uninflected_s_complete = [ - # PAIRS OR GROUPS SUBSUMED TO A SINGULAR... - "breeches", - "britches", - "pajamas", - "pyjamas", - "clippers", - "gallows", - "hijinks", - "headquarters", - "pliers", - "scissors", - "testes", - "herpes", - "pincers", - "shears", - "proceedings", - "trousers", - # UNASSIMILATED LATIN 4th DECLENSION - "cantus", - "coitus", - "nexus", - # RECENT IMPORTS... - "contretemps", - "corps", - "debris", - "siemens", - # DISEASES - "mumps", - # MISCELLANEOUS OTHERS... - "diabetes", - "jackanapes", - "series", - "species", - "subspecies", - "rabies", - "chassis", - "innings", - "news", - "mews", - "haggis", -] - -pl_sb_uninflected_s_endings = [ - # RECENT IMPORTS... - "ois", - # DISEASES - "measles", -] - -pl_sb_uninflected_s = pl_sb_uninflected_s_complete + [ - f".*{w}" for w in pl_sb_uninflected_s_endings -] - -pl_sb_uninflected_herd = ( - # DON'T INFLECT IN CLASSICAL MODE, OTHERWISE NORMAL INFLECTION - "wildebeest", - "swine", - "eland", - "bison", - "buffalo", - "cattle", - "elk", - "rhinoceros", - "zucchini", - "caribou", - "dace", - "grouse", - "guinea fowl", - "guinea-fowl", - "haddock", - "hake", - "halibut", - "herring", - "mackerel", - "pickerel", - "pike", - "roe", - "seed", - "shad", - "snipe", - "teal", - "turbot", - "water fowl", - "water-fowl", -) - -pl_sb_uninflected_complete = [ - # SOME FISH AND HERD ANIMALS - "tuna", - "salmon", - "mackerel", - "trout", - "bream", - "sea-bass", - "sea bass", - "carp", - "cod", - "flounder", - "whiting", - "moose", - # OTHER ODDITIES - "graffiti", - "djinn", - "samuri", - "offspring", - "pence", - "quid", - "hertz", -] + pl_sb_uninflected_s_complete -# SOME WORDS ENDING IN ...s (OFTEN PAIRS TAKEN AS A WHOLE) - -pl_sb_uninflected_caps = [ - # ALL NATIONALS ENDING IN -ese - "Portuguese", - "Amoyese", - "Borghese", - "Congoese", - "Faroese", - "Foochowese", - "Genevese", - "Genoese", - "Gilbertese", - "Hottentotese", - "Kiplingese", - "Kongoese", - "Lucchese", - "Maltese", - "Nankingese", - "Niasese", - "Pekingese", - "Piedmontese", - "Pistoiese", - "Sarawakese", - "Shavese", - "Vermontese", - "Wenchowese", - "Yengeese", -] - - -pl_sb_uninflected_endings = [ - # UNCOUNTABLE NOUNS - "butter", - "cash", - "furniture", - "information", - # SOME FISH AND HERD ANIMALS - "fish", - "deer", - "sheep", - # ALL NATIONALS ENDING IN -ese - "nese", - "rese", - "lese", - "mese", - # DISEASES - "pox", - # OTHER ODDITIES - "craft", -] + pl_sb_uninflected_s_endings -# SOME WORDS ENDING IN ...s (OFTEN PAIRS TAKEN AS A WHOLE) - - -pl_sb_uninflected_bysize = bysize(pl_sb_uninflected_endings) - - -# SINGULAR WORDS ENDING IN ...s (ALL INFLECT WITH ...es) - -pl_sb_singular_s_complete = [ - "acropolis", - "aegis", - "alias", - "asbestos", - "bathos", - "bias", - "bronchitis", - "bursitis", - "caddis", - "cannabis", - "canvas", - "chaos", - "cosmos", - "dais", - "digitalis", - "epidermis", - "ethos", - "eyas", - "gas", - "glottis", - "hubris", - "ibis", - "lens", - "mantis", - "marquis", - "metropolis", - "pathos", - "pelvis", - "polis", - "rhinoceros", - "sassafras", - "trellis", -] + pl_sb_C_is_ides_complete - - -pl_sb_singular_s_endings = ["ss", "us"] + pl_sb_C_is_ides_endings - -pl_sb_singular_s_bysize = bysize(pl_sb_singular_s_endings) - -si_sb_singular_s_complete = [f"{w}es" for w in pl_sb_singular_s_complete] -si_sb_singular_s_endings = [f"{w}es" for w in pl_sb_singular_s_endings] -si_sb_singular_s_bysize = bysize(si_sb_singular_s_endings) - -pl_sb_singular_s_es = ["[A-Z].*es"] - -pl_sb_singular_s = enclose( - "|".join( - pl_sb_singular_s_complete - + [f".*{w}" for w in pl_sb_singular_s_endings] - + pl_sb_singular_s_es - ) -) - - -# PLURALS ENDING IN uses -> use - - -si_sb_ois_oi_case = ("Bolshois", "Hanois") - -si_sb_uses_use_case = ("Betelgeuses", "Duses", "Meuses", "Syracuses", "Toulouses") - -si_sb_uses_use = ( - "abuses", - "applauses", - "blouses", - "carouses", - "causes", - "chartreuses", - "clauses", - "contuses", - "douses", - "excuses", - "fuses", - "grouses", - "hypotenuses", - "masseuses", - "menopauses", - "misuses", - "muses", - "overuses", - "pauses", - "peruses", - "profuses", - "recluses", - "reuses", - "ruses", - "souses", - "spouses", - "suffuses", - "transfuses", - "uses", -) - -si_sb_ies_ie_case = ( - "Addies", - "Aggies", - "Allies", - "Amies", - "Angies", - "Annies", - "Annmaries", - "Archies", - "Arties", - "Aussies", - "Barbies", - "Barries", - "Basies", - "Bennies", - "Bernies", - "Berties", - "Bessies", - "Betties", - "Billies", - "Blondies", - "Bobbies", - "Bonnies", - "Bowies", - "Brandies", - "Bries", - "Brownies", - "Callies", - "Carnegies", - "Carries", - "Cassies", - "Charlies", - "Cheries", - "Christies", - "Connies", - "Curies", - "Dannies", - "Debbies", - "Dixies", - "Dollies", - "Donnies", - "Drambuies", - "Eddies", - "Effies", - "Ellies", - "Elsies", - "Eries", - "Ernies", - "Essies", - "Eugenies", - "Fannies", - "Flossies", - "Frankies", - "Freddies", - "Gillespies", - "Goldies", - "Gracies", - "Guthries", - "Hallies", - "Hatties", - "Hetties", - "Hollies", - "Jackies", - "Jamies", - "Janies", - "Jannies", - "Jeanies", - "Jeannies", - "Jennies", - "Jessies", - "Jimmies", - "Jodies", - "Johnies", - "Johnnies", - "Josies", - "Julies", - "Kalgoorlies", - "Kathies", - "Katies", - "Kellies", - "Kewpies", - "Kristies", - "Laramies", - "Lassies", - "Lauries", - "Leslies", - "Lessies", - "Lillies", - "Lizzies", - "Lonnies", - "Lories", - "Lorries", - "Lotties", - "Louies", - "Mackenzies", - "Maggies", - "Maisies", - "Mamies", - "Marcies", - "Margies", - "Maries", - "Marjories", - "Matties", - "McKenzies", - "Melanies", - "Mickies", - "Millies", - "Minnies", - "Mollies", - "Mounties", - "Nannies", - "Natalies", - "Nellies", - "Netties", - "Ollies", - "Ozzies", - "Pearlies", - "Pottawatomies", - "Reggies", - "Richies", - "Rickies", - "Robbies", - "Ronnies", - "Rosalies", - "Rosemaries", - "Rosies", - "Roxies", - "Rushdies", - "Ruthies", - "Sadies", - "Sallies", - "Sammies", - "Scotties", - "Selassies", - "Sherries", - "Sophies", - "Stacies", - "Stefanies", - "Stephanies", - "Stevies", - "Susies", - "Sylvies", - "Tammies", - "Terries", - "Tessies", - "Tommies", - "Tracies", - "Trekkies", - "Valaries", - "Valeries", - "Valkyries", - "Vickies", - "Virgies", - "Willies", - "Winnies", - "Wylies", - "Yorkies", -) - -si_sb_ies_ie = ( - "aeries", - "baggies", - "belies", - "biggies", - "birdies", - "bogies", - "bonnies", - "boogies", - "bookies", - "bourgeoisies", - "brownies", - "budgies", - "caddies", - "calories", - "camaraderies", - "cockamamies", - "collies", - "cookies", - "coolies", - "cooties", - "coteries", - "crappies", - "curies", - "cutesies", - "dogies", - "eyries", - "floozies", - "footsies", - "freebies", - "genies", - "goalies", - "groupies", - "hies", - "jalousies", - "junkies", - "kiddies", - "laddies", - "lassies", - "lies", - "lingeries", - "magpies", - "menageries", - "mommies", - "movies", - "neckties", - "newbies", - "nighties", - "oldies", - "organdies", - "overlies", - "pies", - "pinkies", - "pixies", - "potpies", - "prairies", - "quickies", - "reveries", - "rookies", - "rotisseries", - "softies", - "sorties", - "species", - "stymies", - "sweeties", - "ties", - "underlies", - "unties", - "veggies", - "vies", - "yuppies", - "zombies", -) - - -si_sb_oes_oe_case = ( - "Chloes", - "Crusoes", - "Defoes", - "Faeroes", - "Ivanhoes", - "Joes", - "McEnroes", - "Moes", - "Monroes", - "Noes", - "Poes", - "Roscoes", - "Tahoes", - "Tippecanoes", - "Zoes", -) - -si_sb_oes_oe = ( - "aloes", - "backhoes", - "canoes", - "does", - "floes", - "foes", - "hoes", - "mistletoes", - "oboes", - "pekoes", - "roes", - "sloes", - "throes", - "tiptoes", - "toes", - "woes", -) - -si_sb_z_zes = ("quartzes", "topazes") - -si_sb_zzes_zz = ("buzzes", "fizzes", "frizzes", "razzes") - -si_sb_ches_che_case = ( - "Andromaches", - "Apaches", - "Blanches", - "Comanches", - "Nietzsches", - "Porsches", - "Roches", -) - -si_sb_ches_che = ( - "aches", - "avalanches", - "backaches", - "bellyaches", - "caches", - "cloches", - "creches", - "douches", - "earaches", - "fiches", - "headaches", - "heartaches", - "microfiches", - "niches", - "pastiches", - "psyches", - "quiches", - "stomachaches", - "toothaches", - "tranches", -) - -si_sb_xes_xe = ("annexes", "axes", "deluxes", "pickaxes") - -si_sb_sses_sse_case = ("Hesses", "Jesses", "Larousses", "Matisses") -si_sb_sses_sse = ( - "bouillabaisses", - "crevasses", - "demitasses", - "impasses", - "mousses", - "posses", -) - -si_sb_ves_ve_case = ( - # *[nwl]ives -> [nwl]live - "Clives", - "Palmolives", -) -si_sb_ves_ve = ( - # *[^d]eaves -> eave - "interweaves", - "weaves", - # *[nwl]ives -> [nwl]live - "olives", - # *[eoa]lves -> [eoa]lve - "bivalves", - "dissolves", - "resolves", - "salves", - "twelves", - "valves", -) - - -plverb_special_s = enclose( - "|".join( - [pl_sb_singular_s] - + pl_sb_uninflected_s - + list(pl_sb_irregular_s) - + ["(.*[csx])is", "(.*)ceps", "[A-Z].*s"] - ) -) - -_pl_sb_postfix_adj_defn = ( - ("general", enclose(r"(?!major|lieutenant|brigadier|adjutant|.*star)\S+")), - ("martial", enclose("court")), - ("force", enclose("pound")), -) - -pl_sb_postfix_adj: Iterable[str] = ( - enclose(val + f"(?=(?:-|\\s+){key})") for key, val in _pl_sb_postfix_adj_defn -) - -pl_sb_postfix_adj_stems = f"({'|'.join(pl_sb_postfix_adj)})(.*)" - - -# PLURAL WORDS ENDING IS es GO TO SINGULAR is - -si_sb_es_is = ( - "amanuenses", - "amniocenteses", - "analyses", - "antitheses", - "apotheoses", - "arterioscleroses", - "atheroscleroses", - "axes", - # 'bases', # bases -> basis - "catalyses", - "catharses", - "chasses", - "cirrhoses", - "cocces", - "crises", - "diagnoses", - "dialyses", - "diereses", - "electrolyses", - "emphases", - "exegeses", - "geneses", - "halitoses", - "hydrolyses", - "hypnoses", - "hypotheses", - "hystereses", - "metamorphoses", - "metastases", - "misdiagnoses", - "mitoses", - "mononucleoses", - "narcoses", - "necroses", - "nemeses", - "neuroses", - "oases", - "osmoses", - "osteoporoses", - "paralyses", - "parentheses", - "parthenogeneses", - "periphrases", - "photosyntheses", - "probosces", - "prognoses", - "prophylaxes", - "prostheses", - "preces", - "psoriases", - "psychoanalyses", - "psychokineses", - "psychoses", - "scleroses", - "scolioses", - "sepses", - "silicoses", - "symbioses", - "synopses", - "syntheses", - "taxes", - "telekineses", - "theses", - "thromboses", - "tuberculoses", - "urinalyses", -) - -pl_prep_list = """ - about above across after among around at athwart before behind - below beneath beside besides between betwixt beyond but by - during except for from in into near of off on onto out over - since till to under until unto upon with""".split() - -pl_prep_list_da = pl_prep_list + ["de", "du", "da"] - -pl_prep_bysize = bysize(pl_prep_list_da) - -pl_prep = enclose("|".join(pl_prep_list_da)) - -pl_sb_prep_dual_compound = rf"(.*?)((?:-|\s+)(?:{pl_prep})(?:-|\s+))a(?:-|\s+)(.*)" - - -singular_pronoun_genders = { - "neuter", - "feminine", - "masculine", - "gender-neutral", - "feminine or masculine", - "masculine or feminine", -} - -pl_pron_nom = { - # NOMINATIVE REFLEXIVE - "i": "we", - "myself": "ourselves", - "you": "you", - "yourself": "yourselves", - "she": "they", - "herself": "themselves", - "he": "they", - "himself": "themselves", - "it": "they", - "itself": "themselves", - "they": "they", - "themself": "themselves", - # POSSESSIVE - "mine": "ours", - "yours": "yours", - "hers": "theirs", - "his": "theirs", - "its": "theirs", - "theirs": "theirs", -} - -si_pron: Dict[str, Dict[str, Union[str, Dict[str, str]]]] = { - "nom": {v: k for (k, v) in pl_pron_nom.items()} -} -si_pron["nom"]["we"] = "I" - - -pl_pron_acc = { - # ACCUSATIVE REFLEXIVE - "me": "us", - "myself": "ourselves", - "you": "you", - "yourself": "yourselves", - "her": "them", - "herself": "themselves", - "him": "them", - "himself": "themselves", - "it": "them", - "itself": "themselves", - "them": "them", - "themself": "themselves", -} - -pl_pron_acc_keys = enclose("|".join(pl_pron_acc)) -pl_pron_acc_keys_bysize = bysize(pl_pron_acc) - -si_pron["acc"] = {v: k for (k, v) in pl_pron_acc.items()} - -for _thecase, _plur, _gend, _sing in ( - ("nom", "they", "neuter", "it"), - ("nom", "they", "feminine", "she"), - ("nom", "they", "masculine", "he"), - ("nom", "they", "gender-neutral", "they"), - ("nom", "they", "feminine or masculine", "she or he"), - ("nom", "they", "masculine or feminine", "he or she"), - ("nom", "themselves", "neuter", "itself"), - ("nom", "themselves", "feminine", "herself"), - ("nom", "themselves", "masculine", "himself"), - ("nom", "themselves", "gender-neutral", "themself"), - ("nom", "themselves", "feminine or masculine", "herself or himself"), - ("nom", "themselves", "masculine or feminine", "himself or herself"), - ("nom", "theirs", "neuter", "its"), - ("nom", "theirs", "feminine", "hers"), - ("nom", "theirs", "masculine", "his"), - ("nom", "theirs", "gender-neutral", "theirs"), - ("nom", "theirs", "feminine or masculine", "hers or his"), - ("nom", "theirs", "masculine or feminine", "his or hers"), - ("acc", "them", "neuter", "it"), - ("acc", "them", "feminine", "her"), - ("acc", "them", "masculine", "him"), - ("acc", "them", "gender-neutral", "them"), - ("acc", "them", "feminine or masculine", "her or him"), - ("acc", "them", "masculine or feminine", "him or her"), - ("acc", "themselves", "neuter", "itself"), - ("acc", "themselves", "feminine", "herself"), - ("acc", "themselves", "masculine", "himself"), - ("acc", "themselves", "gender-neutral", "themself"), - ("acc", "themselves", "feminine or masculine", "herself or himself"), - ("acc", "themselves", "masculine or feminine", "himself or herself"), -): - try: - si_pron[_thecase][_plur][_gend] = _sing # type: ignore - except TypeError: - si_pron[_thecase][_plur] = {} - si_pron[_thecase][_plur][_gend] = _sing # type: ignore - - -si_pron_acc_keys = enclose("|".join(si_pron["acc"])) -si_pron_acc_keys_bysize = bysize(si_pron["acc"]) - - -def get_si_pron(thecase, word, gender) -> str: - try: - sing = si_pron[thecase][word] - except KeyError: - raise # not a pronoun - try: - return sing[gender] # has several types due to gender - except TypeError: - return cast(str, sing) # answer independent of gender - - -# These dictionaries group verbs by first, second and third person -# conjugations. - -plverb_irregular_pres = { - "am": "are", - "are": "are", - "is": "are", - "was": "were", - "were": "were", - "have": "have", - "has": "have", - "do": "do", - "does": "do", -} - -plverb_ambiguous_pres = { - "act": "act", - "acts": "act", - "blame": "blame", - "blames": "blame", - "can": "can", - "must": "must", - "fly": "fly", - "flies": "fly", - "copy": "copy", - "copies": "copy", - "drink": "drink", - "drinks": "drink", - "fight": "fight", - "fights": "fight", - "fire": "fire", - "fires": "fire", - "like": "like", - "likes": "like", - "look": "look", - "looks": "look", - "make": "make", - "makes": "make", - "reach": "reach", - "reaches": "reach", - "run": "run", - "runs": "run", - "sink": "sink", - "sinks": "sink", - "sleep": "sleep", - "sleeps": "sleep", - "view": "view", - "views": "view", -} - -plverb_ambiguous_pres_keys = re.compile( - rf"^({enclose('|'.join(plverb_ambiguous_pres))})((\s.*)?)$", re.IGNORECASE -) - - -plverb_irregular_non_pres = ( - "did", - "had", - "ate", - "made", - "put", - "spent", - "fought", - "sank", - "gave", - "sought", - "shall", - "could", - "ought", - "should", -) - -plverb_ambiguous_non_pres = re.compile( - r"^((?:thought|saw|bent|will|might|cut))((\s.*)?)$", re.IGNORECASE -) - -# "..oes" -> "..oe" (the rest are "..oes" -> "o") - -pl_v_oes_oe = ("canoes", "floes", "oboes", "roes", "throes", "woes") -pl_v_oes_oe_endings_size4 = ("hoes", "toes") -pl_v_oes_oe_endings_size5 = ("shoes",) - - -pl_count_zero = ("0", "no", "zero", "nil") - - -pl_count_one = ("1", "a", "an", "one", "each", "every", "this", "that") - -pl_adj_special = {"a": "some", "an": "some", "this": "these", "that": "those"} - -pl_adj_special_keys = re.compile( - rf"^({enclose('|'.join(pl_adj_special))})$", re.IGNORECASE -) - -pl_adj_poss = { - "my": "our", - "your": "your", - "its": "their", - "her": "their", - "his": "their", - "their": "their", -} - -pl_adj_poss_keys = re.compile(rf"^({enclose('|'.join(pl_adj_poss))})$", re.IGNORECASE) - - -# 2. INDEFINITE ARTICLES - -# THIS PATTERN MATCHES STRINGS OF CAPITALS STARTING WITH A "VOWEL-SOUND" -# CONSONANT FOLLOWED BY ANOTHER CONSONANT, AND WHICH ARE NOT LIKELY -# TO BE REAL WORDS (OH, ALL RIGHT THEN, IT'S JUST MAGIC!) - -A_abbrev = re.compile( - r""" -^(?! FJO | [HLMNS]Y. | RY[EO] | SQU - | ( F[LR]? | [HL] | MN? | N | RH? | S[CHKLMNPTVW]? | X(YL)?) [AEIOU]) -[FHLMNRSX][A-Z] -""", - re.VERBOSE, -) - -# THIS PATTERN CODES THE BEGINNINGS OF ALL ENGLISH WORDS BEGINING WITH A -# 'y' FOLLOWED BY A CONSONANT. ANY OTHER Y-CONSONANT PREFIX THEREFORE -# IMPLIES AN ABBREVIATION. - -A_y_cons = re.compile(r"^(y(b[lor]|cl[ea]|fere|gg|p[ios]|rou|tt))", re.IGNORECASE) - -# EXCEPTIONS TO EXCEPTIONS - -A_explicit_a = re.compile(r"^((?:unabomber|unanimous|US))", re.IGNORECASE) - -A_explicit_an = re.compile( - r"^((?:euler|hour(?!i)|heir|honest|hono[ur]|mpeg))", re.IGNORECASE -) - -A_ordinal_an = re.compile(r"^([aefhilmnorsx]-?th)", re.IGNORECASE) - -A_ordinal_a = re.compile(r"^([bcdgjkpqtuvwyz]-?th)", re.IGNORECASE) - - -# NUMERICAL INFLECTIONS - -nth = { - 0: "th", - 1: "st", - 2: "nd", - 3: "rd", - 4: "th", - 5: "th", - 6: "th", - 7: "th", - 8: "th", - 9: "th", - 11: "th", - 12: "th", - 13: "th", -} -nth_suff = set(nth.values()) - -ordinal = dict( - ty="tieth", - one="first", - two="second", - three="third", - five="fifth", - eight="eighth", - nine="ninth", - twelve="twelfth", -) - -ordinal_suff = re.compile(rf"({'|'.join(ordinal)})\Z") - - -# NUMBERS - -unit = ["", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"] -teen = [ - "ten", - "eleven", - "twelve", - "thirteen", - "fourteen", - "fifteen", - "sixteen", - "seventeen", - "eighteen", - "nineteen", -] -ten = [ - "", - "", - "twenty", - "thirty", - "forty", - "fifty", - "sixty", - "seventy", - "eighty", - "ninety", -] -mill = [ - " ", - " thousand", - " million", - " billion", - " trillion", - " quadrillion", - " quintillion", - " sextillion", - " septillion", - " octillion", - " nonillion", - " decillion", -] - - -# SUPPORT CLASSICAL PLURALIZATIONS - -def_classical = dict( - all=False, zero=False, herd=False, names=True, persons=False, ancient=False -) - -all_classical = {k: True for k in def_classical} -no_classical = {k: False for k in def_classical} - - -# Maps strings to built-in constant types -string_to_constant = {"True": True, "False": False, "None": None} - - -# Pre-compiled regular expression objects -DOLLAR_DIGITS = re.compile(r"\$(\d+)") -FUNCTION_CALL = re.compile(r"((\w+)\([^)]*\)*)", re.IGNORECASE) -PARTITION_WORD = re.compile(r"\A(\s*)(.+?)(\s*)\Z") -PL_SB_POSTFIX_ADJ_STEMS_RE = re.compile( - rf"^(?:{pl_sb_postfix_adj_stems})$", re.IGNORECASE -) -PL_SB_PREP_DUAL_COMPOUND_RE = re.compile( - rf"^(?:{pl_sb_prep_dual_compound})$", re.IGNORECASE -) -DENOMINATOR = re.compile(r"(?P.+)( (per|a) .+)") -PLVERB_SPECIAL_S_RE = re.compile(rf"^({plverb_special_s})$") -WHITESPACE = re.compile(r"\s") -ENDS_WITH_S = re.compile(r"^(.*[^s])s$", re.IGNORECASE) -ENDS_WITH_APOSTROPHE_S = re.compile(r"^(.*)'s?$") -INDEFINITE_ARTICLE_TEST = re.compile(r"\A(\s*)(?:an?\s+)?(.+?)(\s*)\Z", re.IGNORECASE) -SPECIAL_AN = re.compile(r"^[aefhilmnorsx]$", re.IGNORECASE) -SPECIAL_A = re.compile(r"^[bcdgjkpqtuvwyz]$", re.IGNORECASE) -SPECIAL_ABBREV_AN = re.compile(r"^[aefhilmnorsx][.-]", re.IGNORECASE) -SPECIAL_ABBREV_A = re.compile(r"^[a-z][.-]", re.IGNORECASE) -CONSONANTS = re.compile(r"^[^aeiouy]", re.IGNORECASE) -ARTICLE_SPECIAL_EU = re.compile(r"^e[uw]", re.IGNORECASE) -ARTICLE_SPECIAL_ONCE = re.compile(r"^onc?e\b", re.IGNORECASE) -ARTICLE_SPECIAL_ONETIME = re.compile(r"^onetime\b", re.IGNORECASE) -ARTICLE_SPECIAL_UNIT = re.compile(r"^uni([^nmd]|mo)", re.IGNORECASE) -ARTICLE_SPECIAL_UBA = re.compile(r"^u[bcfghjkqrst][aeiou]", re.IGNORECASE) -ARTICLE_SPECIAL_UKR = re.compile(r"^ukr", re.IGNORECASE) -SPECIAL_CAPITALS = re.compile(r"^U[NK][AIEO]?") -VOWELS = re.compile(r"^[aeiou]", re.IGNORECASE) - -DIGIT_GROUP = re.compile(r"(\d)") -TWO_DIGITS = re.compile(r"(\d)(\d)") -THREE_DIGITS = re.compile(r"(\d)(\d)(\d)") -THREE_DIGITS_WORD = re.compile(r"(\d)(\d)(\d)(?=\D*\Z)") -TWO_DIGITS_WORD = re.compile(r"(\d)(\d)(?=\D*\Z)") -ONE_DIGIT_WORD = re.compile(r"(\d)(?=\D*\Z)") - -FOUR_DIGIT_COMMA = re.compile(r"(\d)(\d{3}(?:,|\Z))") -NON_DIGIT = re.compile(r"\D") -WHITESPACES_COMMA = re.compile(r"\s+,") -COMMA_WORD = re.compile(r", (\S+)\s+\Z") -WHITESPACES = re.compile(r"\s+") - - -PRESENT_PARTICIPLE_REPLACEMENTS = ( - (re.compile(r"ie$"), r"y"), - ( - re.compile(r"ue$"), - r"u", - ), # TODO: isn't ue$ -> u encompassed in the following rule? - (re.compile(r"([auy])e$"), r"\g<1>"), - (re.compile(r"ski$"), r"ski"), - (re.compile(r"[^b]i$"), r""), - (re.compile(r"^(are|were)$"), r"be"), - (re.compile(r"^(had)$"), r"hav"), - (re.compile(r"^(hoe)$"), r"\g<1>"), - (re.compile(r"([^e])e$"), r"\g<1>"), - (re.compile(r"er$"), r"er"), - (re.compile(r"([^aeiou][aeiouy]([bdgmnprst]))$"), r"\g<1>\g<2>"), -) - -DIGIT = re.compile(r"\d") - - -class Words(str): - lowered: str - split_: List[str] - first: str - last: str - - def __init__(self, orig) -> None: - self.lowered = self.lower() - self.split_ = self.split() - self.first = self.split_[0] - self.last = self.split_[-1] - - -Falsish = Any # ideally, falsish would only validate on bool(value) is False - - -_STATIC_TYPE_CHECKING = TYPE_CHECKING -# ^-- Workaround for typeguard AST manipulation: -# https://github.com/agronholm/typeguard/issues/353#issuecomment-1556306554 - -if _STATIC_TYPE_CHECKING: # pragma: no cover - Word = Annotated[str, "String with at least 1 character"] -else: - - class _WordMeta(type): # Too dynamic to be supported by mypy... - def __instancecheck__(self, instance: Any) -> bool: - return isinstance(instance, str) and len(instance) >= 1 - - class Word(metaclass=_WordMeta): # type: ignore[no-redef] - """String with at least 1 character""" - - -class engine: - def __init__(self) -> None: - self.classical_dict = def_classical.copy() - self.persistent_count: Optional[int] = None - self.mill_count = 0 - self.pl_sb_user_defined: List[Optional[Word]] = [] - self.pl_v_user_defined: List[Optional[Word]] = [] - self.pl_adj_user_defined: List[Optional[Word]] = [] - self.si_sb_user_defined: List[Optional[Word]] = [] - self.A_a_user_defined: List[Optional[Word]] = [] - self.thegender = "neuter" - self.__number_args: Optional[Dict[str, str]] = None - - @property - def _number_args(self): - return cast(Dict[str, str], self.__number_args) - - @_number_args.setter - def _number_args(self, val): - self.__number_args = val - - @typechecked - def defnoun(self, singular: Optional[Word], plural: Optional[Word]) -> int: - """ - Set the noun plural of singular to plural. - - """ - self.checkpat(singular) - self.checkpatplural(plural) - self.pl_sb_user_defined.extend((singular, plural)) - self.si_sb_user_defined.extend((plural, singular)) - return 1 - - @typechecked - def defverb( - self, - s1: Optional[Word], - p1: Optional[Word], - s2: Optional[Word], - p2: Optional[Word], - s3: Optional[Word], - p3: Optional[Word], - ) -> int: - """ - Set the verb plurals for s1, s2 and s3 to p1, p2 and p3 respectively. - - Where 1, 2 and 3 represent the 1st, 2nd and 3rd person forms of the verb. - - """ - self.checkpat(s1) - self.checkpat(s2) - self.checkpat(s3) - self.checkpatplural(p1) - self.checkpatplural(p2) - self.checkpatplural(p3) - self.pl_v_user_defined.extend((s1, p1, s2, p2, s3, p3)) - return 1 - - @typechecked - def defadj(self, singular: Optional[Word], plural: Optional[Word]) -> int: - """ - Set the adjective plural of singular to plural. - - """ - self.checkpat(singular) - self.checkpatplural(plural) - self.pl_adj_user_defined.extend((singular, plural)) - return 1 - - @typechecked - def defa(self, pattern: Optional[Word]) -> int: - """ - Define the indefinite article as 'a' for words matching pattern. - - """ - self.checkpat(pattern) - self.A_a_user_defined.extend((pattern, "a")) - return 1 - - @typechecked - def defan(self, pattern: Optional[Word]) -> int: - """ - Define the indefinite article as 'an' for words matching pattern. - - """ - self.checkpat(pattern) - self.A_a_user_defined.extend((pattern, "an")) - return 1 - - def checkpat(self, pattern: Optional[Word]) -> None: - """ - check for errors in a regex pattern - """ - if pattern is None: - return - try: - re.match(pattern, "") - except re.error as err: - raise BadUserDefinedPatternError(pattern) from err - - def checkpatplural(self, pattern: Optional[Word]) -> None: - """ - check for errors in a regex replace pattern - """ - return - - @typechecked - def ud_match(self, word: Word, wordlist: Sequence[Optional[Word]]) -> Optional[str]: - for i in range(len(wordlist) - 2, -2, -2): # backwards through even elements - mo = re.search(rf"^{wordlist[i]}$", word, re.IGNORECASE) - if mo: - if wordlist[i + 1] is None: - return None - pl = DOLLAR_DIGITS.sub( - r"\\1", cast(Word, wordlist[i + 1]) - ) # change $n to \n for expand - return mo.expand(pl) - return None - - def classical(self, **kwargs) -> None: - """ - turn classical mode on and off for various categories - - turn on all classical modes: - classical() - classical(all=True) - - turn on or off specific claassical modes: - e.g. - classical(herd=True) - classical(names=False) - - By default all classical modes are off except names. - - unknown value in args or key in kwargs raises - exception: UnknownClasicalModeError - - """ - if not kwargs: - self.classical_dict = all_classical.copy() - return - if "all" in kwargs: - if kwargs["all"]: - self.classical_dict = all_classical.copy() - else: - self.classical_dict = no_classical.copy() - - for k, v in kwargs.items(): - if k in def_classical: - self.classical_dict[k] = v - else: - raise UnknownClassicalModeError - - def num( - self, count: Optional[int] = None, show: Optional[int] = None - ) -> str: # (;$count,$show) - """ - Set the number to be used in other method calls. - - Returns count. - - Set show to False to return '' instead. - - """ - if count is not None: - try: - self.persistent_count = int(count) - except ValueError as err: - raise BadNumValueError from err - if (show is None) or show: - return str(count) - else: - self.persistent_count = None - return "" - - def gender(self, gender: str) -> None: - """ - set the gender for the singular of plural pronouns - - can be one of: - 'neuter' ('they' -> 'it') - 'feminine' ('they' -> 'she') - 'masculine' ('they' -> 'he') - 'gender-neutral' ('they' -> 'they') - 'feminine or masculine' ('they' -> 'she or he') - 'masculine or feminine' ('they' -> 'he or she') - """ - if gender in singular_pronoun_genders: - self.thegender = gender - else: - raise BadGenderError - - def _get_value_from_ast(self, obj): - """ - Return the value of the ast object. - """ - if isinstance(obj, ast.Num): - return obj.n - elif isinstance(obj, ast.Str): - return obj.s - elif isinstance(obj, ast.List): - return [self._get_value_from_ast(e) for e in obj.elts] - elif isinstance(obj, ast.Tuple): - return tuple([self._get_value_from_ast(e) for e in obj.elts]) - - # None, True and False are NameConstants in Py3.4 and above. - elif isinstance(obj, ast.NameConstant): - return obj.value - - # Probably passed a variable name. - # Or passed a single word without wrapping it in quotes as an argument - # ex: p.inflect("I plural(see)") instead of p.inflect("I plural('see')") - raise NameError(f"name '{obj.id}' is not defined") - - def _string_to_substitute( - self, mo: Match, methods_dict: Dict[str, Callable] - ) -> str: - """ - Return the string to be substituted for the match. - """ - matched_text, f_name = mo.groups() - # matched_text is the complete match string. e.g. plural_noun(cat) - # f_name is the function name. e.g. plural_noun - - # Return matched_text if function name is not in methods_dict - if f_name not in methods_dict: - return matched_text - - # Parse the matched text - a_tree = ast.parse(matched_text) - - # get the args and kwargs from ast objects - args_list = [ - self._get_value_from_ast(a) - for a in a_tree.body[0].value.args # type: ignore[attr-defined] - ] - kwargs_list = { - kw.arg: self._get_value_from_ast(kw.value) - for kw in a_tree.body[0].value.keywords # type: ignore[attr-defined] - } - - # Call the corresponding function - return methods_dict[f_name](*args_list, **kwargs_list) - - # 0. PERFORM GENERAL INFLECTIONS IN A STRING - - @typechecked - def inflect(self, text: Word) -> str: - """ - Perform inflections in a string. - - e.g. inflect('The plural of cat is plural(cat)') returns - 'The plural of cat is cats' - - can use plural, plural_noun, plural_verb, plural_adj, - singular_noun, a, an, no, ordinal, number_to_words, - and prespart - - """ - save_persistent_count = self.persistent_count - - # Dictionary of allowed methods - methods_dict: Dict[str, Callable] = { - "plural": self.plural, - "plural_adj": self.plural_adj, - "plural_noun": self.plural_noun, - "plural_verb": self.plural_verb, - "singular_noun": self.singular_noun, - "a": self.a, - "an": self.a, - "no": self.no, - "ordinal": self.ordinal, - "number_to_words": self.number_to_words, - "present_participle": self.present_participle, - "num": self.num, - } - - # Regular expression to find Python's function call syntax - output = FUNCTION_CALL.sub( - lambda mo: self._string_to_substitute(mo, methods_dict), text - ) - self.persistent_count = save_persistent_count - return output - - # ## PLURAL SUBROUTINES - - def postprocess(self, orig: str, inflected) -> str: - inflected = str(inflected) - if "|" in inflected: - word_options = inflected.split("|") - # When two parts of a noun need to be pluralized - if len(word_options[0].split(" ")) == len(word_options[1].split(" ")): - result = inflected.split("|")[self.classical_dict["all"]].split(" ") - # When only the last part of the noun needs to be pluralized - else: - result = inflected.split(" ") - for index, word in enumerate(result): - if "|" in word: - result[index] = word.split("|")[self.classical_dict["all"]] - else: - result = inflected.split(" ") - - # Try to fix word wise capitalization - for index, word in enumerate(orig.split(" ")): - if word == "I": - # Is this the only word for exceptions like this - # Where the original is fully capitalized - # without 'meaning' capitalization? - # Also this fails to handle a capitalizaion in context - continue - if word.capitalize() == word: - result[index] = result[index].capitalize() - if word == word.upper(): - result[index] = result[index].upper() - return " ".join(result) - - def partition_word(self, text: str) -> Tuple[str, str, str]: - mo = PARTITION_WORD.search(text) - if mo: - return mo.group(1), mo.group(2), mo.group(3) - else: - return "", "", "" - - @typechecked - def plural(self, text: Word, count: Optional[Union[str, int, Any]] = None) -> str: - """ - Return the plural of text. - - If count supplied, then return text if count is one of: - 1, a, an, one, each, every, this, that - - otherwise return the plural. - - Whitespace at the start and end is preserved. - - """ - pre, word, post = self.partition_word(text) - if not word: - return text - plural = self.postprocess( - word, - self._pl_special_adjective(word, count) - or self._pl_special_verb(word, count) - or self._plnoun(word, count), - ) - return f"{pre}{plural}{post}" - - @typechecked - def plural_noun( - self, text: Word, count: Optional[Union[str, int, Any]] = None - ) -> str: - """ - Return the plural of text, where text is a noun. - - If count supplied, then return text if count is one of: - 1, a, an, one, each, every, this, that - - otherwise return the plural. - - Whitespace at the start and end is preserved. - - """ - pre, word, post = self.partition_word(text) - if not word: - return text - plural = self.postprocess(word, self._plnoun(word, count)) - return f"{pre}{plural}{post}" - - @typechecked - def plural_verb( - self, text: Word, count: Optional[Union[str, int, Any]] = None - ) -> str: - """ - Return the plural of text, where text is a verb. - - If count supplied, then return text if count is one of: - 1, a, an, one, each, every, this, that - - otherwise return the plural. - - Whitespace at the start and end is preserved. - - """ - pre, word, post = self.partition_word(text) - if not word: - return text - plural = self.postprocess( - word, - self._pl_special_verb(word, count) or self._pl_general_verb(word, count), - ) - return f"{pre}{plural}{post}" - - @typechecked - def plural_adj( - self, text: Word, count: Optional[Union[str, int, Any]] = None - ) -> str: - """ - Return the plural of text, where text is an adjective. - - If count supplied, then return text if count is one of: - 1, a, an, one, each, every, this, that - - otherwise return the plural. - - Whitespace at the start and end is preserved. - - """ - pre, word, post = self.partition_word(text) - if not word: - return text - plural = self.postprocess(word, self._pl_special_adjective(word, count) or word) - return f"{pre}{plural}{post}" - - @typechecked - def compare(self, word1: Word, word2: Word) -> Union[str, bool]: - """ - compare word1 and word2 for equality regardless of plurality - - return values: - eq - the strings are equal - p:s - word1 is the plural of word2 - s:p - word2 is the plural of word1 - p:p - word1 and word2 are two different plural forms of the one word - False - otherwise - - >>> compare = engine().compare - >>> compare("egg", "eggs") - 's:p' - >>> compare('egg', 'egg') - 'eq' - - Words should not be empty. - - >>> compare('egg', '') - Traceback (most recent call last): - ... - typeguard.TypeCheckError:...is not an instance of inflect.Word - """ - norms = self.plural_noun, self.plural_verb, self.plural_adj - results = (self._plequal(word1, word2, norm) for norm in norms) - return next(filter(None, results), False) - - @typechecked - def compare_nouns(self, word1: Word, word2: Word) -> Union[str, bool]: - """ - compare word1 and word2 for equality regardless of plurality - word1 and word2 are to be treated as nouns - - return values: - eq - the strings are equal - p:s - word1 is the plural of word2 - s:p - word2 is the plural of word1 - p:p - word1 and word2 are two different plural forms of the one word - False - otherwise - - """ - return self._plequal(word1, word2, self.plural_noun) - - @typechecked - def compare_verbs(self, word1: Word, word2: Word) -> Union[str, bool]: - """ - compare word1 and word2 for equality regardless of plurality - word1 and word2 are to be treated as verbs - - return values: - eq - the strings are equal - p:s - word1 is the plural of word2 - s:p - word2 is the plural of word1 - p:p - word1 and word2 are two different plural forms of the one word - False - otherwise - - """ - return self._plequal(word1, word2, self.plural_verb) - - @typechecked - def compare_adjs(self, word1: Word, word2: Word) -> Union[str, bool]: - """ - compare word1 and word2 for equality regardless of plurality - word1 and word2 are to be treated as adjectives - - return values: - eq - the strings are equal - p:s - word1 is the plural of word2 - s:p - word2 is the plural of word1 - p:p - word1 and word2 are two different plural forms of the one word - False - otherwise - - """ - return self._plequal(word1, word2, self.plural_adj) - - @typechecked - def singular_noun( - self, - text: Word, - count: Optional[Union[int, str, Any]] = None, - gender: Optional[str] = None, - ) -> Union[str, Literal[False]]: - """ - Return the singular of text, where text is a plural noun. - - If count supplied, then return the singular if count is one of: - 1, a, an, one, each, every, this, that or if count is None - - otherwise return text unchanged. - - Whitespace at the start and end is preserved. - - >>> p = engine() - >>> p.singular_noun('horses') - 'horse' - >>> p.singular_noun('knights') - 'knight' - - Returns False when a singular noun is passed. - - >>> p.singular_noun('horse') - False - >>> p.singular_noun('knight') - False - >>> p.singular_noun('soldier') - False - - """ - pre, word, post = self.partition_word(text) - if not word: - return text - sing = self._sinoun(word, count=count, gender=gender) - if sing is not False: - plural = self.postprocess(word, sing) - return f"{pre}{plural}{post}" - return False - - def _plequal(self, word1: str, word2: str, pl) -> Union[str, bool]: # noqa: C901 - classval = self.classical_dict.copy() - self.classical_dict = all_classical.copy() - if word1 == word2: - return "eq" - if word1 == pl(word2): - return "p:s" - if pl(word1) == word2: - return "s:p" - self.classical_dict = no_classical.copy() - if word1 == pl(word2): - return "p:s" - if pl(word1) == word2: - return "s:p" - self.classical_dict = classval.copy() - - if pl == self.plural or pl == self.plural_noun: - if self._pl_check_plurals_N(word1, word2): - return "p:p" - if self._pl_check_plurals_N(word2, word1): - return "p:p" - if pl == self.plural or pl == self.plural_adj: - if self._pl_check_plurals_adj(word1, word2): - return "p:p" - return False - - def _pl_reg_plurals(self, pair: str, stems: str, end1: str, end2: str) -> bool: - pattern = rf"({stems})({end1}\|\1{end2}|{end2}\|\1{end1})" - return bool(re.search(pattern, pair)) - - def _pl_check_plurals_N(self, word1: str, word2: str) -> bool: - stem_endings = ( - (pl_sb_C_a_ata, "as", "ata"), - (pl_sb_C_is_ides, "is", "ides"), - (pl_sb_C_a_ae, "s", "e"), - (pl_sb_C_en_ina, "ens", "ina"), - (pl_sb_C_um_a, "ums", "a"), - (pl_sb_C_us_i, "uses", "i"), - (pl_sb_C_on_a, "ons", "a"), - (pl_sb_C_o_i_stems, "os", "i"), - (pl_sb_C_ex_ices, "exes", "ices"), - (pl_sb_C_ix_ices, "ixes", "ices"), - (pl_sb_C_i, "s", "i"), - (pl_sb_C_im, "s", "im"), - (".*eau", "s", "x"), - (".*ieu", "s", "x"), - (".*tri", "xes", "ces"), - (".{2,}[yia]n", "xes", "ges"), - ) - - words = map(Words, (word1, word2)) - pair = "|".join(word.last for word in words) - - return ( - pair in pl_sb_irregular_s.values() - or pair in pl_sb_irregular.values() - or pair in pl_sb_irregular_caps.values() - or any( - self._pl_reg_plurals(pair, stems, end1, end2) - for stems, end1, end2 in stem_endings - ) - ) - - def _pl_check_plurals_adj(self, word1: str, word2: str) -> bool: - word1a = word1[: word1.rfind("'")] if word1.endswith(("'s", "'")) else "" - word2a = word2[: word2.rfind("'")] if word2.endswith(("'s", "'")) else "" - - return ( - bool(word1a) - and bool(word2a) - and ( - self._pl_check_plurals_N(word1a, word2a) - or self._pl_check_plurals_N(word2a, word1a) - ) - ) - - def get_count(self, count: Optional[Union[str, int]] = None) -> Union[str, int]: - if count is None and self.persistent_count is not None: - count = self.persistent_count - - if count is not None: - count = ( - 1 - if ( - (str(count) in pl_count_one) - or ( - self.classical_dict["zero"] - and str(count).lower() in pl_count_zero - ) - ) - else 2 - ) - else: - count = "" - return count - - # @profile - def _plnoun( # noqa: C901 - self, word: str, count: Optional[Union[str, int]] = None - ) -> str: - count = self.get_count(count) - - # DEFAULT TO PLURAL - - if count == 1: - return word - - # HANDLE USER-DEFINED NOUNS - - value = self.ud_match(word, self.pl_sb_user_defined) - if value is not None: - return value - - # HANDLE EMPTY WORD, SINGULAR COUNT AND UNINFLECTED PLURALS - - if word == "": - return word - - word = Words(word) - - if word.last.lower() in pl_sb_uninflected_complete: - if len(word.split_) >= 3: - return self._handle_long_compounds(word, count=2) or word - return word - - if word in pl_sb_uninflected_caps: - return word - - for k, v in pl_sb_uninflected_bysize.items(): - if word.lowered[-k:] in v: - return word - - if self.classical_dict["herd"] and word.last.lower() in pl_sb_uninflected_herd: - return word - - # HANDLE COMPOUNDS ("Governor General", "mother-in-law", "aide-de-camp", ETC.) - - mo = PL_SB_POSTFIX_ADJ_STEMS_RE.search(word) - if mo and mo.group(2) != "": - return f"{self._plnoun(mo.group(1), 2)}{mo.group(2)}" - - if " a " in word.lowered or "-a-" in word.lowered: - mo = PL_SB_PREP_DUAL_COMPOUND_RE.search(word) - if mo and mo.group(2) != "" and mo.group(3) != "": - return ( - f"{self._plnoun(mo.group(1), 2)}" - f"{mo.group(2)}" - f"{self._plnoun(mo.group(3))}" - ) - - if len(word.split_) >= 3: - handled_words = self._handle_long_compounds(word, count=2) - if handled_words is not None: - return handled_words - - # only pluralize denominators in units - mo = DENOMINATOR.search(word.lowered) - if mo: - index = len(mo.group("denominator")) - return f"{self._plnoun(word[:index])}{word[index:]}" - - # handle units given in degrees (only accept if - # there is no more than one word following) - # degree Celsius => degrees Celsius but degree - # fahrenheit hour => degree fahrenheit hours - if len(word.split_) >= 2 and word.split_[-2] == "degree": - return " ".join([self._plnoun(word.first)] + word.split_[1:]) - - with contextlib.suppress(ValueError): - return self._handle_prepositional_phrase( - word.lowered, - functools.partial(self._plnoun, count=2), - '-', - ) - - # HANDLE PRONOUNS - - for k, v in pl_pron_acc_keys_bysize.items(): - if word.lowered[-k:] in v: # ends with accusative pronoun - for pk, pv in pl_prep_bysize.items(): - if word.lowered[:pk] in pv: # starts with a prep - if word.lowered.split() == [ - word.lowered[:pk], - word.lowered[-k:], - ]: - # only whitespace in between - return word.lowered[:-k] + pl_pron_acc[word.lowered[-k:]] - - try: - return pl_pron_nom[word.lowered] - except KeyError: - pass - - try: - return pl_pron_acc[word.lowered] - except KeyError: - pass - - # HANDLE ISOLATED IRREGULAR PLURALS - - if word.last in pl_sb_irregular_caps: - llen = len(word.last) - return f"{word[:-llen]}{pl_sb_irregular_caps[word.last]}" - - lowered_last = word.last.lower() - if lowered_last in pl_sb_irregular: - llen = len(lowered_last) - return f"{word[:-llen]}{pl_sb_irregular[lowered_last]}" - - dash_split = word.lowered.split('-') - if (" ".join(dash_split[-2:])).lower() in pl_sb_irregular_compound: - llen = len( - " ".join(dash_split[-2:]) - ) # TODO: what if 2 spaces between these words? - return ( - f"{word[:-llen]}" - f"{pl_sb_irregular_compound[(' '.join(dash_split[-2:])).lower()]}" - ) - - if word.lowered[-3:] == "quy": - return f"{word[:-1]}ies" - - if word.lowered[-6:] == "person": - if self.classical_dict["persons"]: - return f"{word}s" - else: - return f"{word[:-4]}ople" - - # HANDLE FAMILIES OF IRREGULAR PLURALS - - if word.lowered[-3:] == "man": - for k, v in pl_sb_U_man_mans_bysize.items(): - if word.lowered[-k:] in v: - return f"{word}s" - for k, v in pl_sb_U_man_mans_caps_bysize.items(): - if word[-k:] in v: - return f"{word}s" - return f"{word[:-3]}men" - if word.lowered[-5:] == "mouse": - return f"{word[:-5]}mice" - if word.lowered[-5:] == "louse": - v = pl_sb_U_louse_lice_bysize.get(len(word)) - if v and word.lowered in v: - return f"{word[:-5]}lice" - return f"{word}s" - if word.lowered[-5:] == "goose": - return f"{word[:-5]}geese" - if word.lowered[-5:] == "tooth": - return f"{word[:-5]}teeth" - if word.lowered[-4:] == "foot": - return f"{word[:-4]}feet" - if word.lowered[-4:] == "taco": - return f"{word[:-5]}tacos" - - if word.lowered == "die": - return "dice" - - # HANDLE UNASSIMILATED IMPORTS - - if word.lowered[-4:] == "ceps": - return word - if word.lowered[-4:] == "zoon": - return f"{word[:-2]}a" - if word.lowered[-3:] in ("cis", "sis", "xis"): - return f"{word[:-2]}es" - - for lastlet, d, numend, post in ( - ("h", pl_sb_U_ch_chs_bysize, None, "s"), - ("x", pl_sb_U_ex_ices_bysize, -2, "ices"), - ("x", pl_sb_U_ix_ices_bysize, -2, "ices"), - ("m", pl_sb_U_um_a_bysize, -2, "a"), - ("s", pl_sb_U_us_i_bysize, -2, "i"), - ("n", pl_sb_U_on_a_bysize, -2, "a"), - ("a", pl_sb_U_a_ae_bysize, None, "e"), - ): - if word.lowered[-1] == lastlet: # this test to add speed - for k, v in d.items(): - if word.lowered[-k:] in v: - return word[:numend] + post - - # HANDLE INCOMPLETELY ASSIMILATED IMPORTS - - if self.classical_dict["ancient"]: - if word.lowered[-4:] == "trix": - return f"{word[:-1]}ces" - if word.lowered[-3:] in ("eau", "ieu"): - return f"{word}x" - if word.lowered[-3:] in ("ynx", "inx", "anx") and len(word) > 4: - return f"{word[:-1]}ges" - - for lastlet, d, numend, post in ( - ("n", pl_sb_C_en_ina_bysize, -2, "ina"), - ("x", pl_sb_C_ex_ices_bysize, -2, "ices"), - ("x", pl_sb_C_ix_ices_bysize, -2, "ices"), - ("m", pl_sb_C_um_a_bysize, -2, "a"), - ("s", pl_sb_C_us_i_bysize, -2, "i"), - ("s", pl_sb_C_us_us_bysize, None, ""), - ("a", pl_sb_C_a_ae_bysize, None, "e"), - ("a", pl_sb_C_a_ata_bysize, None, "ta"), - ("s", pl_sb_C_is_ides_bysize, -1, "des"), - ("o", pl_sb_C_o_i_bysize, -1, "i"), - ("n", pl_sb_C_on_a_bysize, -2, "a"), - ): - if word.lowered[-1] == lastlet: # this test to add speed - for k, v in d.items(): - if word.lowered[-k:] in v: - return word[:numend] + post - - for d, numend, post in ( - (pl_sb_C_i_bysize, None, "i"), - (pl_sb_C_im_bysize, None, "im"), - ): - for k, v in d.items(): - if word.lowered[-k:] in v: - return word[:numend] + post - - # HANDLE SINGULAR NOUNS ENDING IN ...s OR OTHER SILIBANTS - - if lowered_last in pl_sb_singular_s_complete: - return f"{word}es" - - for k, v in pl_sb_singular_s_bysize.items(): - if word.lowered[-k:] in v: - return f"{word}es" - - if word.lowered[-2:] == "es" and word[0] == word[0].upper(): - return f"{word}es" - - if word.lowered[-1] == "z": - for k, v in pl_sb_z_zes_bysize.items(): - if word.lowered[-k:] in v: - return f"{word}es" - - if word.lowered[-2:-1] != "z": - return f"{word}zes" - - if word.lowered[-2:] == "ze": - for k, v in pl_sb_ze_zes_bysize.items(): - if word.lowered[-k:] in v: - return f"{word}s" - - if word.lowered[-2:] in ("ch", "sh", "zz", "ss") or word.lowered[-1] == "x": - return f"{word}es" - - # HANDLE ...f -> ...ves - - if word.lowered[-3:] in ("elf", "alf", "olf"): - return f"{word[:-1]}ves" - if word.lowered[-3:] == "eaf" and word.lowered[-4:-3] != "d": - return f"{word[:-1]}ves" - if word.lowered[-4:] in ("nife", "life", "wife"): - return f"{word[:-2]}ves" - if word.lowered[-3:] == "arf": - return f"{word[:-1]}ves" - - # HANDLE ...y - - if word.lowered[-1] == "y": - if word.lowered[-2:-1] in "aeiou" or len(word) == 1: - return f"{word}s" - - if self.classical_dict["names"]: - if word.lowered[-1] == "y" and word[0] == word[0].upper(): - return f"{word}s" - - return f"{word[:-1]}ies" - - # HANDLE ...o - - if lowered_last in pl_sb_U_o_os_complete: - return f"{word}s" - - for k, v in pl_sb_U_o_os_bysize.items(): - if word.lowered[-k:] in v: - return f"{word}s" - - if word.lowered[-2:] in ("ao", "eo", "io", "oo", "uo"): - return f"{word}s" - - if word.lowered[-1] == "o": - return f"{word}es" - - # OTHERWISE JUST ADD ...s - - return f"{word}s" - - @classmethod - def _handle_prepositional_phrase(cls, phrase, transform, sep): - """ - Given a word or phrase possibly separated by sep, parse out - the prepositional phrase and apply the transform to the word - preceding the prepositional phrase. - - Raise ValueError if the pivot is not found or if at least two - separators are not found. - - >>> engine._handle_prepositional_phrase("man-of-war", str.upper, '-') - 'MAN-of-war' - >>> engine._handle_prepositional_phrase("man of war", str.upper, ' ') - 'MAN of war' - """ - parts = phrase.split(sep) - if len(parts) < 3: - raise ValueError("Cannot handle words with fewer than two separators") - - pivot = cls._find_pivot(parts, pl_prep_list_da) - - transformed = transform(parts[pivot - 1]) or parts[pivot - 1] - return " ".join( - parts[: pivot - 1] + [sep.join([transformed, parts[pivot], ''])] - ) + " ".join(parts[(pivot + 1) :]) - - def _handle_long_compounds(self, word: Words, count: int) -> Union[str, None]: - """ - Handles the plural and singular for compound `Words` that - have three or more words, based on the given count. - - >>> engine()._handle_long_compounds(Words("pair of scissors"), 2) - 'pairs of scissors' - >>> engine()._handle_long_compounds(Words("men beyond hills"), 1) - 'man beyond hills' - """ - inflection = self._sinoun if count == 1 else self._plnoun - solutions = ( # type: ignore - " ".join( - itertools.chain( - leader, - [inflection(cand, count), prep], # type: ignore - trailer, - ) - ) - for leader, (cand, prep), trailer in windowed_complete(word.split_, 2) - if prep in pl_prep_list_da # type: ignore - ) - return next(solutions, None) - - @staticmethod - def _find_pivot(words, candidates): - pivots = ( - index for index in range(1, len(words) - 1) if words[index] in candidates - ) - try: - return next(pivots) - except StopIteration: - raise ValueError("No pivot found") from None - - def _pl_special_verb( # noqa: C901 - self, word: str, count: Optional[Union[str, int]] = None - ) -> Union[str, bool]: - if self.classical_dict["zero"] and str(count).lower() in pl_count_zero: - return False - count = self.get_count(count) - - if count == 1: - return word - - # HANDLE USER-DEFINED VERBS - - value = self.ud_match(word, self.pl_v_user_defined) - if value is not None: - return value - - # HANDLE IRREGULAR PRESENT TENSE (SIMPLE AND COMPOUND) - - try: - words = Words(word) - except IndexError: - return False # word is '' - - if words.first in plverb_irregular_pres: - return f"{plverb_irregular_pres[words.first]}{words[len(words.first) :]}" - - # HANDLE IRREGULAR FUTURE, PRETERITE AND PERFECT TENSES - - if words.first in plverb_irregular_non_pres: - return word - - # HANDLE PRESENT NEGATIONS (SIMPLE AND COMPOUND) - - if words.first.endswith("n't") and words.first[:-3] in plverb_irregular_pres: - return ( - f"{plverb_irregular_pres[words.first[:-3]]}n't" - f"{words[len(words.first) :]}" - ) - - if words.first.endswith("n't"): - return word - - # HANDLE SPECIAL CASES - - mo = PLVERB_SPECIAL_S_RE.search(word) - if mo: - return False - if WHITESPACE.search(word): - return False - - if words.lowered == "quizzes": - return "quiz" - - # HANDLE STANDARD 3RD PERSON (CHOP THE ...(e)s OFF SINGLE WORDS) - - if ( - words.lowered[-4:] in ("ches", "shes", "zzes", "sses") - or words.lowered[-3:] == "xes" - ): - return words[:-2] - - if words.lowered[-3:] == "ies" and len(words) > 3: - return words.lowered[:-3] + "y" - - if ( - words.last.lower() in pl_v_oes_oe - or words.lowered[-4:] in pl_v_oes_oe_endings_size4 - or words.lowered[-5:] in pl_v_oes_oe_endings_size5 - ): - return words[:-1] - - if words.lowered.endswith("oes") and len(words) > 3: - return words.lowered[:-2] - - mo = ENDS_WITH_S.search(words) - if mo: - return mo.group(1) - - # OTHERWISE, A REGULAR VERB (HANDLE ELSEWHERE) - - return False - - def _pl_general_verb( - self, word: str, count: Optional[Union[str, int]] = None - ) -> str: - count = self.get_count(count) - - if count == 1: - return word - - # HANDLE AMBIGUOUS PRESENT TENSES (SIMPLE AND COMPOUND) - - mo = plverb_ambiguous_pres_keys.search(word) - if mo: - return f"{plverb_ambiguous_pres[mo.group(1).lower()]}{mo.group(2)}" - - # HANDLE AMBIGUOUS PRETERITE AND PERFECT TENSES - - mo = plverb_ambiguous_non_pres.search(word) - if mo: - return word - - # OTHERWISE, 1st OR 2ND PERSON IS UNINFLECTED - - return word - - def _pl_special_adjective( - self, word: str, count: Optional[Union[str, int]] = None - ) -> Union[str, bool]: - count = self.get_count(count) - - if count == 1: - return word - - # HANDLE USER-DEFINED ADJECTIVES - - value = self.ud_match(word, self.pl_adj_user_defined) - if value is not None: - return value - - # HANDLE KNOWN CASES - - mo = pl_adj_special_keys.search(word) - if mo: - return pl_adj_special[mo.group(1).lower()] - - # HANDLE POSSESSIVES - - mo = pl_adj_poss_keys.search(word) - if mo: - return pl_adj_poss[mo.group(1).lower()] - - mo = ENDS_WITH_APOSTROPHE_S.search(word) - if mo: - pl = self.plural_noun(mo.group(1)) - trailing_s = "" if pl[-1] == "s" else "s" - return f"{pl}'{trailing_s}" - - # OTHERWISE, NO IDEA - - return False - - # @profile - def _sinoun( # noqa: C901 - self, - word: str, - count: Optional[Union[str, int]] = None, - gender: Optional[str] = None, - ) -> Union[str, bool]: - count = self.get_count(count) - - # DEFAULT TO PLURAL - - if count == 2: - return word - - # SET THE GENDER - - try: - if gender is None: - gender = self.thegender - elif gender not in singular_pronoun_genders: - raise BadGenderError - except (TypeError, IndexError) as err: - raise BadGenderError from err - - # HANDLE USER-DEFINED NOUNS - - value = self.ud_match(word, self.si_sb_user_defined) - if value is not None: - return value - - # HANDLE EMPTY WORD, SINGULAR COUNT AND UNINFLECTED PLURALS - - if word == "": - return word - - if word in si_sb_ois_oi_case: - return word[:-1] - - words = Words(word) - - if words.last.lower() in pl_sb_uninflected_complete: - if len(words.split_) >= 3: - return self._handle_long_compounds(words, count=1) or word - return word - - if word in pl_sb_uninflected_caps: - return word - - for k, v in pl_sb_uninflected_bysize.items(): - if words.lowered[-k:] in v: - return word - - if self.classical_dict["herd"] and words.last.lower() in pl_sb_uninflected_herd: - return word - - if words.last.lower() in pl_sb_C_us_us: - return word if self.classical_dict["ancient"] else False - - # HANDLE COMPOUNDS ("Governor General", "mother-in-law", "aide-de-camp", ETC.) - - mo = PL_SB_POSTFIX_ADJ_STEMS_RE.search(word) - if mo and mo.group(2) != "": - return f"{self._sinoun(mo.group(1), 1, gender=gender)}{mo.group(2)}" - - with contextlib.suppress(ValueError): - return self._handle_prepositional_phrase( - words.lowered, - functools.partial(self._sinoun, count=1, gender=gender), - ' ', - ) - - with contextlib.suppress(ValueError): - return self._handle_prepositional_phrase( - words.lowered, - functools.partial(self._sinoun, count=1, gender=gender), - '-', - ) - - # HANDLE PRONOUNS - - for k, v in si_pron_acc_keys_bysize.items(): - if words.lowered[-k:] in v: # ends with accusative pronoun - for pk, pv in pl_prep_bysize.items(): - if words.lowered[:pk] in pv: # starts with a prep - if words.lowered.split() == [ - words.lowered[:pk], - words.lowered[-k:], - ]: - # only whitespace in between - return words.lowered[:-k] + get_si_pron( - "acc", words.lowered[-k:], gender - ) - - try: - return get_si_pron("nom", words.lowered, gender) - except KeyError: - pass - - try: - return get_si_pron("acc", words.lowered, gender) - except KeyError: - pass - - # HANDLE ISOLATED IRREGULAR PLURALS - - if words.last in si_sb_irregular_caps: - llen = len(words.last) - return f"{word[:-llen]}{si_sb_irregular_caps[words.last]}" - - if words.last.lower() in si_sb_irregular: - llen = len(words.last.lower()) - return f"{word[:-llen]}{si_sb_irregular[words.last.lower()]}" - - dash_split = words.lowered.split("-") - if (" ".join(dash_split[-2:])).lower() in si_sb_irregular_compound: - llen = len( - " ".join(dash_split[-2:]) - ) # TODO: what if 2 spaces between these words? - return "{}{}".format( - word[:-llen], - si_sb_irregular_compound[(" ".join(dash_split[-2:])).lower()], - ) - - if words.lowered[-5:] == "quies": - return word[:-3] + "y" - - if words.lowered[-7:] == "persons": - return word[:-1] - if words.lowered[-6:] == "people": - return word[:-4] + "rson" - - # HANDLE FAMILIES OF IRREGULAR PLURALS - - if words.lowered[-4:] == "mans": - for k, v in si_sb_U_man_mans_bysize.items(): - if words.lowered[-k:] in v: - return word[:-1] - for k, v in si_sb_U_man_mans_caps_bysize.items(): - if word[-k:] in v: - return word[:-1] - if words.lowered[-3:] == "men": - return word[:-3] + "man" - if words.lowered[-4:] == "mice": - return word[:-4] + "mouse" - if words.lowered[-4:] == "lice": - v = si_sb_U_louse_lice_bysize.get(len(word)) - if v and words.lowered in v: - return word[:-4] + "louse" - if words.lowered[-5:] == "geese": - return word[:-5] + "goose" - if words.lowered[-5:] == "teeth": - return word[:-5] + "tooth" - if words.lowered[-4:] == "feet": - return word[:-4] + "foot" - - if words.lowered == "dice": - return "die" - - # HANDLE UNASSIMILATED IMPORTS - - if words.lowered[-4:] == "ceps": - return word - if words.lowered[-3:] == "zoa": - return word[:-1] + "on" - - for lastlet, d, unass_numend, post in ( - ("s", si_sb_U_ch_chs_bysize, -1, ""), - ("s", si_sb_U_ex_ices_bysize, -4, "ex"), - ("s", si_sb_U_ix_ices_bysize, -4, "ix"), - ("a", si_sb_U_um_a_bysize, -1, "um"), - ("i", si_sb_U_us_i_bysize, -1, "us"), - ("a", si_sb_U_on_a_bysize, -1, "on"), - ("e", si_sb_U_a_ae_bysize, -1, ""), - ): - if words.lowered[-1] == lastlet: # this test to add speed - for k, v in d.items(): - if words.lowered[-k:] in v: - return word[:unass_numend] + post - - # HANDLE INCOMPLETELY ASSIMILATED IMPORTS - - if self.classical_dict["ancient"]: - if words.lowered[-6:] == "trices": - return word[:-3] + "x" - if words.lowered[-4:] in ("eaux", "ieux"): - return word[:-1] - if words.lowered[-5:] in ("ynges", "inges", "anges") and len(word) > 6: - return word[:-3] + "x" - - for lastlet, d, class_numend, post in ( - ("a", si_sb_C_en_ina_bysize, -3, "en"), - ("s", si_sb_C_ex_ices_bysize, -4, "ex"), - ("s", si_sb_C_ix_ices_bysize, -4, "ix"), - ("a", si_sb_C_um_a_bysize, -1, "um"), - ("i", si_sb_C_us_i_bysize, -1, "us"), - ("s", pl_sb_C_us_us_bysize, None, ""), - ("e", si_sb_C_a_ae_bysize, -1, ""), - ("a", si_sb_C_a_ata_bysize, -2, ""), - ("s", si_sb_C_is_ides_bysize, -3, "s"), - ("i", si_sb_C_o_i_bysize, -1, "o"), - ("a", si_sb_C_on_a_bysize, -1, "on"), - ("m", si_sb_C_im_bysize, -2, ""), - ("i", si_sb_C_i_bysize, -1, ""), - ): - if words.lowered[-1] == lastlet: # this test to add speed - for k, v in d.items(): - if words.lowered[-k:] in v: - return word[:class_numend] + post - - # HANDLE PLURLS ENDING IN uses -> use - - if ( - words.lowered[-6:] == "houses" - or word in si_sb_uses_use_case - or words.last.lower() in si_sb_uses_use - ): - return word[:-1] - - # HANDLE PLURLS ENDING IN ies -> ie - - if word in si_sb_ies_ie_case or words.last.lower() in si_sb_ies_ie: - return word[:-1] - - # HANDLE PLURLS ENDING IN oes -> oe - - if ( - words.lowered[-5:] == "shoes" - or word in si_sb_oes_oe_case - or words.last.lower() in si_sb_oes_oe - ): - return word[:-1] - - # HANDLE SINGULAR NOUNS ENDING IN ...s OR OTHER SILIBANTS - - if word in si_sb_sses_sse_case or words.last.lower() in si_sb_sses_sse: - return word[:-1] - - if words.last.lower() in si_sb_singular_s_complete: - return word[:-2] - - for k, v in si_sb_singular_s_bysize.items(): - if words.lowered[-k:] in v: - return word[:-2] - - if words.lowered[-4:] == "eses" and word[0] == word[0].upper(): - return word[:-2] - - if words.last.lower() in si_sb_z_zes: - return word[:-2] - - if words.last.lower() in si_sb_zzes_zz: - return word[:-2] - - if words.lowered[-4:] == "zzes": - return word[:-3] - - if word in si_sb_ches_che_case or words.last.lower() in si_sb_ches_che: - return word[:-1] - - if words.lowered[-4:] in ("ches", "shes"): - return word[:-2] - - if words.last.lower() in si_sb_xes_xe: - return word[:-1] - - if words.lowered[-3:] == "xes": - return word[:-2] - - # HANDLE ...f -> ...ves - - if word in si_sb_ves_ve_case or words.last.lower() in si_sb_ves_ve: - return word[:-1] - - if words.lowered[-3:] == "ves": - if words.lowered[-5:-3] in ("el", "al", "ol"): - return word[:-3] + "f" - if words.lowered[-5:-3] == "ea" and word[-6:-5] != "d": - return word[:-3] + "f" - if words.lowered[-5:-3] in ("ni", "li", "wi"): - return word[:-3] + "fe" - if words.lowered[-5:-3] == "ar": - return word[:-3] + "f" - - # HANDLE ...y - - if words.lowered[-2:] == "ys": - if len(words.lowered) > 2 and words.lowered[-3] in "aeiou": - return word[:-1] - - if self.classical_dict["names"]: - if words.lowered[-2:] == "ys" and word[0] == word[0].upper(): - return word[:-1] - - if words.lowered[-3:] == "ies": - return word[:-3] + "y" - - # HANDLE ...o - - if words.lowered[-2:] == "os": - if words.last.lower() in si_sb_U_o_os_complete: - return word[:-1] - - for k, v in si_sb_U_o_os_bysize.items(): - if words.lowered[-k:] in v: - return word[:-1] - - if words.lowered[-3:] in ("aos", "eos", "ios", "oos", "uos"): - return word[:-1] - - if words.lowered[-3:] == "oes": - return word[:-2] - - # UNASSIMILATED IMPORTS FINAL RULE - - if word in si_sb_es_is: - return word[:-2] + "is" - - # OTHERWISE JUST REMOVE ...s - - if words.lowered[-1] == "s": - return word[:-1] - - # COULD NOT FIND SINGULAR - - return False - - # ADJECTIVES - - @typechecked - def a(self, text: Word, count: Optional[Union[int, str, Any]] = 1) -> str: - """ - Return the appropriate indefinite article followed by text. - - The indefinite article is either 'a' or 'an'. - - If count is not one, then return count followed by text - instead of 'a' or 'an'. - - Whitespace at the start and end is preserved. - - """ - mo = INDEFINITE_ARTICLE_TEST.search(text) - if mo: - word = mo.group(2) - if not word: - return text - pre = mo.group(1) - post = mo.group(3) - result = self._indef_article(word, count) - return f"{pre}{result}{post}" - return "" - - an = a - - _indef_article_cases = ( - # HANDLE ORDINAL FORMS - (A_ordinal_a, "a"), - (A_ordinal_an, "an"), - # HANDLE SPECIAL CASES - (A_explicit_an, "an"), - (SPECIAL_AN, "an"), - (SPECIAL_A, "a"), - # HANDLE ABBREVIATIONS - (A_abbrev, "an"), - (SPECIAL_ABBREV_AN, "an"), - (SPECIAL_ABBREV_A, "a"), - # HANDLE CONSONANTS - (CONSONANTS, "a"), - # HANDLE SPECIAL VOWEL-FORMS - (ARTICLE_SPECIAL_EU, "a"), - (ARTICLE_SPECIAL_ONCE, "a"), - (ARTICLE_SPECIAL_ONETIME, "a"), - (ARTICLE_SPECIAL_UNIT, "a"), - (ARTICLE_SPECIAL_UBA, "a"), - (ARTICLE_SPECIAL_UKR, "a"), - (A_explicit_a, "a"), - # HANDLE SPECIAL CAPITALS - (SPECIAL_CAPITALS, "a"), - # HANDLE VOWELS - (VOWELS, "an"), - # HANDLE y... - # (BEFORE CERTAIN CONSONANTS IMPLIES (UNNATURALIZED) "i.." SOUND) - (A_y_cons, "an"), - ) - - def _indef_article(self, word: str, count: Union[int, str, Any]) -> str: - mycount = self.get_count(count) - - if mycount != 1: - return f"{count} {word}" - - # HANDLE USER-DEFINED VARIANTS - - value = self.ud_match(word, self.A_a_user_defined) - if value is not None: - return f"{value} {word}" - - matches = ( - f'{article} {word}' - for regexen, article in self._indef_article_cases - if regexen.search(word) - ) - - # OTHERWISE, GUESS "a" - fallback = f'a {word}' - return next(matches, fallback) - - # 2. TRANSLATE ZERO-QUANTIFIED $word TO "no plural($word)" - - @typechecked - def no(self, text: Word, count: Optional[Union[int, str]] = None) -> str: - """ - If count is 0, no, zero or nil, return 'no' followed by the plural - of text. - - If count is one of: - 1, a, an, one, each, every, this, that - return count followed by text. - - Otherwise return count follow by the plural of text. - - In the return value count is always followed by a space. - - Whitespace at the start and end is preserved. - - """ - if count is None and self.persistent_count is not None: - count = self.persistent_count - - if count is None: - count = 0 - mo = PARTITION_WORD.search(text) - if mo: - pre = mo.group(1) - word = mo.group(2) - post = mo.group(3) - else: - pre = "" - word = "" - post = "" - - if str(count).lower() in pl_count_zero: - count = 'no' - return f"{pre}{count} {self.plural(word, count)}{post}" - - # PARTICIPLES - - @typechecked - def present_participle(self, word: Word) -> str: - """ - Return the present participle for word. - - word is the 3rd person singular verb. - - """ - plv = self.plural_verb(word, 2) - ans = plv - - for regexen, repl in PRESENT_PARTICIPLE_REPLACEMENTS: - ans, num = regexen.subn(repl, plv) - if num: - return f"{ans}ing" - return f"{ans}ing" - - # NUMERICAL INFLECTIONS - - @typechecked - def ordinal(self, num: Union[Number, Word]) -> str: - """ - Return the ordinal of num. - - >>> ordinal = engine().ordinal - >>> ordinal(1) - '1st' - >>> ordinal('one') - 'first' - """ - if DIGIT.match(str(num)): - if isinstance(num, (float, int)) and int(num) == num: - n = int(num) - else: - if "." in str(num): - try: - # numbers after decimal, - # so only need last one for ordinal - n = int(str(num)[-1]) - - except ValueError: # ends with '.', so need to use whole string - n = int(str(num)[:-1]) - else: - n = int(num) # type: ignore - try: - post = nth[n % 100] - except KeyError: - post = nth[n % 10] - return f"{num}{post}" - else: - return self._sub_ord(num) - - def millfn(self, ind: int = 0) -> str: - if ind > len(mill) - 1: - raise NumOutOfRangeError - return mill[ind] - - def unitfn(self, units: int, mindex: int = 0) -> str: - return f"{unit[units]}{self.millfn(mindex)}" - - def tenfn(self, tens, units, mindex=0) -> str: - if tens != 1: - tens_part = ten[tens] - if tens and units: - hyphen = "-" - else: - hyphen = "" - unit_part = unit[units] - mill_part = self.millfn(mindex) - return f"{tens_part}{hyphen}{unit_part}{mill_part}" - return f"{teen[units]}{mill[mindex]}" - - def hundfn(self, hundreds: int, tens: int, units: int, mindex: int) -> str: - if hundreds: - andword = f" {self._number_args['andword']} " if tens or units else "" - # use unit not unitfn as simpler - return ( - f"{unit[hundreds]} hundred{andword}" - f"{self.tenfn(tens, units)}{self.millfn(mindex)}, " - ) - if tens or units: - return f"{self.tenfn(tens, units)}{self.millfn(mindex)}, " - return "" - - def group1sub(self, mo: Match) -> str: - units = int(mo.group(1)) - if units == 1: - return f" {self._number_args['one']}, " - elif units: - return f"{unit[units]}, " - else: - return f" {self._number_args['zero']}, " - - def group1bsub(self, mo: Match) -> str: - units = int(mo.group(1)) - if units: - return f"{unit[units]}, " - else: - return f" {self._number_args['zero']}, " - - def group2sub(self, mo: Match) -> str: - tens = int(mo.group(1)) - units = int(mo.group(2)) - if tens: - return f"{self.tenfn(tens, units)}, " - if units: - return f" {self._number_args['zero']} {unit[units]}, " - return f" {self._number_args['zero']} {self._number_args['zero']}, " - - def group3sub(self, mo: Match) -> str: - hundreds = int(mo.group(1)) - tens = int(mo.group(2)) - units = int(mo.group(3)) - if hundreds == 1: - hunword = f" {self._number_args['one']}" - elif hundreds: - hunword = str(unit[hundreds]) - else: - hunword = f" {self._number_args['zero']}" - if tens: - tenword = self.tenfn(tens, units) - elif units: - tenword = f" {self._number_args['zero']} {unit[units]}" - else: - tenword = f" {self._number_args['zero']} {self._number_args['zero']}" - return f"{hunword} {tenword}, " - - def hundsub(self, mo: Match) -> str: - ret = self.hundfn( - int(mo.group(1)), int(mo.group(2)), int(mo.group(3)), self.mill_count - ) - self.mill_count += 1 - return ret - - def tensub(self, mo: Match) -> str: - return f"{self.tenfn(int(mo.group(1)), int(mo.group(2)), self.mill_count)}, " - - def unitsub(self, mo: Match) -> str: - return f"{self.unitfn(int(mo.group(1)), self.mill_count)}, " - - def enword(self, num: str, group: int) -> str: - # import pdb - # pdb.set_trace() - - if group == 1: - num = DIGIT_GROUP.sub(self.group1sub, num) - elif group == 2: - num = TWO_DIGITS.sub(self.group2sub, num) - num = DIGIT_GROUP.sub(self.group1bsub, num, 1) - elif group == 3: - num = THREE_DIGITS.sub(self.group3sub, num) - num = TWO_DIGITS.sub(self.group2sub, num, 1) - num = DIGIT_GROUP.sub(self.group1sub, num, 1) - elif int(num) == 0: - num = self._number_args["zero"] - elif int(num) == 1: - num = self._number_args["one"] - else: - num = num.lstrip().lstrip("0") - self.mill_count = 0 - # surely there's a better way to do the next bit - mo = THREE_DIGITS_WORD.search(num) - while mo: - num = THREE_DIGITS_WORD.sub(self.hundsub, num, 1) - mo = THREE_DIGITS_WORD.search(num) - num = TWO_DIGITS_WORD.sub(self.tensub, num, 1) - num = ONE_DIGIT_WORD.sub(self.unitsub, num, 1) - return num - - @staticmethod - def _sub_ord(val): - new = ordinal_suff.sub(lambda match: ordinal[match.group(1)], val) - return new + "th" * (new == val) - - @classmethod - def _chunk_num(cls, num, decimal, group): - if decimal: - max_split = -1 if group != 0 else 1 - chunks = num.split(".", max_split) - else: - chunks = [num] - return cls._remove_last_blank(chunks) - - @staticmethod - def _remove_last_blank(chunks): - """ - Remove the last item from chunks if it's a blank string. - - Return the resultant chunks and whether the last item was removed. - """ - removed = chunks[-1] == "" - result = chunks[:-1] if removed else chunks - return result, removed - - @staticmethod - def _get_sign(num): - return {'+': 'plus', '-': 'minus'}.get(num.lstrip()[0], '') - - @typechecked - def number_to_words( # noqa: C901 - self, - num: Union[Number, Word], - wantlist: bool = False, - group: int = 0, - comma: Union[Falsish, str] = ",", - andword: str = "and", - zero: str = "zero", - one: str = "one", - decimal: Union[Falsish, str] = "point", - threshold: Optional[int] = None, - ) -> Union[str, List[str]]: - """ - Return a number in words. - - group = 1, 2 or 3 to group numbers before turning into words - comma: define comma - - andword: - word for 'and'. Can be set to ''. - e.g. "one hundred and one" vs "one hundred one" - - zero: word for '0' - one: word for '1' - decimal: word for decimal point - threshold: numbers above threshold not turned into words - - parameters not remembered from last call. Departure from Perl version. - """ - self._number_args = {"andword": andword, "zero": zero, "one": one} - num = str(num) - - # Handle "stylistic" conversions (up to a given threshold)... - if threshold is not None and float(num) > threshold: - spnum = num.split(".", 1) - while comma: - (spnum[0], n) = FOUR_DIGIT_COMMA.subn(r"\1,\2", spnum[0]) - if n == 0: - break - try: - return f"{spnum[0]}.{spnum[1]}" - except IndexError: - return str(spnum[0]) - - if group < 0 or group > 3: - raise BadChunkingOptionError - - sign = self._get_sign(num) - - if num in nth_suff: - num = zero - - myord = num[-2:] in nth_suff - if myord: - num = num[:-2] - - chunks, finalpoint = self._chunk_num(num, decimal, group) - - loopstart = chunks[0] == "" - first: bool | None = not loopstart - - def _handle_chunk(chunk): - nonlocal first - - # remove all non numeric \D - chunk = NON_DIGIT.sub("", chunk) - if chunk == "": - chunk = "0" - - if group == 0 and not first: - chunk = self.enword(chunk, 1) - else: - chunk = self.enword(chunk, group) - - if chunk[-2:] == ", ": - chunk = chunk[:-2] - chunk = WHITESPACES_COMMA.sub(",", chunk) - - if group == 0 and first: - chunk = COMMA_WORD.sub(f" {andword} \\1", chunk) - chunk = WHITESPACES.sub(" ", chunk) - # chunk = re.sub(r"(\A\s|\s\Z)", self.blankfn, chunk) - chunk = chunk.strip() - if first: - first = None - return chunk - - chunks[loopstart:] = map(_handle_chunk, chunks[loopstart:]) - - numchunks = [] - if first != 0: - numchunks = chunks[0].split(f"{comma} ") - - if myord and numchunks: - numchunks[-1] = self._sub_ord(numchunks[-1]) - - for chunk in chunks[1:]: - numchunks.append(decimal) - numchunks.extend(chunk.split(f"{comma} ")) - - if finalpoint: - numchunks.append(decimal) - - if wantlist: - return [sign] * bool(sign) + numchunks - - signout = f"{sign} " if sign else "" - valout = ( - ', '.join(numchunks) - if group - else ''.join(self._render(numchunks, decimal, comma)) - ) - return signout + valout - - @staticmethod - def _render(chunks, decimal, comma): - first_item = chunks.pop(0) - yield first_item - first = decimal is None or not first_item.endswith(decimal) - for nc in chunks: - if nc == decimal: - first = False - elif first: - yield comma - yield f" {nc}" - - @typechecked - def join( - self, - words: Optional[Sequence[Word]], - sep: Optional[str] = None, - sep_spaced: bool = True, - final_sep: Optional[str] = None, - conj: str = "and", - conj_spaced: bool = True, - ) -> str: - """ - Join words into a list. - - e.g. join(['ant', 'bee', 'fly']) returns 'ant, bee, and fly' - - options: - conj: replacement for 'and' - sep: separator. default ',', unless ',' is in the list then ';' - final_sep: final separator. default ',', unless ',' is in the list then ';' - conj_spaced: boolean. Should conj have spaces around it - - """ - if not words: - return "" - if len(words) == 1: - return words[0] - - if conj_spaced: - if conj == "": - conj = " " - else: - conj = f" {conj} " - - if len(words) == 2: - return f"{words[0]}{conj}{words[1]}" - - if sep is None: - if "," in "".join(words): - sep = ";" - else: - sep = "," - if final_sep is None: - final_sep = sep - - final_sep = f"{final_sep}{conj}" - - if sep_spaced: - sep += " " - - return f"{sep.join(words[0:-1])}{final_sep}{words[-1]}" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 920cab6..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 3c17a84..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/py38.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/py38.cpython-311.pyc deleted file mode 100644 index c426dc6..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/__pycache__/py38.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/py38.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/py38.py deleted file mode 100644 index a2d01bd..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/compat/py38.py +++ /dev/null @@ -1,7 +0,0 @@ -import sys - - -if sys.version_info > (3, 9): - from typing import Annotated -else: # pragma: no cover - from typing_extensions import Annotated # noqa: F401 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/inflect/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/METADATA deleted file mode 100644 index fe6ca5a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/METADATA +++ /dev/null @@ -1,85 +0,0 @@ -Metadata-Version: 2.1 -Name: jaraco.collections -Version: 5.1.0 -Summary: Collection objects similar to those in stdlib by jaraco -Author-email: "Jason R. Coombs" -Project-URL: Source, https://github.com/jaraco/jaraco.collections -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Requires-Dist: jaraco.text -Provides-Extra: check -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'check' -Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'check' -Provides-Extra: cover -Requires-Dist: pytest-cov ; extra == 'cover' -Provides-Extra: doc -Requires-Dist: sphinx >=3.5 ; extra == 'doc' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc' -Requires-Dist: rst.linker >=1.9 ; extra == 'doc' -Requires-Dist: furo ; extra == 'doc' -Requires-Dist: sphinx-lint ; extra == 'doc' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc' -Provides-Extra: enabler -Requires-Dist: pytest-enabler >=2.2 ; extra == 'enabler' -Provides-Extra: test -Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test' -Provides-Extra: type -Requires-Dist: pytest-mypy ; extra == 'type' - -.. image:: https://img.shields.io/pypi/v/jaraco.collections.svg - :target: https://pypi.org/project/jaraco.collections - -.. image:: https://img.shields.io/pypi/pyversions/jaraco.collections.svg - -.. image:: https://github.com/jaraco/jaraco.collections/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/jaraco.collections/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/jaracocollections/badge/?version=latest - :target: https://jaracocollections.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/jaraco.collections - :target: https://tidelift.com/subscription/pkg/pypi-jaraco.collections?utm_source=pypi-jaraco.collections&utm_medium=readme - -Models and classes to supplement the stdlib 'collections' module. - -See the docs, linked above, for descriptions and usage examples. - -Highlights include: - -- RangeMap: A mapping that accepts a range of values for keys. -- Projection: A subset over an existing mapping. -- KeyTransformingDict: Generalized mapping with keys transformed by a function. -- FoldedCaseKeyedDict: A dict whose string keys are case-insensitive. -- BijectiveMap: A map where keys map to values and values back to their keys. -- ItemsAsAttributes: A mapping mix-in exposing items as attributes. -- IdentityOverrideMap: A map whose keys map by default to themselves unless overridden. -- FrozenDict: A hashable, immutable map. -- Enumeration: An object whose keys are enumerated. -- Everything: A container that contains all things. -- Least, Greatest: Objects that are always less than or greater than any other. -- pop_all: Return all items from the mutable sequence and remove them from that sequence. -- DictStack: A stack of dicts, great for sharing scopes. -- WeightedLookup: A specialized RangeMap for selecting an item by weights. - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/RECORD deleted file mode 100644 index 48b957e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/RECORD +++ /dev/null @@ -1,10 +0,0 @@ -jaraco.collections-5.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -jaraco.collections-5.1.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -jaraco.collections-5.1.0.dist-info/METADATA,sha256=IMUaliNsA5X1Ox9MXUWOagch5R4Wwb_3M7erp29dBtg,3933 -jaraco.collections-5.1.0.dist-info/RECORD,, -jaraco.collections-5.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -jaraco.collections-5.1.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91 -jaraco.collections-5.1.0.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -jaraco/collections/__init__.py,sha256=Pc1-SqjWm81ad1P0-GttpkwO_LWlnaY6gUq8gcKh2v0,26640 -jaraco/collections/__pycache__/__init__.cpython-312.pyc,, -jaraco/collections/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/WHEEL deleted file mode 100644 index 50e1e84..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: setuptools (73.0.1) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/top_level.txt deleted file mode 100644 index f6205a5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.collections-5.1.0.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -jaraco diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/METADATA deleted file mode 100644 index a36f7c5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/METADATA +++ /dev/null @@ -1,75 +0,0 @@ -Metadata-Version: 2.1 -Name: jaraco.context -Version: 5.3.0 -Summary: Useful decorators and context managers -Home-page: https://github.com/jaraco/jaraco.context -Author: Jason R. Coombs -Author-email: jaraco@jaraco.com -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -License-File: LICENSE -Requires-Dist: backports.tarfile ; python_version < "3.12" -Provides-Extra: docs -Requires-Dist: sphinx >=3.5 ; extra == 'docs' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'docs' -Requires-Dist: rst.linker >=1.9 ; extra == 'docs' -Requires-Dist: furo ; extra == 'docs' -Requires-Dist: sphinx-lint ; extra == 'docs' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'docs' -Provides-Extra: testing -Requires-Dist: pytest !=8.1.1,>=6 ; extra == 'testing' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'testing' -Requires-Dist: pytest-cov ; extra == 'testing' -Requires-Dist: pytest-mypy ; extra == 'testing' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'testing' -Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'testing' -Requires-Dist: portend ; extra == 'testing' - -.. image:: https://img.shields.io/pypi/v/jaraco.context.svg - :target: https://pypi.org/project/jaraco.context - -.. image:: https://img.shields.io/pypi/pyversions/jaraco.context.svg - -.. image:: https://github.com/jaraco/jaraco.context/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/jaraco.context/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/jaracocontext/badge/?version=latest - :target: https://jaracocontext.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/jaraco.context - :target: https://tidelift.com/subscription/pkg/pypi-jaraco.context?utm_source=pypi-jaraco.context&utm_medium=readme - - -Highlights -========== - -See the docs linked from the badge above for the full details, but here are some features that may be of interest. - -- ``ExceptionTrap`` provides a general-purpose wrapper for trapping exceptions and then acting on the outcome. Includes ``passes`` and ``raises`` decorators to replace the result of a wrapped function by a boolean indicating the outcome of the exception trap. See `this keyring commit `_ for an example of it in production. -- ``suppress`` simply enables ``contextlib.suppress`` as a decorator. -- ``on_interrupt`` is a decorator used by CLI entry points to affect the handling of a ``KeyboardInterrupt``. Inspired by `Lucretiel/autocommand#18 `_. -- ``pushd`` is similar to pytest's ``monkeypatch.chdir`` or path's `default context `_, changes the current working directory for the duration of the context. -- ``tarball`` will download a tarball, extract it, change directory, yield, then clean up after. Convenient when working with web assets. -- ``null`` is there for those times when one code branch needs a context and the other doesn't; this null context provides symmetry across those branches. - - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/RECORD deleted file mode 100644 index 09d191f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/RECORD +++ /dev/null @@ -1,8 +0,0 @@ -jaraco.context-5.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -jaraco.context-5.3.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -jaraco.context-5.3.0.dist-info/METADATA,sha256=xDtguJej0tN9iEXCUvxEJh2a7xceIRVBEakBLSr__tY,4020 -jaraco.context-5.3.0.dist-info/RECORD,, -jaraco.context-5.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -jaraco.context-5.3.0.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -jaraco/__pycache__/context.cpython-312.pyc,, -jaraco/context.py,sha256=REoLIxDkO5MfEYowt_WoupNCRoxBS5v7YX2PbW8lIcs,9552 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/WHEEL deleted file mode 100644 index bab98d6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.43.0) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/top_level.txt deleted file mode 100644 index f6205a5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.context-5.3.0.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -jaraco diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/METADATA deleted file mode 100644 index c865140..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/METADATA +++ /dev/null @@ -1,64 +0,0 @@ -Metadata-Version: 2.1 -Name: jaraco.functools -Version: 4.0.1 -Summary: Functools like those found in stdlib -Author-email: "Jason R. Coombs" -Project-URL: Homepage, https://github.com/jaraco/jaraco.functools -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Requires-Dist: more-itertools -Provides-Extra: docs -Requires-Dist: sphinx >=3.5 ; extra == 'docs' -Requires-Dist: sphinx <7.2.5 ; extra == 'docs' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'docs' -Requires-Dist: rst.linker >=1.9 ; extra == 'docs' -Requires-Dist: furo ; extra == 'docs' -Requires-Dist: sphinx-lint ; extra == 'docs' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'docs' -Provides-Extra: testing -Requires-Dist: pytest >=6 ; extra == 'testing' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'testing' -Requires-Dist: pytest-cov ; extra == 'testing' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'testing' -Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'testing' -Requires-Dist: jaraco.classes ; extra == 'testing' -Requires-Dist: pytest-mypy ; (platform_python_implementation != "PyPy") and extra == 'testing' - -.. image:: https://img.shields.io/pypi/v/jaraco.functools.svg - :target: https://pypi.org/project/jaraco.functools - -.. image:: https://img.shields.io/pypi/pyversions/jaraco.functools.svg - -.. image:: https://github.com/jaraco/jaraco.functools/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/jaraco.functools/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/jaracofunctools/badge/?version=latest - :target: https://jaracofunctools.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/jaraco.functools - :target: https://tidelift.com/subscription/pkg/pypi-jaraco.functools?utm_source=pypi-jaraco.functools&utm_medium=readme - -Additional functools in the spirit of stdlib's functools. - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/RECORD deleted file mode 100644 index ef3bc21..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/RECORD +++ /dev/null @@ -1,10 +0,0 @@ -jaraco.functools-4.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -jaraco.functools-4.0.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -jaraco.functools-4.0.1.dist-info/METADATA,sha256=i4aUaQDX-jjdEQK5wevhegyx8JyLfin2HyvaSk3FHso,2891 -jaraco.functools-4.0.1.dist-info/RECORD,, -jaraco.functools-4.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -jaraco.functools-4.0.1.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -jaraco/functools/__init__.py,sha256=hEAJaS2uSZRuF_JY4CxCHIYh79ZpxaPp9OiHyr9EJ1w,16642 -jaraco/functools/__init__.pyi,sha256=gk3dsgHzo5F_U74HzAvpNivFAPCkPJ1b2-yCd62dfnw,3878 -jaraco/functools/__pycache__/__init__.cpython-312.pyc,, -jaraco/functools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/WHEEL deleted file mode 100644 index bab98d6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.43.0) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/top_level.txt deleted file mode 100644 index f6205a5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.functools-4.0.1.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -jaraco diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/LICENSE deleted file mode 100644 index 1bb5a44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/METADATA deleted file mode 100644 index 0258a38..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/METADATA +++ /dev/null @@ -1,95 +0,0 @@ -Metadata-Version: 2.1 -Name: jaraco.text -Version: 3.12.1 -Summary: Module for text manipulation -Author-email: "Jason R. Coombs" -Project-URL: Homepage, https://github.com/jaraco/jaraco.text -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -License-File: LICENSE -Requires-Dist: jaraco.functools -Requires-Dist: jaraco.context >=4.1 -Requires-Dist: autocommand -Requires-Dist: inflect -Requires-Dist: more-itertools -Requires-Dist: importlib-resources ; python_version < "3.9" -Provides-Extra: doc -Requires-Dist: sphinx >=3.5 ; extra == 'doc' -Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc' -Requires-Dist: rst.linker >=1.9 ; extra == 'doc' -Requires-Dist: furo ; extra == 'doc' -Requires-Dist: sphinx-lint ; extra == 'doc' -Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc' -Provides-Extra: test -Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test' -Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test' -Requires-Dist: pytest-cov ; extra == 'test' -Requires-Dist: pytest-mypy ; extra == 'test' -Requires-Dist: pytest-enabler >=2.2 ; extra == 'test' -Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test' -Requires-Dist: pathlib2 ; (python_version < "3.10") and extra == 'test' - -.. image:: https://img.shields.io/pypi/v/jaraco.text.svg - :target: https://pypi.org/project/jaraco.text - -.. image:: https://img.shields.io/pypi/pyversions/jaraco.text.svg - -.. image:: https://github.com/jaraco/jaraco.text/actions/workflows/main.yml/badge.svg - :target: https://github.com/jaraco/jaraco.text/actions?query=workflow%3A%22tests%22 - :alt: tests - -.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json - :target: https://github.com/astral-sh/ruff - :alt: Ruff - -.. image:: https://readthedocs.org/projects/jaracotext/badge/?version=latest - :target: https://jaracotext.readthedocs.io/en/latest/?badge=latest - -.. image:: https://img.shields.io/badge/skeleton-2024-informational - :target: https://blog.jaraco.com/skeleton - -.. image:: https://tidelift.com/badges/package/pypi/jaraco.text - :target: https://tidelift.com/subscription/pkg/pypi-jaraco.text?utm_source=pypi-jaraco.text&utm_medium=readme - - -This package provides handy routines for dealing with text, such as -wrapping, substitution, trimming, stripping, prefix and suffix removal, -line continuation, indentation, comment processing, identifier processing, -values parsing, case insensitive comparison, and more. See the docs -(linked in the badge above) for the detailed documentation and examples. - -Layouts -======= - -One of the features of this package is the layouts module, which -provides a simple example of translating keystrokes from one keyboard -layout to another:: - - echo qwerty | python -m jaraco.text.to-dvorak - ',.pyf - echo "',.pyf" | python -m jaraco.text.to-qwerty - qwerty - -Newline Reporting -================= - -Need to know what newlines appear in a file? - -:: - - $ python -m jaraco.text.show-newlines README.rst - newline is '\n' - -For Enterprise -============== - -Available as part of the Tidelift Subscription. - -This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use. - -`Learn more `_. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/RECORD deleted file mode 100644 index 19e2d84..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/RECORD +++ /dev/null @@ -1,20 +0,0 @@ -jaraco.text-3.12.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -jaraco.text-3.12.1.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023 -jaraco.text-3.12.1.dist-info/METADATA,sha256=AzWdm6ViMfDOPoQMfLWn2zgBQSGJScyqeN29TcuWXVI,3658 -jaraco.text-3.12.1.dist-info/RECORD,, -jaraco.text-3.12.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -jaraco.text-3.12.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92 -jaraco.text-3.12.1.dist-info/top_level.txt,sha256=0JnN3LfXH4LIRfXL-QFOGCJzQWZO3ELx4R1d_louoQM,7 -jaraco/text/Lorem ipsum.txt,sha256=N_7c_79zxOufBY9HZ3yzMgOkNv-TkOTTio4BydrSjgs,1335 -jaraco/text/__init__.py,sha256=Y2YUqXR_orUoDaY4SkPRe6ZZhb5HUHB_Ah9RCNsVyho,16250 -jaraco/text/__pycache__/__init__.cpython-312.pyc,, -jaraco/text/__pycache__/layouts.cpython-312.pyc,, -jaraco/text/__pycache__/show-newlines.cpython-312.pyc,, -jaraco/text/__pycache__/strip-prefix.cpython-312.pyc,, -jaraco/text/__pycache__/to-dvorak.cpython-312.pyc,, -jaraco/text/__pycache__/to-qwerty.cpython-312.pyc,, -jaraco/text/layouts.py,sha256=HTC8aSTLZ7uXipyOXapRMC158juecjK6RVwitfmZ9_w,643 -jaraco/text/show-newlines.py,sha256=WGQa65e8lyhb92LUOLqVn6KaCtoeVgVws6WtSRmLk6w,904 -jaraco/text/strip-prefix.py,sha256=NfVXV8JVNo6nqcuYASfMV7_y4Eo8zMQqlCOGvAnRIVw,412 -jaraco/text/to-dvorak.py,sha256=1SNcbSsvISpXXg-LnybIHHY-RUFOQr36zcHkY1pWFqw,119 -jaraco/text/to-qwerty.py,sha256=s4UMQUnPwFn_dB5uZC27BurHOQcYondBfzIpVL5pEzw,119 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/WHEEL deleted file mode 100644 index bab98d6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/WHEEL +++ /dev/null @@ -1,5 +0,0 @@ -Wheel-Version: 1.0 -Generator: bdist_wheel (0.43.0) -Root-Is-Purelib: true -Tag: py3-none-any - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/top_level.txt deleted file mode 100644 index f6205a5..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco.text-3.12.1.dist-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -jaraco diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/__pycache__/context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/__pycache__/context.cpython-311.pyc index 77a3481..0721a1e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/__pycache__/context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/__pycache__/context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__init__.py deleted file mode 100644 index 0d501cf..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__init__.py +++ /dev/null @@ -1,1091 +0,0 @@ -from __future__ import annotations - -import collections.abc -import copy -import functools -import itertools -import operator -import random -import re -from collections.abc import Container, Iterable, Mapping -from typing import TYPE_CHECKING, Any, Callable, Dict, TypeVar, Union, overload - -import jaraco.text - -if TYPE_CHECKING: - from _operator import _SupportsComparison - - from _typeshed import SupportsKeysAndGetItem - from typing_extensions import Self - - _RangeMapKT = TypeVar('_RangeMapKT', bound=_SupportsComparison) -else: - # _SupportsComparison doesn't exist at runtime, - # but _RangeMapKT is used in RangeMap's superclass' type parameters - _RangeMapKT = TypeVar('_RangeMapKT') - -_T = TypeVar('_T') -_VT = TypeVar('_VT') - -_Matchable = Union[Callable, Container, Iterable, re.Pattern] - - -def _dispatch(obj: _Matchable) -> Callable: - # can't rely on singledispatch for Union[Container, Iterable] - # due to ambiguity - # (https://peps.python.org/pep-0443/#abstract-base-classes). - if isinstance(obj, re.Pattern): - return obj.fullmatch - # mypy issue: https://github.com/python/mypy/issues/11071 - if not isinstance(obj, Callable): # type: ignore[arg-type] - if not isinstance(obj, Container): - obj = set(obj) # type: ignore[arg-type] - obj = obj.__contains__ - return obj # type: ignore[return-value] - - -class Projection(collections.abc.Mapping): - """ - Project a set of keys over a mapping - - >>> sample = {'a': 1, 'b': 2, 'c': 3} - >>> prj = Projection(['a', 'c', 'd'], sample) - >>> dict(prj) - {'a': 1, 'c': 3} - - Projection also accepts an iterable or callable or pattern. - - >>> iter_prj = Projection(iter('acd'), sample) - >>> call_prj = Projection(lambda k: ord(k) in (97, 99, 100), sample) - >>> pat_prj = Projection(re.compile(r'[acd]'), sample) - >>> prj == iter_prj == call_prj == pat_prj - True - - Keys should only appear if they were specified and exist in the space. - Order is retained. - - >>> list(prj) - ['a', 'c'] - - Attempting to access a key not in the projection - results in a KeyError. - - >>> prj['b'] - Traceback (most recent call last): - ... - KeyError: 'b' - - Use the projection to update another dict. - - >>> target = {'a': 2, 'b': 2} - >>> target.update(prj) - >>> target - {'a': 1, 'b': 2, 'c': 3} - - Projection keeps a reference to the original dict, so - modifying the original dict may modify the Projection. - - >>> del sample['a'] - >>> dict(prj) - {'c': 3} - """ - - def __init__(self, keys: _Matchable, space: Mapping): - self._match = _dispatch(keys) - self._space = space - - def __getitem__(self, key): - if not self._match(key): - raise KeyError(key) - return self._space[key] - - def _keys_resolved(self): - return filter(self._match, self._space) - - def __iter__(self): - return self._keys_resolved() - - def __len__(self): - return len(tuple(self._keys_resolved())) - - -class Mask(Projection): - """ - The inverse of a :class:`Projection`, masking out keys. - - >>> sample = {'a': 1, 'b': 2, 'c': 3} - >>> msk = Mask(['a', 'c', 'd'], sample) - >>> dict(msk) - {'b': 2} - """ - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - # self._match = compose(operator.not_, self._match) - self._match = lambda key, orig=self._match: not orig(key) - - -def dict_map(function, dictionary): - """ - Return a new dict with function applied to values of dictionary. - - >>> dict_map(lambda x: x+1, dict(a=1, b=2)) - {'a': 2, 'b': 3} - """ - return dict((key, function(value)) for key, value in dictionary.items()) - - -class RangeMap(Dict[_RangeMapKT, _VT]): - """ - A dictionary-like object that uses the keys as bounds for a range. - Inclusion of the value for that range is determined by the - key_match_comparator, which defaults to less-than-or-equal. - A value is returned for a key if it is the first key that matches in - the sorted list of keys. - - One may supply keyword parameters to be passed to the sort function used - to sort keys (i.e. key, reverse) as sort_params. - - Create a map that maps 1-3 -> 'a', 4-6 -> 'b' - - >>> r = RangeMap({3: 'a', 6: 'b'}) # boy, that was easy - >>> r[1], r[2], r[3], r[4], r[5], r[6] - ('a', 'a', 'a', 'b', 'b', 'b') - - Even float values should work so long as the comparison operator - supports it. - - >>> r[4.5] - 'b' - - Notice that the way rangemap is defined, it must be open-ended - on one side. - - >>> r[0] - 'a' - >>> r[-1] - 'a' - - One can close the open-end of the RangeMap by using undefined_value - - >>> r = RangeMap({0: RangeMap.undefined_value, 3: 'a', 6: 'b'}) - >>> r[0] - Traceback (most recent call last): - ... - KeyError: 0 - - One can get the first or last elements in the range by using RangeMap.Item - - >>> last_item = RangeMap.Item(-1) - >>> r[last_item] - 'b' - - .last_item is a shortcut for Item(-1) - - >>> r[RangeMap.last_item] - 'b' - - Sometimes it's useful to find the bounds for a RangeMap - - >>> r.bounds() - (0, 6) - - RangeMap supports .get(key, default) - - >>> r.get(0, 'not found') - 'not found' - - >>> r.get(7, 'not found') - 'not found' - - One often wishes to define the ranges by their left-most values, - which requires use of sort params and a key_match_comparator. - - >>> r = RangeMap({1: 'a', 4: 'b'}, - ... sort_params=dict(reverse=True), - ... key_match_comparator=operator.ge) - >>> r[1], r[2], r[3], r[4], r[5], r[6] - ('a', 'a', 'a', 'b', 'b', 'b') - - That wasn't nearly as easy as before, so an alternate constructor - is provided: - - >>> r = RangeMap.left({1: 'a', 4: 'b', 7: RangeMap.undefined_value}) - >>> r[1], r[2], r[3], r[4], r[5], r[6] - ('a', 'a', 'a', 'b', 'b', 'b') - - """ - - def __init__( - self, - source: ( - SupportsKeysAndGetItem[_RangeMapKT, _VT] | Iterable[tuple[_RangeMapKT, _VT]] - ), - sort_params: Mapping[str, Any] = {}, - key_match_comparator: Callable[[_RangeMapKT, _RangeMapKT], bool] = operator.le, - ): - dict.__init__(self, source) - self.sort_params = sort_params - self.match = key_match_comparator - - @classmethod - def left( - cls, - source: ( - SupportsKeysAndGetItem[_RangeMapKT, _VT] | Iterable[tuple[_RangeMapKT, _VT]] - ), - ) -> Self: - return cls( - source, sort_params=dict(reverse=True), key_match_comparator=operator.ge - ) - - def __getitem__(self, item: _RangeMapKT) -> _VT: - sorted_keys = sorted(self.keys(), **self.sort_params) - if isinstance(item, RangeMap.Item): - result = self.__getitem__(sorted_keys[item]) - else: - key = self._find_first_match_(sorted_keys, item) - result = dict.__getitem__(self, key) - if result is RangeMap.undefined_value: - raise KeyError(key) - return result - - @overload # type: ignore[override] # Signature simplified over dict and Mapping - def get(self, key: _RangeMapKT, default: _T) -> _VT | _T: ... - @overload - def get(self, key: _RangeMapKT, default: None = None) -> _VT | None: ... - def get(self, key: _RangeMapKT, default: _T | None = None) -> _VT | _T | None: - """ - Return the value for key if key is in the dictionary, else default. - If default is not given, it defaults to None, so that this method - never raises a KeyError. - """ - try: - return self[key] - except KeyError: - return default - - def _find_first_match_( - self, keys: Iterable[_RangeMapKT], item: _RangeMapKT - ) -> _RangeMapKT: - is_match = functools.partial(self.match, item) - matches = filter(is_match, keys) - try: - return next(matches) - except StopIteration: - raise KeyError(item) from None - - def bounds(self) -> tuple[_RangeMapKT, _RangeMapKT]: - sorted_keys = sorted(self.keys(), **self.sort_params) - return (sorted_keys[RangeMap.first_item], sorted_keys[RangeMap.last_item]) - - # some special values for the RangeMap - undefined_value = type('RangeValueUndefined', (), {})() - - class Item(int): - """RangeMap Item""" - - first_item = Item(0) - last_item = Item(-1) - - -def __identity(x): - return x - - -def sorted_items(d, key=__identity, reverse=False): - """ - Return the items of the dictionary sorted by the keys. - - >>> sample = dict(foo=20, bar=42, baz=10) - >>> tuple(sorted_items(sample)) - (('bar', 42), ('baz', 10), ('foo', 20)) - - >>> reverse_string = lambda s: ''.join(reversed(s)) - >>> tuple(sorted_items(sample, key=reverse_string)) - (('foo', 20), ('bar', 42), ('baz', 10)) - - >>> tuple(sorted_items(sample, reverse=True)) - (('foo', 20), ('baz', 10), ('bar', 42)) - """ - - # wrap the key func so it operates on the first element of each item - def pairkey_key(item): - return key(item[0]) - - return sorted(d.items(), key=pairkey_key, reverse=reverse) - - -class KeyTransformingDict(dict): - """ - A dict subclass that transforms the keys before they're used. - Subclasses may override the default transform_key to customize behavior. - """ - - @staticmethod - def transform_key(key): # pragma: nocover - return key - - def __init__(self, *args, **kargs): - super().__init__() - # build a dictionary using the default constructs - d = dict(*args, **kargs) - # build this dictionary using transformed keys. - for item in d.items(): - self.__setitem__(*item) - - def __setitem__(self, key, val): - key = self.transform_key(key) - super().__setitem__(key, val) - - def __getitem__(self, key): - key = self.transform_key(key) - return super().__getitem__(key) - - def __contains__(self, key): - key = self.transform_key(key) - return super().__contains__(key) - - def __delitem__(self, key): - key = self.transform_key(key) - return super().__delitem__(key) - - def get(self, key, *args, **kwargs): - key = self.transform_key(key) - return super().get(key, *args, **kwargs) - - def setdefault(self, key, *args, **kwargs): - key = self.transform_key(key) - return super().setdefault(key, *args, **kwargs) - - def pop(self, key, *args, **kwargs): - key = self.transform_key(key) - return super().pop(key, *args, **kwargs) - - def matching_key_for(self, key): - """ - Given a key, return the actual key stored in self that matches. - Raise KeyError if the key isn't found. - """ - try: - return next(e_key for e_key in self.keys() if e_key == key) - except StopIteration as err: - raise KeyError(key) from err - - -class FoldedCaseKeyedDict(KeyTransformingDict): - """ - A case-insensitive dictionary (keys are compared as insensitive - if they are strings). - - >>> d = FoldedCaseKeyedDict() - >>> d['heLlo'] = 'world' - >>> list(d.keys()) == ['heLlo'] - True - >>> list(d.values()) == ['world'] - True - >>> d['hello'] == 'world' - True - >>> 'hello' in d - True - >>> 'HELLO' in d - True - >>> print(repr(FoldedCaseKeyedDict({'heLlo': 'world'}))) - {'heLlo': 'world'} - >>> d = FoldedCaseKeyedDict({'heLlo': 'world'}) - >>> print(d['hello']) - world - >>> print(d['Hello']) - world - >>> list(d.keys()) - ['heLlo'] - >>> d = FoldedCaseKeyedDict({'heLlo': 'world', 'Hello': 'world'}) - >>> list(d.values()) - ['world'] - >>> key, = d.keys() - >>> key in ['heLlo', 'Hello'] - True - >>> del d['HELLO'] - >>> d - {} - - get should work - - >>> d['Sumthin'] = 'else' - >>> d.get('SUMTHIN') - 'else' - >>> d.get('OTHER', 'thing') - 'thing' - >>> del d['sumthin'] - - setdefault should also work - - >>> d['This'] = 'that' - >>> print(d.setdefault('this', 'other')) - that - >>> len(d) - 1 - >>> print(d['this']) - that - >>> print(d.setdefault('That', 'other')) - other - >>> print(d['THAT']) - other - - Make it pop! - - >>> print(d.pop('THAT')) - other - - To retrieve the key in its originally-supplied form, use matching_key_for - - >>> print(d.matching_key_for('this')) - This - - >>> d.matching_key_for('missing') - Traceback (most recent call last): - ... - KeyError: 'missing' - """ - - @staticmethod - def transform_key(key): - return jaraco.text.FoldedCase(key) - - -class DictAdapter: - """ - Provide a getitem interface for attributes of an object. - - Let's say you want to get at the string.lowercase property in a formatted - string. It's easy with DictAdapter. - - >>> import string - >>> print("lowercase is %(ascii_lowercase)s" % DictAdapter(string)) - lowercase is abcdefghijklmnopqrstuvwxyz - """ - - def __init__(self, wrapped_ob): - self.object = wrapped_ob - - def __getitem__(self, name): - return getattr(self.object, name) - - -class ItemsAsAttributes: - """ - Mix-in class to enable a mapping object to provide items as - attributes. - - >>> C = type('C', (dict, ItemsAsAttributes), dict()) - >>> i = C() - >>> i['foo'] = 'bar' - >>> i.foo - 'bar' - - Natural attribute access takes precedence - - >>> i.foo = 'henry' - >>> i.foo - 'henry' - - But as you might expect, the mapping functionality is preserved. - - >>> i['foo'] - 'bar' - - A normal attribute error should be raised if an attribute is - requested that doesn't exist. - - >>> i.missing - Traceback (most recent call last): - ... - AttributeError: 'C' object has no attribute 'missing' - - It also works on dicts that customize __getitem__ - - >>> missing_func = lambda self, key: 'missing item' - >>> C = type( - ... 'C', - ... (dict, ItemsAsAttributes), - ... dict(__missing__ = missing_func), - ... ) - >>> i = C() - >>> i.missing - 'missing item' - >>> i.foo - 'missing item' - """ - - def __getattr__(self, key): - try: - return getattr(super(), key) - except AttributeError as e: - # attempt to get the value from the mapping (return self[key]) - # but be careful not to lose the original exception context. - noval = object() - - def _safe_getitem(cont, key, missing_result): - try: - return cont[key] - except KeyError: - return missing_result - - result = _safe_getitem(self, key, noval) - if result is not noval: - return result - # raise the original exception, but use the original class - # name, not 'super'. - (message,) = e.args - message = message.replace('super', self.__class__.__name__, 1) - e.args = (message,) - raise - - -def invert_map(map): - """ - Given a dictionary, return another dictionary with keys and values - switched. If any of the values resolve to the same key, raises - a ValueError. - - >>> numbers = dict(a=1, b=2, c=3) - >>> letters = invert_map(numbers) - >>> letters[1] - 'a' - >>> numbers['d'] = 3 - >>> invert_map(numbers) - Traceback (most recent call last): - ... - ValueError: Key conflict in inverted mapping - """ - res = dict((v, k) for k, v in map.items()) - if not len(res) == len(map): - raise ValueError('Key conflict in inverted mapping') - return res - - -class IdentityOverrideMap(dict): - """ - A dictionary that by default maps each key to itself, but otherwise - acts like a normal dictionary. - - >>> d = IdentityOverrideMap() - >>> d[42] - 42 - >>> d['speed'] = 'speedo' - >>> print(d['speed']) - speedo - """ - - def __missing__(self, key): - return key - - -class DictStack(list, collections.abc.MutableMapping): - """ - A stack of dictionaries that behaves as a view on those dictionaries, - giving preference to the last. - - >>> stack = DictStack([dict(a=1, c=2), dict(b=2, a=2)]) - >>> stack['a'] - 2 - >>> stack['b'] - 2 - >>> stack['c'] - 2 - >>> len(stack) - 3 - >>> stack.push(dict(a=3)) - >>> stack['a'] - 3 - >>> stack['a'] = 4 - >>> set(stack.keys()) == set(['a', 'b', 'c']) - True - >>> set(stack.items()) == set([('a', 4), ('b', 2), ('c', 2)]) - True - >>> dict(**stack) == dict(stack) == dict(a=4, c=2, b=2) - True - >>> d = stack.pop() - >>> stack['a'] - 2 - >>> d = stack.pop() - >>> stack['a'] - 1 - >>> stack.get('b', None) - >>> 'c' in stack - True - >>> del stack['c'] - >>> dict(stack) - {'a': 1} - """ - - def __iter__(self): - dicts = list.__iter__(self) - return iter(set(itertools.chain.from_iterable(c.keys() for c in dicts))) - - def __getitem__(self, key): - for scope in reversed(tuple(list.__iter__(self))): - if key in scope: - return scope[key] - raise KeyError(key) - - push = list.append - - def __contains__(self, other): - return collections.abc.Mapping.__contains__(self, other) - - def __len__(self): - return len(list(iter(self))) - - def __setitem__(self, key, item): - last = list.__getitem__(self, -1) - return last.__setitem__(key, item) - - def __delitem__(self, key): - last = list.__getitem__(self, -1) - return last.__delitem__(key) - - # workaround for mypy confusion - def pop(self, *args, **kwargs): - return list.pop(self, *args, **kwargs) - - -class BijectiveMap(dict): - """ - A Bijective Map (two-way mapping). - - Implemented as a simple dictionary of 2x the size, mapping values back - to keys. - - Note, this implementation may be incomplete. If there's not a test for - your use case below, it's likely to fail, so please test and send pull - requests or patches for additional functionality needed. - - - >>> m = BijectiveMap() - >>> m['a'] = 'b' - >>> m == {'a': 'b', 'b': 'a'} - True - >>> print(m['b']) - a - - >>> m['c'] = 'd' - >>> len(m) - 2 - - Some weird things happen if you map an item to itself or overwrite a - single key of a pair, so it's disallowed. - - >>> m['e'] = 'e' - Traceback (most recent call last): - ValueError: Key cannot map to itself - - >>> m['d'] = 'e' - Traceback (most recent call last): - ValueError: Key/Value pairs may not overlap - - >>> m['e'] = 'd' - Traceback (most recent call last): - ValueError: Key/Value pairs may not overlap - - >>> print(m.pop('d')) - c - - >>> 'c' in m - False - - >>> m = BijectiveMap(dict(a='b')) - >>> len(m) - 1 - >>> print(m['b']) - a - - >>> m = BijectiveMap() - >>> m.update(a='b') - >>> m['b'] - 'a' - - >>> del m['b'] - >>> len(m) - 0 - >>> 'a' in m - False - """ - - def __init__(self, *args, **kwargs): - super().__init__() - self.update(*args, **kwargs) - - def __setitem__(self, item, value): - if item == value: - raise ValueError("Key cannot map to itself") - overlap = ( - item in self - and self[item] != value - or value in self - and self[value] != item - ) - if overlap: - raise ValueError("Key/Value pairs may not overlap") - super().__setitem__(item, value) - super().__setitem__(value, item) - - def __delitem__(self, item): - self.pop(item) - - def __len__(self): - return super().__len__() // 2 - - def pop(self, key, *args, **kwargs): - mirror = self[key] - super().__delitem__(mirror) - return super().pop(key, *args, **kwargs) - - def update(self, *args, **kwargs): - # build a dictionary using the default constructs - d = dict(*args, **kwargs) - # build this dictionary using transformed keys. - for item in d.items(): - self.__setitem__(*item) - - -class FrozenDict(collections.abc.Mapping, collections.abc.Hashable): - """ - An immutable mapping. - - >>> a = FrozenDict(a=1, b=2) - >>> b = FrozenDict(a=1, b=2) - >>> a == b - True - - >>> a == dict(a=1, b=2) - True - >>> dict(a=1, b=2) == a - True - >>> 'a' in a - True - >>> type(hash(a)) is type(0) - True - >>> set(iter(a)) == {'a', 'b'} - True - >>> len(a) - 2 - >>> a['a'] == a.get('a') == 1 - True - - >>> a['c'] = 3 - Traceback (most recent call last): - ... - TypeError: 'FrozenDict' object does not support item assignment - - >>> a.update(y=3) - Traceback (most recent call last): - ... - AttributeError: 'FrozenDict' object has no attribute 'update' - - Copies should compare equal - - >>> copy.copy(a) == a - True - - Copies should be the same type - - >>> isinstance(copy.copy(a), FrozenDict) - True - - FrozenDict supplies .copy(), even though - collections.abc.Mapping doesn't demand it. - - >>> a.copy() == a - True - >>> a.copy() is not a - True - """ - - __slots__ = ['__data'] - - def __new__(cls, *args, **kwargs): - self = super().__new__(cls) - self.__data = dict(*args, **kwargs) - return self - - # Container - def __contains__(self, key): - return key in self.__data - - # Hashable - def __hash__(self): - return hash(tuple(sorted(self.__data.items()))) - - # Mapping - def __iter__(self): - return iter(self.__data) - - def __len__(self): - return len(self.__data) - - def __getitem__(self, key): - return self.__data[key] - - # override get for efficiency provided by dict - def get(self, *args, **kwargs): - return self.__data.get(*args, **kwargs) - - # override eq to recognize underlying implementation - def __eq__(self, other): - if isinstance(other, FrozenDict): - other = other.__data - return self.__data.__eq__(other) - - def copy(self): - "Return a shallow copy of self" - return copy.copy(self) - - -class Enumeration(ItemsAsAttributes, BijectiveMap): - """ - A convenient way to provide enumerated values - - >>> e = Enumeration('a b c') - >>> e['a'] - 0 - - >>> e.a - 0 - - >>> e[1] - 'b' - - >>> set(e.names) == set('abc') - True - - >>> set(e.codes) == set(range(3)) - True - - >>> e.get('d') is None - True - - Codes need not start with 0 - - >>> e = Enumeration('a b c', range(1, 4)) - >>> e['a'] - 1 - - >>> e[3] - 'c' - """ - - def __init__(self, names, codes=None): - if isinstance(names, str): - names = names.split() - if codes is None: - codes = itertools.count() - super().__init__(zip(names, codes)) - - @property - def names(self): - return (key for key in self if isinstance(key, str)) - - @property - def codes(self): - return (self[name] for name in self.names) - - -class Everything: - """ - A collection "containing" every possible thing. - - >>> 'foo' in Everything() - True - - >>> import random - >>> random.randint(1, 999) in Everything() - True - - >>> random.choice([None, 'foo', 42, ('a', 'b', 'c')]) in Everything() - True - """ - - def __contains__(self, other): - return True - - -class InstrumentedDict(collections.UserDict): - """ - Instrument an existing dictionary with additional - functionality, but always reference and mutate - the original dictionary. - - >>> orig = {'a': 1, 'b': 2} - >>> inst = InstrumentedDict(orig) - >>> inst['a'] - 1 - >>> inst['c'] = 3 - >>> orig['c'] - 3 - >>> inst.keys() == orig.keys() - True - """ - - def __init__(self, data): - super().__init__() - self.data = data - - -class Least: - """ - A value that is always lesser than any other - - >>> least = Least() - >>> 3 < least - False - >>> 3 > least - True - >>> least < 3 - True - >>> least <= 3 - True - >>> least > 3 - False - >>> 'x' > least - True - >>> None > least - True - """ - - def __le__(self, other): - return True - - __lt__ = __le__ - - def __ge__(self, other): - return False - - __gt__ = __ge__ - - -class Greatest: - """ - A value that is always greater than any other - - >>> greatest = Greatest() - >>> 3 < greatest - True - >>> 3 > greatest - False - >>> greatest < 3 - False - >>> greatest > 3 - True - >>> greatest >= 3 - True - >>> 'x' > greatest - False - >>> None > greatest - False - """ - - def __ge__(self, other): - return True - - __gt__ = __ge__ - - def __le__(self, other): - return False - - __lt__ = __le__ - - -def pop_all(items): - """ - Clear items in place and return a copy of items. - - >>> items = [1, 2, 3] - >>> popped = pop_all(items) - >>> popped is items - False - >>> popped - [1, 2, 3] - >>> items - [] - """ - result, items[:] = items[:], [] - return result - - -class FreezableDefaultDict(collections.defaultdict): - """ - Often it is desirable to prevent the mutation of - a default dict after its initial construction, such - as to prevent mutation during iteration. - - >>> dd = FreezableDefaultDict(list) - >>> dd[0].append('1') - >>> dd.freeze() - >>> dd[1] - [] - >>> len(dd) - 1 - """ - - def __missing__(self, key): - return getattr(self, '_frozen', super().__missing__)(key) - - def freeze(self): - self._frozen = lambda key: self.default_factory() - - -class Accumulator: - def __init__(self, initial=0): - self.val = initial - - def __call__(self, val): - self.val += val - return self.val - - -class WeightedLookup(RangeMap): - """ - Given parameters suitable for a dict representing keys - and a weighted proportion, return a RangeMap representing - spans of values proportial to the weights: - - >>> even = WeightedLookup(a=1, b=1) - - [0, 1) -> a - [1, 2) -> b - - >>> lk = WeightedLookup(a=1, b=2) - - [0, 1) -> a - [1, 3) -> b - - >>> lk[.5] - 'a' - >>> lk[1.5] - 'b' - - Adds ``.random()`` to select a random weighted value: - - >>> lk.random() in ['a', 'b'] - True - - >>> choices = [lk.random() for x in range(1000)] - - Statistically speaking, choices should be .5 a:b - >>> ratio = choices.count('a') / choices.count('b') - >>> .4 < ratio < .6 - True - """ - - def __init__(self, *args, **kwargs): - raw = dict(*args, **kwargs) - - # allocate keys by weight - indexes = map(Accumulator(), raw.values()) - super().__init__(zip(indexes, raw.keys()), key_match_comparator=operator.lt) - - def random(self): - lower, upper = self.bounds() - selector = random.random() * upper - return self[selector] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 598c7e6..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/collections/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/context.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/context.py index 61b2713..87a4e3d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/context.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/context.py @@ -1,33 +1,14 @@ -from __future__ import annotations - +import os +import subprocess import contextlib import functools -import operator -import os -import shutil -import subprocess -import sys import tempfile -import urllib.request -import warnings -from typing import Iterator - - -if sys.version_info < (3, 12): - from backports import tarfile -else: - import tarfile +import shutil +import operator @contextlib.contextmanager -def pushd(dir: str | os.PathLike) -> Iterator[str | os.PathLike]: - """ - >>> tmp_path = getfixture('tmp_path') - >>> with pushd(tmp_path): - ... assert os.getcwd() == os.fspath(tmp_path) - >>> assert os.getcwd() != os.fspath(tmp_path) - """ - +def pushd(dir): orig = os.getcwd() os.chdir(dir) try: @@ -37,108 +18,37 @@ def pushd(dir: str | os.PathLike) -> Iterator[str | os.PathLike]: @contextlib.contextmanager -def tarball( - url, target_dir: str | os.PathLike | None = None -) -> Iterator[str | os.PathLike]: +def tarball_context(url, target_dir=None, runner=None, pushd=pushd): """ - Get a tarball, extract it, yield, then clean up. - - >>> import urllib.request - >>> url = getfixture('tarfile_served') - >>> target = getfixture('tmp_path') / 'out' - >>> tb = tarball(url, target_dir=target) - >>> import pathlib - >>> with tb as extracted: - ... contents = pathlib.Path(extracted, 'contents.txt').read_text(encoding='utf-8') - >>> assert not os.path.exists(extracted) + Get a tarball, extract it, change to that directory, yield, then + clean up. + `runner` is the function to invoke commands. + `pushd` is a context manager for changing the directory. """ if target_dir is None: target_dir = os.path.basename(url).replace('.tar.gz', '').replace('.tgz', '') + if runner is None: + runner = functools.partial(subprocess.check_call, shell=True) # In the tar command, use --strip-components=1 to strip the first path and # then # use -C to cause the files to be extracted to {target_dir}. This ensures # that we always know where the files were extracted. - os.mkdir(target_dir) + runner('mkdir {target_dir}'.format(**vars())) try: - req = urllib.request.urlopen(url) - with tarfile.open(fileobj=req, mode='r|*') as tf: - tf.extractall(path=target_dir, filter=strip_first_component) - yield target_dir + getter = 'wget {url} -O -' + extract = 'tar x{compression} --strip-components=1 -C {target_dir}' + cmd = ' | '.join((getter, extract)) + runner(cmd.format(compression=infer_compression(url), **vars())) + with pushd(target_dir): + yield target_dir finally: - shutil.rmtree(target_dir) - - -def strip_first_component( - member: tarfile.TarInfo, - path, -) -> tarfile.TarInfo: - _, member.name = member.name.split('/', 1) - return member - - -def _compose(*cmgrs): - """ - Compose any number of dependent context managers into a single one. - - The last, innermost context manager may take arbitrary arguments, but - each successive context manager should accept the result from the - previous as a single parameter. - - Like :func:`jaraco.functools.compose`, behavior works from right to - left, so the context manager should be indicated from outermost to - innermost. - - Example, to create a context manager to change to a temporary - directory: - - >>> temp_dir_as_cwd = _compose(pushd, temp_dir) - >>> with temp_dir_as_cwd() as dir: - ... assert os.path.samefile(os.getcwd(), dir) - """ - - def compose_two(inner, outer): - def composed(*args, **kwargs): - with inner(*args, **kwargs) as saved, outer(saved) as res: - yield res - - return contextlib.contextmanager(composed) - - return functools.reduce(compose_two, reversed(cmgrs)) - - -tarball_cwd = _compose(pushd, tarball) - - -@contextlib.contextmanager -def tarball_context(*args, **kwargs): - warnings.warn( - "tarball_context is deprecated. Use tarball or tarball_cwd instead.", - DeprecationWarning, - stacklevel=2, - ) - pushd_ctx = kwargs.pop('pushd', pushd) - with tarball(*args, **kwargs) as tball, pushd_ctx(tball) as dir: - yield dir + runner('rm -Rf {target_dir}'.format(**vars())) def infer_compression(url): """ Given a URL or filename, infer the compression code for tar. - - >>> infer_compression('http://foo/bar.tar.gz') - 'z' - >>> infer_compression('http://foo/bar.tgz') - 'z' - >>> infer_compression('file.bz') - 'j' - >>> infer_compression('file.xz') - 'J' """ - warnings.warn( - "infer_compression is deprecated with no replacement", - DeprecationWarning, - stacklevel=2, - ) # cheat and just assume it's the last two characters compression_indicator = url[-2:] mapping = dict(gz='z', bz='j', xz='J') @@ -151,12 +61,6 @@ def temp_dir(remover=shutil.rmtree): """ Create a temporary directory context. Pass a custom remover to override the removal behavior. - - >>> import pathlib - >>> with temp_dir() as the_dir: - ... assert os.path.isdir(the_dir) - ... _ = pathlib.Path(the_dir).joinpath('somefile').write_text('contents', encoding='utf-8') - >>> assert not os.path.exists(the_dir) """ temp_dir = tempfile.mkdtemp() try: @@ -184,23 +88,9 @@ def repo_context(url, branch=None, quiet=True, dest_ctx=temp_dir): yield repo_dir +@contextlib.contextmanager def null(): - """ - A null context suitable to stand in for a meaningful context. - - >>> with null() as value: - ... assert value is None - - This context is most useful when dealing with two or more code - branches but only some need a context. Wrap the others in a null - context to provide symmetry across all options. - """ - warnings.warn( - "null is deprecated. Use contextlib.nullcontext", - DeprecationWarning, - stacklevel=2, - ) - return contextlib.nullcontext() + yield class ExceptionTrap: @@ -222,10 +112,6 @@ class ExceptionTrap: ... raise ValueError("1 + 1 is not 3") >>> bool(trap) True - >>> trap.value - ValueError('1 + 1 is not 3') - >>> trap.tb - >>> with ExceptionTrap(ValueError) as trap: ... raise Exception() @@ -325,37 +211,3 @@ class suppress(contextlib.suppress, contextlib.ContextDecorator): ... {}[''] >>> key_error() """ - - -class on_interrupt(contextlib.ContextDecorator): - """ - Replace a KeyboardInterrupt with SystemExit(1) - - >>> def do_interrupt(): - ... raise KeyboardInterrupt() - >>> on_interrupt('error')(do_interrupt)() - Traceback (most recent call last): - ... - SystemExit: 1 - >>> on_interrupt('error', code=255)(do_interrupt)() - Traceback (most recent call last): - ... - SystemExit: 255 - >>> on_interrupt('suppress')(do_interrupt)() - >>> with __import__('pytest').raises(KeyboardInterrupt): - ... on_interrupt('ignore')(do_interrupt)() - """ - - def __init__(self, action='error', /, code=1): - self.action = action - self.code = code - - def __enter__(self): - return self - - def __exit__(self, exctype, excinst, exctb): - if exctype is not KeyboardInterrupt or self.action == 'ignore': - return - elif self.action == 'error': - raise SystemExit(self.code) from excinst - return self.action == 'suppress' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.py deleted file mode 100644 index ca6c22f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.py +++ /dev/null @@ -1,633 +0,0 @@ -import collections.abc -import functools -import inspect -import itertools -import operator -import time -import types -import warnings - -import more_itertools - - -def compose(*funcs): - """ - Compose any number of unary functions into a single unary function. - - >>> import textwrap - >>> expected = str.strip(textwrap.dedent(compose.__doc__)) - >>> strip_and_dedent = compose(str.strip, textwrap.dedent) - >>> strip_and_dedent(compose.__doc__) == expected - True - - Compose also allows the innermost function to take arbitrary arguments. - - >>> round_three = lambda x: round(x, ndigits=3) - >>> f = compose(round_three, int.__truediv__) - >>> [f(3*x, x+1) for x in range(1,10)] - [1.5, 2.0, 2.25, 2.4, 2.5, 2.571, 2.625, 2.667, 2.7] - """ - - def compose_two(f1, f2): - return lambda *args, **kwargs: f1(f2(*args, **kwargs)) - - return functools.reduce(compose_two, funcs) - - -def once(func): - """ - Decorate func so it's only ever called the first time. - - This decorator can ensure that an expensive or non-idempotent function - will not be expensive on subsequent calls and is idempotent. - - >>> add_three = once(lambda a: a+3) - >>> add_three(3) - 6 - >>> add_three(9) - 6 - >>> add_three('12') - 6 - - To reset the stored value, simply clear the property ``saved_result``. - - >>> del add_three.saved_result - >>> add_three(9) - 12 - >>> add_three(8) - 12 - - Or invoke 'reset()' on it. - - >>> add_three.reset() - >>> add_three(-3) - 0 - >>> add_three(0) - 0 - """ - - @functools.wraps(func) - def wrapper(*args, **kwargs): - if not hasattr(wrapper, 'saved_result'): - wrapper.saved_result = func(*args, **kwargs) - return wrapper.saved_result - - wrapper.reset = lambda: vars(wrapper).__delitem__('saved_result') - return wrapper - - -def method_cache(method, cache_wrapper=functools.lru_cache()): - """ - Wrap lru_cache to support storing the cache data in the object instances. - - Abstracts the common paradigm where the method explicitly saves an - underscore-prefixed protected property on first call and returns that - subsequently. - - >>> class MyClass: - ... calls = 0 - ... - ... @method_cache - ... def method(self, value): - ... self.calls += 1 - ... return value - - >>> a = MyClass() - >>> a.method(3) - 3 - >>> for x in range(75): - ... res = a.method(x) - >>> a.calls - 75 - - Note that the apparent behavior will be exactly like that of lru_cache - except that the cache is stored on each instance, so values in one - instance will not flush values from another, and when an instance is - deleted, so are the cached values for that instance. - - >>> b = MyClass() - >>> for x in range(35): - ... res = b.method(x) - >>> b.calls - 35 - >>> a.method(0) - 0 - >>> a.calls - 75 - - Note that if method had been decorated with ``functools.lru_cache()``, - a.calls would have been 76 (due to the cached value of 0 having been - flushed by the 'b' instance). - - Clear the cache with ``.cache_clear()`` - - >>> a.method.cache_clear() - - Same for a method that hasn't yet been called. - - >>> c = MyClass() - >>> c.method.cache_clear() - - Another cache wrapper may be supplied: - - >>> cache = functools.lru_cache(maxsize=2) - >>> MyClass.method2 = method_cache(lambda self: 3, cache_wrapper=cache) - >>> a = MyClass() - >>> a.method2() - 3 - - Caution - do not subsequently wrap the method with another decorator, such - as ``@property``, which changes the semantics of the function. - - See also - http://code.activestate.com/recipes/577452-a-memoize-decorator-for-instance-methods/ - for another implementation and additional justification. - """ - - def wrapper(self, *args, **kwargs): - # it's the first call, replace the method with a cached, bound method - bound_method = types.MethodType(method, self) - cached_method = cache_wrapper(bound_method) - setattr(self, method.__name__, cached_method) - return cached_method(*args, **kwargs) - - # Support cache clear even before cache has been created. - wrapper.cache_clear = lambda: None - - return _special_method_cache(method, cache_wrapper) or wrapper - - -def _special_method_cache(method, cache_wrapper): - """ - Because Python treats special methods differently, it's not - possible to use instance attributes to implement the cached - methods. - - Instead, install the wrapper method under a different name - and return a simple proxy to that wrapper. - - https://github.com/jaraco/jaraco.functools/issues/5 - """ - name = method.__name__ - special_names = '__getattr__', '__getitem__' - - if name not in special_names: - return None - - wrapper_name = '__cached' + name - - def proxy(self, /, *args, **kwargs): - if wrapper_name not in vars(self): - bound = types.MethodType(method, self) - cache = cache_wrapper(bound) - setattr(self, wrapper_name, cache) - else: - cache = getattr(self, wrapper_name) - return cache(*args, **kwargs) - - return proxy - - -def apply(transform): - """ - Decorate a function with a transform function that is - invoked on results returned from the decorated function. - - >>> @apply(reversed) - ... def get_numbers(start): - ... "doc for get_numbers" - ... return range(start, start+3) - >>> list(get_numbers(4)) - [6, 5, 4] - >>> get_numbers.__doc__ - 'doc for get_numbers' - """ - - def wrap(func): - return functools.wraps(func)(compose(transform, func)) - - return wrap - - -def result_invoke(action): - r""" - Decorate a function with an action function that is - invoked on the results returned from the decorated - function (for its side effect), then return the original - result. - - >>> @result_invoke(print) - ... def add_two(a, b): - ... return a + b - >>> x = add_two(2, 3) - 5 - >>> x - 5 - """ - - def wrap(func): - @functools.wraps(func) - def wrapper(*args, **kwargs): - result = func(*args, **kwargs) - action(result) - return result - - return wrapper - - return wrap - - -def invoke(f, /, *args, **kwargs): - """ - Call a function for its side effect after initialization. - - The benefit of using the decorator instead of simply invoking a function - after defining it is that it makes explicit the author's intent for the - function to be called immediately. Whereas if one simply calls the - function immediately, it's less obvious if that was intentional or - incidental. It also avoids repeating the name - the two actions, defining - the function and calling it immediately are modeled separately, but linked - by the decorator construct. - - The benefit of having a function construct (opposed to just invoking some - behavior inline) is to serve as a scope in which the behavior occurs. It - avoids polluting the global namespace with local variables, provides an - anchor on which to attach documentation (docstring), keeps the behavior - logically separated (instead of conceptually separated or not separated at - all), and provides potential to re-use the behavior for testing or other - purposes. - - This function is named as a pithy way to communicate, "call this function - primarily for its side effect", or "while defining this function, also - take it aside and call it". It exists because there's no Python construct - for "define and call" (nor should there be, as decorators serve this need - just fine). The behavior happens immediately and synchronously. - - >>> @invoke - ... def func(): print("called") - called - >>> func() - called - - Use functools.partial to pass parameters to the initial call - - >>> @functools.partial(invoke, name='bingo') - ... def func(name): print('called with', name) - called with bingo - """ - f(*args, **kwargs) - return f - - -class Throttler: - """Rate-limit a function (or other callable).""" - - def __init__(self, func, max_rate=float('Inf')): - if isinstance(func, Throttler): - func = func.func - self.func = func - self.max_rate = max_rate - self.reset() - - def reset(self): - self.last_called = 0 - - def __call__(self, *args, **kwargs): - self._wait() - return self.func(*args, **kwargs) - - def _wait(self): - """Ensure at least 1/max_rate seconds from last call.""" - elapsed = time.time() - self.last_called - must_wait = 1 / self.max_rate - elapsed - time.sleep(max(0, must_wait)) - self.last_called = time.time() - - def __get__(self, obj, owner=None): - return first_invoke(self._wait, functools.partial(self.func, obj)) - - -def first_invoke(func1, func2): - """ - Return a function that when invoked will invoke func1 without - any parameters (for its side effect) and then invoke func2 - with whatever parameters were passed, returning its result. - """ - - def wrapper(*args, **kwargs): - func1() - return func2(*args, **kwargs) - - return wrapper - - -method_caller = first_invoke( - lambda: warnings.warn( - '`jaraco.functools.method_caller` is deprecated, ' - 'use `operator.methodcaller` instead', - DeprecationWarning, - stacklevel=3, - ), - operator.methodcaller, -) - - -def retry_call(func, cleanup=lambda: None, retries=0, trap=()): - """ - Given a callable func, trap the indicated exceptions - for up to 'retries' times, invoking cleanup on the - exception. On the final attempt, allow any exceptions - to propagate. - """ - attempts = itertools.count() if retries == float('inf') else range(retries) - for _ in attempts: - try: - return func() - except trap: - cleanup() - - return func() - - -def retry(*r_args, **r_kwargs): - """ - Decorator wrapper for retry_call. Accepts arguments to retry_call - except func and then returns a decorator for the decorated function. - - Ex: - - >>> @retry(retries=3) - ... def my_func(a, b): - ... "this is my funk" - ... print(a, b) - >>> my_func.__doc__ - 'this is my funk' - """ - - def decorate(func): - @functools.wraps(func) - def wrapper(*f_args, **f_kwargs): - bound = functools.partial(func, *f_args, **f_kwargs) - return retry_call(bound, *r_args, **r_kwargs) - - return wrapper - - return decorate - - -def print_yielded(func): - """ - Convert a generator into a function that prints all yielded elements. - - >>> @print_yielded - ... def x(): - ... yield 3; yield None - >>> x() - 3 - None - """ - print_all = functools.partial(map, print) - print_results = compose(more_itertools.consume, print_all, func) - return functools.wraps(func)(print_results) - - -def pass_none(func): - """ - Wrap func so it's not called if its first param is None. - - >>> print_text = pass_none(print) - >>> print_text('text') - text - >>> print_text(None) - """ - - @functools.wraps(func) - def wrapper(param, /, *args, **kwargs): - if param is not None: - return func(param, *args, **kwargs) - return None - - return wrapper - - -def assign_params(func, namespace): - """ - Assign parameters from namespace where func solicits. - - >>> def func(x, y=3): - ... print(x, y) - >>> assigned = assign_params(func, dict(x=2, z=4)) - >>> assigned() - 2 3 - - The usual errors are raised if a function doesn't receive - its required parameters: - - >>> assigned = assign_params(func, dict(y=3, z=4)) - >>> assigned() - Traceback (most recent call last): - TypeError: func() ...argument... - - It even works on methods: - - >>> class Handler: - ... def meth(self, arg): - ... print(arg) - >>> assign_params(Handler().meth, dict(arg='crystal', foo='clear'))() - crystal - """ - sig = inspect.signature(func) - params = sig.parameters.keys() - call_ns = {k: namespace[k] for k in params if k in namespace} - return functools.partial(func, **call_ns) - - -def save_method_args(method): - """ - Wrap a method such that when it is called, the args and kwargs are - saved on the method. - - >>> class MyClass: - ... @save_method_args - ... def method(self, a, b): - ... print(a, b) - >>> my_ob = MyClass() - >>> my_ob.method(1, 2) - 1 2 - >>> my_ob._saved_method.args - (1, 2) - >>> my_ob._saved_method.kwargs - {} - >>> my_ob.method(a=3, b='foo') - 3 foo - >>> my_ob._saved_method.args - () - >>> my_ob._saved_method.kwargs == dict(a=3, b='foo') - True - - The arguments are stored on the instance, allowing for - different instance to save different args. - - >>> your_ob = MyClass() - >>> your_ob.method({str('x'): 3}, b=[4]) - {'x': 3} [4] - >>> your_ob._saved_method.args - ({'x': 3},) - >>> my_ob._saved_method.args - () - """ - args_and_kwargs = collections.namedtuple('args_and_kwargs', 'args kwargs') - - @functools.wraps(method) - def wrapper(self, /, *args, **kwargs): - attr_name = '_saved_' + method.__name__ - attr = args_and_kwargs(args, kwargs) - setattr(self, attr_name, attr) - return method(self, *args, **kwargs) - - return wrapper - - -def except_(*exceptions, replace=None, use=None): - """ - Replace the indicated exceptions, if raised, with the indicated - literal replacement or evaluated expression (if present). - - >>> safe_int = except_(ValueError)(int) - >>> safe_int('five') - >>> safe_int('5') - 5 - - Specify a literal replacement with ``replace``. - - >>> safe_int_r = except_(ValueError, replace=0)(int) - >>> safe_int_r('five') - 0 - - Provide an expression to ``use`` to pass through particular parameters. - - >>> safe_int_pt = except_(ValueError, use='args[0]')(int) - >>> safe_int_pt('five') - 'five' - - """ - - def decorate(func): - @functools.wraps(func) - def wrapper(*args, **kwargs): - try: - return func(*args, **kwargs) - except exceptions: - try: - return eval(use) - except TypeError: - return replace - - return wrapper - - return decorate - - -def identity(x): - """ - Return the argument. - - >>> o = object() - >>> identity(o) is o - True - """ - return x - - -def bypass_when(check, *, _op=identity): - """ - Decorate a function to return its parameter when ``check``. - - >>> bypassed = [] # False - - >>> @bypass_when(bypassed) - ... def double(x): - ... return x * 2 - >>> double(2) - 4 - >>> bypassed[:] = [object()] # True - >>> double(2) - 2 - """ - - def decorate(func): - @functools.wraps(func) - def wrapper(param, /): - return param if _op(check) else func(param) - - return wrapper - - return decorate - - -def bypass_unless(check): - """ - Decorate a function to return its parameter unless ``check``. - - >>> enabled = [object()] # True - - >>> @bypass_unless(enabled) - ... def double(x): - ... return x * 2 - >>> double(2) - 4 - >>> del enabled[:] # False - >>> double(2) - 2 - """ - return bypass_when(check, _op=operator.not_) - - -@functools.singledispatch -def _splat_inner(args, func): - """Splat args to func.""" - return func(*args) - - -@_splat_inner.register -def _(args: collections.abc.Mapping, func): - """Splat kargs to func as kwargs.""" - return func(**args) - - -def splat(func): - """ - Wrap func to expect its parameters to be passed positionally in a tuple. - - Has a similar effect to that of ``itertools.starmap`` over - simple ``map``. - - >>> pairs = [(-1, 1), (0, 2)] - >>> more_itertools.consume(itertools.starmap(print, pairs)) - -1 1 - 0 2 - >>> more_itertools.consume(map(splat(print), pairs)) - -1 1 - 0 2 - - The approach generalizes to other iterators that don't have a "star" - equivalent, such as a "starfilter". - - >>> list(filter(splat(operator.add), pairs)) - [(0, 2)] - - Splat also accepts a mapping argument. - - >>> def is_nice(msg, code): - ... return "smile" in msg or code == 0 - >>> msgs = [ - ... dict(msg='smile!', code=20), - ... dict(msg='error :(', code=1), - ... dict(msg='unknown', code=0), - ... ] - >>> for msg in filter(splat(is_nice), msgs): - ... print(msg) - {'msg': 'smile!', 'code': 20} - {'msg': 'unknown', 'code': 0} - """ - return functools.wraps(func)(functools.partial(_splat_inner, func=func)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.pyi b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.pyi deleted file mode 100644 index 19191bf..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__init__.pyi +++ /dev/null @@ -1,125 +0,0 @@ -from collections.abc import Callable, Hashable, Iterator -from functools import partial -from operator import methodcaller -import sys -from typing import ( - Any, - Generic, - Protocol, - TypeVar, - overload, -) - -if sys.version_info >= (3, 10): - from typing import Concatenate, ParamSpec -else: - from typing_extensions import Concatenate, ParamSpec - -_P = ParamSpec('_P') -_R = TypeVar('_R') -_T = TypeVar('_T') -_R1 = TypeVar('_R1') -_R2 = TypeVar('_R2') -_V = TypeVar('_V') -_S = TypeVar('_S') -_R_co = TypeVar('_R_co', covariant=True) - -class _OnceCallable(Protocol[_P, _R]): - saved_result: _R - reset: Callable[[], None] - def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R: ... - -class _ProxyMethodCacheWrapper(Protocol[_R_co]): - cache_clear: Callable[[], None] - def __call__(self, *args: Hashable, **kwargs: Hashable) -> _R_co: ... - -class _MethodCacheWrapper(Protocol[_R_co]): - def cache_clear(self) -> None: ... - def __call__(self, *args: Hashable, **kwargs: Hashable) -> _R_co: ... - -# `compose()` overloads below will cover most use cases. - -@overload -def compose( - __func1: Callable[[_R], _T], - __func2: Callable[_P, _R], - /, -) -> Callable[_P, _T]: ... -@overload -def compose( - __func1: Callable[[_R], _T], - __func2: Callable[[_R1], _R], - __func3: Callable[_P, _R1], - /, -) -> Callable[_P, _T]: ... -@overload -def compose( - __func1: Callable[[_R], _T], - __func2: Callable[[_R2], _R], - __func3: Callable[[_R1], _R2], - __func4: Callable[_P, _R1], - /, -) -> Callable[_P, _T]: ... -def once(func: Callable[_P, _R]) -> _OnceCallable[_P, _R]: ... -def method_cache( - method: Callable[..., _R], - cache_wrapper: Callable[[Callable[..., _R]], _MethodCacheWrapper[_R]] = ..., -) -> _MethodCacheWrapper[_R] | _ProxyMethodCacheWrapper[_R]: ... -def apply( - transform: Callable[[_R], _T] -) -> Callable[[Callable[_P, _R]], Callable[_P, _T]]: ... -def result_invoke( - action: Callable[[_R], Any] -) -> Callable[[Callable[_P, _R]], Callable[_P, _R]]: ... -def invoke( - f: Callable[_P, _R], /, *args: _P.args, **kwargs: _P.kwargs -) -> Callable[_P, _R]: ... - -class Throttler(Generic[_R]): - last_called: float - func: Callable[..., _R] - max_rate: float - def __init__( - self, func: Callable[..., _R] | Throttler[_R], max_rate: float = ... - ) -> None: ... - def reset(self) -> None: ... - def __call__(self, *args: Any, **kwargs: Any) -> _R: ... - def __get__(self, obj: Any, owner: type[Any] | None = ...) -> Callable[..., _R]: ... - -def first_invoke( - func1: Callable[..., Any], func2: Callable[_P, _R] -) -> Callable[_P, _R]: ... - -method_caller: Callable[..., methodcaller] - -def retry_call( - func: Callable[..., _R], - cleanup: Callable[..., None] = ..., - retries: int | float = ..., - trap: type[BaseException] | tuple[type[BaseException], ...] = ..., -) -> _R: ... -def retry( - cleanup: Callable[..., None] = ..., - retries: int | float = ..., - trap: type[BaseException] | tuple[type[BaseException], ...] = ..., -) -> Callable[[Callable[..., _R]], Callable[..., _R]]: ... -def print_yielded(func: Callable[_P, Iterator[Any]]) -> Callable[_P, None]: ... -def pass_none( - func: Callable[Concatenate[_T, _P], _R] -) -> Callable[Concatenate[_T, _P], _R]: ... -def assign_params( - func: Callable[..., _R], namespace: dict[str, Any] -) -> partial[_R]: ... -def save_method_args( - method: Callable[Concatenate[_S, _P], _R] -) -> Callable[Concatenate[_S, _P], _R]: ... -def except_( - *exceptions: type[BaseException], replace: Any = ..., use: Any = ... -) -> Callable[[Callable[_P, Any]], Callable[_P, Any]]: ... -def identity(x: _T) -> _T: ... -def bypass_when( - check: _V, *, _op: Callable[[_V], Any] = ... -) -> Callable[[Callable[[_T], _R]], Callable[[_T], _T | _R]]: ... -def bypass_unless( - check: Any, -) -> Callable[[Callable[[_T], _R]], Callable[[_T], _T | _R]]: ... diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 456e411..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/functools/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/Lorem ipsum.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/Lorem ipsum.txt deleted file mode 100644 index 986f944..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/Lorem ipsum.txt +++ /dev/null @@ -1,2 +0,0 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__init__.py index 0fabd0c..a0306d5 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__init__.py @@ -6,10 +6,10 @@ import functools try: from importlib.resources import files # type: ignore except ImportError: # pragma: nocover - from importlib_resources import files # type: ignore + from setuptools.extern.importlib_resources import files # type: ignore -from jaraco.functools import compose, method_cache -from jaraco.context import ExceptionTrap +from setuptools.extern.jaraco.functools import compose, method_cache +from setuptools.extern.jaraco.context import ExceptionTrap def substitution(old, new): @@ -66,7 +66,7 @@ class FoldedCase(str): >>> s in ["Hello World"] True - Allows testing for set inclusion, but candidate and elements + You may test for set inclusion, but candidate and elements must both be folded. >>> FoldedCase("Hello World") in {s} @@ -92,40 +92,37 @@ class FoldedCase(str): >>> FoldedCase('hello') > FoldedCase('Hello') False - - >>> FoldedCase('ß') == FoldedCase('ss') - True """ def __lt__(self, other): - return self.casefold() < other.casefold() + return self.lower() < other.lower() def __gt__(self, other): - return self.casefold() > other.casefold() + return self.lower() > other.lower() def __eq__(self, other): - return self.casefold() == other.casefold() + return self.lower() == other.lower() def __ne__(self, other): - return self.casefold() != other.casefold() + return self.lower() != other.lower() def __hash__(self): - return hash(self.casefold()) + return hash(self.lower()) def __contains__(self, other): - return super().casefold().__contains__(other.casefold()) + return super().lower().__contains__(other.lower()) def in_(self, other): "Does self appear in other?" return self in FoldedCase(other) - # cache casefold since it's likely to be called frequently. + # cache lower since it's likely to be called frequently. @method_cache - def casefold(self): - return super().casefold() + def lower(self): + return super().lower() def index(self, sub): - return self.casefold().index(sub.casefold()) + return self.lower().index(sub.lower()) def split(self, splitter=' ', maxsplit=0): pattern = re.compile(re.escape(splitter), re.I) @@ -227,12 +224,9 @@ def unwrap(s): return '\n'.join(cleaned) -lorem_ipsum: str = ( - files(__name__).joinpath('Lorem ipsum.txt').read_text(encoding='utf-8') -) -class Splitter: +class Splitter(object): """object that will split a string with the given arguments for each call >>> s = Splitter(',') @@ -282,7 +276,7 @@ class WordSet(tuple): >>> WordSet.parse("myABCClass") ('my', 'ABC', 'Class') - The result is a WordSet, providing access to other forms. + The result is a WordSet, so you can get the form you need. >>> WordSet.parse("myABCClass").underscore_separated() 'my_ABC_Class' @@ -369,7 +363,7 @@ class WordSet(tuple): return self.trim_left(item).trim_right(item) def __getitem__(self, item): - result = super().__getitem__(item) + result = super(WordSet, self).__getitem__(item) if isinstance(item, slice): result = WordSet(result) return result @@ -584,7 +578,7 @@ def join_continuation(lines): ['foobarbaz'] Not sure why, but... - The character preceding the backslash is also elided. + The character preceeding the backslash is also elided. >>> list(join_continuation(['goo\\', 'dly'])) ['godly'] @@ -603,22 +597,3 @@ def join_continuation(lines): except StopIteration: return yield item - - -def read_newlines(filename, limit=1024): - r""" - >>> tmp_path = getfixture('tmp_path') - >>> filename = tmp_path / 'out.txt' - >>> _ = filename.write_text('foo\n', newline='', encoding='utf-8') - >>> read_newlines(filename) - '\n' - >>> _ = filename.write_text('foo\r\n', newline='', encoding='utf-8') - >>> read_newlines(filename) - '\r\n' - >>> _ = filename.write_text('foo\r\nbar\nbing\r', newline='', encoding='utf-8') - >>> read_newlines(filename) - ('\r', '\n', '\r\n') - """ - with open(filename, encoding='utf-8') as fp: - fp.read(limit) - return fp.newlines diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/__init__.cpython-311.pyc index be37b0b..51cf504 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/layouts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/layouts.cpython-311.pyc deleted file mode 100644 index a9bd5bf..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/layouts.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/show-newlines.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/show-newlines.cpython-311.pyc deleted file mode 100644 index 570bf67..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/show-newlines.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/strip-prefix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/strip-prefix.cpython-311.pyc deleted file mode 100644 index dd95511..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/strip-prefix.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-dvorak.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-dvorak.cpython-311.pyc deleted file mode 100644 index 913eadb..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-dvorak.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-qwerty.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-qwerty.cpython-311.pyc deleted file mode 100644 index df6a175..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/__pycache__/to-qwerty.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/layouts.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/layouts.py deleted file mode 100644 index 9636f0f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/layouts.py +++ /dev/null @@ -1,25 +0,0 @@ -qwerty = "-=qwertyuiop[]asdfghjkl;'zxcvbnm,./_+QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?" -dvorak = "[]',.pyfgcrl/=aoeuidhtns-;qjkxbmwvz{}\"<>PYFGCRL?+AOEUIDHTNS_:QJKXBMWVZ" - - -to_dvorak = str.maketrans(qwerty, dvorak) -to_qwerty = str.maketrans(dvorak, qwerty) - - -def translate(input, translation): - """ - >>> translate('dvorak', to_dvorak) - 'ekrpat' - >>> translate('qwerty', to_qwerty) - 'x,dokt' - """ - return input.translate(translation) - - -def _translate_stream(stream, translation): - """ - >>> import io - >>> _translate_stream(io.StringIO('foo'), to_dvorak) - urr - """ - print(translate(stream.read(), translation)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/show-newlines.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/show-newlines.py deleted file mode 100644 index e11d1ba..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/show-newlines.py +++ /dev/null @@ -1,33 +0,0 @@ -import autocommand -import inflect - -from more_itertools import always_iterable - -import jaraco.text - - -def report_newlines(filename): - r""" - Report the newlines in the indicated file. - - >>> tmp_path = getfixture('tmp_path') - >>> filename = tmp_path / 'out.txt' - >>> _ = filename.write_text('foo\nbar\n', newline='', encoding='utf-8') - >>> report_newlines(filename) - newline is '\n' - >>> filename = tmp_path / 'out.txt' - >>> _ = filename.write_text('foo\nbar\r\n', newline='', encoding='utf-8') - >>> report_newlines(filename) - newlines are ('\n', '\r\n') - """ - newlines = jaraco.text.read_newlines(filename) - count = len(tuple(always_iterable(newlines))) - engine = inflect.engine() - print( - engine.plural_noun("newline", count), - engine.plural_verb("is", count), - repr(newlines), - ) - - -autocommand.autocommand(__name__)(report_newlines) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/strip-prefix.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/strip-prefix.py deleted file mode 100644 index 761717a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/strip-prefix.py +++ /dev/null @@ -1,21 +0,0 @@ -import sys - -import autocommand - -from jaraco.text import Stripper - - -def strip_prefix(): - r""" - Strip any common prefix from stdin. - - >>> import io, pytest - >>> getfixture('monkeypatch').setattr('sys.stdin', io.StringIO('abcdef\nabc123')) - >>> strip_prefix() - def - 123 - """ - sys.stdout.writelines(Stripper.strip_prefix(sys.stdin).lines) - - -autocommand.autocommand(__name__)(strip_prefix) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-dvorak.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-dvorak.py deleted file mode 100644 index a6d5da8..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-dvorak.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys - -from . import layouts - - -__name__ == '__main__' and layouts._translate_stream(sys.stdin, layouts.to_dvorak) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-qwerty.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-qwerty.py deleted file mode 100644 index abe2728..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/jaraco/text/to-qwerty.py +++ /dev/null @@ -1,6 +0,0 @@ -import sys - -from . import layouts - - -__name__ == '__main__' and layouts._translate_stream(sys.stdin, layouts.to_qwerty) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/INSTALLER deleted file mode 100644 index a1b589e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -pip diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/LICENSE deleted file mode 100644 index 0a523be..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2012 Erik Rose - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/METADATA deleted file mode 100644 index fb41b0c..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/METADATA +++ /dev/null @@ -1,266 +0,0 @@ -Metadata-Version: 2.1 -Name: more-itertools -Version: 10.3.0 -Summary: More routines for operating on iterables, beyond itertools -Keywords: itertools,iterator,iteration,filter,peek,peekable,chunk,chunked -Author-email: Erik Rose -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: Natural Language :: English -Classifier: License :: OSI Approved :: MIT License -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.8 -Classifier: Programming Language :: Python :: 3.9 -Classifier: Programming Language :: Python :: 3.10 -Classifier: Programming Language :: Python :: 3.11 -Classifier: Programming Language :: Python :: 3.12 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Programming Language :: Python :: Implementation :: CPython -Classifier: Programming Language :: Python :: Implementation :: PyPy -Classifier: Topic :: Software Development :: Libraries -Project-URL: Homepage, https://github.com/more-itertools/more-itertools - -============== -More Itertools -============== - -.. image:: https://readthedocs.org/projects/more-itertools/badge/?version=latest - :target: https://more-itertools.readthedocs.io/en/stable/ - -Python's ``itertools`` library is a gem - you can compose elegant solutions -for a variety of problems with the functions it provides. In ``more-itertools`` -we collect additional building blocks, recipes, and routines for working with -Python iterables. - -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Grouping | `chunked `_, | -| | `ichunked `_, | -| | `chunked_even `_, | -| | `sliced `_, | -| | `constrained_batches `_, | -| | `distribute `_, | -| | `divide `_, | -| | `split_at `_, | -| | `split_before `_, | -| | `split_after `_, | -| | `split_into `_, | -| | `split_when `_, | -| | `bucket `_, | -| | `unzip `_, | -| | `batched `_, | -| | `grouper `_, | -| | `partition `_, | -| | `transpose `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Lookahead and lookback | `spy `_, | -| | `peekable `_, | -| | `seekable `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Windowing | `windowed `_, | -| | `substrings `_, | -| | `substrings_indexes `_, | -| | `stagger `_, | -| | `windowed_complete `_, | -| | `pairwise `_, | -| | `triplewise `_, | -| | `sliding_window `_, | -| | `subslices `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Augmenting | `count_cycle `_, | -| | `intersperse `_, | -| | `padded `_, | -| | `repeat_each `_, | -| | `mark_ends `_, | -| | `repeat_last `_, | -| | `adjacent `_, | -| | `groupby_transform `_, | -| | `pad_none `_, | -| | `ncycles `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Combining | `collapse `_, | -| | `sort_together `_, | -| | `interleave `_, | -| | `interleave_longest `_, | -| | `interleave_evenly `_, | -| | `zip_offset `_, | -| | `zip_equal `_, | -| | `zip_broadcast `_, | -| | `flatten `_, | -| | `roundrobin `_, | -| | `prepend `_, | -| | `value_chain `_, | -| | `partial_product `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Summarizing | `ilen `_, | -| | `unique_to_each `_, | -| | `sample `_, | -| | `consecutive_groups `_, | -| | `run_length `_, | -| | `map_reduce `_, | -| | `join_mappings `_, | -| | `exactly_n `_, | -| | `is_sorted `_, | -| | `all_equal `_, | -| | `all_unique `_, | -| | `minmax `_, | -| | `first_true `_, | -| | `quantify `_, | -| | `iequals `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Selecting | `islice_extended `_, | -| | `first `_, | -| | `last `_, | -| | `one `_, | -| | `only `_, | -| | `strictly_n `_, | -| | `strip `_, | -| | `lstrip `_, | -| | `rstrip `_, | -| | `filter_except `_, | -| | `map_except `_, | -| | `filter_map `_, | -| | `iter_suppress `_, | -| | `nth_or_last `_, | -| | `unique_in_window `_, | -| | `before_and_after `_, | -| | `nth `_, | -| | `take `_, | -| | `tail `_, | -| | `unique_everseen `_, | -| | `unique_justseen `_, | -| | `unique `_, | -| | `duplicates_everseen `_, | -| | `duplicates_justseen `_, | -| | `classify_unique `_, | -| | `longest_common_prefix `_, | -| | `takewhile_inclusive `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Math | `dft `_, | -| | `idft `_, | -| | `convolve `_, | -| | `dotproduct `_, | -| | `factor `_, | -| | `matmul `_, | -| | `polynomial_from_roots `_, | -| | `polynomial_derivative `_, | -| | `polynomial_eval `_, | -| | `sieve `_, | -| | `sum_of_squares `_, | -| | `totient `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Combinatorics | `distinct_permutations `_, | -| | `distinct_combinations `_, | -| | `circular_shifts `_, | -| | `partitions `_, | -| | `set_partitions `_, | -| | `product_index `_, | -| | `combination_index `_, | -| | `permutation_index `_, | -| | `combination_with_replacement_index `_, | -| | `gray_product `_, | -| | `outer_product `_, | -| | `powerset `_, | -| | `powerset_of_sets `_, | -| | `random_product `_, | -| | `random_permutation `_, | -| | `random_combination `_, | -| | `random_combination_with_replacement `_, | -| | `nth_product `_, | -| | `nth_permutation `_, | -| | `nth_combination `_, | -| | `nth_combination_with_replacement `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Wrapping | `always_iterable `_, | -| | `always_reversible `_, | -| | `countable `_, | -| | `consumer `_, | -| | `with_iter `_, | -| | `iter_except `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Others | `locate `_, | -| | `rlocate `_, | -| | `replace `_, | -| | `numeric_range `_, | -| | `side_effect `_, | -| | `iterate `_, | -| | `difference `_, | -| | `make_decorator `_, | -| | `SequenceView `_, | -| | `time_limited `_, | -| | `map_if `_, | -| | `iter_index `_, | -| | `consume `_, | -| | `tabulate `_, | -| | `repeatfunc `_, | -| | `reshape `_ | -| | `doublestarmap `_ | -+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ - - -Getting started -=============== - -To get started, install the library with `pip `_: - -.. code-block:: shell - - pip install more-itertools - -The recipes from the `itertools docs `_ -are included in the top-level package: - -.. code-block:: python - - >>> from more_itertools import flatten - >>> iterable = [(0, 1), (2, 3)] - >>> list(flatten(iterable)) - [0, 1, 2, 3] - -Several new recipes are available as well: - -.. code-block:: python - - >>> from more_itertools import chunked - >>> iterable = [0, 1, 2, 3, 4, 5, 6, 7, 8] - >>> list(chunked(iterable, 3)) - [[0, 1, 2], [3, 4, 5], [6, 7, 8]] - - >>> from more_itertools import spy - >>> iterable = (x * x for x in range(1, 6)) - >>> head, iterable = spy(iterable, n=3) - >>> list(head) - [1, 4, 9] - >>> list(iterable) - [1, 4, 9, 16, 25] - - - -For the full listing of functions, see the `API documentation `_. - - -Links elsewhere -=============== - -Blog posts about ``more-itertools``: - -* `Yo, I heard you like decorators `__ -* `Tour of Python Itertools `__ (`Alternate `__) -* `Real-World Python More Itertools `_ - - -Development -=========== - -``more-itertools`` is maintained by `@erikrose `_ -and `@bbayles `_, with help from `many others `_. -If you have a problem or suggestion, please file a bug or pull request in this -repository. Thanks for contributing! - - -Version History -=============== - -The version history can be found in `documentation `_. - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/RECORD deleted file mode 100644 index f15f3fc..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/RECORD +++ /dev/null @@ -1,16 +0,0 @@ -more_itertools-10.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -more_itertools-10.3.0.dist-info/LICENSE,sha256=CfHIyelBrz5YTVlkHqm4fYPAyw_QB-te85Gn4mQ8GkY,1053 -more_itertools-10.3.0.dist-info/METADATA,sha256=BFO90O-fLNiVQMpj7oIS5ztzgJUUQZ3TA32P5HH3N-A,36293 -more_itertools-10.3.0.dist-info/RECORD,, -more_itertools-10.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -more_itertools-10.3.0.dist-info/WHEEL,sha256=rSgq_JpHF9fHR1lx53qwg_1-2LypZE_qmcuXbVUq948,81 -more_itertools/__init__.py,sha256=dtAbGjTDmn_ghiU5YXfhyDy0phAlXVdt5klZA5fUa-Q,149 -more_itertools/__init__.pyi,sha256=5B3eTzON1BBuOLob1vCflyEb2lSd6usXQQ-Cv-hXkeA,43 -more_itertools/__pycache__/__init__.cpython-312.pyc,, -more_itertools/__pycache__/more.cpython-312.pyc,, -more_itertools/__pycache__/recipes.cpython-312.pyc,, -more_itertools/more.py,sha256=1E5kzFncRKTDw0cYv1yRXMgDdunstLQd1QStcnL6U90,148370 -more_itertools/more.pyi,sha256=iXXeqt48Nxe8VGmIWpkVXuKpR2FYNuu2DU8nQLWCCu0,21484 -more_itertools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -more_itertools/recipes.py,sha256=WedhhfhGVgr6zii8fIbGJVmRTw0ZKRiLKnYBDGJv4nY,28591 -more_itertools/recipes.pyi,sha256=T_mdGpcFdfrP3JSWbwzYP9JyNV-Go-7RPfpxfftAWlA,4617 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/WHEEL deleted file mode 100644 index db4a255..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools-10.3.0.dist-info/WHEEL +++ /dev/null @@ -1,4 +0,0 @@ -Wheel-Version: 1.0 -Generator: flit 3.8.0 -Root-Is-Purelib: true -Tag: py3-none-any diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.py index 9c4662f..19a169f 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.py @@ -1,6 +1,4 @@ -"""More routines for operating on iterables, beyond itertools""" - from .more import * # noqa from .recipes import * # noqa -__version__ = '10.3.0' +__version__ = '8.8.0' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.pyi b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.pyi deleted file mode 100644 index 96f6e36..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__init__.pyi +++ /dev/null @@ -1,2 +0,0 @@ -from .more import * -from .recipes import * diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/__init__.cpython-311.pyc index 08161d8..5db33cf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/more.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/more.cpython-311.pyc index 9c40714..e00d67b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/more.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/more.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/recipes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/recipes.cpython-311.pyc index 1509f7e..fdde9f5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/recipes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/__pycache__/recipes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.py index 7b48190..e6fca4d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.py @@ -1,13 +1,11 @@ -import math import warnings from collections import Counter, defaultdict, deque, abc from collections.abc import Sequence -from functools import cached_property, partial, reduce, wraps -from heapq import heapify, heapreplace, heappop +from functools import partial, reduce, wraps +from heapq import merge, heapify, heapreplace, heappop from itertools import ( chain, - combinations, compress, count, cycle, @@ -19,106 +17,72 @@ from itertools import ( takewhile, tee, zip_longest, - product, ) -from math import comb, e, exp, factorial, floor, fsum, log, perm, tau +from math import exp, factorial, floor, log from queue import Empty, Queue from random import random, randrange, uniform -from operator import itemgetter, mul, sub, gt, lt, ge, le +from operator import itemgetter, mul, sub, gt, lt from sys import hexversion, maxsize from time import monotonic from .recipes import ( - _marker, - _zip_equal, - UnequalIterablesError, consume, flatten, pairwise, powerset, take, unique_everseen, - all_equal, - batched, ) __all__ = [ 'AbortThread', - 'SequenceView', - 'UnequalIterablesError', 'adjacent', - 'all_unique', 'always_iterable', 'always_reversible', 'bucket', 'callback_iter', 'chunked', - 'chunked_even', 'circular_shifts', 'collapse', - 'combination_index', - 'combination_with_replacement_index', + 'collate', 'consecutive_groups', - 'constrained_batches', 'consumer', - 'count_cycle', 'countable', - 'dft', + 'count_cycle', + 'mark_ends', 'difference', 'distinct_combinations', 'distinct_permutations', 'distribute', 'divide', - 'doublestarmap', - 'duplicates_everseen', - 'duplicates_justseen', - 'classify_unique', 'exactly_n', 'filter_except', - 'filter_map', 'first', - 'gray_product', 'groupby_transform', - 'ichunked', - 'iequals', - 'idft', 'ilen', - 'interleave', - 'interleave_evenly', 'interleave_longest', + 'interleave', 'intersperse', - 'is_sorted', 'islice_extended', 'iterate', - 'iter_suppress', - 'join_mappings', + 'ichunked', + 'is_sorted', 'last', 'locate', - 'longest_common_prefix', 'lstrip', 'make_decorator', 'map_except', - 'map_if', 'map_reduce', - 'mark_ends', - 'minmax', 'nth_or_last', 'nth_permutation', 'nth_product', - 'nth_combination_with_replacement', 'numeric_range', 'one', 'only', - 'outer_product', 'padded', - 'partial_product', 'partitions', + 'set_partitions', 'peekable', - 'permutation_index', - 'powerset_of_sets', - 'product_index', - 'raise_', - 'repeat_each', 'repeat_last', 'replace', 'rlocate', @@ -126,37 +90,37 @@ __all__ = [ 'run_length', 'sample', 'seekable', - 'set_partitions', + 'SequenceView', 'side_effect', 'sliced', 'sort_together', - 'split_after', 'split_at', + 'split_after', 'split_before', - 'split_into', 'split_when', + 'split_into', 'spy', 'stagger', 'strip', - 'strictly_n', 'substrings', 'substrings_indexes', - 'takewhile_inclusive', 'time_limited', - 'unique_in_window', 'unique_to_each', 'unzip', - 'value_chain', 'windowed', - 'windowed_complete', 'with_iter', - 'zip_broadcast', + 'UnequalIterablesError', 'zip_equal', 'zip_offset', + 'windowed_complete', + 'all_unique', + 'value_chain', + 'product_index', + 'combination_index', + 'permutation_index', ] -# math.sumprod is available for Python 3.12+ -_fsumprod = getattr(math, 'sumprod', lambda x, y: fsum(map(mul, x, y))) +_marker = object() def chunked(iterable, n, strict=False): @@ -180,8 +144,6 @@ def chunked(iterable, n, strict=False): """ iterator = iter(partial(take, n, iter(iterable)), []) if strict: - if n is None: - raise ValueError('n must not be None when using strict mode.') def ret(): for chunk in iterator: @@ -211,14 +173,15 @@ def first(iterable, default=_marker): ``next(iter(iterable), default)``. """ - for item in iterable: - return item - if default is _marker: - raise ValueError( - 'first() was called on an empty iterable, and no ' - 'default value was provided.' - ) - return default + try: + return next(iter(iterable)) + except StopIteration as e: + if default is _marker: + raise ValueError( + 'first() was called on an empty iterable, and no ' + 'default value was provided.' + ) from e + return default def last(iterable, default=_marker): @@ -432,6 +395,44 @@ class peekable: return self._cache[index] +def collate(*iterables, **kwargs): + """Return a sorted merge of the items from each of several already-sorted + *iterables*. + + >>> list(collate('ACDZ', 'AZ', 'JKL')) + ['A', 'A', 'C', 'D', 'J', 'K', 'L', 'Z', 'Z'] + + Works lazily, keeping only the next value from each iterable in memory. Use + :func:`collate` to, for example, perform a n-way mergesort of items that + don't fit in memory. + + If a *key* function is specified, the iterables will be sorted according + to its result: + + >>> key = lambda s: int(s) # Sort by numeric value, not by string + >>> list(collate(['1', '10'], ['2', '11'], key=key)) + ['1', '2', '10', '11'] + + + If the *iterables* are sorted in descending order, set *reverse* to + ``True``: + + >>> list(collate([5, 3, 1], [4, 2, 0], reverse=True)) + [5, 4, 3, 2, 1, 0] + + If the elements of the passed-in iterables are out of order, you might get + unexpected results. + + On Python 3.5+, this function is an alias for :func:`heapq.merge`. + + """ + warnings.warn( + "collate is no longer part of more_itertools, use heapq.merge", + DeprecationWarning, + ) + return merge(*iterables, **kwargs) + + def consumer(func): """Decorator that automatically advances a PEP-342-style "reverse iterator" to its first yield point so you don't have to call ``next()`` on it @@ -491,10 +492,7 @@ def iterate(func, start): """ while True: yield start - try: - start = func(start) - except StopIteration: - break + start = func(start) def with_iter(context_manager): @@ -560,10 +558,10 @@ def one(iterable, too_short=None, too_long=None): try: first_value = next(it) - except StopIteration as exc: + except StopIteration as e: raise ( too_short or ValueError('too few items in iterable (expected 1)') - ) from exc + ) from e try: second_value = next(it) @@ -579,87 +577,6 @@ def one(iterable, too_short=None, too_long=None): return first_value -def raise_(exception, *args): - raise exception(*args) - - -def strictly_n(iterable, n, too_short=None, too_long=None): - """Validate that *iterable* has exactly *n* items and return them if - it does. If it has fewer than *n* items, call function *too_short* - with those items. If it has more than *n* items, call function - *too_long* with the first ``n + 1`` items. - - >>> iterable = ['a', 'b', 'c', 'd'] - >>> n = 4 - >>> list(strictly_n(iterable, n)) - ['a', 'b', 'c', 'd'] - - Note that the returned iterable must be consumed in order for the check to - be made. - - By default, *too_short* and *too_long* are functions that raise - ``ValueError``. - - >>> list(strictly_n('ab', 3)) # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - ValueError: too few items in iterable (got 2) - - >>> list(strictly_n('abc', 2)) # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - ValueError: too many items in iterable (got at least 3) - - You can instead supply functions that do something else. - *too_short* will be called with the number of items in *iterable*. - *too_long* will be called with `n + 1`. - - >>> def too_short(item_count): - ... raise RuntimeError - >>> it = strictly_n('abcd', 6, too_short=too_short) - >>> list(it) # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - RuntimeError - - >>> def too_long(item_count): - ... print('The boss is going to hear about this') - >>> it = strictly_n('abcdef', 4, too_long=too_long) - >>> list(it) - The boss is going to hear about this - ['a', 'b', 'c', 'd'] - - """ - if too_short is None: - too_short = lambda item_count: raise_( - ValueError, - 'Too few items in iterable (got {})'.format(item_count), - ) - - if too_long is None: - too_long = lambda item_count: raise_( - ValueError, - 'Too many items in iterable (got at least {})'.format(item_count), - ) - - it = iter(iterable) - for i in range(n): - try: - item = next(it) - except StopIteration: - too_short(i) - return - else: - yield item - - try: - next(it) - except StopIteration: - pass - else: - too_long(n + 1) - - def distinct_permutations(iterable, r=None): """Yield successive distinct permutations of the elements in *iterable*. @@ -684,7 +601,6 @@ def distinct_permutations(iterable, r=None): [(0, 1), (0, 2), (1, 0), (1, 2), (2, 0), (2, 1)] """ - # Algorithm: https://w.wiki/Qai def _full(A): while True: @@ -775,8 +691,8 @@ def intersperse(e, iterable, n=1): if n == 0: raise ValueError('n must be > 0') elif n == 1: - # interleave(repeat(e), iterable) -> e, x_0, e, x_1, e, x_2... - # islice(..., 1, None) -> x_0, e, x_1, e, x_2... + # interleave(repeat(e), iterable) -> e, x_0, e, e, x_1, e, x_2... + # islice(..., 1, None) -> x_0, e, e, x_1, e, x_2... return islice(interleave(repeat(e), iterable), 1, None) else: # interleave(filler, chunks) -> [e], [x_0, x_1], [e], [x_2, x_3]... @@ -850,31 +766,24 @@ def windowed(seq, n, fillvalue=None, step=1): if n < 0: raise ValueError('n must be >= 0') if n == 0: - yield () + yield tuple() return if step < 1: raise ValueError('step must be >= 1') - iterable = iter(seq) + window = deque(maxlen=n) + i = n + for _ in map(window.append, seq): + i -= 1 + if not i: + i = step + yield tuple(window) - # Generate first window - window = deque(islice(iterable, n), maxlen=n) - - # Deal with the first window not being full - if not window: - return - if len(window) < n: - yield tuple(window) + ((fillvalue,) * (n - len(window))) - return - yield tuple(window) - - # Create the filler for the next windows. The padding ensures - # we have just enough elements to fill the last window. - padding = (fillvalue,) * (n - 1 if step >= n else step - 1) - filler = map(window.append, chain(iterable, padding)) - - # Generate the rest of the windows - for _ in islice(filler, step - 1, None, step): + size = len(window) + if size < n: + yield tuple(chain(window, repeat(fillvalue, n - size))) + elif 0 < i < min(step, n): + window += (fillvalue,) * i yield tuple(window) @@ -939,7 +848,7 @@ def substrings_indexes(seq, reverse=False): class bucket: - """Wrap *iterable* and return an object that buckets the iterable into + """Wrap *iterable* and return an object that buckets it iterable into child iterables based on a *key* function. >>> iterable = ['a1', 'b1', 'c1', 'a2', 'b2', 'c2', 'b3'] @@ -1107,72 +1016,6 @@ def interleave_longest(*iterables): return (x for x in i if x is not _marker) -def interleave_evenly(iterables, lengths=None): - """ - Interleave multiple iterables so that their elements are evenly distributed - throughout the output sequence. - - >>> iterables = [1, 2, 3, 4, 5], ['a', 'b'] - >>> list(interleave_evenly(iterables)) - [1, 2, 'a', 3, 4, 'b', 5] - - >>> iterables = [[1, 2, 3], [4, 5], [6, 7, 8]] - >>> list(interleave_evenly(iterables)) - [1, 6, 4, 2, 7, 3, 8, 5] - - This function requires iterables of known length. Iterables without - ``__len__()`` can be used by manually specifying lengths with *lengths*: - - >>> from itertools import combinations, repeat - >>> iterables = [combinations(range(4), 2), ['a', 'b', 'c']] - >>> lengths = [4 * (4 - 1) // 2, 3] - >>> list(interleave_evenly(iterables, lengths=lengths)) - [(0, 1), (0, 2), 'a', (0, 3), (1, 2), 'b', (1, 3), (2, 3), 'c'] - - Based on Bresenham's algorithm. - """ - if lengths is None: - try: - lengths = [len(it) for it in iterables] - except TypeError: - raise ValueError( - 'Iterable lengths could not be determined automatically. ' - 'Specify them with the lengths keyword.' - ) - elif len(iterables) != len(lengths): - raise ValueError('Mismatching number of iterables and lengths.') - - dims = len(lengths) - - # sort iterables by length, descending - lengths_permute = sorted( - range(dims), key=lambda i: lengths[i], reverse=True - ) - lengths_desc = [lengths[i] for i in lengths_permute] - iters_desc = [iter(iterables[i]) for i in lengths_permute] - - # the longest iterable is the primary one (Bresenham: the longest - # distance along an axis) - delta_primary, deltas_secondary = lengths_desc[0], lengths_desc[1:] - iter_primary, iters_secondary = iters_desc[0], iters_desc[1:] - errors = [delta_primary // dims] * len(deltas_secondary) - - to_yield = sum(lengths) - while to_yield: - yield next(iter_primary) - to_yield -= 1 - # update errors for each secondary iterable - errors = [e - delta for e, delta in zip(errors, deltas_secondary)] - - # those iterables for which the error is negative are yielded - # ("diagonal step" in Bresenham) - for i, e_ in enumerate(errors): - if e_ < 0: - yield next(iters_secondary[i]) - to_yield -= 1 - errors[i] += delta_primary - - def collapse(iterable, base_type=None, levels=None): """Flatten an iterable with multiple levels of nesting (e.g., a list of lists of tuples) into non-iterable types. @@ -1199,38 +1042,26 @@ def collapse(iterable, base_type=None, levels=None): ['a', ['b'], 'c', ['d']] """ - stack = deque() - # Add our first node group, treat the iterable as a single node - stack.appendleft((0, repeat(iterable, 1))) - while stack: - node_group = stack.popleft() - level, nodes = node_group + def walk(node, level): + if ( + ((levels is not None) and (level > levels)) + or isinstance(node, (str, bytes)) + or ((base_type is not None) and isinstance(node, base_type)) + ): + yield node + return - # Check if beyond max level - if levels is not None and level > levels: - yield from nodes - continue + try: + tree = iter(node) + except TypeError: + yield node + return + else: + for child in tree: + yield from walk(child, level + 1) - for node in nodes: - # Check if done iterating - if isinstance(node, (str, bytes)) or ( - (base_type is not None) and isinstance(node, base_type) - ): - yield node - # Otherwise try to create child nodes - else: - try: - tree = iter(node) - except TypeError: - yield node - else: - # Save our current location - stack.appendleft(node_group) - # Append the new child node - stack.appendleft((level + 1, tree)) - # Break to process child node - break + yield from walk(iterable, 0) def side_effect(func, iterable, chunk_size=None, before=None, after=None): @@ -1345,7 +1176,7 @@ def split_at(iterable, pred, maxsplit=-1, keep_separator=False): [[0], [2], [4, 5, 6, 7, 8, 9]] By default, the delimiting items are not included in the output. - To include them, set *keep_separator* to ``True``. + The include them, set *keep_separator* to ``True``. >>> list(split_at('abcdcba', lambda x: x == 'b', keep_separator=True)) [['a'], ['b'], ['c', 'd', 'c'], ['b'], ['a']] @@ -1435,9 +1266,7 @@ def split_after(iterable, pred, maxsplit=-1): if pred(item) and buf: yield buf if maxsplit == 1: - buf = list(it) - if buf: - yield buf + yield list(it) return buf = [] maxsplit -= 1 @@ -1543,50 +1372,28 @@ def padded(iterable, fillvalue=None, n=None, next_multiple=False): [1, 2, 3, '?', '?'] If *next_multiple* is ``True``, *fillvalue* will be emitted until the - number of items emitted is a multiple of *n*: + number of items emitted is a multiple of *n*:: >>> list(padded([1, 2, 3, 4], n=3, next_multiple=True)) [1, 2, 3, 4, None, None] If *n* is ``None``, *fillvalue* will be emitted indefinitely. - To create an *iterable* of exactly size *n*, you can truncate with - :func:`islice`. - - >>> list(islice(padded([1, 2, 3], '?'), 5)) - [1, 2, 3, '?', '?'] - >>> list(islice(padded([1, 2, 3, 4, 5, 6, 7, 8], '?'), 5)) - [1, 2, 3, 4, 5] - """ - iterable = iter(iterable) - iterable_with_repeat = chain(iterable, repeat(fillvalue)) - + it = iter(iterable) if n is None: - return iterable_with_repeat + yield from chain(it, repeat(fillvalue)) elif n < 1: raise ValueError('n must be at least 1') - elif next_multiple: - - def slice_generator(): - for first in iterable: - yield (first,) - yield islice(iterable_with_repeat, n - 1) - - # While elements exist produce slices of size n - return chain.from_iterable(slice_generator()) else: - # Ensure the first batch is at least size n then iterate - return chain(islice(iterable_with_repeat, n), iterable) + item_count = 0 + for item in it: + yield item + item_count += 1 - -def repeat_each(iterable, n=2): - """Repeat each element in *iterable* *n* times. - - >>> list(repeat_each('ABC', 3)) - ['A', 'A', 'A', 'B', 'B', 'B', 'C', 'C', 'C'] - """ - return chain.from_iterable(map(repeat, iterable, repeat(n))) + remaining = (n - item_count) % n if next_multiple else n - item_count + for _ in range(remaining): + yield fillvalue def repeat_last(iterable, default=None): @@ -1632,9 +1439,7 @@ def distribute(n, iterable): [[1], [2], [3], [], []] This function uses :func:`itertools.tee` and may require significant - storage. - - If you need the order items in the smaller iterables to match the + storage. If you need the order items in the smaller iterables to match the original iterable, see :func:`divide`. """ @@ -1673,6 +1478,25 @@ def stagger(iterable, offsets=(-1, 0, 1), longest=False, fillvalue=None): ) +class UnequalIterablesError(ValueError): + def __init__(self, details=None): + msg = 'Iterables have different lengths' + if details is not None: + msg += (': index 0 has length {}; index {} has length {}').format( + *details + ) + + super().__init__(msg) + + +def _zip_equal_generator(iterables): + for combo in zip_longest(*iterables, fillvalue=_marker): + for val in combo: + if val is _marker: + raise UnequalIterablesError() + yield combo + + def zip_equal(*iterables): """``zip`` the input *iterables* together, but raise ``UnequalIterablesError`` if they aren't all the same length. @@ -1700,8 +1524,23 @@ def zip_equal(*iterables): ), DeprecationWarning, ) + # Check whether the iterables are all the same size. + try: + first_size = len(iterables[0]) + for i, it in enumerate(iterables[1:], 1): + size = len(it) + if size != first_size: + break + else: + # If we didn't break out, we can use the built-in zip. + return zip(*iterables) - return _zip_equal(*iterables) + # If we did break out, there was a mismatch. + raise UnequalIterablesError(details=(first_size, i, size)) + # If any one of the iterables didn't have a length, start reading + # them until one runs out. + except TypeError: + return _zip_equal_generator(iterables) def zip_offset(*iterables, offsets, longest=False, fillvalue=None): @@ -1814,7 +1653,7 @@ def unzip(iterable): of the zipped *iterable*. The ``i``-th iterable contains the ``i``-th element from each element - of the zipped iterable. The first element is used to determine the + of the zipped iterable. The first element is used to to determine the length of the remaining elements. >>> iterable = [('a', 1), ('b', 2), ('c', 3), ('d', 4)] @@ -1882,9 +1721,9 @@ def divide(n, iterable): >>> [list(c) for c in children] [[1], [2], [3], [], []] - This function will exhaust the iterable before returning. - If order is not important, see :func:`distribute`, which does not first - pull the iterable into memory. + This function will exhaust the iterable before returning and may require + significant storage. If order is not important, see :func:`distribute`, + which does not first pull the iterable into memory. """ if n < 1: @@ -2126,6 +1965,7 @@ class numeric_range(abc.Sequence, abc.Hashable): if self._step == self._zero: raise ValueError('numeric_range() arg 3 must not be zero') self._growing = self._step > self._zero + self._init_len() def __bool__(self): if self._growing: @@ -2201,8 +2041,7 @@ class numeric_range(abc.Sequence, abc.Hashable): def __len__(self): return self._len - @cached_property - def _len(self): + def _init_len(self): if self._growing: start = self._start stop = self._stop @@ -2213,10 +2052,10 @@ class numeric_range(abc.Sequence, abc.Hashable): step = -self._step distance = stop - start if distance <= self._zero: - return 0 + self._len = 0 else: # distance > 0 and step > 0: regular euclidean division q, r = divmod(distance, step) - return int(q) + int(r != self._zero) + self._len = int(q) + int(r != self._zero) def __reduce__(self): return numeric_range, (self._start, self._stop, self._step) @@ -2364,16 +2203,6 @@ def locate(iterable, pred=bool, window_size=None): return compress(count(), starmap(pred, it)) -def longest_common_prefix(iterables): - """Yield elements of the longest common prefix amongst given *iterables*. - - >>> ''.join(longest_common_prefix(['abcd', 'abc', 'abf'])) - 'ab' - - """ - return (c[0] for c in takewhile(all_equal, zip(*iterables))) - - def lstrip(iterable, pred): """Yield the items from *iterable*, but strip any from the beginning for which *pred* returns ``True``. @@ -2682,7 +2511,7 @@ def difference(iterable, func=sub, *, initial=None): if initial is not None: first = [] - return chain(first, map(func, b, a)) + return chain(first, starmap(func, zip(b, a))) class SequenceView(Sequence): @@ -2756,9 +2585,6 @@ class seekable: >>> it.seek(10) >>> next(it) '10' - >>> it.relative_seek(-2) # Seeking relative to the current position - >>> next(it) - '9' >>> it.seek(20) # Seeking past the end of the source isn't a problem >>> list(it) [] @@ -2872,10 +2698,6 @@ class seekable: if remainder > 0: consume(self, remainder) - def relative_seek(self, count): - index = len(self._cache) - self.seek(max(index + count, 0)) - class run_length: """ @@ -2982,7 +2804,6 @@ def make_decorator(wrapping_func, result_index=0): '7' """ - # See https://sites.google.com/site/bbayles/index/decorator_factory for # notes on how this works. def decorator(*wrapping_args, **wrapping_kwargs): @@ -3269,8 +3090,6 @@ class time_limited: stops if the time elapsed is greater than *limit_seconds*. If your time limit is 1 second, but it takes 2 seconds to generate the first item from the iterable, the function will run for 2 seconds and not yield anything. - As a special case, when *limit_seconds* is zero, the iterator never - returns anything. """ @@ -3286,9 +3105,6 @@ class time_limited: return self def __next__(self): - if self.limit_seconds == 0: - self.timed_out = True - raise StopIteration item = next(self._iterable) if monotonic() - self._start_time > self.limit_seconds: self.timed_out = True @@ -3338,40 +3154,6 @@ def only(iterable, default=None, too_long=None): return first_value -def _ichunk(iterable, n): - cache = deque() - chunk = islice(iterable, n) - - def generator(): - while True: - if cache: - yield cache.popleft() - else: - try: - item = next(chunk) - except StopIteration: - return - else: - yield item - - def materialize_next(n=1): - # if n not specified materialize everything - if n is None: - cache.extend(chunk) - return len(cache) - - to_cache = n - len(cache) - - # materialize up to n - if to_cache > 0: - cache.extend(islice(chunk, to_cache)) - - # return number materialized up to n - return min(n, len(cache)) - - return (generator(), materialize_next) - - def ichunked(iterable, n): """Break *iterable* into sub-iterables with *n* elements each. :func:`ichunked` is like :func:`chunked`, but it yields iterables @@ -3393,39 +3175,20 @@ def ichunked(iterable, n): [8, 9, 10, 11] """ - iterable = iter(iterable) - while True: - # Create new chunk - chunk, materialize_next = _ichunk(iterable, n) + source = iter(iterable) + while True: # Check to see whether we're at the end of the source iterable - if not materialize_next(): + item = next(source, _marker) + if item is _marker: return - yield chunk + # Clone the source and yield an n-length slice + source, it = tee(chain([item], source)) + yield islice(it, n) - # Fill previous chunk's cache - materialize_next(None) - - -def iequals(*iterables): - """Return ``True`` if all given *iterables* are equal to each other, - which means that they contain the same elements in the same order. - - The function is useful for comparing iterables of different data types - or iterables that do not support equality checks. - - >>> iequals("abc", ['a', 'b', 'c'], ('a', 'b', 'c'), iter("abc")) - True - - >>> iequals("abc", "acb") - False - - Not to be confused with :func:`all_equal`, which checks whether all - elements of iterable are equal to each other. - - """ - return all(map(all_equal, zip_longest(*iterables, fillvalue=object()))) + # Advance the source iterable + consume(source, n) def distinct_combinations(iterable, r): @@ -3497,7 +3260,7 @@ def map_except(function, iterable, *exceptions): result, unless *function* raises one of the specified *exceptions*. *function* is called to transform each item in *iterable*. - It should accept one argument. + It should be a accept one argument. >>> iterable = ['1', '2', 'three', '4', None] >>> list(map_except(int, iterable, ValueError, TypeError)) @@ -3513,28 +3276,6 @@ def map_except(function, iterable, *exceptions): pass -def map_if(iterable, pred, func, func_else=lambda x: x): - """Evaluate each item from *iterable* using *pred*. If the result is - equivalent to ``True``, transform the item with *func* and yield it. - Otherwise, transform the item with *func_else* and yield it. - - *pred*, *func*, and *func_else* should each be functions that accept - one argument. By default, *func_else* is the identity function. - - >>> from math import sqrt - >>> iterable = list(range(-5, 5)) - >>> iterable - [-5, -4, -3, -2, -1, 0, 1, 2, 3, 4] - >>> list(map_if(iterable, lambda x: x > 3, lambda x: 'toobig')) - [-5, -4, -3, -2, -1, 0, 1, 2, 3, 'toobig'] - >>> list(map_if(iterable, lambda x: x >= 0, - ... lambda x: f'{sqrt(x):.2f}', lambda x: None)) - [None, None, None, None, None, '0.00', '1.00', '1.41', '1.73', '2.00'] - """ - for item in iterable: - yield func(item) if pred(item) else func_else(item) - - def _sample_unweighted(iterable, k): # Implementation of "Algorithm L" from the 1994 paper by Kim-Hung Li: # "Reservoir-Sampling Algorithms of Time Complexity O(n(1+log(N/n)))". @@ -3551,6 +3292,7 @@ def _sample_unweighted(iterable, k): next_index = k + floor(log(random()) / log(1 - W)) for index, element in enumerate(iterable, k): + if index == next_index: reservoir[randrange(k)] = element # The new W is the largest in a sample of k U(0, `old_W`) numbers @@ -3631,7 +3373,7 @@ def sample(iterable, k, weights=None): return _sample_weighted(iterable, k, weights) -def is_sorted(iterable, key=None, reverse=False, strict=False): +def is_sorted(iterable, key=None, reverse=False): """Returns ``True`` if the items of iterable are in sorted order, and ``False`` otherwise. *key* and *reverse* have the same meaning that they do in the built-in :func:`sorted` function. @@ -3641,20 +3383,12 @@ def is_sorted(iterable, key=None, reverse=False, strict=False): >>> is_sorted([5, 4, 3, 1, 2], reverse=True) False - If *strict*, tests for strict sorting, that is, returns ``False`` if equal - elements are found: - - >>> is_sorted([1, 2, 2]) - True - >>> is_sorted([1, 2, 2], strict=True) - False - The function returns ``False`` after encountering the first out-of-order item. If there are no out-of-order items, the iterable is exhausted. """ - compare = (le if reverse else ge) if strict else (lt if reverse else gt) - it = iterable if key is None else map(key, iterable) + compare = lt if reverse else gt + it = iterable if (key is None) else map(key, iterable) return not any(starmap(compare, pairwise(it))) @@ -3719,10 +3453,7 @@ class callback_iter: self._aborted = False self._future = None self._wait_seconds = wait_seconds - # Lazily import concurrent.future - self._executor = __import__( - 'concurrent.futures' - ).futures.ThreadPoolExecutor(max_workers=1) + self._executor = __import__("concurrent.futures").futures.ThreadPoolExecutor(max_workers=1) self._iterator = self._reader() def __enter__(self): @@ -3918,8 +3649,7 @@ def nth_permutation(iterable, r, index): elif not 0 <= r < n: raise ValueError else: - c = perm(n, r) - assert c > 0 # factortial(n)>0, and r>> nth_combination_with_replacement(range(5), 3, 5) - (0, 1, 1) - - ``ValueError`` will be raised If *r* is negative or greater than the length - of *iterable*. - ``IndexError`` will be raised if the given *index* is invalid. - """ - pool = tuple(iterable) - n = len(pool) - if (r < 0) or (r > n): - raise ValueError - - c = comb(n + r - 1, r) - - if index < 0: - index += c - - if (index < 0) or (index >= c): - raise IndexError - - result = [] - i = 0 - while r: - r -= 1 - while n >= 0: - num_combs = comb(n + r - 1, r) - if index < num_combs: - break - n -= 1 - i += 1 - index -= num_combs - result.append(pool[i]) - - return tuple(result) - - def value_chain(*args): """Yield all arguments passed to the function in the same order in which they were passed. If an argument itself is iterable then iterate over its @@ -3999,12 +3686,6 @@ def value_chain(*args): >>> list(value_chain('12', '34', ['56', '78'])) ['12', '34', '56', '78'] - Pre- or postpend a single element to an iterable: - - >>> list(value_chain(1, [2, 3, 4, 5, 6])) - [1, 2, 3, 4, 5, 6] - >>> list(value_chain([1, 2, 3, 4, 5], 6)) - [1, 2, 3, 4, 5, 6] Multiple levels of nesting are not flattened. @@ -4077,71 +3758,14 @@ def combination_index(element, iterable): n, _ = last(pool, default=(n, None)) - # Python versions below 3.8 don't have math.comb + # Python versiosn below 3.8 don't have math.comb index = 1 for i, j in enumerate(reversed(indexes), start=1): j = n - j if i <= j: - index += comb(j, i) + index += factorial(j) // (factorial(i) * factorial(j - i)) - return comb(n + 1, k + 1) - index - - -def combination_with_replacement_index(element, iterable): - """Equivalent to - ``list(combinations_with_replacement(iterable, r)).index(element)`` - - The subsequences with repetition of *iterable* that are of length *r* can - be ordered lexicographically. :func:`combination_with_replacement_index` - computes the index of the first *element*, without computing the previous - combinations with replacement. - - >>> combination_with_replacement_index('adf', 'abcdefg') - 20 - - ``ValueError`` will be raised if the given *element* isn't one of the - combinations with replacement of *iterable*. - """ - element = tuple(element) - l = len(element) - element = enumerate(element) - - k, y = next(element, (None, None)) - if k is None: - return 0 - - indexes = [] - pool = tuple(iterable) - for n, x in enumerate(pool): - while x == y: - indexes.append(n) - tmp, y = next(element, (None, None)) - if tmp is None: - break - else: - k = tmp - if y is None: - break - else: - raise ValueError( - 'element is not a combination with replacement of iterable' - ) - - n = len(pool) - occupations = [0] * n - for p in indexes: - occupations[p] += 1 - - index = 0 - cumulative_sum = 0 - for k in range(1, n): - cumulative_sum += occupations[k - 1] - j = l + n - 1 - k - cumulative_sum - i = n - k - if i <= j: - index += comb(j, i) - - return index + return factorial(n + 1) // (factorial(k + 1) * factorial(n - k)) - index def permutation_index(element, iterable): @@ -4198,609 +3822,3 @@ class countable: self.items_seen += 1 return item - - -def chunked_even(iterable, n): - """Break *iterable* into lists of approximately length *n*. - Items are distributed such the lengths of the lists differ by at most - 1 item. - - >>> iterable = [1, 2, 3, 4, 5, 6, 7] - >>> n = 3 - >>> list(chunked_even(iterable, n)) # List lengths: 3, 2, 2 - [[1, 2, 3], [4, 5], [6, 7]] - >>> list(chunked(iterable, n)) # List lengths: 3, 3, 1 - [[1, 2, 3], [4, 5, 6], [7]] - - """ - iterable = iter(iterable) - - # Initialize a buffer to process the chunks while keeping - # some back to fill any underfilled chunks - min_buffer = (n - 1) * (n - 2) - buffer = list(islice(iterable, min_buffer)) - - # Append items until we have a completed chunk - for _ in islice(map(buffer.append, iterable), n, None, n): - yield buffer[:n] - del buffer[:n] - - # Check if any chunks need addition processing - if not buffer: - return - length = len(buffer) - - # Chunks are either size `full_size <= n` or `partial_size = full_size - 1` - q, r = divmod(length, n) - num_lists = q + (1 if r > 0 else 0) - q, r = divmod(length, num_lists) - full_size = q + (1 if r > 0 else 0) - partial_size = full_size - 1 - num_full = length - partial_size * num_lists - - # Yield chunks of full size - partial_start_idx = num_full * full_size - if full_size > 0: - for i in range(0, partial_start_idx, full_size): - yield buffer[i : i + full_size] - - # Yield chunks of partial size - if partial_size > 0: - for i in range(partial_start_idx, length, partial_size): - yield buffer[i : i + partial_size] - - -def zip_broadcast(*objects, scalar_types=(str, bytes), strict=False): - """A version of :func:`zip` that "broadcasts" any scalar - (i.e., non-iterable) items into output tuples. - - >>> iterable_1 = [1, 2, 3] - >>> iterable_2 = ['a', 'b', 'c'] - >>> scalar = '_' - >>> list(zip_broadcast(iterable_1, iterable_2, scalar)) - [(1, 'a', '_'), (2, 'b', '_'), (3, 'c', '_')] - - The *scalar_types* keyword argument determines what types are considered - scalar. It is set to ``(str, bytes)`` by default. Set it to ``None`` to - treat strings and byte strings as iterable: - - >>> list(zip_broadcast('abc', 0, 'xyz', scalar_types=None)) - [('a', 0, 'x'), ('b', 0, 'y'), ('c', 0, 'z')] - - If the *strict* keyword argument is ``True``, then - ``UnequalIterablesError`` will be raised if any of the iterables have - different lengths. - """ - - def is_scalar(obj): - if scalar_types and isinstance(obj, scalar_types): - return True - try: - iter(obj) - except TypeError: - return True - else: - return False - - size = len(objects) - if not size: - return - - new_item = [None] * size - iterables, iterable_positions = [], [] - for i, obj in enumerate(objects): - if is_scalar(obj): - new_item[i] = obj - else: - iterables.append(iter(obj)) - iterable_positions.append(i) - - if not iterables: - yield tuple(objects) - return - - zipper = _zip_equal if strict else zip - for item in zipper(*iterables): - for i, new_item[i] in zip(iterable_positions, item): - pass - yield tuple(new_item) - - -def unique_in_window(iterable, n, key=None): - """Yield the items from *iterable* that haven't been seen recently. - *n* is the size of the lookback window. - - >>> iterable = [0, 1, 0, 2, 3, 0] - >>> n = 3 - >>> list(unique_in_window(iterable, n)) - [0, 1, 2, 3, 0] - - The *key* function, if provided, will be used to determine uniqueness: - - >>> list(unique_in_window('abAcda', 3, key=lambda x: x.lower())) - ['a', 'b', 'c', 'd', 'a'] - - The items in *iterable* must be hashable. - - """ - if n <= 0: - raise ValueError('n must be greater than 0') - - window = deque(maxlen=n) - counts = defaultdict(int) - use_key = key is not None - - for item in iterable: - if len(window) == n: - to_discard = window[0] - if counts[to_discard] == 1: - del counts[to_discard] - else: - counts[to_discard] -= 1 - - k = key(item) if use_key else item - if k not in counts: - yield item - counts[k] += 1 - window.append(k) - - -def duplicates_everseen(iterable, key=None): - """Yield duplicate elements after their first appearance. - - >>> list(duplicates_everseen('mississippi')) - ['s', 'i', 's', 's', 'i', 'p', 'i'] - >>> list(duplicates_everseen('AaaBbbCccAaa', str.lower)) - ['a', 'a', 'b', 'b', 'c', 'c', 'A', 'a', 'a'] - - This function is analogous to :func:`unique_everseen` and is subject to - the same performance considerations. - - """ - seen_set = set() - seen_list = [] - use_key = key is not None - - for element in iterable: - k = key(element) if use_key else element - try: - if k not in seen_set: - seen_set.add(k) - else: - yield element - except TypeError: - if k not in seen_list: - seen_list.append(k) - else: - yield element - - -def duplicates_justseen(iterable, key=None): - """Yields serially-duplicate elements after their first appearance. - - >>> list(duplicates_justseen('mississippi')) - ['s', 's', 'p'] - >>> list(duplicates_justseen('AaaBbbCccAaa', str.lower)) - ['a', 'a', 'b', 'b', 'c', 'c', 'a', 'a'] - - This function is analogous to :func:`unique_justseen`. - - """ - return flatten(g for _, g in groupby(iterable, key) for _ in g) - - -def classify_unique(iterable, key=None): - """Classify each element in terms of its uniqueness. - - For each element in the input iterable, return a 3-tuple consisting of: - - 1. The element itself - 2. ``False`` if the element is equal to the one preceding it in the input, - ``True`` otherwise (i.e. the equivalent of :func:`unique_justseen`) - 3. ``False`` if this element has been seen anywhere in the input before, - ``True`` otherwise (i.e. the equivalent of :func:`unique_everseen`) - - >>> list(classify_unique('otto')) # doctest: +NORMALIZE_WHITESPACE - [('o', True, True), - ('t', True, True), - ('t', False, False), - ('o', True, False)] - - This function is analogous to :func:`unique_everseen` and is subject to - the same performance considerations. - - """ - seen_set = set() - seen_list = [] - use_key = key is not None - previous = None - - for i, element in enumerate(iterable): - k = key(element) if use_key else element - is_unique_justseen = not i or previous != k - previous = k - is_unique_everseen = False - try: - if k not in seen_set: - seen_set.add(k) - is_unique_everseen = True - except TypeError: - if k not in seen_list: - seen_list.append(k) - is_unique_everseen = True - yield element, is_unique_justseen, is_unique_everseen - - -def minmax(iterable_or_value, *others, key=None, default=_marker): - """Returns both the smallest and largest items in an iterable - or the largest of two or more arguments. - - >>> minmax([3, 1, 5]) - (1, 5) - - >>> minmax(4, 2, 6) - (2, 6) - - If a *key* function is provided, it will be used to transform the input - items for comparison. - - >>> minmax([5, 30], key=str) # '30' sorts before '5' - (30, 5) - - If a *default* value is provided, it will be returned if there are no - input items. - - >>> minmax([], default=(0, 0)) - (0, 0) - - Otherwise ``ValueError`` is raised. - - This function is based on the - `recipe `__ by - Raymond Hettinger and takes care to minimize the number of comparisons - performed. - """ - iterable = (iterable_or_value, *others) if others else iterable_or_value - - it = iter(iterable) - - try: - lo = hi = next(it) - except StopIteration as exc: - if default is _marker: - raise ValueError( - '`minmax()` argument is an empty iterable. ' - 'Provide a `default` value to suppress this error.' - ) from exc - return default - - # Different branches depending on the presence of key. This saves a lot - # of unimportant copies which would slow the "key=None" branch - # significantly down. - if key is None: - for x, y in zip_longest(it, it, fillvalue=lo): - if y < x: - x, y = y, x - if x < lo: - lo = x - if hi < y: - hi = y - - else: - lo_key = hi_key = key(lo) - - for x, y in zip_longest(it, it, fillvalue=lo): - x_key, y_key = key(x), key(y) - - if y_key < x_key: - x, y, x_key, y_key = y, x, y_key, x_key - if x_key < lo_key: - lo, lo_key = x, x_key - if hi_key < y_key: - hi, hi_key = y, y_key - - return lo, hi - - -def constrained_batches( - iterable, max_size, max_count=None, get_len=len, strict=True -): - """Yield batches of items from *iterable* with a combined size limited by - *max_size*. - - >>> iterable = [b'12345', b'123', b'12345678', b'1', b'1', b'12', b'1'] - >>> list(constrained_batches(iterable, 10)) - [(b'12345', b'123'), (b'12345678', b'1', b'1'), (b'12', b'1')] - - If a *max_count* is supplied, the number of items per batch is also - limited: - - >>> iterable = [b'12345', b'123', b'12345678', b'1', b'1', b'12', b'1'] - >>> list(constrained_batches(iterable, 10, max_count = 2)) - [(b'12345', b'123'), (b'12345678', b'1'), (b'1', b'12'), (b'1',)] - - If a *get_len* function is supplied, use that instead of :func:`len` to - determine item size. - - If *strict* is ``True``, raise ``ValueError`` if any single item is bigger - than *max_size*. Otherwise, allow single items to exceed *max_size*. - """ - if max_size <= 0: - raise ValueError('maximum size must be greater than zero') - - batch = [] - batch_size = 0 - batch_count = 0 - for item in iterable: - item_len = get_len(item) - if strict and item_len > max_size: - raise ValueError('item size exceeds maximum size') - - reached_count = batch_count == max_count - reached_size = item_len + batch_size > max_size - if batch_count and (reached_size or reached_count): - yield tuple(batch) - batch.clear() - batch_size = 0 - batch_count = 0 - - batch.append(item) - batch_size += item_len - batch_count += 1 - - if batch: - yield tuple(batch) - - -def gray_product(*iterables): - """Like :func:`itertools.product`, but return tuples in an order such - that only one element in the generated tuple changes from one iteration - to the next. - - >>> list(gray_product('AB','CD')) - [('A', 'C'), ('B', 'C'), ('B', 'D'), ('A', 'D')] - - This function consumes all of the input iterables before producing output. - If any of the input iterables have fewer than two items, ``ValueError`` - is raised. - - For information on the algorithm, see - `this section `__ - of Donald Knuth's *The Art of Computer Programming*. - """ - all_iterables = tuple(tuple(x) for x in iterables) - iterable_count = len(all_iterables) - for iterable in all_iterables: - if len(iterable) < 2: - raise ValueError("each iterable must have two or more items") - - # This is based on "Algorithm H" from section 7.2.1.1, page 20. - # a holds the indexes of the source iterables for the n-tuple to be yielded - # f is the array of "focus pointers" - # o is the array of "directions" - a = [0] * iterable_count - f = list(range(iterable_count + 1)) - o = [1] * iterable_count - while True: - yield tuple(all_iterables[i][a[i]] for i in range(iterable_count)) - j = f[0] - f[0] = 0 - if j == iterable_count: - break - a[j] = a[j] + o[j] - if a[j] == 0 or a[j] == len(all_iterables[j]) - 1: - o[j] = -o[j] - f[j] = f[j + 1] - f[j + 1] = j + 1 - - -def partial_product(*iterables): - """Yields tuples containing one item from each iterator, with subsequent - tuples changing a single item at a time by advancing each iterator until it - is exhausted. This sequence guarantees every value in each iterable is - output at least once without generating all possible combinations. - - This may be useful, for example, when testing an expensive function. - - >>> list(partial_product('AB', 'C', 'DEF')) - [('A', 'C', 'D'), ('B', 'C', 'D'), ('B', 'C', 'E'), ('B', 'C', 'F')] - """ - - iterators = list(map(iter, iterables)) - - try: - prod = [next(it) for it in iterators] - except StopIteration: - return - yield tuple(prod) - - for i, it in enumerate(iterators): - for prod[i] in it: - yield tuple(prod) - - -def takewhile_inclusive(predicate, iterable): - """A variant of :func:`takewhile` that yields one additional element. - - >>> list(takewhile_inclusive(lambda x: x < 5, [1, 4, 6, 4, 1])) - [1, 4, 6] - - :func:`takewhile` would return ``[1, 4]``. - """ - for x in iterable: - yield x - if not predicate(x): - break - - -def outer_product(func, xs, ys, *args, **kwargs): - """A generalized outer product that applies a binary function to all - pairs of items. Returns a 2D matrix with ``len(xs)`` rows and ``len(ys)`` - columns. - Also accepts ``*args`` and ``**kwargs`` that are passed to ``func``. - - Multiplication table: - - >>> list(outer_product(mul, range(1, 4), range(1, 6))) - [(1, 2, 3, 4, 5), (2, 4, 6, 8, 10), (3, 6, 9, 12, 15)] - - Cross tabulation: - - >>> xs = ['A', 'B', 'A', 'A', 'B', 'B', 'A', 'A', 'B', 'B'] - >>> ys = ['X', 'X', 'X', 'Y', 'Z', 'Z', 'Y', 'Y', 'Z', 'Z'] - >>> rows = list(zip(xs, ys)) - >>> count_rows = lambda x, y: rows.count((x, y)) - >>> list(outer_product(count_rows, sorted(set(xs)), sorted(set(ys)))) - [(2, 3, 0), (1, 0, 4)] - - Usage with ``*args`` and ``**kwargs``: - - >>> animals = ['cat', 'wolf', 'mouse'] - >>> list(outer_product(min, animals, animals, key=len)) - [('cat', 'cat', 'cat'), ('cat', 'wolf', 'wolf'), ('cat', 'wolf', 'mouse')] - """ - ys = tuple(ys) - return batched( - starmap(lambda x, y: func(x, y, *args, **kwargs), product(xs, ys)), - n=len(ys), - ) - - -def iter_suppress(iterable, *exceptions): - """Yield each of the items from *iterable*. If the iteration raises one of - the specified *exceptions*, that exception will be suppressed and iteration - will stop. - - >>> from itertools import chain - >>> def breaks_at_five(x): - ... while True: - ... if x >= 5: - ... raise RuntimeError - ... yield x - ... x += 1 - >>> it_1 = iter_suppress(breaks_at_five(1), RuntimeError) - >>> it_2 = iter_suppress(breaks_at_five(2), RuntimeError) - >>> list(chain(it_1, it_2)) - [1, 2, 3, 4, 2, 3, 4] - """ - try: - yield from iterable - except exceptions: - return - - -def filter_map(func, iterable): - """Apply *func* to every element of *iterable*, yielding only those which - are not ``None``. - - >>> elems = ['1', 'a', '2', 'b', '3'] - >>> list(filter_map(lambda s: int(s) if s.isnumeric() else None, elems)) - [1, 2, 3] - """ - for x in iterable: - y = func(x) - if y is not None: - yield y - - -def powerset_of_sets(iterable): - """Yields all possible subsets of the iterable. - - >>> list(powerset_of_sets([1, 2, 3])) # doctest: +SKIP - [set(), {1}, {2}, {3}, {1, 2}, {1, 3}, {2, 3}, {1, 2, 3}] - >>> list(powerset_of_sets([1, 1, 0])) # doctest: +SKIP - [set(), {1}, {0}, {0, 1}] - - :func:`powerset_of_sets` takes care to minimize the number - of hash operations performed. - """ - sets = tuple(map(set, dict.fromkeys(map(frozenset, zip(iterable))))) - for r in range(len(sets) + 1): - yield from starmap(set().union, combinations(sets, r)) - - -def join_mappings(**field_to_map): - """ - Joins multiple mappings together using their common keys. - - >>> user_scores = {'elliot': 50, 'claris': 60} - >>> user_times = {'elliot': 30, 'claris': 40} - >>> join_mappings(score=user_scores, time=user_times) - {'elliot': {'score': 50, 'time': 30}, 'claris': {'score': 60, 'time': 40}} - """ - ret = defaultdict(dict) - - for field_name, mapping in field_to_map.items(): - for key, value in mapping.items(): - ret[key][field_name] = value - - return dict(ret) - - -def _complex_sumprod(v1, v2): - """High precision sumprod() for complex numbers. - Used by :func:`dft` and :func:`idft`. - """ - - r1 = chain((p.real for p in v1), (-p.imag for p in v1)) - r2 = chain((q.real for q in v2), (q.imag for q in v2)) - i1 = chain((p.real for p in v1), (p.imag for p in v1)) - i2 = chain((q.imag for q in v2), (q.real for q in v2)) - return complex(_fsumprod(r1, r2), _fsumprod(i1, i2)) - - -def dft(xarr): - """Discrete Fourier Tranform. *xarr* is a sequence of complex numbers. - Yields the components of the corresponding transformed output vector. - - >>> import cmath - >>> xarr = [1, 2-1j, -1j, -1+2j] - >>> Xarr = [2, -2-2j, -2j, 4+4j] - >>> all(map(cmath.isclose, dft(xarr), Xarr)) - True - - See :func:`idft` for the inverse Discrete Fourier Transform. - """ - N = len(xarr) - roots_of_unity = [e ** (n / N * tau * -1j) for n in range(N)] - for k in range(N): - coeffs = [roots_of_unity[k * n % N] for n in range(N)] - yield _complex_sumprod(xarr, coeffs) - - -def idft(Xarr): - """Inverse Discrete Fourier Tranform. *Xarr* is a sequence of - complex numbers. Yields the components of the corresponding - inverse-transformed output vector. - - >>> import cmath - >>> xarr = [1, 2-1j, -1j, -1+2j] - >>> Xarr = [2, -2-2j, -2j, 4+4j] - >>> all(map(cmath.isclose, idft(Xarr), xarr)) - True - - See :func:`dft` for the Discrete Fourier Transform. - """ - N = len(Xarr) - roots_of_unity = [e ** (n / N * tau * 1j) for n in range(N)] - for k in range(N): - coeffs = [roots_of_unity[k * n % N] for n in range(N)] - yield _complex_sumprod(Xarr, coeffs) / N - - -def doublestarmap(func, iterable): - """Apply *func* to every item of *iterable* by dictionary unpacking - the item into *func*. - - The difference between :func:`itertools.starmap` and :func:`doublestarmap` - parallels the distinction between ``func(*a)`` and ``func(**a)``. - - >>> iterable = [{'a': 1, 'b': 2}, {'a': 40, 'b': 60}] - >>> list(doublestarmap(lambda a, b: a + b, iterable)) - [3, 100] - - ``TypeError`` will be raised if *func*'s signature doesn't match the - mapping contained in *iterable* or if *iterable* does not contain mappings. - """ - for item in iterable: - yield func(**item) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.pyi b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.pyi deleted file mode 100644 index e946023..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/more.pyi +++ /dev/null @@ -1,709 +0,0 @@ -"""Stubs for more_itertools.more""" - -from __future__ import annotations - -from types import TracebackType -from typing import ( - Any, - Callable, - Container, - ContextManager, - Generic, - Hashable, - Mapping, - Iterable, - Iterator, - Mapping, - overload, - Reversible, - Sequence, - Sized, - Type, - TypeVar, - type_check_only, -) -from typing_extensions import Protocol - -# Type and type variable definitions -_T = TypeVar('_T') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_U = TypeVar('_U') -_V = TypeVar('_V') -_W = TypeVar('_W') -_T_co = TypeVar('_T_co', covariant=True) -_GenFn = TypeVar('_GenFn', bound=Callable[..., Iterator[Any]]) -_Raisable = BaseException | Type[BaseException] - -@type_check_only -class _SizedIterable(Protocol[_T_co], Sized, Iterable[_T_co]): ... - -@type_check_only -class _SizedReversible(Protocol[_T_co], Sized, Reversible[_T_co]): ... - -@type_check_only -class _SupportsSlicing(Protocol[_T_co]): - def __getitem__(self, __k: slice) -> _T_co: ... - -def chunked( - iterable: Iterable[_T], n: int | None, strict: bool = ... -) -> Iterator[list[_T]]: ... -@overload -def first(iterable: Iterable[_T]) -> _T: ... -@overload -def first(iterable: Iterable[_T], default: _U) -> _T | _U: ... -@overload -def last(iterable: Iterable[_T]) -> _T: ... -@overload -def last(iterable: Iterable[_T], default: _U) -> _T | _U: ... -@overload -def nth_or_last(iterable: Iterable[_T], n: int) -> _T: ... -@overload -def nth_or_last(iterable: Iterable[_T], n: int, default: _U) -> _T | _U: ... - -class peekable(Generic[_T], Iterator[_T]): - def __init__(self, iterable: Iterable[_T]) -> None: ... - def __iter__(self) -> peekable[_T]: ... - def __bool__(self) -> bool: ... - @overload - def peek(self) -> _T: ... - @overload - def peek(self, default: _U) -> _T | _U: ... - def prepend(self, *items: _T) -> None: ... - def __next__(self) -> _T: ... - @overload - def __getitem__(self, index: int) -> _T: ... - @overload - def __getitem__(self, index: slice) -> list[_T]: ... - -def consumer(func: _GenFn) -> _GenFn: ... -def ilen(iterable: Iterable[_T]) -> int: ... -def iterate(func: Callable[[_T], _T], start: _T) -> Iterator[_T]: ... -def with_iter( - context_manager: ContextManager[Iterable[_T]], -) -> Iterator[_T]: ... -def one( - iterable: Iterable[_T], - too_short: _Raisable | None = ..., - too_long: _Raisable | None = ..., -) -> _T: ... -def raise_(exception: _Raisable, *args: Any) -> None: ... -def strictly_n( - iterable: Iterable[_T], - n: int, - too_short: _GenFn | None = ..., - too_long: _GenFn | None = ..., -) -> list[_T]: ... -def distinct_permutations( - iterable: Iterable[_T], r: int | None = ... -) -> Iterator[tuple[_T, ...]]: ... -def intersperse( - e: _U, iterable: Iterable[_T], n: int = ... -) -> Iterator[_T | _U]: ... -def unique_to_each(*iterables: Iterable[_T]) -> list[list[_T]]: ... -@overload -def windowed( - seq: Iterable[_T], n: int, *, step: int = ... -) -> Iterator[tuple[_T | None, ...]]: ... -@overload -def windowed( - seq: Iterable[_T], n: int, fillvalue: _U, step: int = ... -) -> Iterator[tuple[_T | _U, ...]]: ... -def substrings(iterable: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ... -def substrings_indexes( - seq: Sequence[_T], reverse: bool = ... -) -> Iterator[tuple[Sequence[_T], int, int]]: ... - -class bucket(Generic[_T, _U], Container[_U]): - def __init__( - self, - iterable: Iterable[_T], - key: Callable[[_T], _U], - validator: Callable[[_U], object] | None = ..., - ) -> None: ... - def __contains__(self, value: object) -> bool: ... - def __iter__(self) -> Iterator[_U]: ... - def __getitem__(self, value: object) -> Iterator[_T]: ... - -def spy( - iterable: Iterable[_T], n: int = ... -) -> tuple[list[_T], Iterator[_T]]: ... -def interleave(*iterables: Iterable[_T]) -> Iterator[_T]: ... -def interleave_longest(*iterables: Iterable[_T]) -> Iterator[_T]: ... -def interleave_evenly( - iterables: list[Iterable[_T]], lengths: list[int] | None = ... -) -> Iterator[_T]: ... -def collapse( - iterable: Iterable[Any], - base_type: type | None = ..., - levels: int | None = ..., -) -> Iterator[Any]: ... -@overload -def side_effect( - func: Callable[[_T], object], - iterable: Iterable[_T], - chunk_size: None = ..., - before: Callable[[], object] | None = ..., - after: Callable[[], object] | None = ..., -) -> Iterator[_T]: ... -@overload -def side_effect( - func: Callable[[list[_T]], object], - iterable: Iterable[_T], - chunk_size: int, - before: Callable[[], object] | None = ..., - after: Callable[[], object] | None = ..., -) -> Iterator[_T]: ... -def sliced( - seq: _SupportsSlicing[_T], n: int, strict: bool = ... -) -> Iterator[_T]: ... -def split_at( - iterable: Iterable[_T], - pred: Callable[[_T], object], - maxsplit: int = ..., - keep_separator: bool = ..., -) -> Iterator[list[_T]]: ... -def split_before( - iterable: Iterable[_T], pred: Callable[[_T], object], maxsplit: int = ... -) -> Iterator[list[_T]]: ... -def split_after( - iterable: Iterable[_T], pred: Callable[[_T], object], maxsplit: int = ... -) -> Iterator[list[_T]]: ... -def split_when( - iterable: Iterable[_T], - pred: Callable[[_T, _T], object], - maxsplit: int = ..., -) -> Iterator[list[_T]]: ... -def split_into( - iterable: Iterable[_T], sizes: Iterable[int | None] -) -> Iterator[list[_T]]: ... -@overload -def padded( - iterable: Iterable[_T], - *, - n: int | None = ..., - next_multiple: bool = ..., -) -> Iterator[_T | None]: ... -@overload -def padded( - iterable: Iterable[_T], - fillvalue: _U, - n: int | None = ..., - next_multiple: bool = ..., -) -> Iterator[_T | _U]: ... -@overload -def repeat_last(iterable: Iterable[_T]) -> Iterator[_T]: ... -@overload -def repeat_last(iterable: Iterable[_T], default: _U) -> Iterator[_T | _U]: ... -def distribute(n: int, iterable: Iterable[_T]) -> list[Iterator[_T]]: ... -@overload -def stagger( - iterable: Iterable[_T], - offsets: _SizedIterable[int] = ..., - longest: bool = ..., -) -> Iterator[tuple[_T | None, ...]]: ... -@overload -def stagger( - iterable: Iterable[_T], - offsets: _SizedIterable[int] = ..., - longest: bool = ..., - fillvalue: _U = ..., -) -> Iterator[tuple[_T | _U, ...]]: ... - -class UnequalIterablesError(ValueError): - def __init__(self, details: tuple[int, int, int] | None = ...) -> None: ... - -@overload -def zip_equal(__iter1: Iterable[_T1]) -> Iterator[tuple[_T1]]: ... -@overload -def zip_equal( - __iter1: Iterable[_T1], __iter2: Iterable[_T2] -) -> Iterator[tuple[_T1, _T2]]: ... -@overload -def zip_equal( - __iter1: Iterable[_T], - __iter2: Iterable[_T], - __iter3: Iterable[_T], - *iterables: Iterable[_T], -) -> Iterator[tuple[_T, ...]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T1], - *, - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: None = None, -) -> Iterator[tuple[_T1 | None]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - *, - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: None = None, -) -> Iterator[tuple[_T1 | None, _T2 | None]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T], - __iter2: Iterable[_T], - __iter3: Iterable[_T], - *iterables: Iterable[_T], - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: None = None, -) -> Iterator[tuple[_T | None, ...]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T1], - *, - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: _U, -) -> Iterator[tuple[_T1 | _U]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T1], - __iter2: Iterable[_T2], - *, - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: _U, -) -> Iterator[tuple[_T1 | _U, _T2 | _U]]: ... -@overload -def zip_offset( - __iter1: Iterable[_T], - __iter2: Iterable[_T], - __iter3: Iterable[_T], - *iterables: Iterable[_T], - offsets: _SizedIterable[int], - longest: bool = ..., - fillvalue: _U, -) -> Iterator[tuple[_T | _U, ...]]: ... -def sort_together( - iterables: Iterable[Iterable[_T]], - key_list: Iterable[int] = ..., - key: Callable[..., Any] | None = ..., - reverse: bool = ..., -) -> list[tuple[_T, ...]]: ... -def unzip(iterable: Iterable[Sequence[_T]]) -> tuple[Iterator[_T], ...]: ... -def divide(n: int, iterable: Iterable[_T]) -> list[Iterator[_T]]: ... -def always_iterable( - obj: object, - base_type: type | tuple[type | tuple[Any, ...], ...] | None = ..., -) -> Iterator[Any]: ... -def adjacent( - predicate: Callable[[_T], bool], - iterable: Iterable[_T], - distance: int = ..., -) -> Iterator[tuple[bool, _T]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: None = None, - valuefunc: None = None, - reducefunc: None = None, -) -> Iterator[tuple[_T, Iterator[_T]]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: None, - reducefunc: None, -) -> Iterator[tuple[_U, Iterator[_T]]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: None, - valuefunc: Callable[[_T], _V], - reducefunc: None, -) -> Iterable[tuple[_T, Iterable[_V]]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: Callable[[_T], _V], - reducefunc: None, -) -> Iterable[tuple[_U, Iterator[_V]]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: None, - valuefunc: None, - reducefunc: Callable[[Iterator[_T]], _W], -) -> Iterable[tuple[_T, _W]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: None, - reducefunc: Callable[[Iterator[_T]], _W], -) -> Iterable[tuple[_U, _W]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: None, - valuefunc: Callable[[_T], _V], - reducefunc: Callable[[Iterable[_V]], _W], -) -> Iterable[tuple[_T, _W]]: ... -@overload -def groupby_transform( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: Callable[[_T], _V], - reducefunc: Callable[[Iterable[_V]], _W], -) -> Iterable[tuple[_U, _W]]: ... - -class numeric_range(Generic[_T, _U], Sequence[_T], Hashable, Reversible[_T]): - @overload - def __init__(self, __stop: _T) -> None: ... - @overload - def __init__(self, __start: _T, __stop: _T) -> None: ... - @overload - def __init__(self, __start: _T, __stop: _T, __step: _U) -> None: ... - def __bool__(self) -> bool: ... - def __contains__(self, elem: object) -> bool: ... - def __eq__(self, other: object) -> bool: ... - @overload - def __getitem__(self, key: int) -> _T: ... - @overload - def __getitem__(self, key: slice) -> numeric_range[_T, _U]: ... - def __hash__(self) -> int: ... - def __iter__(self) -> Iterator[_T]: ... - def __len__(self) -> int: ... - def __reduce__( - self, - ) -> tuple[Type[numeric_range[_T, _U]], tuple[_T, _T, _U]]: ... - def __repr__(self) -> str: ... - def __reversed__(self) -> Iterator[_T]: ... - def count(self, value: _T) -> int: ... - def index(self, value: _T) -> int: ... # type: ignore - -def count_cycle( - iterable: Iterable[_T], n: int | None = ... -) -> Iterable[tuple[int, _T]]: ... -def mark_ends( - iterable: Iterable[_T], -) -> Iterable[tuple[bool, bool, _T]]: ... -def locate( - iterable: Iterable[_T], - pred: Callable[..., Any] = ..., - window_size: int | None = ..., -) -> Iterator[int]: ... -def lstrip( - iterable: Iterable[_T], pred: Callable[[_T], object] -) -> Iterator[_T]: ... -def rstrip( - iterable: Iterable[_T], pred: Callable[[_T], object] -) -> Iterator[_T]: ... -def strip( - iterable: Iterable[_T], pred: Callable[[_T], object] -) -> Iterator[_T]: ... - -class islice_extended(Generic[_T], Iterator[_T]): - def __init__(self, iterable: Iterable[_T], *args: int | None) -> None: ... - def __iter__(self) -> islice_extended[_T]: ... - def __next__(self) -> _T: ... - def __getitem__(self, index: slice) -> islice_extended[_T]: ... - -def always_reversible(iterable: Iterable[_T]) -> Iterator[_T]: ... -def consecutive_groups( - iterable: Iterable[_T], ordering: Callable[[_T], int] = ... -) -> Iterator[Iterator[_T]]: ... -@overload -def difference( - iterable: Iterable[_T], - func: Callable[[_T, _T], _U] = ..., - *, - initial: None = ..., -) -> Iterator[_T | _U]: ... -@overload -def difference( - iterable: Iterable[_T], func: Callable[[_T, _T], _U] = ..., *, initial: _U -) -> Iterator[_U]: ... - -class SequenceView(Generic[_T], Sequence[_T]): - def __init__(self, target: Sequence[_T]) -> None: ... - @overload - def __getitem__(self, index: int) -> _T: ... - @overload - def __getitem__(self, index: slice) -> Sequence[_T]: ... - def __len__(self) -> int: ... - -class seekable(Generic[_T], Iterator[_T]): - def __init__( - self, iterable: Iterable[_T], maxlen: int | None = ... - ) -> None: ... - def __iter__(self) -> seekable[_T]: ... - def __next__(self) -> _T: ... - def __bool__(self) -> bool: ... - @overload - def peek(self) -> _T: ... - @overload - def peek(self, default: _U) -> _T | _U: ... - def elements(self) -> SequenceView[_T]: ... - def seek(self, index: int) -> None: ... - def relative_seek(self, count: int) -> None: ... - -class run_length: - @staticmethod - def encode(iterable: Iterable[_T]) -> Iterator[tuple[_T, int]]: ... - @staticmethod - def decode(iterable: Iterable[tuple[_T, int]]) -> Iterator[_T]: ... - -def exactly_n( - iterable: Iterable[_T], n: int, predicate: Callable[[_T], object] = ... -) -> bool: ... -def circular_shifts(iterable: Iterable[_T]) -> list[tuple[_T, ...]]: ... -def make_decorator( - wrapping_func: Callable[..., _U], result_index: int = ... -) -> Callable[..., Callable[[Callable[..., Any]], Callable[..., _U]]]: ... -@overload -def map_reduce( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: None = ..., - reducefunc: None = ..., -) -> dict[_U, list[_T]]: ... -@overload -def map_reduce( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: Callable[[_T], _V], - reducefunc: None = ..., -) -> dict[_U, list[_V]]: ... -@overload -def map_reduce( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: None = ..., - reducefunc: Callable[[list[_T]], _W] = ..., -) -> dict[_U, _W]: ... -@overload -def map_reduce( - iterable: Iterable[_T], - keyfunc: Callable[[_T], _U], - valuefunc: Callable[[_T], _V], - reducefunc: Callable[[list[_V]], _W], -) -> dict[_U, _W]: ... -def rlocate( - iterable: Iterable[_T], - pred: Callable[..., object] = ..., - window_size: int | None = ..., -) -> Iterator[int]: ... -def replace( - iterable: Iterable[_T], - pred: Callable[..., object], - substitutes: Iterable[_U], - count: int | None = ..., - window_size: int = ..., -) -> Iterator[_T | _U]: ... -def partitions(iterable: Iterable[_T]) -> Iterator[list[list[_T]]]: ... -def set_partitions( - iterable: Iterable[_T], k: int | None = ... -) -> Iterator[list[list[_T]]]: ... - -class time_limited(Generic[_T], Iterator[_T]): - def __init__( - self, limit_seconds: float, iterable: Iterable[_T] - ) -> None: ... - def __iter__(self) -> islice_extended[_T]: ... - def __next__(self) -> _T: ... - -@overload -def only( - iterable: Iterable[_T], *, too_long: _Raisable | None = ... -) -> _T | None: ... -@overload -def only( - iterable: Iterable[_T], default: _U, too_long: _Raisable | None = ... -) -> _T | _U: ... -def ichunked(iterable: Iterable[_T], n: int) -> Iterator[Iterator[_T]]: ... -def distinct_combinations( - iterable: Iterable[_T], r: int -) -> Iterator[tuple[_T, ...]]: ... -def filter_except( - validator: Callable[[Any], object], - iterable: Iterable[_T], - *exceptions: Type[BaseException], -) -> Iterator[_T]: ... -def map_except( - function: Callable[[Any], _U], - iterable: Iterable[_T], - *exceptions: Type[BaseException], -) -> Iterator[_U]: ... -def map_if( - iterable: Iterable[Any], - pred: Callable[[Any], bool], - func: Callable[[Any], Any], - func_else: Callable[[Any], Any] | None = ..., -) -> Iterator[Any]: ... -def sample( - iterable: Iterable[_T], - k: int, - weights: Iterable[float] | None = ..., -) -> list[_T]: ... -def is_sorted( - iterable: Iterable[_T], - key: Callable[[_T], _U] | None = ..., - reverse: bool = False, - strict: bool = False, -) -> bool: ... - -class AbortThread(BaseException): - pass - -class callback_iter(Generic[_T], Iterator[_T]): - def __init__( - self, - func: Callable[..., Any], - callback_kwd: str = ..., - wait_seconds: float = ..., - ) -> None: ... - def __enter__(self) -> callback_iter[_T]: ... - def __exit__( - self, - exc_type: Type[BaseException] | None, - exc_value: BaseException | None, - traceback: TracebackType | None, - ) -> bool | None: ... - def __iter__(self) -> callback_iter[_T]: ... - def __next__(self) -> _T: ... - def _reader(self) -> Iterator[_T]: ... - @property - def done(self) -> bool: ... - @property - def result(self) -> Any: ... - -def windowed_complete( - iterable: Iterable[_T], n: int -) -> Iterator[tuple[_T, ...]]: ... -def all_unique( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> bool: ... -def nth_product(index: int, *args: Iterable[_T]) -> tuple[_T, ...]: ... -def nth_combination_with_replacement( - iterable: Iterable[_T], r: int, index: int -) -> tuple[_T, ...]: ... -def nth_permutation( - iterable: Iterable[_T], r: int, index: int -) -> tuple[_T, ...]: ... -def value_chain(*args: _T | Iterable[_T]) -> Iterable[_T]: ... -def product_index(element: Iterable[_T], *args: Iterable[_T]) -> int: ... -def combination_index( - element: Iterable[_T], iterable: Iterable[_T] -) -> int: ... -def combination_with_replacement_index( - element: Iterable[_T], iterable: Iterable[_T] -) -> int: ... -def permutation_index( - element: Iterable[_T], iterable: Iterable[_T] -) -> int: ... -def repeat_each(iterable: Iterable[_T], n: int = ...) -> Iterator[_T]: ... - -class countable(Generic[_T], Iterator[_T]): - def __init__(self, iterable: Iterable[_T]) -> None: ... - def __iter__(self) -> countable[_T]: ... - def __next__(self) -> _T: ... - items_seen: int - -def chunked_even(iterable: Iterable[_T], n: int) -> Iterator[list[_T]]: ... -def zip_broadcast( - *objects: _T | Iterable[_T], - scalar_types: type | tuple[type | tuple[Any, ...], ...] | None = ..., - strict: bool = ..., -) -> Iterable[tuple[_T, ...]]: ... -def unique_in_window( - iterable: Iterable[_T], n: int, key: Callable[[_T], _U] | None = ... -) -> Iterator[_T]: ... -def duplicates_everseen( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> Iterator[_T]: ... -def duplicates_justseen( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> Iterator[_T]: ... -def classify_unique( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> Iterator[tuple[_T, bool, bool]]: ... - -class _SupportsLessThan(Protocol): - def __lt__(self, __other: Any) -> bool: ... - -_SupportsLessThanT = TypeVar("_SupportsLessThanT", bound=_SupportsLessThan) - -@overload -def minmax( - iterable_or_value: Iterable[_SupportsLessThanT], *, key: None = None -) -> tuple[_SupportsLessThanT, _SupportsLessThanT]: ... -@overload -def minmax( - iterable_or_value: Iterable[_T], *, key: Callable[[_T], _SupportsLessThan] -) -> tuple[_T, _T]: ... -@overload -def minmax( - iterable_or_value: Iterable[_SupportsLessThanT], - *, - key: None = None, - default: _U, -) -> _U | tuple[_SupportsLessThanT, _SupportsLessThanT]: ... -@overload -def minmax( - iterable_or_value: Iterable[_T], - *, - key: Callable[[_T], _SupportsLessThan], - default: _U, -) -> _U | tuple[_T, _T]: ... -@overload -def minmax( - iterable_or_value: _SupportsLessThanT, - __other: _SupportsLessThanT, - *others: _SupportsLessThanT, -) -> tuple[_SupportsLessThanT, _SupportsLessThanT]: ... -@overload -def minmax( - iterable_or_value: _T, - __other: _T, - *others: _T, - key: Callable[[_T], _SupportsLessThan], -) -> tuple[_T, _T]: ... -def longest_common_prefix( - iterables: Iterable[Iterable[_T]], -) -> Iterator[_T]: ... -def iequals(*iterables: Iterable[Any]) -> bool: ... -def constrained_batches( - iterable: Iterable[_T], - max_size: int, - max_count: int | None = ..., - get_len: Callable[[_T], object] = ..., - strict: bool = ..., -) -> Iterator[tuple[_T]]: ... -def gray_product(*iterables: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ... -def partial_product(*iterables: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ... -def takewhile_inclusive( - predicate: Callable[[_T], bool], iterable: Iterable[_T] -) -> Iterator[_T]: ... -def outer_product( - func: Callable[[_T, _U], _V], - xs: Iterable[_T], - ys: Iterable[_U], - *args: Any, - **kwargs: Any, -) -> Iterator[tuple[_V, ...]]: ... -def iter_suppress( - iterable: Iterable[_T], - *exceptions: Type[BaseException], -) -> Iterator[_T]: ... -def filter_map( - func: Callable[[_T], _V | None], - iterable: Iterable[_T], -) -> Iterator[_V]: ... -def powerset_of_sets(iterable: Iterable[_T]) -> Iterator[set[_T]]: ... -def join_mappings( - **field_to_map: Mapping[_T, _V] -) -> dict[_T, dict[str, _V]]: ... -def doublestarmap( - func: Callable[..., _T], - iterable: Iterable[Mapping[str, Any]], -) -> Iterator[_T]: ... -def dft(xarr: Sequence[complex]) -> Iterator[complex]: ... -def idft(Xarr: Sequence[complex]) -> Iterator[complex]: ... diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.py index b32fa95..521abd7 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.py @@ -7,44 +7,32 @@ Some backward-compatible usability improvements have been made. .. [1] http://docs.python.org/library/itertools.html#recipes """ - -import math -import operator - +import warnings from collections import deque -from collections.abc import Sized -from functools import partial, reduce from itertools import ( chain, combinations, - compress, count, cycle, groupby, islice, - product, repeat, starmap, tee, zip_longest, ) +import operator from random import randrange, sample, choice -from sys import hexversion __all__ = [ 'all_equal', - 'batched', - 'before_and_after', 'consume', 'convolve', 'dotproduct', 'first_true', - 'factor', 'flatten', 'grouper', 'iter_except', - 'iter_index', - 'matmul', 'ncycles', 'nth', 'nth_combination', @@ -52,48 +40,22 @@ __all__ = [ 'pad_none', 'pairwise', 'partition', - 'polynomial_eval', - 'polynomial_from_roots', - 'polynomial_derivative', 'powerset', 'prepend', 'quantify', - 'reshape', 'random_combination_with_replacement', 'random_combination', 'random_permutation', 'random_product', 'repeatfunc', 'roundrobin', - 'sieve', - 'sliding_window', - 'subslices', - 'sum_of_squares', 'tabulate', 'tail', 'take', - 'totient', - 'transpose', - 'triplewise', - 'unique', 'unique_everseen', 'unique_justseen', ] -_marker = object() - - -# zip with strict is available for Python 3.10+ -try: - zip(strict=True) -except TypeError: - _zip_strict = zip -else: - _zip_strict = partial(zip, strict=True) - -# math.sumprod is available for Python 3.12+ -_sumprod = getattr(math, 'sumprod', lambda x, y: dotproduct(x, y)) - def take(n, iterable): """Return first *n* items of the iterable as a list. @@ -137,14 +99,7 @@ def tail(n, iterable): ['E', 'F', 'G'] """ - # If the given iterable has a length, then we can use islice to get its - # final elements. Note that if the iterable is not actually Iterable, - # either islice or deque will throw a TypeError. This is why we don't - # check if it is Iterable. - if isinstance(iterable, Sized): - yield from islice(iterable, max(0, len(iterable) - n), None) - else: - yield from iter(deque(iterable, maxlen=n)) + return iter(deque(iterable, maxlen=n)) def consume(iterator, n=None): @@ -200,7 +155,7 @@ def nth(iterable, n, default=None): return next(islice(iterable, n, None), default) -def all_equal(iterable, key=None): +def all_equal(iterable): """ Returns ``True`` if all the elements are equal to each other. @@ -209,16 +164,9 @@ def all_equal(iterable, key=None): >>> all_equal('aaab') False - A function that accepts a single argument and returns a transformed version - of each input item can be specified with *key*: - - >>> all_equal('AaaA', key=str.casefold) - True - >>> all_equal([1, 2, 3], key=lambda x: x < 10) - True - """ - return len(list(islice(groupby(iterable, key), 2))) <= 1 + g = groupby(iterable) + return next(g, True) and not next(g, False) def quantify(iterable, pred=bool): @@ -318,7 +266,7 @@ def _pairwise(iterable): """ a, b = tee(iterable) next(b, None) - return zip(a, b) + yield from zip(a, b) try: @@ -328,84 +276,25 @@ except ImportError: else: def pairwise(iterable): - return itertools_pairwise(iterable) + yield from itertools_pairwise(iterable) pairwise.__doc__ = _pairwise.__doc__ -class UnequalIterablesError(ValueError): - def __init__(self, details=None): - msg = 'Iterables have different lengths' - if details is not None: - msg += (': index 0 has length {}; index {} has length {}').format( - *details - ) +def grouper(iterable, n, fillvalue=None): + """Collect data into fixed-length chunks or blocks. - super().__init__(msg) - - -def _zip_equal_generator(iterables): - for combo in zip_longest(*iterables, fillvalue=_marker): - for val in combo: - if val is _marker: - raise UnequalIterablesError() - yield combo - - -def _zip_equal(*iterables): - # Check whether the iterables are all the same size. - try: - first_size = len(iterables[0]) - for i, it in enumerate(iterables[1:], 1): - size = len(it) - if size != first_size: - raise UnequalIterablesError(details=(first_size, i, size)) - # All sizes are equal, we can use the built-in zip. - return zip(*iterables) - # If any one of the iterables didn't have a length, start reading - # them until one runs out. - except TypeError: - return _zip_equal_generator(iterables) - - -def grouper(iterable, n, incomplete='fill', fillvalue=None): - """Group elements from *iterable* into fixed-length groups of length *n*. - - >>> list(grouper('ABCDEF', 3)) - [('A', 'B', 'C'), ('D', 'E', 'F')] - - The keyword arguments *incomplete* and *fillvalue* control what happens for - iterables whose length is not a multiple of *n*. - - When *incomplete* is `'fill'`, the last group will contain instances of - *fillvalue*. - - >>> list(grouper('ABCDEFG', 3, incomplete='fill', fillvalue='x')) + >>> list(grouper('ABCDEFG', 3, 'x')) [('A', 'B', 'C'), ('D', 'E', 'F'), ('G', 'x', 'x')] - When *incomplete* is `'ignore'`, the last group will not be emitted. - - >>> list(grouper('ABCDEFG', 3, incomplete='ignore', fillvalue='x')) - [('A', 'B', 'C'), ('D', 'E', 'F')] - - When *incomplete* is `'strict'`, a subclass of `ValueError` will be raised. - - >>> it = grouper('ABCDEFG', 3, incomplete='strict') - >>> list(it) # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - UnequalIterablesError - """ + if isinstance(iterable, int): + warnings.warn( + "grouper expects iterable as first parameter", DeprecationWarning + ) + n, iterable = iterable, n args = [iter(iterable)] * n - if incomplete == 'fill': - return zip_longest(*args, fillvalue=fillvalue) - if incomplete == 'strict': - return _zip_equal(*args) - if incomplete == 'ignore': - return zip(*args) - else: - raise ValueError('Expected fill, strict, or ignore') + return zip_longest(fillvalue=fillvalue, *args) def roundrobin(*iterables): @@ -419,11 +308,16 @@ def roundrobin(*iterables): iterables is small). """ - # Algorithm credited to George Sakkis - iterators = map(iter, iterables) - for num_active in range(len(iterables), 0, -1): - iterators = cycle(islice(iterators, num_active)) - yield from map(next, iterators) + # Recipe credited to George Sakkis + pending = len(iterables) + nexts = cycle(iter(it).__next__ for it in iterables) + while pending: + try: + for next in nexts: + yield next() + except StopIteration: + pending -= 1 + nexts = cycle(islice(nexts, pending)) def partition(pred, iterable): @@ -449,9 +343,12 @@ def partition(pred, iterable): if pred is None: pred = bool - t1, t2, p = tee(iterable, 3) - p1, p2 = tee(map(pred, p)) - return (compress(t1, map(operator.not_, p1)), compress(t2, p2)) + evaluations = ((pred(x), x) for x in iterable) + t1, t2 = tee(evaluations) + return ( + (x for (cond, x) in t1 if not cond), + (x for (cond, x) in t2 if cond), + ) def powerset(iterable): @@ -462,14 +359,16 @@ def powerset(iterable): :func:`powerset` will operate on iterables that aren't :class:`set` instances, so repeated elements in the input will produce repeated elements - in the output. + in the output. Use :func:`unique_everseen` on the input to avoid generating + duplicates: >>> seq = [1, 1, 0] >>> list(powerset(seq)) [(), (1,), (1,), (0,), (1, 1), (1, 0), (1, 0), (1, 1, 0)] + >>> from more_itertools import unique_everseen + >>> list(powerset(unique_everseen(seq))) + [(), (1,), (0,), (1, 0)] - For a variant that efficiently yields actual :class:`set` instances, see - :func:`powerset_of_sets`. """ s = list(iterable) return chain.from_iterable(combinations(s, r) for r in range(len(s) + 1)) @@ -497,7 +396,7 @@ def unique_everseen(iterable, key=None): >>> list(unique_everseen(iterable, key=tuple)) # Faster [[1, 2], [2, 3]] - Similarly, you may want to convert unhashable ``set`` objects with + Similary, you may want to convert unhashable ``set`` objects with ``key=frozenset``. For ``dict`` objects, ``key=lambda x: frozenset(x.items())`` can be used. @@ -529,31 +428,9 @@ def unique_justseen(iterable, key=None): ['A', 'B', 'C', 'A', 'D'] """ - if key is None: - return map(operator.itemgetter(0), groupby(iterable)) - return map(next, map(operator.itemgetter(1), groupby(iterable, key))) -def unique(iterable, key=None, reverse=False): - """Yields unique elements in sorted order. - - >>> list(unique([[1, 2], [3, 4], [1, 2]])) - [[1, 2], [3, 4]] - - *key* and *reverse* are passed to :func:`sorted`. - - >>> list(unique('ABBcCAD', str.casefold)) - ['A', 'B', 'c', 'D'] - >>> list(unique('ABBcCAD', str.casefold, reverse=True)) - ['D', 'c', 'B', 'A'] - - The elements in *iterable* need not be hashable, but they must be - comparable for sorting to work. - """ - return unique_justseen(sorted(iterable, key=key, reverse=reverse), key=key) - - def iter_except(func, exception, first=None): """Yields results from a function repeatedly until an exception is raised. @@ -565,16 +442,6 @@ def iter_except(func, exception, first=None): >>> list(iter_except(l.pop, IndexError)) [2, 1, 0] - Multiple exceptions can be specified as a stopping condition: - - >>> l = [1, 2, 3, '...', 4, 5, 6] - >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError))) - [7, 6, 5] - >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError))) - [4, 3, 2] - >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError))) - [] - """ try: if first is not None: @@ -745,302 +612,9 @@ def convolve(signal, kernel): is immediately consumed and stored. """ - # This implementation intentionally doesn't match the one in the itertools - # documentation. kernel = tuple(kernel)[::-1] n = len(kernel) window = deque([0], maxlen=n) * n for x in chain(signal, repeat(0, n - 1)): window.append(x) - yield _sumprod(kernel, window) - - -def before_and_after(predicate, it): - """A variant of :func:`takewhile` that allows complete access to the - remainder of the iterator. - - >>> it = iter('ABCdEfGhI') - >>> all_upper, remainder = before_and_after(str.isupper, it) - >>> ''.join(all_upper) - 'ABC' - >>> ''.join(remainder) # takewhile() would lose the 'd' - 'dEfGhI' - - Note that the first iterator must be fully consumed before the second - iterator can generate valid results. - """ - it = iter(it) - transition = [] - - def true_iterator(): - for elem in it: - if predicate(elem): - yield elem - else: - transition.append(elem) - return - - # Note: this is different from itertools recipes to allow nesting - # before_and_after remainders into before_and_after again. See tests - # for an example. - remainder_iterator = chain(transition, it) - - return true_iterator(), remainder_iterator - - -def triplewise(iterable): - """Return overlapping triplets from *iterable*. - - >>> list(triplewise('ABCDE')) - [('A', 'B', 'C'), ('B', 'C', 'D'), ('C', 'D', 'E')] - - """ - for (a, _), (b, c) in pairwise(pairwise(iterable)): - yield a, b, c - - -def sliding_window(iterable, n): - """Return a sliding window of width *n* over *iterable*. - - >>> list(sliding_window(range(6), 4)) - [(0, 1, 2, 3), (1, 2, 3, 4), (2, 3, 4, 5)] - - If *iterable* has fewer than *n* items, then nothing is yielded: - - >>> list(sliding_window(range(3), 4)) - [] - - For a variant with more features, see :func:`windowed`. - """ - it = iter(iterable) - window = deque(islice(it, n - 1), maxlen=n) - for x in it: - window.append(x) - yield tuple(window) - - -def subslices(iterable): - """Return all contiguous non-empty subslices of *iterable*. - - >>> list(subslices('ABC')) - [['A'], ['A', 'B'], ['A', 'B', 'C'], ['B'], ['B', 'C'], ['C']] - - This is similar to :func:`substrings`, but emits items in a different - order. - """ - seq = list(iterable) - slices = starmap(slice, combinations(range(len(seq) + 1), 2)) - return map(operator.getitem, repeat(seq), slices) - - -def polynomial_from_roots(roots): - """Compute a polynomial's coefficients from its roots. - - >>> roots = [5, -4, 3] # (x - 5) * (x + 4) * (x - 3) - >>> polynomial_from_roots(roots) # x^3 - 4 * x^2 - 17 * x + 60 - [1, -4, -17, 60] - """ - factors = zip(repeat(1), map(operator.neg, roots)) - return list(reduce(convolve, factors, [1])) - - -def iter_index(iterable, value, start=0, stop=None): - """Yield the index of each place in *iterable* that *value* occurs, - beginning with index *start* and ending before index *stop*. - - - >>> list(iter_index('AABCADEAF', 'A')) - [0, 1, 4, 7] - >>> list(iter_index('AABCADEAF', 'A', 1)) # start index is inclusive - [1, 4, 7] - >>> list(iter_index('AABCADEAF', 'A', 1, 7)) # stop index is not inclusive - [1, 4] - - The behavior for non-scalar *values* matches the built-in Python types. - - >>> list(iter_index('ABCDABCD', 'AB')) - [0, 4] - >>> list(iter_index([0, 1, 2, 3, 0, 1, 2, 3], [0, 1])) - [] - >>> list(iter_index([[0, 1], [2, 3], [0, 1], [2, 3]], [0, 1])) - [0, 2] - - See :func:`locate` for a more general means of finding the indexes - associated with particular values. - - """ - seq_index = getattr(iterable, 'index', None) - if seq_index is None: - # Slow path for general iterables - it = islice(iterable, start, stop) - for i, element in enumerate(it, start): - if element is value or element == value: - yield i - else: - # Fast path for sequences - stop = len(iterable) if stop is None else stop - i = start - 1 - try: - while True: - yield (i := seq_index(value, i + 1, stop)) - except ValueError: - pass - - -def sieve(n): - """Yield the primes less than n. - - >>> list(sieve(30)) - [2, 3, 5, 7, 11, 13, 17, 19, 23, 29] - """ - if n > 2: - yield 2 - start = 3 - data = bytearray((0, 1)) * (n // 2) - limit = math.isqrt(n) + 1 - for p in iter_index(data, 1, start, limit): - yield from iter_index(data, 1, start, p * p) - data[p * p : n : p + p] = bytes(len(range(p * p, n, p + p))) - start = p * p - yield from iter_index(data, 1, start) - - -def _batched(iterable, n, *, strict=False): - """Batch data into tuples of length *n*. If the number of items in - *iterable* is not divisible by *n*: - * The last batch will be shorter if *strict* is ``False``. - * :exc:`ValueError` will be raised if *strict* is ``True``. - - >>> list(batched('ABCDEFG', 3)) - [('A', 'B', 'C'), ('D', 'E', 'F'), ('G',)] - - On Python 3.13 and above, this is an alias for :func:`itertools.batched`. - """ - if n < 1: - raise ValueError('n must be at least one') - it = iter(iterable) - while batch := tuple(islice(it, n)): - if strict and len(batch) != n: - raise ValueError('batched(): incomplete batch') - yield batch - - -if hexversion >= 0x30D00A2: - from itertools import batched as itertools_batched - - def batched(iterable, n, *, strict=False): - return itertools_batched(iterable, n, strict=strict) - -else: - batched = _batched - - batched.__doc__ = _batched.__doc__ - - -def transpose(it): - """Swap the rows and columns of the input matrix. - - >>> list(transpose([(1, 2, 3), (11, 22, 33)])) - [(1, 11), (2, 22), (3, 33)] - - The caller should ensure that the dimensions of the input are compatible. - If the input is empty, no output will be produced. - """ - return _zip_strict(*it) - - -def reshape(matrix, cols): - """Reshape the 2-D input *matrix* to have a column count given by *cols*. - - >>> matrix = [(0, 1), (2, 3), (4, 5)] - >>> cols = 3 - >>> list(reshape(matrix, cols)) - [(0, 1, 2), (3, 4, 5)] - """ - return batched(chain.from_iterable(matrix), cols) - - -def matmul(m1, m2): - """Multiply two matrices. - - >>> list(matmul([(7, 5), (3, 5)], [(2, 5), (7, 9)])) - [(49, 80), (41, 60)] - - The caller should ensure that the dimensions of the input matrices are - compatible with each other. - """ - n = len(m2[0]) - return batched(starmap(_sumprod, product(m1, transpose(m2))), n) - - -def factor(n): - """Yield the prime factors of n. - - >>> list(factor(360)) - [2, 2, 2, 3, 3, 5] - """ - for prime in sieve(math.isqrt(n) + 1): - while not n % prime: - yield prime - n //= prime - if n == 1: - return - if n > 1: - yield n - - -def polynomial_eval(coefficients, x): - """Evaluate a polynomial at a specific value. - - Example: evaluating x^3 - 4 * x^2 - 17 * x + 60 at x = 2.5: - - >>> coefficients = [1, -4, -17, 60] - >>> x = 2.5 - >>> polynomial_eval(coefficients, x) - 8.125 - """ - n = len(coefficients) - if n == 0: - return x * 0 # coerce zero to the type of x - powers = map(pow, repeat(x), reversed(range(n))) - return _sumprod(coefficients, powers) - - -def sum_of_squares(it): - """Return the sum of the squares of the input values. - - >>> sum_of_squares([10, 20, 30]) - 1400 - """ - return _sumprod(*tee(it)) - - -def polynomial_derivative(coefficients): - """Compute the first derivative of a polynomial. - - Example: evaluating the derivative of x^3 - 4 * x^2 - 17 * x + 60 - - >>> coefficients = [1, -4, -17, 60] - >>> derivative_coefficients = polynomial_derivative(coefficients) - >>> derivative_coefficients - [3, -8, -17] - """ - n = len(coefficients) - powers = reversed(range(1, n)) - return list(map(operator.mul, coefficients, powers)) - - -def totient(n): - """Return the count of natural numbers up to *n* that are coprime with *n*. - - >>> totient(9) - 6 - >>> totient(12) - 4 - """ - # The itertools docs use unique_justseen instead of set; see - # https://github.com/more-itertools/more-itertools/issues/823 - for p in set(factor(n)): - n = n // p * (p - 1) - - return n + yield sum(map(operator.mul, kernel, window)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.pyi b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.pyi deleted file mode 100644 index 739acec..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/more_itertools/recipes.pyi +++ /dev/null @@ -1,136 +0,0 @@ -"""Stubs for more_itertools.recipes""" - -from __future__ import annotations - -from typing import ( - Any, - Callable, - Iterable, - Iterator, - overload, - Sequence, - Type, - TypeVar, -) - -# Type and type variable definitions -_T = TypeVar('_T') -_T1 = TypeVar('_T1') -_T2 = TypeVar('_T2') -_U = TypeVar('_U') - -def take(n: int, iterable: Iterable[_T]) -> list[_T]: ... -def tabulate( - function: Callable[[int], _T], start: int = ... -) -> Iterator[_T]: ... -def tail(n: int, iterable: Iterable[_T]) -> Iterator[_T]: ... -def consume(iterator: Iterable[_T], n: int | None = ...) -> None: ... -@overload -def nth(iterable: Iterable[_T], n: int) -> _T | None: ... -@overload -def nth(iterable: Iterable[_T], n: int, default: _U) -> _T | _U: ... -def all_equal( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> bool: ... -def quantify( - iterable: Iterable[_T], pred: Callable[[_T], bool] = ... -) -> int: ... -def pad_none(iterable: Iterable[_T]) -> Iterator[_T | None]: ... -def padnone(iterable: Iterable[_T]) -> Iterator[_T | None]: ... -def ncycles(iterable: Iterable[_T], n: int) -> Iterator[_T]: ... -def dotproduct(vec1: Iterable[_T1], vec2: Iterable[_T2]) -> Any: ... -def flatten(listOfLists: Iterable[Iterable[_T]]) -> Iterator[_T]: ... -def repeatfunc( - func: Callable[..., _U], times: int | None = ..., *args: Any -) -> Iterator[_U]: ... -def pairwise(iterable: Iterable[_T]) -> Iterator[tuple[_T, _T]]: ... -def grouper( - iterable: Iterable[_T], - n: int, - incomplete: str = ..., - fillvalue: _U = ..., -) -> Iterator[tuple[_T | _U, ...]]: ... -def roundrobin(*iterables: Iterable[_T]) -> Iterator[_T]: ... -def partition( - pred: Callable[[_T], object] | None, iterable: Iterable[_T] -) -> tuple[Iterator[_T], Iterator[_T]]: ... -def powerset(iterable: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ... -def unique_everseen( - iterable: Iterable[_T], key: Callable[[_T], _U] | None = ... -) -> Iterator[_T]: ... -def unique_justseen( - iterable: Iterable[_T], key: Callable[[_T], object] | None = ... -) -> Iterator[_T]: ... -def unique( - iterable: Iterable[_T], - key: Callable[[_T], object] | None = ..., - reverse: bool = False, -) -> Iterator[_T]: ... -@overload -def iter_except( - func: Callable[[], _T], - exception: Type[BaseException] | tuple[Type[BaseException], ...], - first: None = ..., -) -> Iterator[_T]: ... -@overload -def iter_except( - func: Callable[[], _T], - exception: Type[BaseException] | tuple[Type[BaseException], ...], - first: Callable[[], _U], -) -> Iterator[_T | _U]: ... -@overload -def first_true( - iterable: Iterable[_T], *, pred: Callable[[_T], object] | None = ... -) -> _T | None: ... -@overload -def first_true( - iterable: Iterable[_T], - default: _U, - pred: Callable[[_T], object] | None = ..., -) -> _T | _U: ... -def random_product( - *args: Iterable[_T], repeat: int = ... -) -> tuple[_T, ...]: ... -def random_permutation( - iterable: Iterable[_T], r: int | None = ... -) -> tuple[_T, ...]: ... -def random_combination(iterable: Iterable[_T], r: int) -> tuple[_T, ...]: ... -def random_combination_with_replacement( - iterable: Iterable[_T], r: int -) -> tuple[_T, ...]: ... -def nth_combination( - iterable: Iterable[_T], r: int, index: int -) -> tuple[_T, ...]: ... -def prepend(value: _T, iterator: Iterable[_U]) -> Iterator[_T | _U]: ... -def convolve(signal: Iterable[_T], kernel: Iterable[_T]) -> Iterator[_T]: ... -def before_and_after( - predicate: Callable[[_T], bool], it: Iterable[_T] -) -> tuple[Iterator[_T], Iterator[_T]]: ... -def triplewise(iterable: Iterable[_T]) -> Iterator[tuple[_T, _T, _T]]: ... -def sliding_window( - iterable: Iterable[_T], n: int -) -> Iterator[tuple[_T, ...]]: ... -def subslices(iterable: Iterable[_T]) -> Iterator[list[_T]]: ... -def polynomial_from_roots(roots: Sequence[_T]) -> list[_T]: ... -def iter_index( - iterable: Iterable[_T], - value: Any, - start: int | None = ..., - stop: int | None = ..., -) -> Iterator[int]: ... -def sieve(n: int) -> Iterator[int]: ... -def batched( - iterable: Iterable[_T], n: int, *, strict: bool = False -) -> Iterator[tuple[_T]]: ... -def transpose( - it: Iterable[Iterable[_T]], -) -> Iterator[tuple[_T, ...]]: ... -def reshape( - matrix: Iterable[Iterable[_T]], cols: int -) -> Iterator[tuple[_T, ...]]: ... -def matmul(m1: Sequence[_T], m2: Sequence[_T]) -> Iterator[tuple[_T]]: ... -def factor(n: int) -> Iterator[int]: ... -def polynomial_eval(coefficients: Sequence[_T], x: _U) -> _U: ... -def sum_of_squares(it: Iterable[_T]) -> _T: ... -def polynomial_derivative(coefficients: Sequence[_T]) -> list[_T]: ... -def totient(n: int) -> int: ... diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/INSTALLER deleted file mode 100644 index 5c69047..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/INSTALLER +++ /dev/null @@ -1 +0,0 @@ -uv \ No newline at end of file diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE deleted file mode 100644 index 6f62d44..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -This software is made available under the terms of *either* of the licenses -found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made -under the terms of *both* these licenses. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.APACHE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.APACHE deleted file mode 100644 index f433b1a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.APACHE +++ /dev/null @@ -1,177 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.BSD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.BSD deleted file mode 100644 index 42ce7b7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/LICENSE.BSD +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) Donald Stufft and individual contributors. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/METADATA deleted file mode 100644 index 1479c86..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/METADATA +++ /dev/null @@ -1,102 +0,0 @@ -Metadata-Version: 2.3 -Name: packaging -Version: 24.2 -Summary: Core utilities for Python packages -Author-email: Donald Stufft -Requires-Python: >=3.8 -Description-Content-Type: text/x-rst -Classifier: Development Status :: 5 - Production/Stable -Classifier: Intended Audience :: Developers -Classifier: License :: OSI Approved :: Apache Software License -Classifier: License :: OSI Approved :: BSD License -Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Programming Language :: Python :: 3.8 -Classifier: Programming Language :: Python :: 3.9 -Classifier: Programming Language :: Python :: 3.10 -Classifier: Programming Language :: Python :: 3.11 -Classifier: Programming Language :: Python :: 3.12 -Classifier: Programming Language :: Python :: 3.13 -Classifier: Programming Language :: Python :: Implementation :: CPython -Classifier: Programming Language :: Python :: Implementation :: PyPy -Classifier: Typing :: Typed -Project-URL: Documentation, https://packaging.pypa.io/ -Project-URL: Source, https://github.com/pypa/packaging - -packaging -========= - -.. start-intro - -Reusable core utilities for various Python Packaging -`interoperability specifications `_. - -This library provides utilities that implement the interoperability -specifications which have clearly one correct behaviour (eg: :pep:`440`) -or benefit greatly from having a single shared implementation (eg: :pep:`425`). - -.. end-intro - -The ``packaging`` project includes the following: version handling, specifiers, -markers, requirements, tags, utilities. - -Documentation -------------- - -The `documentation`_ provides information and the API for the following: - -- Version Handling -- Specifiers -- Markers -- Requirements -- Tags -- Utilities - -Installation ------------- - -Use ``pip`` to install these utilities:: - - pip install packaging - -The ``packaging`` library uses calendar-based versioning (``YY.N``). - -Discussion ----------- - -If you run into bugs, you can file them in our `issue tracker`_. - -You can also join ``#pypa`` on Freenode to ask questions or get involved. - - -.. _`documentation`: https://packaging.pypa.io/ -.. _`issue tracker`: https://github.com/pypa/packaging/issues - - -Code of Conduct ---------------- - -Everyone interacting in the packaging project's codebases, issue trackers, chat -rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_. - -.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md - -Contributing ------------- - -The ``CONTRIBUTING.rst`` file outlines how to contribute to this project as -well as how to report a potential security issue. The documentation for this -project also covers information about `project development`_ and `security`_. - -.. _`project development`: https://packaging.pypa.io/en/latest/development/ -.. _`security`: https://packaging.pypa.io/en/latest/security/ - -Project History ---------------- - -Please review the ``CHANGELOG.rst`` file or the `Changelog documentation`_ for -recent changes and project history. - -.. _`Changelog documentation`: https://packaging.pypa.io/en/latest/changelog/ - diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/RECORD deleted file mode 100644 index 678aa5a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/RECORD +++ /dev/null @@ -1,25 +0,0 @@ -packaging-24.2.dist-info/INSTALLER,sha256=5hhM4Q4mYTT9z6QB6PGpUAW81PGNFrYrdXMj4oM_6ak,2 -packaging-24.2.dist-info/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197 -packaging-24.2.dist-info/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174 -packaging-24.2.dist-info/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344 -packaging-24.2.dist-info/METADATA,sha256=ohH86s6k5mIfQxY2TS0LcSfADeOFa4BiCC-bxZV-pNs,3204 -packaging-24.2.dist-info/RECORD,, -packaging-24.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -packaging-24.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82 -packaging/__init__.py,sha256=dk4Ta_vmdVJxYHDcfyhvQNw8V3PgSBomKNXqg-D2JDY,494 -packaging/_elffile.py,sha256=cflAQAkE25tzhYmq_aCi72QfbT_tn891tPzfpbeHOwE,3306 -packaging/_manylinux.py,sha256=vl5OCoz4kx80H5rwXKeXWjl9WNISGmr4ZgTpTP9lU9c,9612 -packaging/_musllinux.py,sha256=p9ZqNYiOItGee8KcZFeHF_YcdhVwGHdK6r-8lgixvGQ,2694 -packaging/_parser.py,sha256=s_TvTvDNK0NrM2QB3VKThdWFM4Nc0P6JnkObkl3MjpM,10236 -packaging/_structures.py,sha256=q3eVNmbWJGG_S0Dit_S3Ao8qQqz_5PYTXFAKBZe5yr4,1431 -packaging/_tokenizer.py,sha256=J6v5H7Jzvb-g81xp_2QACKwO7LxHQA6ikryMU7zXwN8,5273 -packaging/licenses/__init__.py,sha256=1x5M1nEYjcgwEbLt0dXwz2ukjr18DiCzC0sraQqJ-Ww,5715 -packaging/licenses/_spdx.py,sha256=oAm1ztPFwlsmCKe7lAAsv_OIOfS1cWDu9bNBkeu-2ns,48398 -packaging/markers.py,sha256=c89TNzB7ZdGYhkovm6PYmqGyHxXlYVaLW591PHUNKD8,10561 -packaging/metadata.py,sha256=YJibM7GYe4re8-0a3OlXmGS-XDgTEoO4tlBt2q25Bng,34762 -packaging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -packaging/requirements.py,sha256=gYyRSAdbrIyKDY66ugIDUQjRMvxkH2ALioTmX3tnL6o,2947 -packaging/specifiers.py,sha256=GG1wPNMcL0fMJO68vF53wKMdwnfehDcaI-r9NpTfilA,40074 -packaging/tags.py,sha256=CFqrJzAzc2XNGexerH__T-Y5Iwq7WbsYXsiLERLWxY0,21014 -packaging/utils.py,sha256=0F3Hh9OFuRgrhTgGZUl5K22Fv1YP2tZl1z_2gO6kJiA,5050 -packaging/version.py,sha256=olfyuk_DPbflNkJ4wBWetXQ17c74x3DB501degUv7DY,16676 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/REQUESTED deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/WHEEL deleted file mode 100644 index e3c6fee..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging-24.2.dist-info/WHEEL +++ /dev/null @@ -1,4 +0,0 @@ -Wheel-Version: 1.0 -Generator: flit 3.10.1 -Root-Is-Purelib: true -Tag: py3-none-any diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__init__.py index d79f73c..3c50c5d 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__init__.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__init__.py @@ -2,14 +2,24 @@ # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -__title__ = "packaging" -__summary__ = "Core utilities for Python packages" -__uri__ = "https://github.com/pypa/packaging" +from .__about__ import ( + __author__, + __copyright__, + __email__, + __license__, + __summary__, + __title__, + __uri__, + __version__, +) -__version__ = "24.2" - -__author__ = "Donald Stufft and individual contributors" -__email__ = "donald@stufft.io" - -__license__ = "BSD-2-Clause or Apache-2.0" -__copyright__ = f"2014 {__author__}" +__all__ = [ + "__title__", + "__summary__", + "__uri__", + "__version__", + "__author__", + "__email__", + "__license__", + "__copyright__", +] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-311.pyc index b6d8fa2..a6237c4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc deleted file mode 100644 index b901b81..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_elffile.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc index 7c39fbd..73dfa7f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_manylinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc index c299319..ad66bdf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_musllinux.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_parser.cpython-311.pyc deleted file mode 100644 index 43cfc1a..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_parser.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-311.pyc index fc14878..179bda6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc deleted file mode 100644 index 8383a75..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/_tokenizer.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-311.pyc index 2897466..f761362 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/metadata.cpython-311.pyc deleted file mode 100644 index e2bc7b1..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/metadata.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-311.pyc index c07beb6..13d5ba7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc index 9ad41c2..c89b9b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/tags.cpython-311.pyc index 255676d..ddb5917 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/tags.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/tags.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-311.pyc index 398a823..416f2f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-311.pyc index f003c2d..7b06fc5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_elffile.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_elffile.py deleted file mode 100644 index 25f4282..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_elffile.py +++ /dev/null @@ -1,110 +0,0 @@ -""" -ELF file parser. - -This provides a class ``ELFFile`` that parses an ELF executable in a similar -interface to ``ZipFile``. Only the read interface is implemented. - -Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca -ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html -""" - -from __future__ import annotations - -import enum -import os -import struct -from typing import IO - - -class ELFInvalid(ValueError): - pass - - -class EIClass(enum.IntEnum): - C32 = 1 - C64 = 2 - - -class EIData(enum.IntEnum): - Lsb = 1 - Msb = 2 - - -class EMachine(enum.IntEnum): - I386 = 3 - S390 = 22 - Arm = 40 - X8664 = 62 - AArc64 = 183 - - -class ELFFile: - """ - Representation of an ELF executable. - """ - - def __init__(self, f: IO[bytes]) -> None: - self._f = f - - try: - ident = self._read("16B") - except struct.error as e: - raise ELFInvalid("unable to parse identification") from e - magic = bytes(ident[:4]) - if magic != b"\x7fELF": - raise ELFInvalid(f"invalid magic: {magic!r}") - - self.capacity = ident[4] # Format for program header (bitness). - self.encoding = ident[5] # Data structure encoding (endianness). - - try: - # e_fmt: Format for program header. - # p_fmt: Format for section header. - # p_idx: Indexes to find p_type, p_offset, and p_filesz. - e_fmt, self._p_fmt, self._p_idx = { - (1, 1): ("HHIIIIIHHH", ">IIIIIIII", (0, 1, 4)), # 32-bit MSB. - (2, 1): ("HHIQQQIHHH", ">IIQQQQQQ", (0, 2, 5)), # 64-bit MSB. - }[(self.capacity, self.encoding)] - except KeyError as e: - raise ELFInvalid( - f"unrecognized capacity ({self.capacity}) or " - f"encoding ({self.encoding})" - ) from e - - try: - ( - _, - self.machine, # Architecture type. - _, - _, - self._e_phoff, # Offset of program header. - _, - self.flags, # Processor-specific flags. - _, - self._e_phentsize, # Size of section. - self._e_phnum, # Number of sections. - ) = self._read(e_fmt) - except struct.error as e: - raise ELFInvalid("unable to parse machine and section information") from e - - def _read(self, fmt: str) -> tuple[int, ...]: - return struct.unpack(fmt, self._f.read(struct.calcsize(fmt))) - - @property - def interpreter(self) -> str | None: - """ - The path recorded in the ``PT_INTERP`` section header. - """ - for index in range(self._e_phnum): - self._f.seek(self._e_phoff + self._e_phentsize * index) - try: - data = self._read(self._p_fmt) - except struct.error: - continue - if data[self._p_idx[0]] != 3: # Not PT_INTERP. - continue - self._f.seek(data[self._p_idx[1]]) - return os.fsdecode(self._f.read(data[self._p_idx[2]])).strip("\0") - return None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_manylinux.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_manylinux.py index 61339a6..4c379aa 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_manylinux.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_manylinux.py @@ -1,72 +1,122 @@ -from __future__ import annotations - import collections -import contextlib import functools import os import re +import struct import sys import warnings -from typing import Generator, Iterator, NamedTuple, Sequence - -from ._elffile import EIClass, EIData, ELFFile, EMachine - -EF_ARM_ABIMASK = 0xFF000000 -EF_ARM_ABI_VER5 = 0x05000000 -EF_ARM_ABI_FLOAT_HARD = 0x00000400 +from typing import IO, Dict, Iterator, NamedTuple, Optional, Tuple -# `os.PathLike` not a generic type until Python 3.9, so sticking with `str` -# as the type for `path` until then. -@contextlib.contextmanager -def _parse_elf(path: str) -> Generator[ELFFile | None, None, None]: +# Python does not provide platform information at sufficient granularity to +# identify the architecture of the running executable in some cases, so we +# determine it dynamically by reading the information from the running +# process. This only applies on Linux, which uses the ELF format. +class _ELFFileHeader: + # https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header + class _InvalidELFFileHeader(ValueError): + """ + An invalid ELF file header was found. + """ + + ELF_MAGIC_NUMBER = 0x7F454C46 + ELFCLASS32 = 1 + ELFCLASS64 = 2 + ELFDATA2LSB = 1 + ELFDATA2MSB = 2 + EM_386 = 3 + EM_S390 = 22 + EM_ARM = 40 + EM_X86_64 = 62 + EF_ARM_ABIMASK = 0xFF000000 + EF_ARM_ABI_VER5 = 0x05000000 + EF_ARM_ABI_FLOAT_HARD = 0x00000400 + + def __init__(self, file: IO[bytes]) -> None: + def unpack(fmt: str) -> int: + try: + data = file.read(struct.calcsize(fmt)) + result: Tuple[int, ...] = struct.unpack(fmt, data) + except struct.error: + raise _ELFFileHeader._InvalidELFFileHeader() + return result[0] + + self.e_ident_magic = unpack(">I") + if self.e_ident_magic != self.ELF_MAGIC_NUMBER: + raise _ELFFileHeader._InvalidELFFileHeader() + self.e_ident_class = unpack("B") + if self.e_ident_class not in {self.ELFCLASS32, self.ELFCLASS64}: + raise _ELFFileHeader._InvalidELFFileHeader() + self.e_ident_data = unpack("B") + if self.e_ident_data not in {self.ELFDATA2LSB, self.ELFDATA2MSB}: + raise _ELFFileHeader._InvalidELFFileHeader() + self.e_ident_version = unpack("B") + self.e_ident_osabi = unpack("B") + self.e_ident_abiversion = unpack("B") + self.e_ident_pad = file.read(7) + format_h = "H" + format_i = "I" + format_q = "Q" + format_p = format_i if self.e_ident_class == self.ELFCLASS32 else format_q + self.e_type = unpack(format_h) + self.e_machine = unpack(format_h) + self.e_version = unpack(format_i) + self.e_entry = unpack(format_p) + self.e_phoff = unpack(format_p) + self.e_shoff = unpack(format_p) + self.e_flags = unpack(format_i) + self.e_ehsize = unpack(format_h) + self.e_phentsize = unpack(format_h) + self.e_phnum = unpack(format_h) + self.e_shentsize = unpack(format_h) + self.e_shnum = unpack(format_h) + self.e_shstrndx = unpack(format_h) + + +def _get_elf_header() -> Optional[_ELFFileHeader]: try: - with open(path, "rb") as f: - yield ELFFile(f) - except (OSError, TypeError, ValueError): - yield None + with open(sys.executable, "rb") as f: + elf_header = _ELFFileHeader(f) + except (OSError, TypeError, _ELFFileHeader._InvalidELFFileHeader): + return None + return elf_header -def _is_linux_armhf(executable: str) -> bool: +def _is_linux_armhf() -> bool: # hard-float ABI can be detected from the ELF header of the running # process # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf - with _parse_elf(executable) as f: - return ( - f is not None - and f.capacity == EIClass.C32 - and f.encoding == EIData.Lsb - and f.machine == EMachine.Arm - and f.flags & EF_ARM_ABIMASK == EF_ARM_ABI_VER5 - and f.flags & EF_ARM_ABI_FLOAT_HARD == EF_ARM_ABI_FLOAT_HARD - ) + elf_header = _get_elf_header() + if elf_header is None: + return False + result = elf_header.e_ident_class == elf_header.ELFCLASS32 + result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB + result &= elf_header.e_machine == elf_header.EM_ARM + result &= ( + elf_header.e_flags & elf_header.EF_ARM_ABIMASK + ) == elf_header.EF_ARM_ABI_VER5 + result &= ( + elf_header.e_flags & elf_header.EF_ARM_ABI_FLOAT_HARD + ) == elf_header.EF_ARM_ABI_FLOAT_HARD + return result -def _is_linux_i686(executable: str) -> bool: - with _parse_elf(executable) as f: - return ( - f is not None - and f.capacity == EIClass.C32 - and f.encoding == EIData.Lsb - and f.machine == EMachine.I386 - ) +def _is_linux_i686() -> bool: + elf_header = _get_elf_header() + if elf_header is None: + return False + result = elf_header.e_ident_class == elf_header.ELFCLASS32 + result &= elf_header.e_ident_data == elf_header.ELFDATA2LSB + result &= elf_header.e_machine == elf_header.EM_386 + return result -def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool: - if "armv7l" in archs: - return _is_linux_armhf(executable) - if "i686" in archs: - return _is_linux_i686(executable) - allowed_archs = { - "x86_64", - "aarch64", - "ppc64", - "ppc64le", - "s390x", - "loongarch64", - "riscv64", - } - return any(arch in allowed_archs for arch in archs) +def _have_compatible_abi(arch: str) -> bool: + if arch == "armv7l": + return _is_linux_armhf() + if arch == "i686": + return _is_linux_i686() + return arch in {"x86_64", "aarch64", "ppc64", "ppc64le", "s390x"} # If glibc ever changes its major version, we need to know what the last @@ -74,7 +124,7 @@ def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool: # For now, guess what the highest minor version might be, assume it will # be 50 for testing. Once this actually happens, update the dictionary # with the actual value. -_LAST_GLIBC_MINOR: dict[int, int] = collections.defaultdict(lambda: 50) +_LAST_GLIBC_MINOR: Dict[int, int] = collections.defaultdict(lambda: 50) class _GLibCVersion(NamedTuple): @@ -82,7 +132,7 @@ class _GLibCVersion(NamedTuple): minor: int -def _glibc_version_string_confstr() -> str | None: +def _glibc_version_string_confstr() -> Optional[str]: """ Primary implementation of glibc_version_string using os.confstr. """ @@ -91,17 +141,17 @@ def _glibc_version_string_confstr() -> str | None: # platform module. # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183 try: - # Should be a string like "glibc 2.17". - version_string: str | None = os.confstr("CS_GNU_LIBC_VERSION") + # os.confstr("CS_GNU_LIBC_VERSION") returns a string like "glibc 2.17". + version_string = os.confstr("CS_GNU_LIBC_VERSION") assert version_string is not None - _, version = version_string.rsplit() + _, version = version_string.split() except (AssertionError, AttributeError, OSError, ValueError): # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)... return None return version -def _glibc_version_string_ctypes() -> str | None: +def _glibc_version_string_ctypes() -> Optional[str]: """ Fallback implementation of glibc_version_string using ctypes. """ @@ -145,12 +195,12 @@ def _glibc_version_string_ctypes() -> str | None: return version_str -def _glibc_version_string() -> str | None: +def _glibc_version_string() -> Optional[str]: """Returns glibc version string, or None if not using glibc.""" return _glibc_version_string_confstr() or _glibc_version_string_ctypes() -def _parse_glibc_version(version_str: str) -> tuple[int, int]: +def _parse_glibc_version(version_str: str) -> Tuple[int, int]: """Parse glibc version. We use a regexp instead of str.split because we want to discard any @@ -161,17 +211,16 @@ def _parse_glibc_version(version_str: str) -> tuple[int, int]: m = re.match(r"(?P[0-9]+)\.(?P[0-9]+)", version_str) if not m: warnings.warn( - f"Expected glibc version with 2 components major.minor," - f" got: {version_str}", + "Expected glibc version with 2 components major.minor," + " got: %s" % version_str, RuntimeWarning, - stacklevel=2, ) return -1, -1 return int(m.group("major")), int(m.group("minor")) -@functools.lru_cache -def _get_glibc_version() -> tuple[int, int]: +@functools.lru_cache() +def _get_glibc_version() -> Tuple[int, int]: version_str = _glibc_version_string() if version_str is None: return (-1, -1) @@ -179,13 +228,13 @@ def _get_glibc_version() -> tuple[int, int]: # From PEP 513, PEP 600 -def _is_compatible(arch: str, version: _GLibCVersion) -> bool: +def _is_compatible(name: str, arch: str, version: _GLibCVersion) -> bool: sys_glibc = _get_glibc_version() if sys_glibc < version: return False # Check for presence of _manylinux module. try: - import _manylinux + import _manylinux # noqa except ImportError: return True if hasattr(_manylinux, "manylinux_compatible"): @@ -215,22 +264,12 @@ _LEGACY_MANYLINUX_MAP = { } -def platform_tags(archs: Sequence[str]) -> Iterator[str]: - """Generate manylinux tags compatible to the current platform. - - :param archs: Sequence of compatible architectures. - The first one shall be the closest to the actual architecture and be the part of - platform tag after the ``linux_`` prefix, e.g. ``x86_64``. - The ``linux_`` prefix is assumed as a prerequisite for the current platform to - be manylinux-compatible. - - :returns: An iterator of compatible manylinux tags. - """ - if not _have_compatible_abi(sys.executable, archs): +def platform_tags(linux: str, arch: str) -> Iterator[str]: + if not _have_compatible_abi(arch): return # Oldest glibc to be supported regardless of architecture is (2, 17). too_old_glibc2 = _GLibCVersion(2, 16) - if set(archs) & {"x86_64", "i686"}: + if arch in {"x86_64", "i686"}: # On x86/i686 also oldest glibc to be supported is (2, 5). too_old_glibc2 = _GLibCVersion(2, 4) current_glibc = _GLibCVersion(*_get_glibc_version()) @@ -244,20 +283,19 @@ def platform_tags(archs: Sequence[str]) -> Iterator[str]: for glibc_major in range(current_glibc.major - 1, 1, -1): glibc_minor = _LAST_GLIBC_MINOR[glibc_major] glibc_max_list.append(_GLibCVersion(glibc_major, glibc_minor)) - for arch in archs: - for glibc_max in glibc_max_list: - if glibc_max.major == too_old_glibc2.major: - min_minor = too_old_glibc2.minor - else: - # For other glibc major versions oldest supported is (x, 0). - min_minor = -1 - for glibc_minor in range(glibc_max.minor, min_minor, -1): - glibc_version = _GLibCVersion(glibc_max.major, glibc_minor) - tag = "manylinux_{}_{}".format(*glibc_version) - if _is_compatible(arch, glibc_version): - yield f"{tag}_{arch}" - # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags. - if glibc_version in _LEGACY_MANYLINUX_MAP: - legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version] - if _is_compatible(arch, glibc_version): - yield f"{legacy_tag}_{arch}" + for glibc_max in glibc_max_list: + if glibc_max.major == too_old_glibc2.major: + min_minor = too_old_glibc2.minor + else: + # For other glibc major versions oldest supported is (x, 0). + min_minor = -1 + for glibc_minor in range(glibc_max.minor, min_minor, -1): + glibc_version = _GLibCVersion(glibc_max.major, glibc_minor) + tag = "manylinux_{}_{}".format(*glibc_version) + if _is_compatible(tag, arch, glibc_version): + yield linux.replace("linux", tag) + # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags. + if glibc_version in _LEGACY_MANYLINUX_MAP: + legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version] + if _is_compatible(legacy_tag, arch, glibc_version): + yield linux.replace("linux", legacy_tag) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_musllinux.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_musllinux.py index d2bf30b..8ac3059 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_musllinux.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_musllinux.py @@ -4,15 +4,68 @@ This module implements logic to detect if the currently running Python is linked against musl, and what musl version is used. """ -from __future__ import annotations - +import contextlib import functools +import operator +import os import re +import struct import subprocess import sys -from typing import Iterator, NamedTuple, Sequence +from typing import IO, Iterator, NamedTuple, Optional, Tuple -from ._elffile import ELFFile + +def _read_unpacked(f: IO[bytes], fmt: str) -> Tuple[int, ...]: + return struct.unpack(fmt, f.read(struct.calcsize(fmt))) + + +def _parse_ld_musl_from_elf(f: IO[bytes]) -> Optional[str]: + """Detect musl libc location by parsing the Python executable. + + Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca + ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html + """ + f.seek(0) + try: + ident = _read_unpacked(f, "16B") + except struct.error: + return None + if ident[:4] != tuple(b"\x7fELF"): # Invalid magic, not ELF. + return None + f.seek(struct.calcsize("HHI"), 1) # Skip file type, machine, and version. + + try: + # e_fmt: Format for program header. + # p_fmt: Format for section header. + # p_idx: Indexes to find p_type, p_offset, and p_filesz. + e_fmt, p_fmt, p_idx = { + 1: ("IIIIHHH", "IIIIIIII", (0, 1, 4)), # 32-bit. + 2: ("QQQIHHH", "IIQQQQQQ", (0, 2, 5)), # 64-bit. + }[ident[4]] + except KeyError: + return None + else: + p_get = operator.itemgetter(*p_idx) + + # Find the interpreter section and return its content. + try: + _, e_phoff, _, _, _, e_phentsize, e_phnum = _read_unpacked(f, e_fmt) + except struct.error: + return None + for i in range(e_phnum + 1): + f.seek(e_phoff + e_phentsize * i) + try: + p_type, p_offset, p_filesz = p_get(_read_unpacked(f, p_fmt)) + except struct.error: + return None + if p_type != 3: # Not PT_INTERP. + continue + f.seek(p_offset) + interpreter = os.fsdecode(f.read(p_filesz)).strip("\0") + if "musl" not in interpreter: + return None + return interpreter + return None class _MuslVersion(NamedTuple): @@ -20,7 +73,7 @@ class _MuslVersion(NamedTuple): minor: int -def _parse_musl_version(output: str) -> _MuslVersion | None: +def _parse_musl_version(output: str) -> Optional[_MuslVersion]: lines = [n for n in (n.strip() for n in output.splitlines()) if n] if len(lines) < 2 or lines[0][:4] != "musl": return None @@ -30,8 +83,8 @@ def _parse_musl_version(output: str) -> _MuslVersion | None: return _MuslVersion(major=int(m.group(1)), minor=int(m.group(2))) -@functools.lru_cache -def _get_musl_version(executable: str) -> _MuslVersion | None: +@functools.lru_cache() +def _get_musl_version(executable: str) -> Optional[_MuslVersion]: """Detect currently-running musl runtime version. This is done by checking the specified executable's dynamic linking @@ -42,34 +95,32 @@ def _get_musl_version(executable: str) -> _MuslVersion | None: Version 1.2.2 Dynamic Program Loader """ - try: - with open(executable, "rb") as f: - ld = ELFFile(f).interpreter - except (OSError, TypeError, ValueError): + with contextlib.ExitStack() as stack: + try: + f = stack.enter_context(open(executable, "rb")) + except OSError: + return None + ld = _parse_ld_musl_from_elf(f) + if not ld: return None - if ld is None or "musl" not in ld: - return None - proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True) + proc = subprocess.run([ld], stderr=subprocess.PIPE, universal_newlines=True) return _parse_musl_version(proc.stderr) -def platform_tags(archs: Sequence[str]) -> Iterator[str]: +def platform_tags(arch: str) -> Iterator[str]: """Generate musllinux tags compatible to the current platform. - :param archs: Sequence of compatible architectures. - The first one shall be the closest to the actual architecture and be the part of - platform tag after the ``linux_`` prefix, e.g. ``x86_64``. - The ``linux_`` prefix is assumed as a prerequisite for the current platform to - be musllinux-compatible. + :param arch: Should be the part of platform tag after the ``linux_`` + prefix, e.g. ``x86_64``. The ``linux_`` prefix is assumed as a + prerequisite for the current platform to be musllinux-compatible. :returns: An iterator of compatible musllinux tags. """ sys_musl = _get_musl_version(sys.executable) if sys_musl is None: # Python not dynamically linked against musl. return - for arch in archs: - for minor in range(sys_musl.minor, -1, -1): - yield f"musllinux_{sys_musl.major}_{minor}_{arch}" + for minor in range(sys_musl.minor, -1, -1): + yield f"musllinux_{sys_musl.major}_{minor}_{arch}" if __name__ == "__main__": # pragma: no cover diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_parser.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_parser.py deleted file mode 100644 index c1238c0..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_parser.py +++ /dev/null @@ -1,354 +0,0 @@ -"""Handwritten parser of dependency specifiers. - -The docstring for each __parse_* function contains EBNF-inspired grammar representing -the implementation. -""" - -from __future__ import annotations - -import ast -from typing import NamedTuple, Sequence, Tuple, Union - -from ._tokenizer import DEFAULT_RULES, Tokenizer - - -class Node: - def __init__(self, value: str) -> None: - self.value = value - - def __str__(self) -> str: - return self.value - - def __repr__(self) -> str: - return f"<{self.__class__.__name__}('{self}')>" - - def serialize(self) -> str: - raise NotImplementedError - - -class Variable(Node): - def serialize(self) -> str: - return str(self) - - -class Value(Node): - def serialize(self) -> str: - return f'"{self}"' - - -class Op(Node): - def serialize(self) -> str: - return str(self) - - -MarkerVar = Union[Variable, Value] -MarkerItem = Tuple[MarkerVar, Op, MarkerVar] -MarkerAtom = Union[MarkerItem, Sequence["MarkerAtom"]] -MarkerList = Sequence[Union["MarkerList", MarkerAtom, str]] - - -class ParsedRequirement(NamedTuple): - name: str - url: str - extras: list[str] - specifier: str - marker: MarkerList | None - - -# -------------------------------------------------------------------------------------- -# Recursive descent parser for dependency specifier -# -------------------------------------------------------------------------------------- -def parse_requirement(source: str) -> ParsedRequirement: - return _parse_requirement(Tokenizer(source, rules=DEFAULT_RULES)) - - -def _parse_requirement(tokenizer: Tokenizer) -> ParsedRequirement: - """ - requirement = WS? IDENTIFIER WS? extras WS? requirement_details - """ - tokenizer.consume("WS") - - name_token = tokenizer.expect( - "IDENTIFIER", expected="package name at the start of dependency specifier" - ) - name = name_token.text - tokenizer.consume("WS") - - extras = _parse_extras(tokenizer) - tokenizer.consume("WS") - - url, specifier, marker = _parse_requirement_details(tokenizer) - tokenizer.expect("END", expected="end of dependency specifier") - - return ParsedRequirement(name, url, extras, specifier, marker) - - -def _parse_requirement_details( - tokenizer: Tokenizer, -) -> tuple[str, str, MarkerList | None]: - """ - requirement_details = AT URL (WS requirement_marker?)? - | specifier WS? (requirement_marker)? - """ - - specifier = "" - url = "" - marker = None - - if tokenizer.check("AT"): - tokenizer.read() - tokenizer.consume("WS") - - url_start = tokenizer.position - url = tokenizer.expect("URL", expected="URL after @").text - if tokenizer.check("END", peek=True): - return (url, specifier, marker) - - tokenizer.expect("WS", expected="whitespace after URL") - - # The input might end after whitespace. - if tokenizer.check("END", peek=True): - return (url, specifier, marker) - - marker = _parse_requirement_marker( - tokenizer, span_start=url_start, after="URL and whitespace" - ) - else: - specifier_start = tokenizer.position - specifier = _parse_specifier(tokenizer) - tokenizer.consume("WS") - - if tokenizer.check("END", peek=True): - return (url, specifier, marker) - - marker = _parse_requirement_marker( - tokenizer, - span_start=specifier_start, - after=( - "version specifier" - if specifier - else "name and no valid version specifier" - ), - ) - - return (url, specifier, marker) - - -def _parse_requirement_marker( - tokenizer: Tokenizer, *, span_start: int, after: str -) -> MarkerList: - """ - requirement_marker = SEMICOLON marker WS? - """ - - if not tokenizer.check("SEMICOLON"): - tokenizer.raise_syntax_error( - f"Expected end or semicolon (after {after})", - span_start=span_start, - ) - tokenizer.read() - - marker = _parse_marker(tokenizer) - tokenizer.consume("WS") - - return marker - - -def _parse_extras(tokenizer: Tokenizer) -> list[str]: - """ - extras = (LEFT_BRACKET wsp* extras_list? wsp* RIGHT_BRACKET)? - """ - if not tokenizer.check("LEFT_BRACKET", peek=True): - return [] - - with tokenizer.enclosing_tokens( - "LEFT_BRACKET", - "RIGHT_BRACKET", - around="extras", - ): - tokenizer.consume("WS") - extras = _parse_extras_list(tokenizer) - tokenizer.consume("WS") - - return extras - - -def _parse_extras_list(tokenizer: Tokenizer) -> list[str]: - """ - extras_list = identifier (wsp* ',' wsp* identifier)* - """ - extras: list[str] = [] - - if not tokenizer.check("IDENTIFIER"): - return extras - - extras.append(tokenizer.read().text) - - while True: - tokenizer.consume("WS") - if tokenizer.check("IDENTIFIER", peek=True): - tokenizer.raise_syntax_error("Expected comma between extra names") - elif not tokenizer.check("COMMA"): - break - - tokenizer.read() - tokenizer.consume("WS") - - extra_token = tokenizer.expect("IDENTIFIER", expected="extra name after comma") - extras.append(extra_token.text) - - return extras - - -def _parse_specifier(tokenizer: Tokenizer) -> str: - """ - specifier = LEFT_PARENTHESIS WS? version_many WS? RIGHT_PARENTHESIS - | WS? version_many WS? - """ - with tokenizer.enclosing_tokens( - "LEFT_PARENTHESIS", - "RIGHT_PARENTHESIS", - around="version specifier", - ): - tokenizer.consume("WS") - parsed_specifiers = _parse_version_many(tokenizer) - tokenizer.consume("WS") - - return parsed_specifiers - - -def _parse_version_many(tokenizer: Tokenizer) -> str: - """ - version_many = (SPECIFIER (WS? COMMA WS? SPECIFIER)*)? - """ - parsed_specifiers = "" - while tokenizer.check("SPECIFIER"): - span_start = tokenizer.position - parsed_specifiers += tokenizer.read().text - if tokenizer.check("VERSION_PREFIX_TRAIL", peek=True): - tokenizer.raise_syntax_error( - ".* suffix can only be used with `==` or `!=` operators", - span_start=span_start, - span_end=tokenizer.position + 1, - ) - if tokenizer.check("VERSION_LOCAL_LABEL_TRAIL", peek=True): - tokenizer.raise_syntax_error( - "Local version label can only be used with `==` or `!=` operators", - span_start=span_start, - span_end=tokenizer.position, - ) - tokenizer.consume("WS") - if not tokenizer.check("COMMA"): - break - parsed_specifiers += tokenizer.read().text - tokenizer.consume("WS") - - return parsed_specifiers - - -# -------------------------------------------------------------------------------------- -# Recursive descent parser for marker expression -# -------------------------------------------------------------------------------------- -def parse_marker(source: str) -> MarkerList: - return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES)) - - -def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList: - retval = _parse_marker(tokenizer) - tokenizer.expect("END", expected="end of marker expression") - return retval - - -def _parse_marker(tokenizer: Tokenizer) -> MarkerList: - """ - marker = marker_atom (BOOLOP marker_atom)+ - """ - expression = [_parse_marker_atom(tokenizer)] - while tokenizer.check("BOOLOP"): - token = tokenizer.read() - expr_right = _parse_marker_atom(tokenizer) - expression.extend((token.text, expr_right)) - return expression - - -def _parse_marker_atom(tokenizer: Tokenizer) -> MarkerAtom: - """ - marker_atom = WS? LEFT_PARENTHESIS WS? marker WS? RIGHT_PARENTHESIS WS? - | WS? marker_item WS? - """ - - tokenizer.consume("WS") - if tokenizer.check("LEFT_PARENTHESIS", peek=True): - with tokenizer.enclosing_tokens( - "LEFT_PARENTHESIS", - "RIGHT_PARENTHESIS", - around="marker expression", - ): - tokenizer.consume("WS") - marker: MarkerAtom = _parse_marker(tokenizer) - tokenizer.consume("WS") - else: - marker = _parse_marker_item(tokenizer) - tokenizer.consume("WS") - return marker - - -def _parse_marker_item(tokenizer: Tokenizer) -> MarkerItem: - """ - marker_item = WS? marker_var WS? marker_op WS? marker_var WS? - """ - tokenizer.consume("WS") - marker_var_left = _parse_marker_var(tokenizer) - tokenizer.consume("WS") - marker_op = _parse_marker_op(tokenizer) - tokenizer.consume("WS") - marker_var_right = _parse_marker_var(tokenizer) - tokenizer.consume("WS") - return (marker_var_left, marker_op, marker_var_right) - - -def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar: - """ - marker_var = VARIABLE | QUOTED_STRING - """ - if tokenizer.check("VARIABLE"): - return process_env_var(tokenizer.read().text.replace(".", "_")) - elif tokenizer.check("QUOTED_STRING"): - return process_python_str(tokenizer.read().text) - else: - tokenizer.raise_syntax_error( - message="Expected a marker variable or quoted string" - ) - - -def process_env_var(env_var: str) -> Variable: - if env_var in ("platform_python_implementation", "python_implementation"): - return Variable("platform_python_implementation") - else: - return Variable(env_var) - - -def process_python_str(python_str: str) -> Value: - value = ast.literal_eval(python_str) - return Value(str(value)) - - -def _parse_marker_op(tokenizer: Tokenizer) -> Op: - """ - marker_op = IN | NOT IN | OP - """ - if tokenizer.check("IN"): - tokenizer.read() - return Op("in") - elif tokenizer.check("NOT"): - tokenizer.read() - tokenizer.expect("WS", expected="whitespace after 'not'") - tokenizer.expect("IN", expected="'in' after 'not'") - return Op("not in") - elif tokenizer.check("OP"): - return Op(tokenizer.read().text) - else: - return tokenizer.raise_syntax_error( - "Expected marker operator, one of " - "<=, <, !=, ==, >=, >, ~=, ===, in, not in" - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_tokenizer.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_tokenizer.py deleted file mode 100644 index 89d0416..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/_tokenizer.py +++ /dev/null @@ -1,194 +0,0 @@ -from __future__ import annotations - -import contextlib -import re -from dataclasses import dataclass -from typing import Iterator, NoReturn - -from .specifiers import Specifier - - -@dataclass -class Token: - name: str - text: str - position: int - - -class ParserSyntaxError(Exception): - """The provided source text could not be parsed correctly.""" - - def __init__( - self, - message: str, - *, - source: str, - span: tuple[int, int], - ) -> None: - self.span = span - self.message = message - self.source = source - - super().__init__() - - def __str__(self) -> str: - marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^" - return "\n ".join([self.message, self.source, marker]) - - -DEFAULT_RULES: dict[str, str | re.Pattern[str]] = { - "LEFT_PARENTHESIS": r"\(", - "RIGHT_PARENTHESIS": r"\)", - "LEFT_BRACKET": r"\[", - "RIGHT_BRACKET": r"\]", - "SEMICOLON": r";", - "COMMA": r",", - "QUOTED_STRING": re.compile( - r""" - ( - ('[^']*') - | - ("[^"]*") - ) - """, - re.VERBOSE, - ), - "OP": r"(===|==|~=|!=|<=|>=|<|>)", - "BOOLOP": r"\b(or|and)\b", - "IN": r"\bin\b", - "NOT": r"\bnot\b", - "VARIABLE": re.compile( - r""" - \b( - python_version - |python_full_version - |os[._]name - |sys[._]platform - |platform_(release|system) - |platform[._](version|machine|python_implementation) - |python_implementation - |implementation_(name|version) - |extra - )\b - """, - re.VERBOSE, - ), - "SPECIFIER": re.compile( - Specifier._operator_regex_str + Specifier._version_regex_str, - re.VERBOSE | re.IGNORECASE, - ), - "AT": r"\@", - "URL": r"[^ \t]+", - "IDENTIFIER": r"\b[a-zA-Z0-9][a-zA-Z0-9._-]*\b", - "VERSION_PREFIX_TRAIL": r"\.\*", - "VERSION_LOCAL_LABEL_TRAIL": r"\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*", - "WS": r"[ \t]+", - "END": r"$", -} - - -class Tokenizer: - """Context-sensitive token parsing. - - Provides methods to examine the input stream to check whether the next token - matches. - """ - - def __init__( - self, - source: str, - *, - rules: dict[str, str | re.Pattern[str]], - ) -> None: - self.source = source - self.rules: dict[str, re.Pattern[str]] = { - name: re.compile(pattern) for name, pattern in rules.items() - } - self.next_token: Token | None = None - self.position = 0 - - def consume(self, name: str) -> None: - """Move beyond provided token name, if at current position.""" - if self.check(name): - self.read() - - def check(self, name: str, *, peek: bool = False) -> bool: - """Check whether the next token has the provided name. - - By default, if the check succeeds, the token *must* be read before - another check. If `peek` is set to `True`, the token is not loaded and - would need to be checked again. - """ - assert ( - self.next_token is None - ), f"Cannot check for {name!r}, already have {self.next_token!r}" - assert name in self.rules, f"Unknown token name: {name!r}" - - expression = self.rules[name] - - match = expression.match(self.source, self.position) - if match is None: - return False - if not peek: - self.next_token = Token(name, match[0], self.position) - return True - - def expect(self, name: str, *, expected: str) -> Token: - """Expect a certain token name next, failing with a syntax error otherwise. - - The token is *not* read. - """ - if not self.check(name): - raise self.raise_syntax_error(f"Expected {expected}") - return self.read() - - def read(self) -> Token: - """Consume the next token and return it.""" - token = self.next_token - assert token is not None - - self.position += len(token.text) - self.next_token = None - - return token - - def raise_syntax_error( - self, - message: str, - *, - span_start: int | None = None, - span_end: int | None = None, - ) -> NoReturn: - """Raise ParserSyntaxError at the given position.""" - span = ( - self.position if span_start is None else span_start, - self.position if span_end is None else span_end, - ) - raise ParserSyntaxError( - message, - source=self.source, - span=span, - ) - - @contextlib.contextmanager - def enclosing_tokens( - self, open_token: str, close_token: str, *, around: str - ) -> Iterator[None]: - if self.check(open_token): - open_position = self.position - self.read() - else: - open_position = None - - yield - - if open_position is None: - return - - if not self.check(close_token): - self.raise_syntax_error( - f"Expected matching {close_token} for {open_token}, after {around}", - span_start=open_position, - ) - - self.read() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__init__.py deleted file mode 100644 index 569156d..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__init__.py +++ /dev/null @@ -1,145 +0,0 @@ -####################################################################################### -# -# Adapted from: -# https://github.com/pypa/hatch/blob/5352e44/backend/src/hatchling/licenses/parse.py -# -# MIT License -# -# Copyright (c) 2017-present Ofek Lev -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this -# software and associated documentation files (the "Software"), to deal in the Software -# without restriction, including without limitation the rights to use, copy, modify, -# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be included in all copies -# or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# -# With additional allowance of arbitrary `LicenseRef-` identifiers, not just -# `LicenseRef-Public-Domain` and `LicenseRef-Proprietary`. -# -####################################################################################### -from __future__ import annotations - -import re -from typing import NewType, cast - -from packaging.licenses._spdx import EXCEPTIONS, LICENSES - -__all__ = [ - "NormalizedLicenseExpression", - "InvalidLicenseExpression", - "canonicalize_license_expression", -] - -license_ref_allowed = re.compile("^[A-Za-z0-9.-]*$") - -NormalizedLicenseExpression = NewType("NormalizedLicenseExpression", str) - - -class InvalidLicenseExpression(ValueError): - """Raised when a license-expression string is invalid - - >>> canonicalize_license_expression("invalid") - Traceback (most recent call last): - ... - packaging.licenses.InvalidLicenseExpression: Invalid license expression: 'invalid' - """ - - -def canonicalize_license_expression( - raw_license_expression: str, -) -> NormalizedLicenseExpression: - if not raw_license_expression: - message = f"Invalid license expression: {raw_license_expression!r}" - raise InvalidLicenseExpression(message) - - # Pad any parentheses so tokenization can be achieved by merely splitting on - # whitespace. - license_expression = raw_license_expression.replace("(", " ( ").replace(")", " ) ") - licenseref_prefix = "LicenseRef-" - license_refs = { - ref.lower(): "LicenseRef-" + ref[len(licenseref_prefix) :] - for ref in license_expression.split() - if ref.lower().startswith(licenseref_prefix.lower()) - } - - # Normalize to lower case so we can look up licenses/exceptions - # and so boolean operators are Python-compatible. - license_expression = license_expression.lower() - - tokens = license_expression.split() - - # Rather than implementing boolean logic, we create an expression that Python can - # parse. Everything that is not involved with the grammar itself is treated as - # `False` and the expression should evaluate as such. - python_tokens = [] - for token in tokens: - if token not in {"or", "and", "with", "(", ")"}: - python_tokens.append("False") - elif token == "with": - python_tokens.append("or") - elif token == "(" and python_tokens and python_tokens[-1] not in {"or", "and"}: - message = f"Invalid license expression: {raw_license_expression!r}" - raise InvalidLicenseExpression(message) - else: - python_tokens.append(token) - - python_expression = " ".join(python_tokens) - try: - invalid = eval(python_expression, globals(), locals()) - except Exception: - invalid = True - - if invalid is not False: - message = f"Invalid license expression: {raw_license_expression!r}" - raise InvalidLicenseExpression(message) from None - - # Take a final pass to check for unknown licenses/exceptions. - normalized_tokens = [] - for token in tokens: - if token in {"or", "and", "with", "(", ")"}: - normalized_tokens.append(token.upper()) - continue - - if normalized_tokens and normalized_tokens[-1] == "WITH": - if token not in EXCEPTIONS: - message = f"Unknown license exception: {token!r}" - raise InvalidLicenseExpression(message) - - normalized_tokens.append(EXCEPTIONS[token]["id"]) - else: - if token.endswith("+"): - final_token = token[:-1] - suffix = "+" - else: - final_token = token - suffix = "" - - if final_token.startswith("licenseref-"): - if not license_ref_allowed.match(final_token): - message = f"Invalid licenseref: {final_token!r}" - raise InvalidLicenseExpression(message) - normalized_tokens.append(license_refs[final_token] + suffix) - else: - if final_token not in LICENSES: - message = f"Unknown license: {final_token!r}" - raise InvalidLicenseExpression(message) - normalized_tokens.append(LICENSES[final_token]["id"] + suffix) - - normalized_expression = " ".join(normalized_tokens) - - return cast( - NormalizedLicenseExpression, - normalized_expression.replace("( ", "(").replace(" )", ")"), - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index bf31684..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc deleted file mode 100644 index e09ca14..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/__pycache__/_spdx.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/_spdx.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/_spdx.py deleted file mode 100644 index eac2227..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/licenses/_spdx.py +++ /dev/null @@ -1,759 +0,0 @@ - -from __future__ import annotations - -from typing import TypedDict - -class SPDXLicense(TypedDict): - id: str - deprecated: bool - -class SPDXException(TypedDict): - id: str - deprecated: bool - - -VERSION = '3.25.0' - -LICENSES: dict[str, SPDXLicense] = { - '0bsd': {'id': '0BSD', 'deprecated': False}, - '3d-slicer-1.0': {'id': '3D-Slicer-1.0', 'deprecated': False}, - 'aal': {'id': 'AAL', 'deprecated': False}, - 'abstyles': {'id': 'Abstyles', 'deprecated': False}, - 'adacore-doc': {'id': 'AdaCore-doc', 'deprecated': False}, - 'adobe-2006': {'id': 'Adobe-2006', 'deprecated': False}, - 'adobe-display-postscript': {'id': 'Adobe-Display-PostScript', 'deprecated': False}, - 'adobe-glyph': {'id': 'Adobe-Glyph', 'deprecated': False}, - 'adobe-utopia': {'id': 'Adobe-Utopia', 'deprecated': False}, - 'adsl': {'id': 'ADSL', 'deprecated': False}, - 'afl-1.1': {'id': 'AFL-1.1', 'deprecated': False}, - 'afl-1.2': {'id': 'AFL-1.2', 'deprecated': False}, - 'afl-2.0': {'id': 'AFL-2.0', 'deprecated': False}, - 'afl-2.1': {'id': 'AFL-2.1', 'deprecated': False}, - 'afl-3.0': {'id': 'AFL-3.0', 'deprecated': False}, - 'afmparse': {'id': 'Afmparse', 'deprecated': False}, - 'agpl-1.0': {'id': 'AGPL-1.0', 'deprecated': True}, - 'agpl-1.0-only': {'id': 'AGPL-1.0-only', 'deprecated': False}, - 'agpl-1.0-or-later': {'id': 'AGPL-1.0-or-later', 'deprecated': False}, - 'agpl-3.0': {'id': 'AGPL-3.0', 'deprecated': True}, - 'agpl-3.0-only': {'id': 'AGPL-3.0-only', 'deprecated': False}, - 'agpl-3.0-or-later': {'id': 'AGPL-3.0-or-later', 'deprecated': False}, - 'aladdin': {'id': 'Aladdin', 'deprecated': False}, - 'amd-newlib': {'id': 'AMD-newlib', 'deprecated': False}, - 'amdplpa': {'id': 'AMDPLPA', 'deprecated': False}, - 'aml': {'id': 'AML', 'deprecated': False}, - 'aml-glslang': {'id': 'AML-glslang', 'deprecated': False}, - 'ampas': {'id': 'AMPAS', 'deprecated': False}, - 'antlr-pd': {'id': 'ANTLR-PD', 'deprecated': False}, - 'antlr-pd-fallback': {'id': 'ANTLR-PD-fallback', 'deprecated': False}, - 'any-osi': {'id': 'any-OSI', 'deprecated': False}, - 'apache-1.0': {'id': 'Apache-1.0', 'deprecated': False}, - 'apache-1.1': {'id': 'Apache-1.1', 'deprecated': False}, - 'apache-2.0': {'id': 'Apache-2.0', 'deprecated': False}, - 'apafml': {'id': 'APAFML', 'deprecated': False}, - 'apl-1.0': {'id': 'APL-1.0', 'deprecated': False}, - 'app-s2p': {'id': 'App-s2p', 'deprecated': False}, - 'apsl-1.0': {'id': 'APSL-1.0', 'deprecated': False}, - 'apsl-1.1': {'id': 'APSL-1.1', 'deprecated': False}, - 'apsl-1.2': {'id': 'APSL-1.2', 'deprecated': False}, - 'apsl-2.0': {'id': 'APSL-2.0', 'deprecated': False}, - 'arphic-1999': {'id': 'Arphic-1999', 'deprecated': False}, - 'artistic-1.0': {'id': 'Artistic-1.0', 'deprecated': False}, - 'artistic-1.0-cl8': {'id': 'Artistic-1.0-cl8', 'deprecated': False}, - 'artistic-1.0-perl': {'id': 'Artistic-1.0-Perl', 'deprecated': False}, - 'artistic-2.0': {'id': 'Artistic-2.0', 'deprecated': False}, - 'aswf-digital-assets-1.0': {'id': 'ASWF-Digital-Assets-1.0', 'deprecated': False}, - 'aswf-digital-assets-1.1': {'id': 'ASWF-Digital-Assets-1.1', 'deprecated': False}, - 'baekmuk': {'id': 'Baekmuk', 'deprecated': False}, - 'bahyph': {'id': 'Bahyph', 'deprecated': False}, - 'barr': {'id': 'Barr', 'deprecated': False}, - 'bcrypt-solar-designer': {'id': 'bcrypt-Solar-Designer', 'deprecated': False}, - 'beerware': {'id': 'Beerware', 'deprecated': False}, - 'bitstream-charter': {'id': 'Bitstream-Charter', 'deprecated': False}, - 'bitstream-vera': {'id': 'Bitstream-Vera', 'deprecated': False}, - 'bittorrent-1.0': {'id': 'BitTorrent-1.0', 'deprecated': False}, - 'bittorrent-1.1': {'id': 'BitTorrent-1.1', 'deprecated': False}, - 'blessing': {'id': 'blessing', 'deprecated': False}, - 'blueoak-1.0.0': {'id': 'BlueOak-1.0.0', 'deprecated': False}, - 'boehm-gc': {'id': 'Boehm-GC', 'deprecated': False}, - 'borceux': {'id': 'Borceux', 'deprecated': False}, - 'brian-gladman-2-clause': {'id': 'Brian-Gladman-2-Clause', 'deprecated': False}, - 'brian-gladman-3-clause': {'id': 'Brian-Gladman-3-Clause', 'deprecated': False}, - 'bsd-1-clause': {'id': 'BSD-1-Clause', 'deprecated': False}, - 'bsd-2-clause': {'id': 'BSD-2-Clause', 'deprecated': False}, - 'bsd-2-clause-darwin': {'id': 'BSD-2-Clause-Darwin', 'deprecated': False}, - 'bsd-2-clause-first-lines': {'id': 'BSD-2-Clause-first-lines', 'deprecated': False}, - 'bsd-2-clause-freebsd': {'id': 'BSD-2-Clause-FreeBSD', 'deprecated': True}, - 'bsd-2-clause-netbsd': {'id': 'BSD-2-Clause-NetBSD', 'deprecated': True}, - 'bsd-2-clause-patent': {'id': 'BSD-2-Clause-Patent', 'deprecated': False}, - 'bsd-2-clause-views': {'id': 'BSD-2-Clause-Views', 'deprecated': False}, - 'bsd-3-clause': {'id': 'BSD-3-Clause', 'deprecated': False}, - 'bsd-3-clause-acpica': {'id': 'BSD-3-Clause-acpica', 'deprecated': False}, - 'bsd-3-clause-attribution': {'id': 'BSD-3-Clause-Attribution', 'deprecated': False}, - 'bsd-3-clause-clear': {'id': 'BSD-3-Clause-Clear', 'deprecated': False}, - 'bsd-3-clause-flex': {'id': 'BSD-3-Clause-flex', 'deprecated': False}, - 'bsd-3-clause-hp': {'id': 'BSD-3-Clause-HP', 'deprecated': False}, - 'bsd-3-clause-lbnl': {'id': 'BSD-3-Clause-LBNL', 'deprecated': False}, - 'bsd-3-clause-modification': {'id': 'BSD-3-Clause-Modification', 'deprecated': False}, - 'bsd-3-clause-no-military-license': {'id': 'BSD-3-Clause-No-Military-License', 'deprecated': False}, - 'bsd-3-clause-no-nuclear-license': {'id': 'BSD-3-Clause-No-Nuclear-License', 'deprecated': False}, - 'bsd-3-clause-no-nuclear-license-2014': {'id': 'BSD-3-Clause-No-Nuclear-License-2014', 'deprecated': False}, - 'bsd-3-clause-no-nuclear-warranty': {'id': 'BSD-3-Clause-No-Nuclear-Warranty', 'deprecated': False}, - 'bsd-3-clause-open-mpi': {'id': 'BSD-3-Clause-Open-MPI', 'deprecated': False}, - 'bsd-3-clause-sun': {'id': 'BSD-3-Clause-Sun', 'deprecated': False}, - 'bsd-4-clause': {'id': 'BSD-4-Clause', 'deprecated': False}, - 'bsd-4-clause-shortened': {'id': 'BSD-4-Clause-Shortened', 'deprecated': False}, - 'bsd-4-clause-uc': {'id': 'BSD-4-Clause-UC', 'deprecated': False}, - 'bsd-4.3reno': {'id': 'BSD-4.3RENO', 'deprecated': False}, - 'bsd-4.3tahoe': {'id': 'BSD-4.3TAHOE', 'deprecated': False}, - 'bsd-advertising-acknowledgement': {'id': 'BSD-Advertising-Acknowledgement', 'deprecated': False}, - 'bsd-attribution-hpnd-disclaimer': {'id': 'BSD-Attribution-HPND-disclaimer', 'deprecated': False}, - 'bsd-inferno-nettverk': {'id': 'BSD-Inferno-Nettverk', 'deprecated': False}, - 'bsd-protection': {'id': 'BSD-Protection', 'deprecated': False}, - 'bsd-source-beginning-file': {'id': 'BSD-Source-beginning-file', 'deprecated': False}, - 'bsd-source-code': {'id': 'BSD-Source-Code', 'deprecated': False}, - 'bsd-systemics': {'id': 'BSD-Systemics', 'deprecated': False}, - 'bsd-systemics-w3works': {'id': 'BSD-Systemics-W3Works', 'deprecated': False}, - 'bsl-1.0': {'id': 'BSL-1.0', 'deprecated': False}, - 'busl-1.1': {'id': 'BUSL-1.1', 'deprecated': False}, - 'bzip2-1.0.5': {'id': 'bzip2-1.0.5', 'deprecated': True}, - 'bzip2-1.0.6': {'id': 'bzip2-1.0.6', 'deprecated': False}, - 'c-uda-1.0': {'id': 'C-UDA-1.0', 'deprecated': False}, - 'cal-1.0': {'id': 'CAL-1.0', 'deprecated': False}, - 'cal-1.0-combined-work-exception': {'id': 'CAL-1.0-Combined-Work-Exception', 'deprecated': False}, - 'caldera': {'id': 'Caldera', 'deprecated': False}, - 'caldera-no-preamble': {'id': 'Caldera-no-preamble', 'deprecated': False}, - 'catharon': {'id': 'Catharon', 'deprecated': False}, - 'catosl-1.1': {'id': 'CATOSL-1.1', 'deprecated': False}, - 'cc-by-1.0': {'id': 'CC-BY-1.0', 'deprecated': False}, - 'cc-by-2.0': {'id': 'CC-BY-2.0', 'deprecated': False}, - 'cc-by-2.5': {'id': 'CC-BY-2.5', 'deprecated': False}, - 'cc-by-2.5-au': {'id': 'CC-BY-2.5-AU', 'deprecated': False}, - 'cc-by-3.0': {'id': 'CC-BY-3.0', 'deprecated': False}, - 'cc-by-3.0-at': {'id': 'CC-BY-3.0-AT', 'deprecated': False}, - 'cc-by-3.0-au': {'id': 'CC-BY-3.0-AU', 'deprecated': False}, - 'cc-by-3.0-de': {'id': 'CC-BY-3.0-DE', 'deprecated': False}, - 'cc-by-3.0-igo': {'id': 'CC-BY-3.0-IGO', 'deprecated': False}, - 'cc-by-3.0-nl': {'id': 'CC-BY-3.0-NL', 'deprecated': False}, - 'cc-by-3.0-us': {'id': 'CC-BY-3.0-US', 'deprecated': False}, - 'cc-by-4.0': {'id': 'CC-BY-4.0', 'deprecated': False}, - 'cc-by-nc-1.0': {'id': 'CC-BY-NC-1.0', 'deprecated': False}, - 'cc-by-nc-2.0': {'id': 'CC-BY-NC-2.0', 'deprecated': False}, - 'cc-by-nc-2.5': {'id': 'CC-BY-NC-2.5', 'deprecated': False}, - 'cc-by-nc-3.0': {'id': 'CC-BY-NC-3.0', 'deprecated': False}, - 'cc-by-nc-3.0-de': {'id': 'CC-BY-NC-3.0-DE', 'deprecated': False}, - 'cc-by-nc-4.0': {'id': 'CC-BY-NC-4.0', 'deprecated': False}, - 'cc-by-nc-nd-1.0': {'id': 'CC-BY-NC-ND-1.0', 'deprecated': False}, - 'cc-by-nc-nd-2.0': {'id': 'CC-BY-NC-ND-2.0', 'deprecated': False}, - 'cc-by-nc-nd-2.5': {'id': 'CC-BY-NC-ND-2.5', 'deprecated': False}, - 'cc-by-nc-nd-3.0': {'id': 'CC-BY-NC-ND-3.0', 'deprecated': False}, - 'cc-by-nc-nd-3.0-de': {'id': 'CC-BY-NC-ND-3.0-DE', 'deprecated': False}, - 'cc-by-nc-nd-3.0-igo': {'id': 'CC-BY-NC-ND-3.0-IGO', 'deprecated': False}, - 'cc-by-nc-nd-4.0': {'id': 'CC-BY-NC-ND-4.0', 'deprecated': False}, - 'cc-by-nc-sa-1.0': {'id': 'CC-BY-NC-SA-1.0', 'deprecated': False}, - 'cc-by-nc-sa-2.0': {'id': 'CC-BY-NC-SA-2.0', 'deprecated': False}, - 'cc-by-nc-sa-2.0-de': {'id': 'CC-BY-NC-SA-2.0-DE', 'deprecated': False}, - 'cc-by-nc-sa-2.0-fr': {'id': 'CC-BY-NC-SA-2.0-FR', 'deprecated': False}, - 'cc-by-nc-sa-2.0-uk': {'id': 'CC-BY-NC-SA-2.0-UK', 'deprecated': False}, - 'cc-by-nc-sa-2.5': {'id': 'CC-BY-NC-SA-2.5', 'deprecated': False}, - 'cc-by-nc-sa-3.0': {'id': 'CC-BY-NC-SA-3.0', 'deprecated': False}, - 'cc-by-nc-sa-3.0-de': {'id': 'CC-BY-NC-SA-3.0-DE', 'deprecated': False}, - 'cc-by-nc-sa-3.0-igo': {'id': 'CC-BY-NC-SA-3.0-IGO', 'deprecated': False}, - 'cc-by-nc-sa-4.0': {'id': 'CC-BY-NC-SA-4.0', 'deprecated': False}, - 'cc-by-nd-1.0': {'id': 'CC-BY-ND-1.0', 'deprecated': False}, - 'cc-by-nd-2.0': {'id': 'CC-BY-ND-2.0', 'deprecated': False}, - 'cc-by-nd-2.5': {'id': 'CC-BY-ND-2.5', 'deprecated': False}, - 'cc-by-nd-3.0': {'id': 'CC-BY-ND-3.0', 'deprecated': False}, - 'cc-by-nd-3.0-de': {'id': 'CC-BY-ND-3.0-DE', 'deprecated': False}, - 'cc-by-nd-4.0': {'id': 'CC-BY-ND-4.0', 'deprecated': False}, - 'cc-by-sa-1.0': {'id': 'CC-BY-SA-1.0', 'deprecated': False}, - 'cc-by-sa-2.0': {'id': 'CC-BY-SA-2.0', 'deprecated': False}, - 'cc-by-sa-2.0-uk': {'id': 'CC-BY-SA-2.0-UK', 'deprecated': False}, - 'cc-by-sa-2.1-jp': {'id': 'CC-BY-SA-2.1-JP', 'deprecated': False}, - 'cc-by-sa-2.5': {'id': 'CC-BY-SA-2.5', 'deprecated': False}, - 'cc-by-sa-3.0': {'id': 'CC-BY-SA-3.0', 'deprecated': False}, - 'cc-by-sa-3.0-at': {'id': 'CC-BY-SA-3.0-AT', 'deprecated': False}, - 'cc-by-sa-3.0-de': {'id': 'CC-BY-SA-3.0-DE', 'deprecated': False}, - 'cc-by-sa-3.0-igo': {'id': 'CC-BY-SA-3.0-IGO', 'deprecated': False}, - 'cc-by-sa-4.0': {'id': 'CC-BY-SA-4.0', 'deprecated': False}, - 'cc-pddc': {'id': 'CC-PDDC', 'deprecated': False}, - 'cc0-1.0': {'id': 'CC0-1.0', 'deprecated': False}, - 'cddl-1.0': {'id': 'CDDL-1.0', 'deprecated': False}, - 'cddl-1.1': {'id': 'CDDL-1.1', 'deprecated': False}, - 'cdl-1.0': {'id': 'CDL-1.0', 'deprecated': False}, - 'cdla-permissive-1.0': {'id': 'CDLA-Permissive-1.0', 'deprecated': False}, - 'cdla-permissive-2.0': {'id': 'CDLA-Permissive-2.0', 'deprecated': False}, - 'cdla-sharing-1.0': {'id': 'CDLA-Sharing-1.0', 'deprecated': False}, - 'cecill-1.0': {'id': 'CECILL-1.0', 'deprecated': False}, - 'cecill-1.1': {'id': 'CECILL-1.1', 'deprecated': False}, - 'cecill-2.0': {'id': 'CECILL-2.0', 'deprecated': False}, - 'cecill-2.1': {'id': 'CECILL-2.1', 'deprecated': False}, - 'cecill-b': {'id': 'CECILL-B', 'deprecated': False}, - 'cecill-c': {'id': 'CECILL-C', 'deprecated': False}, - 'cern-ohl-1.1': {'id': 'CERN-OHL-1.1', 'deprecated': False}, - 'cern-ohl-1.2': {'id': 'CERN-OHL-1.2', 'deprecated': False}, - 'cern-ohl-p-2.0': {'id': 'CERN-OHL-P-2.0', 'deprecated': False}, - 'cern-ohl-s-2.0': {'id': 'CERN-OHL-S-2.0', 'deprecated': False}, - 'cern-ohl-w-2.0': {'id': 'CERN-OHL-W-2.0', 'deprecated': False}, - 'cfitsio': {'id': 'CFITSIO', 'deprecated': False}, - 'check-cvs': {'id': 'check-cvs', 'deprecated': False}, - 'checkmk': {'id': 'checkmk', 'deprecated': False}, - 'clartistic': {'id': 'ClArtistic', 'deprecated': False}, - 'clips': {'id': 'Clips', 'deprecated': False}, - 'cmu-mach': {'id': 'CMU-Mach', 'deprecated': False}, - 'cmu-mach-nodoc': {'id': 'CMU-Mach-nodoc', 'deprecated': False}, - 'cnri-jython': {'id': 'CNRI-Jython', 'deprecated': False}, - 'cnri-python': {'id': 'CNRI-Python', 'deprecated': False}, - 'cnri-python-gpl-compatible': {'id': 'CNRI-Python-GPL-Compatible', 'deprecated': False}, - 'coil-1.0': {'id': 'COIL-1.0', 'deprecated': False}, - 'community-spec-1.0': {'id': 'Community-Spec-1.0', 'deprecated': False}, - 'condor-1.1': {'id': 'Condor-1.1', 'deprecated': False}, - 'copyleft-next-0.3.0': {'id': 'copyleft-next-0.3.0', 'deprecated': False}, - 'copyleft-next-0.3.1': {'id': 'copyleft-next-0.3.1', 'deprecated': False}, - 'cornell-lossless-jpeg': {'id': 'Cornell-Lossless-JPEG', 'deprecated': False}, - 'cpal-1.0': {'id': 'CPAL-1.0', 'deprecated': False}, - 'cpl-1.0': {'id': 'CPL-1.0', 'deprecated': False}, - 'cpol-1.02': {'id': 'CPOL-1.02', 'deprecated': False}, - 'cronyx': {'id': 'Cronyx', 'deprecated': False}, - 'crossword': {'id': 'Crossword', 'deprecated': False}, - 'crystalstacker': {'id': 'CrystalStacker', 'deprecated': False}, - 'cua-opl-1.0': {'id': 'CUA-OPL-1.0', 'deprecated': False}, - 'cube': {'id': 'Cube', 'deprecated': False}, - 'curl': {'id': 'curl', 'deprecated': False}, - 'cve-tou': {'id': 'cve-tou', 'deprecated': False}, - 'd-fsl-1.0': {'id': 'D-FSL-1.0', 'deprecated': False}, - 'dec-3-clause': {'id': 'DEC-3-Clause', 'deprecated': False}, - 'diffmark': {'id': 'diffmark', 'deprecated': False}, - 'dl-de-by-2.0': {'id': 'DL-DE-BY-2.0', 'deprecated': False}, - 'dl-de-zero-2.0': {'id': 'DL-DE-ZERO-2.0', 'deprecated': False}, - 'doc': {'id': 'DOC', 'deprecated': False}, - 'docbook-schema': {'id': 'DocBook-Schema', 'deprecated': False}, - 'docbook-xml': {'id': 'DocBook-XML', 'deprecated': False}, - 'dotseqn': {'id': 'Dotseqn', 'deprecated': False}, - 'drl-1.0': {'id': 'DRL-1.0', 'deprecated': False}, - 'drl-1.1': {'id': 'DRL-1.1', 'deprecated': False}, - 'dsdp': {'id': 'DSDP', 'deprecated': False}, - 'dtoa': {'id': 'dtoa', 'deprecated': False}, - 'dvipdfm': {'id': 'dvipdfm', 'deprecated': False}, - 'ecl-1.0': {'id': 'ECL-1.0', 'deprecated': False}, - 'ecl-2.0': {'id': 'ECL-2.0', 'deprecated': False}, - 'ecos-2.0': {'id': 'eCos-2.0', 'deprecated': True}, - 'efl-1.0': {'id': 'EFL-1.0', 'deprecated': False}, - 'efl-2.0': {'id': 'EFL-2.0', 'deprecated': False}, - 'egenix': {'id': 'eGenix', 'deprecated': False}, - 'elastic-2.0': {'id': 'Elastic-2.0', 'deprecated': False}, - 'entessa': {'id': 'Entessa', 'deprecated': False}, - 'epics': {'id': 'EPICS', 'deprecated': False}, - 'epl-1.0': {'id': 'EPL-1.0', 'deprecated': False}, - 'epl-2.0': {'id': 'EPL-2.0', 'deprecated': False}, - 'erlpl-1.1': {'id': 'ErlPL-1.1', 'deprecated': False}, - 'etalab-2.0': {'id': 'etalab-2.0', 'deprecated': False}, - 'eudatagrid': {'id': 'EUDatagrid', 'deprecated': False}, - 'eupl-1.0': {'id': 'EUPL-1.0', 'deprecated': False}, - 'eupl-1.1': {'id': 'EUPL-1.1', 'deprecated': False}, - 'eupl-1.2': {'id': 'EUPL-1.2', 'deprecated': False}, - 'eurosym': {'id': 'Eurosym', 'deprecated': False}, - 'fair': {'id': 'Fair', 'deprecated': False}, - 'fbm': {'id': 'FBM', 'deprecated': False}, - 'fdk-aac': {'id': 'FDK-AAC', 'deprecated': False}, - 'ferguson-twofish': {'id': 'Ferguson-Twofish', 'deprecated': False}, - 'frameworx-1.0': {'id': 'Frameworx-1.0', 'deprecated': False}, - 'freebsd-doc': {'id': 'FreeBSD-DOC', 'deprecated': False}, - 'freeimage': {'id': 'FreeImage', 'deprecated': False}, - 'fsfap': {'id': 'FSFAP', 'deprecated': False}, - 'fsfap-no-warranty-disclaimer': {'id': 'FSFAP-no-warranty-disclaimer', 'deprecated': False}, - 'fsful': {'id': 'FSFUL', 'deprecated': False}, - 'fsfullr': {'id': 'FSFULLR', 'deprecated': False}, - 'fsfullrwd': {'id': 'FSFULLRWD', 'deprecated': False}, - 'ftl': {'id': 'FTL', 'deprecated': False}, - 'furuseth': {'id': 'Furuseth', 'deprecated': False}, - 'fwlw': {'id': 'fwlw', 'deprecated': False}, - 'gcr-docs': {'id': 'GCR-docs', 'deprecated': False}, - 'gd': {'id': 'GD', 'deprecated': False}, - 'gfdl-1.1': {'id': 'GFDL-1.1', 'deprecated': True}, - 'gfdl-1.1-invariants-only': {'id': 'GFDL-1.1-invariants-only', 'deprecated': False}, - 'gfdl-1.1-invariants-or-later': {'id': 'GFDL-1.1-invariants-or-later', 'deprecated': False}, - 'gfdl-1.1-no-invariants-only': {'id': 'GFDL-1.1-no-invariants-only', 'deprecated': False}, - 'gfdl-1.1-no-invariants-or-later': {'id': 'GFDL-1.1-no-invariants-or-later', 'deprecated': False}, - 'gfdl-1.1-only': {'id': 'GFDL-1.1-only', 'deprecated': False}, - 'gfdl-1.1-or-later': {'id': 'GFDL-1.1-or-later', 'deprecated': False}, - 'gfdl-1.2': {'id': 'GFDL-1.2', 'deprecated': True}, - 'gfdl-1.2-invariants-only': {'id': 'GFDL-1.2-invariants-only', 'deprecated': False}, - 'gfdl-1.2-invariants-or-later': {'id': 'GFDL-1.2-invariants-or-later', 'deprecated': False}, - 'gfdl-1.2-no-invariants-only': {'id': 'GFDL-1.2-no-invariants-only', 'deprecated': False}, - 'gfdl-1.2-no-invariants-or-later': {'id': 'GFDL-1.2-no-invariants-or-later', 'deprecated': False}, - 'gfdl-1.2-only': {'id': 'GFDL-1.2-only', 'deprecated': False}, - 'gfdl-1.2-or-later': {'id': 'GFDL-1.2-or-later', 'deprecated': False}, - 'gfdl-1.3': {'id': 'GFDL-1.3', 'deprecated': True}, - 'gfdl-1.3-invariants-only': {'id': 'GFDL-1.3-invariants-only', 'deprecated': False}, - 'gfdl-1.3-invariants-or-later': {'id': 'GFDL-1.3-invariants-or-later', 'deprecated': False}, - 'gfdl-1.3-no-invariants-only': {'id': 'GFDL-1.3-no-invariants-only', 'deprecated': False}, - 'gfdl-1.3-no-invariants-or-later': {'id': 'GFDL-1.3-no-invariants-or-later', 'deprecated': False}, - 'gfdl-1.3-only': {'id': 'GFDL-1.3-only', 'deprecated': False}, - 'gfdl-1.3-or-later': {'id': 'GFDL-1.3-or-later', 'deprecated': False}, - 'giftware': {'id': 'Giftware', 'deprecated': False}, - 'gl2ps': {'id': 'GL2PS', 'deprecated': False}, - 'glide': {'id': 'Glide', 'deprecated': False}, - 'glulxe': {'id': 'Glulxe', 'deprecated': False}, - 'glwtpl': {'id': 'GLWTPL', 'deprecated': False}, - 'gnuplot': {'id': 'gnuplot', 'deprecated': False}, - 'gpl-1.0': {'id': 'GPL-1.0', 'deprecated': True}, - 'gpl-1.0+': {'id': 'GPL-1.0+', 'deprecated': True}, - 'gpl-1.0-only': {'id': 'GPL-1.0-only', 'deprecated': False}, - 'gpl-1.0-or-later': {'id': 'GPL-1.0-or-later', 'deprecated': False}, - 'gpl-2.0': {'id': 'GPL-2.0', 'deprecated': True}, - 'gpl-2.0+': {'id': 'GPL-2.0+', 'deprecated': True}, - 'gpl-2.0-only': {'id': 'GPL-2.0-only', 'deprecated': False}, - 'gpl-2.0-or-later': {'id': 'GPL-2.0-or-later', 'deprecated': False}, - 'gpl-2.0-with-autoconf-exception': {'id': 'GPL-2.0-with-autoconf-exception', 'deprecated': True}, - 'gpl-2.0-with-bison-exception': {'id': 'GPL-2.0-with-bison-exception', 'deprecated': True}, - 'gpl-2.0-with-classpath-exception': {'id': 'GPL-2.0-with-classpath-exception', 'deprecated': True}, - 'gpl-2.0-with-font-exception': {'id': 'GPL-2.0-with-font-exception', 'deprecated': True}, - 'gpl-2.0-with-gcc-exception': {'id': 'GPL-2.0-with-GCC-exception', 'deprecated': True}, - 'gpl-3.0': {'id': 'GPL-3.0', 'deprecated': True}, - 'gpl-3.0+': {'id': 'GPL-3.0+', 'deprecated': True}, - 'gpl-3.0-only': {'id': 'GPL-3.0-only', 'deprecated': False}, - 'gpl-3.0-or-later': {'id': 'GPL-3.0-or-later', 'deprecated': False}, - 'gpl-3.0-with-autoconf-exception': {'id': 'GPL-3.0-with-autoconf-exception', 'deprecated': True}, - 'gpl-3.0-with-gcc-exception': {'id': 'GPL-3.0-with-GCC-exception', 'deprecated': True}, - 'graphics-gems': {'id': 'Graphics-Gems', 'deprecated': False}, - 'gsoap-1.3b': {'id': 'gSOAP-1.3b', 'deprecated': False}, - 'gtkbook': {'id': 'gtkbook', 'deprecated': False}, - 'gutmann': {'id': 'Gutmann', 'deprecated': False}, - 'haskellreport': {'id': 'HaskellReport', 'deprecated': False}, - 'hdparm': {'id': 'hdparm', 'deprecated': False}, - 'hidapi': {'id': 'HIDAPI', 'deprecated': False}, - 'hippocratic-2.1': {'id': 'Hippocratic-2.1', 'deprecated': False}, - 'hp-1986': {'id': 'HP-1986', 'deprecated': False}, - 'hp-1989': {'id': 'HP-1989', 'deprecated': False}, - 'hpnd': {'id': 'HPND', 'deprecated': False}, - 'hpnd-dec': {'id': 'HPND-DEC', 'deprecated': False}, - 'hpnd-doc': {'id': 'HPND-doc', 'deprecated': False}, - 'hpnd-doc-sell': {'id': 'HPND-doc-sell', 'deprecated': False}, - 'hpnd-export-us': {'id': 'HPND-export-US', 'deprecated': False}, - 'hpnd-export-us-acknowledgement': {'id': 'HPND-export-US-acknowledgement', 'deprecated': False}, - 'hpnd-export-us-modify': {'id': 'HPND-export-US-modify', 'deprecated': False}, - 'hpnd-export2-us': {'id': 'HPND-export2-US', 'deprecated': False}, - 'hpnd-fenneberg-livingston': {'id': 'HPND-Fenneberg-Livingston', 'deprecated': False}, - 'hpnd-inria-imag': {'id': 'HPND-INRIA-IMAG', 'deprecated': False}, - 'hpnd-intel': {'id': 'HPND-Intel', 'deprecated': False}, - 'hpnd-kevlin-henney': {'id': 'HPND-Kevlin-Henney', 'deprecated': False}, - 'hpnd-markus-kuhn': {'id': 'HPND-Markus-Kuhn', 'deprecated': False}, - 'hpnd-merchantability-variant': {'id': 'HPND-merchantability-variant', 'deprecated': False}, - 'hpnd-mit-disclaimer': {'id': 'HPND-MIT-disclaimer', 'deprecated': False}, - 'hpnd-netrek': {'id': 'HPND-Netrek', 'deprecated': False}, - 'hpnd-pbmplus': {'id': 'HPND-Pbmplus', 'deprecated': False}, - 'hpnd-sell-mit-disclaimer-xserver': {'id': 'HPND-sell-MIT-disclaimer-xserver', 'deprecated': False}, - 'hpnd-sell-regexpr': {'id': 'HPND-sell-regexpr', 'deprecated': False}, - 'hpnd-sell-variant': {'id': 'HPND-sell-variant', 'deprecated': False}, - 'hpnd-sell-variant-mit-disclaimer': {'id': 'HPND-sell-variant-MIT-disclaimer', 'deprecated': False}, - 'hpnd-sell-variant-mit-disclaimer-rev': {'id': 'HPND-sell-variant-MIT-disclaimer-rev', 'deprecated': False}, - 'hpnd-uc': {'id': 'HPND-UC', 'deprecated': False}, - 'hpnd-uc-export-us': {'id': 'HPND-UC-export-US', 'deprecated': False}, - 'htmltidy': {'id': 'HTMLTIDY', 'deprecated': False}, - 'ibm-pibs': {'id': 'IBM-pibs', 'deprecated': False}, - 'icu': {'id': 'ICU', 'deprecated': False}, - 'iec-code-components-eula': {'id': 'IEC-Code-Components-EULA', 'deprecated': False}, - 'ijg': {'id': 'IJG', 'deprecated': False}, - 'ijg-short': {'id': 'IJG-short', 'deprecated': False}, - 'imagemagick': {'id': 'ImageMagick', 'deprecated': False}, - 'imatix': {'id': 'iMatix', 'deprecated': False}, - 'imlib2': {'id': 'Imlib2', 'deprecated': False}, - 'info-zip': {'id': 'Info-ZIP', 'deprecated': False}, - 'inner-net-2.0': {'id': 'Inner-Net-2.0', 'deprecated': False}, - 'intel': {'id': 'Intel', 'deprecated': False}, - 'intel-acpi': {'id': 'Intel-ACPI', 'deprecated': False}, - 'interbase-1.0': {'id': 'Interbase-1.0', 'deprecated': False}, - 'ipa': {'id': 'IPA', 'deprecated': False}, - 'ipl-1.0': {'id': 'IPL-1.0', 'deprecated': False}, - 'isc': {'id': 'ISC', 'deprecated': False}, - 'isc-veillard': {'id': 'ISC-Veillard', 'deprecated': False}, - 'jam': {'id': 'Jam', 'deprecated': False}, - 'jasper-2.0': {'id': 'JasPer-2.0', 'deprecated': False}, - 'jpl-image': {'id': 'JPL-image', 'deprecated': False}, - 'jpnic': {'id': 'JPNIC', 'deprecated': False}, - 'json': {'id': 'JSON', 'deprecated': False}, - 'kastrup': {'id': 'Kastrup', 'deprecated': False}, - 'kazlib': {'id': 'Kazlib', 'deprecated': False}, - 'knuth-ctan': {'id': 'Knuth-CTAN', 'deprecated': False}, - 'lal-1.2': {'id': 'LAL-1.2', 'deprecated': False}, - 'lal-1.3': {'id': 'LAL-1.3', 'deprecated': False}, - 'latex2e': {'id': 'Latex2e', 'deprecated': False}, - 'latex2e-translated-notice': {'id': 'Latex2e-translated-notice', 'deprecated': False}, - 'leptonica': {'id': 'Leptonica', 'deprecated': False}, - 'lgpl-2.0': {'id': 'LGPL-2.0', 'deprecated': True}, - 'lgpl-2.0+': {'id': 'LGPL-2.0+', 'deprecated': True}, - 'lgpl-2.0-only': {'id': 'LGPL-2.0-only', 'deprecated': False}, - 'lgpl-2.0-or-later': {'id': 'LGPL-2.0-or-later', 'deprecated': False}, - 'lgpl-2.1': {'id': 'LGPL-2.1', 'deprecated': True}, - 'lgpl-2.1+': {'id': 'LGPL-2.1+', 'deprecated': True}, - 'lgpl-2.1-only': {'id': 'LGPL-2.1-only', 'deprecated': False}, - 'lgpl-2.1-or-later': {'id': 'LGPL-2.1-or-later', 'deprecated': False}, - 'lgpl-3.0': {'id': 'LGPL-3.0', 'deprecated': True}, - 'lgpl-3.0+': {'id': 'LGPL-3.0+', 'deprecated': True}, - 'lgpl-3.0-only': {'id': 'LGPL-3.0-only', 'deprecated': False}, - 'lgpl-3.0-or-later': {'id': 'LGPL-3.0-or-later', 'deprecated': False}, - 'lgpllr': {'id': 'LGPLLR', 'deprecated': False}, - 'libpng': {'id': 'Libpng', 'deprecated': False}, - 'libpng-2.0': {'id': 'libpng-2.0', 'deprecated': False}, - 'libselinux-1.0': {'id': 'libselinux-1.0', 'deprecated': False}, - 'libtiff': {'id': 'libtiff', 'deprecated': False}, - 'libutil-david-nugent': {'id': 'libutil-David-Nugent', 'deprecated': False}, - 'liliq-p-1.1': {'id': 'LiLiQ-P-1.1', 'deprecated': False}, - 'liliq-r-1.1': {'id': 'LiLiQ-R-1.1', 'deprecated': False}, - 'liliq-rplus-1.1': {'id': 'LiLiQ-Rplus-1.1', 'deprecated': False}, - 'linux-man-pages-1-para': {'id': 'Linux-man-pages-1-para', 'deprecated': False}, - 'linux-man-pages-copyleft': {'id': 'Linux-man-pages-copyleft', 'deprecated': False}, - 'linux-man-pages-copyleft-2-para': {'id': 'Linux-man-pages-copyleft-2-para', 'deprecated': False}, - 'linux-man-pages-copyleft-var': {'id': 'Linux-man-pages-copyleft-var', 'deprecated': False}, - 'linux-openib': {'id': 'Linux-OpenIB', 'deprecated': False}, - 'loop': {'id': 'LOOP', 'deprecated': False}, - 'lpd-document': {'id': 'LPD-document', 'deprecated': False}, - 'lpl-1.0': {'id': 'LPL-1.0', 'deprecated': False}, - 'lpl-1.02': {'id': 'LPL-1.02', 'deprecated': False}, - 'lppl-1.0': {'id': 'LPPL-1.0', 'deprecated': False}, - 'lppl-1.1': {'id': 'LPPL-1.1', 'deprecated': False}, - 'lppl-1.2': {'id': 'LPPL-1.2', 'deprecated': False}, - 'lppl-1.3a': {'id': 'LPPL-1.3a', 'deprecated': False}, - 'lppl-1.3c': {'id': 'LPPL-1.3c', 'deprecated': False}, - 'lsof': {'id': 'lsof', 'deprecated': False}, - 'lucida-bitmap-fonts': {'id': 'Lucida-Bitmap-Fonts', 'deprecated': False}, - 'lzma-sdk-9.11-to-9.20': {'id': 'LZMA-SDK-9.11-to-9.20', 'deprecated': False}, - 'lzma-sdk-9.22': {'id': 'LZMA-SDK-9.22', 'deprecated': False}, - 'mackerras-3-clause': {'id': 'Mackerras-3-Clause', 'deprecated': False}, - 'mackerras-3-clause-acknowledgment': {'id': 'Mackerras-3-Clause-acknowledgment', 'deprecated': False}, - 'magaz': {'id': 'magaz', 'deprecated': False}, - 'mailprio': {'id': 'mailprio', 'deprecated': False}, - 'makeindex': {'id': 'MakeIndex', 'deprecated': False}, - 'martin-birgmeier': {'id': 'Martin-Birgmeier', 'deprecated': False}, - 'mcphee-slideshow': {'id': 'McPhee-slideshow', 'deprecated': False}, - 'metamail': {'id': 'metamail', 'deprecated': False}, - 'minpack': {'id': 'Minpack', 'deprecated': False}, - 'miros': {'id': 'MirOS', 'deprecated': False}, - 'mit': {'id': 'MIT', 'deprecated': False}, - 'mit-0': {'id': 'MIT-0', 'deprecated': False}, - 'mit-advertising': {'id': 'MIT-advertising', 'deprecated': False}, - 'mit-cmu': {'id': 'MIT-CMU', 'deprecated': False}, - 'mit-enna': {'id': 'MIT-enna', 'deprecated': False}, - 'mit-feh': {'id': 'MIT-feh', 'deprecated': False}, - 'mit-festival': {'id': 'MIT-Festival', 'deprecated': False}, - 'mit-khronos-old': {'id': 'MIT-Khronos-old', 'deprecated': False}, - 'mit-modern-variant': {'id': 'MIT-Modern-Variant', 'deprecated': False}, - 'mit-open-group': {'id': 'MIT-open-group', 'deprecated': False}, - 'mit-testregex': {'id': 'MIT-testregex', 'deprecated': False}, - 'mit-wu': {'id': 'MIT-Wu', 'deprecated': False}, - 'mitnfa': {'id': 'MITNFA', 'deprecated': False}, - 'mmixware': {'id': 'MMIXware', 'deprecated': False}, - 'motosoto': {'id': 'Motosoto', 'deprecated': False}, - 'mpeg-ssg': {'id': 'MPEG-SSG', 'deprecated': False}, - 'mpi-permissive': {'id': 'mpi-permissive', 'deprecated': False}, - 'mpich2': {'id': 'mpich2', 'deprecated': False}, - 'mpl-1.0': {'id': 'MPL-1.0', 'deprecated': False}, - 'mpl-1.1': {'id': 'MPL-1.1', 'deprecated': False}, - 'mpl-2.0': {'id': 'MPL-2.0', 'deprecated': False}, - 'mpl-2.0-no-copyleft-exception': {'id': 'MPL-2.0-no-copyleft-exception', 'deprecated': False}, - 'mplus': {'id': 'mplus', 'deprecated': False}, - 'ms-lpl': {'id': 'MS-LPL', 'deprecated': False}, - 'ms-pl': {'id': 'MS-PL', 'deprecated': False}, - 'ms-rl': {'id': 'MS-RL', 'deprecated': False}, - 'mtll': {'id': 'MTLL', 'deprecated': False}, - 'mulanpsl-1.0': {'id': 'MulanPSL-1.0', 'deprecated': False}, - 'mulanpsl-2.0': {'id': 'MulanPSL-2.0', 'deprecated': False}, - 'multics': {'id': 'Multics', 'deprecated': False}, - 'mup': {'id': 'Mup', 'deprecated': False}, - 'naist-2003': {'id': 'NAIST-2003', 'deprecated': False}, - 'nasa-1.3': {'id': 'NASA-1.3', 'deprecated': False}, - 'naumen': {'id': 'Naumen', 'deprecated': False}, - 'nbpl-1.0': {'id': 'NBPL-1.0', 'deprecated': False}, - 'ncbi-pd': {'id': 'NCBI-PD', 'deprecated': False}, - 'ncgl-uk-2.0': {'id': 'NCGL-UK-2.0', 'deprecated': False}, - 'ncl': {'id': 'NCL', 'deprecated': False}, - 'ncsa': {'id': 'NCSA', 'deprecated': False}, - 'net-snmp': {'id': 'Net-SNMP', 'deprecated': True}, - 'netcdf': {'id': 'NetCDF', 'deprecated': False}, - 'newsletr': {'id': 'Newsletr', 'deprecated': False}, - 'ngpl': {'id': 'NGPL', 'deprecated': False}, - 'nicta-1.0': {'id': 'NICTA-1.0', 'deprecated': False}, - 'nist-pd': {'id': 'NIST-PD', 'deprecated': False}, - 'nist-pd-fallback': {'id': 'NIST-PD-fallback', 'deprecated': False}, - 'nist-software': {'id': 'NIST-Software', 'deprecated': False}, - 'nlod-1.0': {'id': 'NLOD-1.0', 'deprecated': False}, - 'nlod-2.0': {'id': 'NLOD-2.0', 'deprecated': False}, - 'nlpl': {'id': 'NLPL', 'deprecated': False}, - 'nokia': {'id': 'Nokia', 'deprecated': False}, - 'nosl': {'id': 'NOSL', 'deprecated': False}, - 'noweb': {'id': 'Noweb', 'deprecated': False}, - 'npl-1.0': {'id': 'NPL-1.0', 'deprecated': False}, - 'npl-1.1': {'id': 'NPL-1.1', 'deprecated': False}, - 'nposl-3.0': {'id': 'NPOSL-3.0', 'deprecated': False}, - 'nrl': {'id': 'NRL', 'deprecated': False}, - 'ntp': {'id': 'NTP', 'deprecated': False}, - 'ntp-0': {'id': 'NTP-0', 'deprecated': False}, - 'nunit': {'id': 'Nunit', 'deprecated': True}, - 'o-uda-1.0': {'id': 'O-UDA-1.0', 'deprecated': False}, - 'oar': {'id': 'OAR', 'deprecated': False}, - 'occt-pl': {'id': 'OCCT-PL', 'deprecated': False}, - 'oclc-2.0': {'id': 'OCLC-2.0', 'deprecated': False}, - 'odbl-1.0': {'id': 'ODbL-1.0', 'deprecated': False}, - 'odc-by-1.0': {'id': 'ODC-By-1.0', 'deprecated': False}, - 'offis': {'id': 'OFFIS', 'deprecated': False}, - 'ofl-1.0': {'id': 'OFL-1.0', 'deprecated': False}, - 'ofl-1.0-no-rfn': {'id': 'OFL-1.0-no-RFN', 'deprecated': False}, - 'ofl-1.0-rfn': {'id': 'OFL-1.0-RFN', 'deprecated': False}, - 'ofl-1.1': {'id': 'OFL-1.1', 'deprecated': False}, - 'ofl-1.1-no-rfn': {'id': 'OFL-1.1-no-RFN', 'deprecated': False}, - 'ofl-1.1-rfn': {'id': 'OFL-1.1-RFN', 'deprecated': False}, - 'ogc-1.0': {'id': 'OGC-1.0', 'deprecated': False}, - 'ogdl-taiwan-1.0': {'id': 'OGDL-Taiwan-1.0', 'deprecated': False}, - 'ogl-canada-2.0': {'id': 'OGL-Canada-2.0', 'deprecated': False}, - 'ogl-uk-1.0': {'id': 'OGL-UK-1.0', 'deprecated': False}, - 'ogl-uk-2.0': {'id': 'OGL-UK-2.0', 'deprecated': False}, - 'ogl-uk-3.0': {'id': 'OGL-UK-3.0', 'deprecated': False}, - 'ogtsl': {'id': 'OGTSL', 'deprecated': False}, - 'oldap-1.1': {'id': 'OLDAP-1.1', 'deprecated': False}, - 'oldap-1.2': {'id': 'OLDAP-1.2', 'deprecated': False}, - 'oldap-1.3': {'id': 'OLDAP-1.3', 'deprecated': False}, - 'oldap-1.4': {'id': 'OLDAP-1.4', 'deprecated': False}, - 'oldap-2.0': {'id': 'OLDAP-2.0', 'deprecated': False}, - 'oldap-2.0.1': {'id': 'OLDAP-2.0.1', 'deprecated': False}, - 'oldap-2.1': {'id': 'OLDAP-2.1', 'deprecated': False}, - 'oldap-2.2': {'id': 'OLDAP-2.2', 'deprecated': False}, - 'oldap-2.2.1': {'id': 'OLDAP-2.2.1', 'deprecated': False}, - 'oldap-2.2.2': {'id': 'OLDAP-2.2.2', 'deprecated': False}, - 'oldap-2.3': {'id': 'OLDAP-2.3', 'deprecated': False}, - 'oldap-2.4': {'id': 'OLDAP-2.4', 'deprecated': False}, - 'oldap-2.5': {'id': 'OLDAP-2.5', 'deprecated': False}, - 'oldap-2.6': {'id': 'OLDAP-2.6', 'deprecated': False}, - 'oldap-2.7': {'id': 'OLDAP-2.7', 'deprecated': False}, - 'oldap-2.8': {'id': 'OLDAP-2.8', 'deprecated': False}, - 'olfl-1.3': {'id': 'OLFL-1.3', 'deprecated': False}, - 'oml': {'id': 'OML', 'deprecated': False}, - 'openpbs-2.3': {'id': 'OpenPBS-2.3', 'deprecated': False}, - 'openssl': {'id': 'OpenSSL', 'deprecated': False}, - 'openssl-standalone': {'id': 'OpenSSL-standalone', 'deprecated': False}, - 'openvision': {'id': 'OpenVision', 'deprecated': False}, - 'opl-1.0': {'id': 'OPL-1.0', 'deprecated': False}, - 'opl-uk-3.0': {'id': 'OPL-UK-3.0', 'deprecated': False}, - 'opubl-1.0': {'id': 'OPUBL-1.0', 'deprecated': False}, - 'oset-pl-2.1': {'id': 'OSET-PL-2.1', 'deprecated': False}, - 'osl-1.0': {'id': 'OSL-1.0', 'deprecated': False}, - 'osl-1.1': {'id': 'OSL-1.1', 'deprecated': False}, - 'osl-2.0': {'id': 'OSL-2.0', 'deprecated': False}, - 'osl-2.1': {'id': 'OSL-2.1', 'deprecated': False}, - 'osl-3.0': {'id': 'OSL-3.0', 'deprecated': False}, - 'padl': {'id': 'PADL', 'deprecated': False}, - 'parity-6.0.0': {'id': 'Parity-6.0.0', 'deprecated': False}, - 'parity-7.0.0': {'id': 'Parity-7.0.0', 'deprecated': False}, - 'pddl-1.0': {'id': 'PDDL-1.0', 'deprecated': False}, - 'php-3.0': {'id': 'PHP-3.0', 'deprecated': False}, - 'php-3.01': {'id': 'PHP-3.01', 'deprecated': False}, - 'pixar': {'id': 'Pixar', 'deprecated': False}, - 'pkgconf': {'id': 'pkgconf', 'deprecated': False}, - 'plexus': {'id': 'Plexus', 'deprecated': False}, - 'pnmstitch': {'id': 'pnmstitch', 'deprecated': False}, - 'polyform-noncommercial-1.0.0': {'id': 'PolyForm-Noncommercial-1.0.0', 'deprecated': False}, - 'polyform-small-business-1.0.0': {'id': 'PolyForm-Small-Business-1.0.0', 'deprecated': False}, - 'postgresql': {'id': 'PostgreSQL', 'deprecated': False}, - 'ppl': {'id': 'PPL', 'deprecated': False}, - 'psf-2.0': {'id': 'PSF-2.0', 'deprecated': False}, - 'psfrag': {'id': 'psfrag', 'deprecated': False}, - 'psutils': {'id': 'psutils', 'deprecated': False}, - 'python-2.0': {'id': 'Python-2.0', 'deprecated': False}, - 'python-2.0.1': {'id': 'Python-2.0.1', 'deprecated': False}, - 'python-ldap': {'id': 'python-ldap', 'deprecated': False}, - 'qhull': {'id': 'Qhull', 'deprecated': False}, - 'qpl-1.0': {'id': 'QPL-1.0', 'deprecated': False}, - 'qpl-1.0-inria-2004': {'id': 'QPL-1.0-INRIA-2004', 'deprecated': False}, - 'radvd': {'id': 'radvd', 'deprecated': False}, - 'rdisc': {'id': 'Rdisc', 'deprecated': False}, - 'rhecos-1.1': {'id': 'RHeCos-1.1', 'deprecated': False}, - 'rpl-1.1': {'id': 'RPL-1.1', 'deprecated': False}, - 'rpl-1.5': {'id': 'RPL-1.5', 'deprecated': False}, - 'rpsl-1.0': {'id': 'RPSL-1.0', 'deprecated': False}, - 'rsa-md': {'id': 'RSA-MD', 'deprecated': False}, - 'rscpl': {'id': 'RSCPL', 'deprecated': False}, - 'ruby': {'id': 'Ruby', 'deprecated': False}, - 'ruby-pty': {'id': 'Ruby-pty', 'deprecated': False}, - 'sax-pd': {'id': 'SAX-PD', 'deprecated': False}, - 'sax-pd-2.0': {'id': 'SAX-PD-2.0', 'deprecated': False}, - 'saxpath': {'id': 'Saxpath', 'deprecated': False}, - 'scea': {'id': 'SCEA', 'deprecated': False}, - 'schemereport': {'id': 'SchemeReport', 'deprecated': False}, - 'sendmail': {'id': 'Sendmail', 'deprecated': False}, - 'sendmail-8.23': {'id': 'Sendmail-8.23', 'deprecated': False}, - 'sgi-b-1.0': {'id': 'SGI-B-1.0', 'deprecated': False}, - 'sgi-b-1.1': {'id': 'SGI-B-1.1', 'deprecated': False}, - 'sgi-b-2.0': {'id': 'SGI-B-2.0', 'deprecated': False}, - 'sgi-opengl': {'id': 'SGI-OpenGL', 'deprecated': False}, - 'sgp4': {'id': 'SGP4', 'deprecated': False}, - 'shl-0.5': {'id': 'SHL-0.5', 'deprecated': False}, - 'shl-0.51': {'id': 'SHL-0.51', 'deprecated': False}, - 'simpl-2.0': {'id': 'SimPL-2.0', 'deprecated': False}, - 'sissl': {'id': 'SISSL', 'deprecated': False}, - 'sissl-1.2': {'id': 'SISSL-1.2', 'deprecated': False}, - 'sl': {'id': 'SL', 'deprecated': False}, - 'sleepycat': {'id': 'Sleepycat', 'deprecated': False}, - 'smlnj': {'id': 'SMLNJ', 'deprecated': False}, - 'smppl': {'id': 'SMPPL', 'deprecated': False}, - 'snia': {'id': 'SNIA', 'deprecated': False}, - 'snprintf': {'id': 'snprintf', 'deprecated': False}, - 'softsurfer': {'id': 'softSurfer', 'deprecated': False}, - 'soundex': {'id': 'Soundex', 'deprecated': False}, - 'spencer-86': {'id': 'Spencer-86', 'deprecated': False}, - 'spencer-94': {'id': 'Spencer-94', 'deprecated': False}, - 'spencer-99': {'id': 'Spencer-99', 'deprecated': False}, - 'spl-1.0': {'id': 'SPL-1.0', 'deprecated': False}, - 'ssh-keyscan': {'id': 'ssh-keyscan', 'deprecated': False}, - 'ssh-openssh': {'id': 'SSH-OpenSSH', 'deprecated': False}, - 'ssh-short': {'id': 'SSH-short', 'deprecated': False}, - 'ssleay-standalone': {'id': 'SSLeay-standalone', 'deprecated': False}, - 'sspl-1.0': {'id': 'SSPL-1.0', 'deprecated': False}, - 'standardml-nj': {'id': 'StandardML-NJ', 'deprecated': True}, - 'sugarcrm-1.1.3': {'id': 'SugarCRM-1.1.3', 'deprecated': False}, - 'sun-ppp': {'id': 'Sun-PPP', 'deprecated': False}, - 'sun-ppp-2000': {'id': 'Sun-PPP-2000', 'deprecated': False}, - 'sunpro': {'id': 'SunPro', 'deprecated': False}, - 'swl': {'id': 'SWL', 'deprecated': False}, - 'swrule': {'id': 'swrule', 'deprecated': False}, - 'symlinks': {'id': 'Symlinks', 'deprecated': False}, - 'tapr-ohl-1.0': {'id': 'TAPR-OHL-1.0', 'deprecated': False}, - 'tcl': {'id': 'TCL', 'deprecated': False}, - 'tcp-wrappers': {'id': 'TCP-wrappers', 'deprecated': False}, - 'termreadkey': {'id': 'TermReadKey', 'deprecated': False}, - 'tgppl-1.0': {'id': 'TGPPL-1.0', 'deprecated': False}, - 'threeparttable': {'id': 'threeparttable', 'deprecated': False}, - 'tmate': {'id': 'TMate', 'deprecated': False}, - 'torque-1.1': {'id': 'TORQUE-1.1', 'deprecated': False}, - 'tosl': {'id': 'TOSL', 'deprecated': False}, - 'tpdl': {'id': 'TPDL', 'deprecated': False}, - 'tpl-1.0': {'id': 'TPL-1.0', 'deprecated': False}, - 'ttwl': {'id': 'TTWL', 'deprecated': False}, - 'ttyp0': {'id': 'TTYP0', 'deprecated': False}, - 'tu-berlin-1.0': {'id': 'TU-Berlin-1.0', 'deprecated': False}, - 'tu-berlin-2.0': {'id': 'TU-Berlin-2.0', 'deprecated': False}, - 'ubuntu-font-1.0': {'id': 'Ubuntu-font-1.0', 'deprecated': False}, - 'ucar': {'id': 'UCAR', 'deprecated': False}, - 'ucl-1.0': {'id': 'UCL-1.0', 'deprecated': False}, - 'ulem': {'id': 'ulem', 'deprecated': False}, - 'umich-merit': {'id': 'UMich-Merit', 'deprecated': False}, - 'unicode-3.0': {'id': 'Unicode-3.0', 'deprecated': False}, - 'unicode-dfs-2015': {'id': 'Unicode-DFS-2015', 'deprecated': False}, - 'unicode-dfs-2016': {'id': 'Unicode-DFS-2016', 'deprecated': False}, - 'unicode-tou': {'id': 'Unicode-TOU', 'deprecated': False}, - 'unixcrypt': {'id': 'UnixCrypt', 'deprecated': False}, - 'unlicense': {'id': 'Unlicense', 'deprecated': False}, - 'upl-1.0': {'id': 'UPL-1.0', 'deprecated': False}, - 'urt-rle': {'id': 'URT-RLE', 'deprecated': False}, - 'vim': {'id': 'Vim', 'deprecated': False}, - 'vostrom': {'id': 'VOSTROM', 'deprecated': False}, - 'vsl-1.0': {'id': 'VSL-1.0', 'deprecated': False}, - 'w3c': {'id': 'W3C', 'deprecated': False}, - 'w3c-19980720': {'id': 'W3C-19980720', 'deprecated': False}, - 'w3c-20150513': {'id': 'W3C-20150513', 'deprecated': False}, - 'w3m': {'id': 'w3m', 'deprecated': False}, - 'watcom-1.0': {'id': 'Watcom-1.0', 'deprecated': False}, - 'widget-workshop': {'id': 'Widget-Workshop', 'deprecated': False}, - 'wsuipa': {'id': 'Wsuipa', 'deprecated': False}, - 'wtfpl': {'id': 'WTFPL', 'deprecated': False}, - 'wxwindows': {'id': 'wxWindows', 'deprecated': True}, - 'x11': {'id': 'X11', 'deprecated': False}, - 'x11-distribute-modifications-variant': {'id': 'X11-distribute-modifications-variant', 'deprecated': False}, - 'x11-swapped': {'id': 'X11-swapped', 'deprecated': False}, - 'xdebug-1.03': {'id': 'Xdebug-1.03', 'deprecated': False}, - 'xerox': {'id': 'Xerox', 'deprecated': False}, - 'xfig': {'id': 'Xfig', 'deprecated': False}, - 'xfree86-1.1': {'id': 'XFree86-1.1', 'deprecated': False}, - 'xinetd': {'id': 'xinetd', 'deprecated': False}, - 'xkeyboard-config-zinoviev': {'id': 'xkeyboard-config-Zinoviev', 'deprecated': False}, - 'xlock': {'id': 'xlock', 'deprecated': False}, - 'xnet': {'id': 'Xnet', 'deprecated': False}, - 'xpp': {'id': 'xpp', 'deprecated': False}, - 'xskat': {'id': 'XSkat', 'deprecated': False}, - 'xzoom': {'id': 'xzoom', 'deprecated': False}, - 'ypl-1.0': {'id': 'YPL-1.0', 'deprecated': False}, - 'ypl-1.1': {'id': 'YPL-1.1', 'deprecated': False}, - 'zed': {'id': 'Zed', 'deprecated': False}, - 'zeeff': {'id': 'Zeeff', 'deprecated': False}, - 'zend-2.0': {'id': 'Zend-2.0', 'deprecated': False}, - 'zimbra-1.3': {'id': 'Zimbra-1.3', 'deprecated': False}, - 'zimbra-1.4': {'id': 'Zimbra-1.4', 'deprecated': False}, - 'zlib': {'id': 'Zlib', 'deprecated': False}, - 'zlib-acknowledgement': {'id': 'zlib-acknowledgement', 'deprecated': False}, - 'zpl-1.1': {'id': 'ZPL-1.1', 'deprecated': False}, - 'zpl-2.0': {'id': 'ZPL-2.0', 'deprecated': False}, - 'zpl-2.1': {'id': 'ZPL-2.1', 'deprecated': False}, -} - -EXCEPTIONS: dict[str, SPDXException] = { - '389-exception': {'id': '389-exception', 'deprecated': False}, - 'asterisk-exception': {'id': 'Asterisk-exception', 'deprecated': False}, - 'asterisk-linking-protocols-exception': {'id': 'Asterisk-linking-protocols-exception', 'deprecated': False}, - 'autoconf-exception-2.0': {'id': 'Autoconf-exception-2.0', 'deprecated': False}, - 'autoconf-exception-3.0': {'id': 'Autoconf-exception-3.0', 'deprecated': False}, - 'autoconf-exception-generic': {'id': 'Autoconf-exception-generic', 'deprecated': False}, - 'autoconf-exception-generic-3.0': {'id': 'Autoconf-exception-generic-3.0', 'deprecated': False}, - 'autoconf-exception-macro': {'id': 'Autoconf-exception-macro', 'deprecated': False}, - 'bison-exception-1.24': {'id': 'Bison-exception-1.24', 'deprecated': False}, - 'bison-exception-2.2': {'id': 'Bison-exception-2.2', 'deprecated': False}, - 'bootloader-exception': {'id': 'Bootloader-exception', 'deprecated': False}, - 'classpath-exception-2.0': {'id': 'Classpath-exception-2.0', 'deprecated': False}, - 'clisp-exception-2.0': {'id': 'CLISP-exception-2.0', 'deprecated': False}, - 'cryptsetup-openssl-exception': {'id': 'cryptsetup-OpenSSL-exception', 'deprecated': False}, - 'digirule-foss-exception': {'id': 'DigiRule-FOSS-exception', 'deprecated': False}, - 'ecos-exception-2.0': {'id': 'eCos-exception-2.0', 'deprecated': False}, - 'erlang-otp-linking-exception': {'id': 'erlang-otp-linking-exception', 'deprecated': False}, - 'fawkes-runtime-exception': {'id': 'Fawkes-Runtime-exception', 'deprecated': False}, - 'fltk-exception': {'id': 'FLTK-exception', 'deprecated': False}, - 'fmt-exception': {'id': 'fmt-exception', 'deprecated': False}, - 'font-exception-2.0': {'id': 'Font-exception-2.0', 'deprecated': False}, - 'freertos-exception-2.0': {'id': 'freertos-exception-2.0', 'deprecated': False}, - 'gcc-exception-2.0': {'id': 'GCC-exception-2.0', 'deprecated': False}, - 'gcc-exception-2.0-note': {'id': 'GCC-exception-2.0-note', 'deprecated': False}, - 'gcc-exception-3.1': {'id': 'GCC-exception-3.1', 'deprecated': False}, - 'gmsh-exception': {'id': 'Gmsh-exception', 'deprecated': False}, - 'gnat-exception': {'id': 'GNAT-exception', 'deprecated': False}, - 'gnome-examples-exception': {'id': 'GNOME-examples-exception', 'deprecated': False}, - 'gnu-compiler-exception': {'id': 'GNU-compiler-exception', 'deprecated': False}, - 'gnu-javamail-exception': {'id': 'gnu-javamail-exception', 'deprecated': False}, - 'gpl-3.0-interface-exception': {'id': 'GPL-3.0-interface-exception', 'deprecated': False}, - 'gpl-3.0-linking-exception': {'id': 'GPL-3.0-linking-exception', 'deprecated': False}, - 'gpl-3.0-linking-source-exception': {'id': 'GPL-3.0-linking-source-exception', 'deprecated': False}, - 'gpl-cc-1.0': {'id': 'GPL-CC-1.0', 'deprecated': False}, - 'gstreamer-exception-2005': {'id': 'GStreamer-exception-2005', 'deprecated': False}, - 'gstreamer-exception-2008': {'id': 'GStreamer-exception-2008', 'deprecated': False}, - 'i2p-gpl-java-exception': {'id': 'i2p-gpl-java-exception', 'deprecated': False}, - 'kicad-libraries-exception': {'id': 'KiCad-libraries-exception', 'deprecated': False}, - 'lgpl-3.0-linking-exception': {'id': 'LGPL-3.0-linking-exception', 'deprecated': False}, - 'libpri-openh323-exception': {'id': 'libpri-OpenH323-exception', 'deprecated': False}, - 'libtool-exception': {'id': 'Libtool-exception', 'deprecated': False}, - 'linux-syscall-note': {'id': 'Linux-syscall-note', 'deprecated': False}, - 'llgpl': {'id': 'LLGPL', 'deprecated': False}, - 'llvm-exception': {'id': 'LLVM-exception', 'deprecated': False}, - 'lzma-exception': {'id': 'LZMA-exception', 'deprecated': False}, - 'mif-exception': {'id': 'mif-exception', 'deprecated': False}, - 'nokia-qt-exception-1.1': {'id': 'Nokia-Qt-exception-1.1', 'deprecated': True}, - 'ocaml-lgpl-linking-exception': {'id': 'OCaml-LGPL-linking-exception', 'deprecated': False}, - 'occt-exception-1.0': {'id': 'OCCT-exception-1.0', 'deprecated': False}, - 'openjdk-assembly-exception-1.0': {'id': 'OpenJDK-assembly-exception-1.0', 'deprecated': False}, - 'openvpn-openssl-exception': {'id': 'openvpn-openssl-exception', 'deprecated': False}, - 'pcre2-exception': {'id': 'PCRE2-exception', 'deprecated': False}, - 'ps-or-pdf-font-exception-20170817': {'id': 'PS-or-PDF-font-exception-20170817', 'deprecated': False}, - 'qpl-1.0-inria-2004-exception': {'id': 'QPL-1.0-INRIA-2004-exception', 'deprecated': False}, - 'qt-gpl-exception-1.0': {'id': 'Qt-GPL-exception-1.0', 'deprecated': False}, - 'qt-lgpl-exception-1.1': {'id': 'Qt-LGPL-exception-1.1', 'deprecated': False}, - 'qwt-exception-1.0': {'id': 'Qwt-exception-1.0', 'deprecated': False}, - 'romic-exception': {'id': 'romic-exception', 'deprecated': False}, - 'rrdtool-floss-exception-2.0': {'id': 'RRDtool-FLOSS-exception-2.0', 'deprecated': False}, - 'sane-exception': {'id': 'SANE-exception', 'deprecated': False}, - 'shl-2.0': {'id': 'SHL-2.0', 'deprecated': False}, - 'shl-2.1': {'id': 'SHL-2.1', 'deprecated': False}, - 'stunnel-exception': {'id': 'stunnel-exception', 'deprecated': False}, - 'swi-exception': {'id': 'SWI-exception', 'deprecated': False}, - 'swift-exception': {'id': 'Swift-exception', 'deprecated': False}, - 'texinfo-exception': {'id': 'Texinfo-exception', 'deprecated': False}, - 'u-boot-exception-2.0': {'id': 'u-boot-exception-2.0', 'deprecated': False}, - 'ubdl-exception': {'id': 'UBDL-exception', 'deprecated': False}, - 'universal-foss-exception-1.0': {'id': 'Universal-FOSS-exception-1.0', 'deprecated': False}, - 'vsftpd-openssl-exception': {'id': 'vsftpd-openssl-exception', 'deprecated': False}, - 'wxwindows-exception-3.1': {'id': 'WxWindows-exception-3.1', 'deprecated': False}, - 'x11vnc-openssl-exception': {'id': 'x11vnc-openssl-exception', 'deprecated': False}, -} diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/markers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/markers.py index fb7f49c..eb0541b 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/markers.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/markers.py @@ -2,25 +2,31 @@ # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -from __future__ import annotations - import operator import os import platform import sys -from typing import Any, Callable, TypedDict, cast +from typing import Any, Callable, Dict, List, Optional, Tuple, Union + +from setuptools.extern.pyparsing import ( # noqa: N817 + Forward, + Group, + Literal as L, + ParseException, + ParseResults, + QuotedString, + ZeroOrMore, + stringEnd, + stringStart, +) -from ._parser import MarkerAtom, MarkerList, Op, Value, Variable -from ._parser import parse_marker as _parse_marker -from ._tokenizer import ParserSyntaxError from .specifiers import InvalidSpecifier, Specifier -from .utils import canonicalize_name __all__ = [ "InvalidMarker", - "Marker", "UndefinedComparison", "UndefinedEnvironmentName", + "Marker", "default_environment", ] @@ -46,97 +52,103 @@ class UndefinedEnvironmentName(ValueError): """ -class Environment(TypedDict): - implementation_name: str - """The implementation's identifier, e.g. ``'cpython'``.""" +class Node: + def __init__(self, value: Any) -> None: + self.value = value - implementation_version: str - """ - The implementation's version, e.g. ``'3.13.0a2'`` for CPython 3.13.0a2, or - ``'7.3.13'`` for PyPy3.10 v7.3.13. - """ + def __str__(self) -> str: + return str(self.value) - os_name: str - """ - The value of :py:data:`os.name`. The name of the operating system dependent module - imported, e.g. ``'posix'``. - """ + def __repr__(self) -> str: + return f"<{self.__class__.__name__}('{self}')>" - platform_machine: str - """ - Returns the machine type, e.g. ``'i386'``. - - An empty string if the value cannot be determined. - """ - - platform_release: str - """ - The system's release, e.g. ``'2.2.0'`` or ``'NT'``. - - An empty string if the value cannot be determined. - """ - - platform_system: str - """ - The system/OS name, e.g. ``'Linux'``, ``'Windows'`` or ``'Java'``. - - An empty string if the value cannot be determined. - """ - - platform_version: str - """ - The system's release version, e.g. ``'#3 on degas'``. - - An empty string if the value cannot be determined. - """ - - python_full_version: str - """ - The Python version as string ``'major.minor.patchlevel'``. - - Note that unlike the Python :py:data:`sys.version`, this value will always include - the patchlevel (it defaults to 0). - """ - - platform_python_implementation: str - """ - A string identifying the Python implementation, e.g. ``'CPython'``. - """ - - python_version: str - """The Python version as string ``'major.minor'``.""" - - sys_platform: str - """ - This string contains a platform identifier that can be used to append - platform-specific components to :py:data:`sys.path`, for instance. - - For Unix systems, except on Linux and AIX, this is the lowercased OS name as - returned by ``uname -s`` with the first part of the version as returned by - ``uname -r`` appended, e.g. ``'sunos5'`` or ``'freebsd8'``, at the time when Python - was built. - """ + def serialize(self) -> str: + raise NotImplementedError -def _normalize_extra_values(results: Any) -> Any: - """ - Normalize extra values. - """ - if isinstance(results[0], tuple): - lhs, op, rhs = results[0] - if isinstance(lhs, Variable) and lhs.value == "extra": - normalized_extra = canonicalize_name(rhs.value) - rhs = Value(normalized_extra) - elif isinstance(rhs, Variable) and rhs.value == "extra": - normalized_extra = canonicalize_name(lhs.value) - lhs = Value(normalized_extra) - results[0] = lhs, op, rhs - return results +class Variable(Node): + def serialize(self) -> str: + return str(self) + + +class Value(Node): + def serialize(self) -> str: + return f'"{self}"' + + +class Op(Node): + def serialize(self) -> str: + return str(self) + + +VARIABLE = ( + L("implementation_version") + | L("platform_python_implementation") + | L("implementation_name") + | L("python_full_version") + | L("platform_release") + | L("platform_version") + | L("platform_machine") + | L("platform_system") + | L("python_version") + | L("sys_platform") + | L("os_name") + | L("os.name") # PEP-345 + | L("sys.platform") # PEP-345 + | L("platform.version") # PEP-345 + | L("platform.machine") # PEP-345 + | L("platform.python_implementation") # PEP-345 + | L("python_implementation") # undocumented setuptools legacy + | L("extra") # PEP-508 +) +ALIASES = { + "os.name": "os_name", + "sys.platform": "sys_platform", + "platform.version": "platform_version", + "platform.machine": "platform_machine", + "platform.python_implementation": "platform_python_implementation", + "python_implementation": "platform_python_implementation", +} +VARIABLE.setParseAction(lambda s, l, t: Variable(ALIASES.get(t[0], t[0]))) + +VERSION_CMP = ( + L("===") | L("==") | L(">=") | L("<=") | L("!=") | L("~=") | L(">") | L("<") +) + +MARKER_OP = VERSION_CMP | L("not in") | L("in") +MARKER_OP.setParseAction(lambda s, l, t: Op(t[0])) + +MARKER_VALUE = QuotedString("'") | QuotedString('"') +MARKER_VALUE.setParseAction(lambda s, l, t: Value(t[0])) + +BOOLOP = L("and") | L("or") + +MARKER_VAR = VARIABLE | MARKER_VALUE + +MARKER_ITEM = Group(MARKER_VAR + MARKER_OP + MARKER_VAR) +MARKER_ITEM.setParseAction(lambda s, l, t: tuple(t[0])) + +LPAREN = L("(").suppress() +RPAREN = L(")").suppress() + +MARKER_EXPR = Forward() +MARKER_ATOM = MARKER_ITEM | Group(LPAREN + MARKER_EXPR + RPAREN) +MARKER_EXPR << MARKER_ATOM + ZeroOrMore(BOOLOP + MARKER_EXPR) + +MARKER = stringStart + MARKER_EXPR + stringEnd + + +def _coerce_parse_result(results: Union[ParseResults, List[Any]]) -> List[Any]: + if isinstance(results, ParseResults): + return [_coerce_parse_result(i) for i in results] + else: + return results def _format_marker( - marker: list[str] | MarkerAtom | str, first: bool | None = True + marker: Union[List[str], Tuple[Node, ...], str], first: Optional[bool] = True ) -> str: + assert isinstance(marker, (list, tuple, str)) # Sometimes we have a structure like [[...]] which is a single item list @@ -162,7 +174,7 @@ def _format_marker( return marker -_operators: dict[str, Operator] = { +_operators: Dict[str, Operator] = { "in": lambda lhs, rhs: lhs in rhs, "not in": lambda lhs, rhs: lhs not in rhs, "<": operator.lt, @@ -180,29 +192,35 @@ def _eval_op(lhs: str, op: Op, rhs: str) -> bool: except InvalidSpecifier: pass else: - return spec.contains(lhs, prereleases=True) + return spec.contains(lhs) - oper: Operator | None = _operators.get(op.serialize()) + oper: Optional[Operator] = _operators.get(op.serialize()) if oper is None: raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.") return oper(lhs, rhs) -def _normalize(*values: str, key: str) -> tuple[str, ...]: - # PEP 685 – Comparison of extra names for optional distribution dependencies - # https://peps.python.org/pep-0685/ - # > When comparing extra names, tools MUST normalize the names being - # > compared using the semantics outlined in PEP 503 for names - if key == "extra": - return tuple(canonicalize_name(v) for v in values) - - # other environment markers don't have such standards - return values +class Undefined: + pass -def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool: - groups: list[list[bool]] = [[]] +_undefined = Undefined() + + +def _get_env(environment: Dict[str, str], name: str) -> str: + value: Union[str, Undefined] = environment.get(name, _undefined) + + if isinstance(value, Undefined): + raise UndefinedEnvironmentName( + f"{name!r} does not exist in evaluation environment." + ) + + return value + + +def _evaluate_markers(markers: List[Any], environment: Dict[str, str]) -> bool: + groups: List[List[bool]] = [[]] for marker in markers: assert isinstance(marker, (list, tuple, str)) @@ -213,15 +231,12 @@ def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool: lhs, op, rhs = marker if isinstance(lhs, Variable): - environment_key = lhs.value - lhs_value = environment[environment_key] + lhs_value = _get_env(environment, lhs.value) rhs_value = rhs.value else: lhs_value = lhs.value - environment_key = rhs.value - rhs_value = environment[environment_key] + rhs_value = _get_env(environment, rhs.value) - lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key) groups[-1].append(_eval_op(lhs_value, op, rhs_value)) else: assert marker in ["and", "or"] @@ -231,15 +246,15 @@ def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool: return any(all(item) for item in groups) -def format_full_version(info: sys._version_info) -> str: - version = f"{info.major}.{info.minor}.{info.micro}" +def format_full_version(info: "sys._version_info") -> str: + version = "{0.major}.{0.minor}.{0.micro}".format(info) kind = info.releaselevel if kind != "final": version += kind[0] + str(info.serial) return version -def default_environment() -> Environment: +def default_environment() -> Dict[str, str]: iver = format_full_version(sys.implementation.version) implementation_name = sys.implementation.name return { @@ -259,29 +274,13 @@ def default_environment() -> Environment: class Marker: def __init__(self, marker: str) -> None: - # Note: We create a Marker object without calling this constructor in - # packaging.requirements.Requirement. If any additional logic is - # added here, make sure to mirror/adapt Requirement. try: - self._markers = _normalize_extra_values(_parse_marker(marker)) - # The attribute `_markers` can be described in terms of a recursive type: - # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]] - # - # For example, the following expression: - # python_version > "3.6" or (python_version == "3.6" and os_name == "unix") - # - # is parsed into: - # [ - # (, ')>, ), - # 'and', - # [ - # (, , ), - # 'or', - # (, , ) - # ] - # ] - except ParserSyntaxError as e: - raise InvalidMarker(str(e)) from e + self._markers = _coerce_parse_result(MARKER.parseString(marker)) + except ParseException as e: + raise InvalidMarker( + f"Invalid marker: {marker!r}, parse error at " + f"{marker[e.loc : e.loc + 8]!r}" + ) def __str__(self) -> str: return _format_marker(self._markers) @@ -289,16 +288,7 @@ class Marker: def __repr__(self) -> str: return f"" - def __hash__(self) -> int: - return hash((self.__class__.__name__, str(self))) - - def __eq__(self, other: Any) -> bool: - if not isinstance(other, Marker): - return NotImplemented - - return str(self) == str(other) - - def evaluate(self, environment: dict[str, str] | None = None) -> bool: + def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool: """Evaluate a marker. Return the boolean from evaluating the given marker against the @@ -307,25 +297,8 @@ class Marker: The environment is determined from the current Python process. """ - current_environment = cast("dict[str, str]", default_environment()) - current_environment["extra"] = "" + current_environment = default_environment() if environment is not None: current_environment.update(environment) - # The API used to allow setting extra to None. We need to handle this - # case for backwards compatibility. - if current_environment["extra"] is None: - current_environment["extra"] = "" - return _evaluate_markers( - self._markers, _repair_python_full_version(current_environment) - ) - - -def _repair_python_full_version(env: dict[str, str]) -> dict[str, str]: - """ - Work around platform.python_version() returning something that is not PEP 440 - compliant for non-tagged Python builds. - """ - if env["python_full_version"].endswith("+"): - env["python_full_version"] += "local" - return env + return _evaluate_markers(self._markers, current_environment) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/metadata.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/metadata.py deleted file mode 100644 index 721f411..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/metadata.py +++ /dev/null @@ -1,863 +0,0 @@ -from __future__ import annotations - -import email.feedparser -import email.header -import email.message -import email.parser -import email.policy -import pathlib -import sys -import typing -from typing import ( - Any, - Callable, - Generic, - Literal, - TypedDict, - cast, -) - -from . import licenses, requirements, specifiers, utils -from . import version as version_module -from .licenses import NormalizedLicenseExpression - -T = typing.TypeVar("T") - - -if sys.version_info >= (3, 11): # pragma: no cover - ExceptionGroup = ExceptionGroup -else: # pragma: no cover - - class ExceptionGroup(Exception): - """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11. - - If :external:exc:`ExceptionGroup` is already defined by Python itself, - that version is used instead. - """ - - message: str - exceptions: list[Exception] - - def __init__(self, message: str, exceptions: list[Exception]) -> None: - self.message = message - self.exceptions = exceptions - - def __repr__(self) -> str: - return f"{self.__class__.__name__}({self.message!r}, {self.exceptions!r})" - - -class InvalidMetadata(ValueError): - """A metadata field contains invalid data.""" - - field: str - """The name of the field that contains invalid data.""" - - def __init__(self, field: str, message: str) -> None: - self.field = field - super().__init__(message) - - -# The RawMetadata class attempts to make as few assumptions about the underlying -# serialization formats as possible. The idea is that as long as a serialization -# formats offer some very basic primitives in *some* way then we can support -# serializing to and from that format. -class RawMetadata(TypedDict, total=False): - """A dictionary of raw core metadata. - - Each field in core metadata maps to a key of this dictionary (when data is - provided). The key is lower-case and underscores are used instead of dashes - compared to the equivalent core metadata field. Any core metadata field that - can be specified multiple times or can hold multiple values in a single - field have a key with a plural name. See :class:`Metadata` whose attributes - match the keys of this dictionary. - - Core metadata fields that can be specified multiple times are stored as a - list or dict depending on which is appropriate for the field. Any fields - which hold multiple values in a single field are stored as a list. - - """ - - # Metadata 1.0 - PEP 241 - metadata_version: str - name: str - version: str - platforms: list[str] - summary: str - description: str - keywords: list[str] - home_page: str - author: str - author_email: str - license: str - - # Metadata 1.1 - PEP 314 - supported_platforms: list[str] - download_url: str - classifiers: list[str] - requires: list[str] - provides: list[str] - obsoletes: list[str] - - # Metadata 1.2 - PEP 345 - maintainer: str - maintainer_email: str - requires_dist: list[str] - provides_dist: list[str] - obsoletes_dist: list[str] - requires_python: str - requires_external: list[str] - project_urls: dict[str, str] - - # Metadata 2.0 - # PEP 426 attempted to completely revamp the metadata format - # but got stuck without ever being able to build consensus on - # it and ultimately ended up withdrawn. - # - # However, a number of tools had started emitting METADATA with - # `2.0` Metadata-Version, so for historical reasons, this version - # was skipped. - - # Metadata 2.1 - PEP 566 - description_content_type: str - provides_extra: list[str] - - # Metadata 2.2 - PEP 643 - dynamic: list[str] - - # Metadata 2.3 - PEP 685 - # No new fields were added in PEP 685, just some edge case were - # tightened up to provide better interoptability. - - # Metadata 2.4 - PEP 639 - license_expression: str - license_files: list[str] - - -_STRING_FIELDS = { - "author", - "author_email", - "description", - "description_content_type", - "download_url", - "home_page", - "license", - "license_expression", - "maintainer", - "maintainer_email", - "metadata_version", - "name", - "requires_python", - "summary", - "version", -} - -_LIST_FIELDS = { - "classifiers", - "dynamic", - "license_files", - "obsoletes", - "obsoletes_dist", - "platforms", - "provides", - "provides_dist", - "provides_extra", - "requires", - "requires_dist", - "requires_external", - "supported_platforms", -} - -_DICT_FIELDS = { - "project_urls", -} - - -def _parse_keywords(data: str) -> list[str]: - """Split a string of comma-separated keywords into a list of keywords.""" - return [k.strip() for k in data.split(",")] - - -def _parse_project_urls(data: list[str]) -> dict[str, str]: - """Parse a list of label/URL string pairings separated by a comma.""" - urls = {} - for pair in data: - # Our logic is slightly tricky here as we want to try and do - # *something* reasonable with malformed data. - # - # The main thing that we have to worry about, is data that does - # not have a ',' at all to split the label from the Value. There - # isn't a singular right answer here, and we will fail validation - # later on (if the caller is validating) so it doesn't *really* - # matter, but since the missing value has to be an empty str - # and our return value is dict[str, str], if we let the key - # be the missing value, then they'd have multiple '' values that - # overwrite each other in a accumulating dict. - # - # The other potentional issue is that it's possible to have the - # same label multiple times in the metadata, with no solid "right" - # answer with what to do in that case. As such, we'll do the only - # thing we can, which is treat the field as unparseable and add it - # to our list of unparsed fields. - parts = [p.strip() for p in pair.split(",", 1)] - parts.extend([""] * (max(0, 2 - len(parts)))) # Ensure 2 items - - # TODO: The spec doesn't say anything about if the keys should be - # considered case sensitive or not... logically they should - # be case-preserving and case-insensitive, but doing that - # would open up more cases where we might have duplicate - # entries. - label, url = parts - if label in urls: - # The label already exists in our set of urls, so this field - # is unparseable, and we can just add the whole thing to our - # unparseable data and stop processing it. - raise KeyError("duplicate labels in project urls") - urls[label] = url - - return urls - - -def _get_payload(msg: email.message.Message, source: bytes | str) -> str: - """Get the body of the message.""" - # If our source is a str, then our caller has managed encodings for us, - # and we don't need to deal with it. - if isinstance(source, str): - payload = msg.get_payload() - assert isinstance(payload, str) - return payload - # If our source is a bytes, then we're managing the encoding and we need - # to deal with it. - else: - bpayload = msg.get_payload(decode=True) - assert isinstance(bpayload, bytes) - try: - return bpayload.decode("utf8", "strict") - except UnicodeDecodeError as exc: - raise ValueError("payload in an invalid encoding") from exc - - -# The various parse_FORMAT functions here are intended to be as lenient as -# possible in their parsing, while still returning a correctly typed -# RawMetadata. -# -# To aid in this, we also generally want to do as little touching of the -# data as possible, except where there are possibly some historic holdovers -# that make valid data awkward to work with. -# -# While this is a lower level, intermediate format than our ``Metadata`` -# class, some light touch ups can make a massive difference in usability. - -# Map METADATA fields to RawMetadata. -_EMAIL_TO_RAW_MAPPING = { - "author": "author", - "author-email": "author_email", - "classifier": "classifiers", - "description": "description", - "description-content-type": "description_content_type", - "download-url": "download_url", - "dynamic": "dynamic", - "home-page": "home_page", - "keywords": "keywords", - "license": "license", - "license-expression": "license_expression", - "license-file": "license_files", - "maintainer": "maintainer", - "maintainer-email": "maintainer_email", - "metadata-version": "metadata_version", - "name": "name", - "obsoletes": "obsoletes", - "obsoletes-dist": "obsoletes_dist", - "platform": "platforms", - "project-url": "project_urls", - "provides": "provides", - "provides-dist": "provides_dist", - "provides-extra": "provides_extra", - "requires": "requires", - "requires-dist": "requires_dist", - "requires-external": "requires_external", - "requires-python": "requires_python", - "summary": "summary", - "supported-platform": "supported_platforms", - "version": "version", -} -_RAW_TO_EMAIL_MAPPING = {raw: email for email, raw in _EMAIL_TO_RAW_MAPPING.items()} - - -def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]: - """Parse a distribution's metadata stored as email headers (e.g. from ``METADATA``). - - This function returns a two-item tuple of dicts. The first dict is of - recognized fields from the core metadata specification. Fields that can be - parsed and translated into Python's built-in types are converted - appropriately. All other fields are left as-is. Fields that are allowed to - appear multiple times are stored as lists. - - The second dict contains all other fields from the metadata. This includes - any unrecognized fields. It also includes any fields which are expected to - be parsed into a built-in type but were not formatted appropriately. Finally, - any fields that are expected to appear only once but are repeated are - included in this dict. - - """ - raw: dict[str, str | list[str] | dict[str, str]] = {} - unparsed: dict[str, list[str]] = {} - - if isinstance(data, str): - parsed = email.parser.Parser(policy=email.policy.compat32).parsestr(data) - else: - parsed = email.parser.BytesParser(policy=email.policy.compat32).parsebytes(data) - - # We have to wrap parsed.keys() in a set, because in the case of multiple - # values for a key (a list), the key will appear multiple times in the - # list of keys, but we're avoiding that by using get_all(). - for name in frozenset(parsed.keys()): - # Header names in RFC are case insensitive, so we'll normalize to all - # lower case to make comparisons easier. - name = name.lower() - - # We use get_all() here, even for fields that aren't multiple use, - # because otherwise someone could have e.g. two Name fields, and we - # would just silently ignore it rather than doing something about it. - headers = parsed.get_all(name) or [] - - # The way the email module works when parsing bytes is that it - # unconditionally decodes the bytes as ascii using the surrogateescape - # handler. When you pull that data back out (such as with get_all() ), - # it looks to see if the str has any surrogate escapes, and if it does - # it wraps it in a Header object instead of returning the string. - # - # As such, we'll look for those Header objects, and fix up the encoding. - value = [] - # Flag if we have run into any issues processing the headers, thus - # signalling that the data belongs in 'unparsed'. - valid_encoding = True - for h in headers: - # It's unclear if this can return more types than just a Header or - # a str, so we'll just assert here to make sure. - assert isinstance(h, (email.header.Header, str)) - - # If it's a header object, we need to do our little dance to get - # the real data out of it. In cases where there is invalid data - # we're going to end up with mojibake, but there's no obvious, good - # way around that without reimplementing parts of the Header object - # ourselves. - # - # That should be fine since, if mojibacked happens, this key is - # going into the unparsed dict anyways. - if isinstance(h, email.header.Header): - # The Header object stores it's data as chunks, and each chunk - # can be independently encoded, so we'll need to check each - # of them. - chunks: list[tuple[bytes, str | None]] = [] - for bin, encoding in email.header.decode_header(h): - try: - bin.decode("utf8", "strict") - except UnicodeDecodeError: - # Enable mojibake. - encoding = "latin1" - valid_encoding = False - else: - encoding = "utf8" - chunks.append((bin, encoding)) - - # Turn our chunks back into a Header object, then let that - # Header object do the right thing to turn them into a - # string for us. - value.append(str(email.header.make_header(chunks))) - # This is already a string, so just add it. - else: - value.append(h) - - # We've processed all of our values to get them into a list of str, - # but we may have mojibake data, in which case this is an unparsed - # field. - if not valid_encoding: - unparsed[name] = value - continue - - raw_name = _EMAIL_TO_RAW_MAPPING.get(name) - if raw_name is None: - # This is a bit of a weird situation, we've encountered a key that - # we don't know what it means, so we don't know whether it's meant - # to be a list or not. - # - # Since we can't really tell one way or another, we'll just leave it - # as a list, even though it may be a single item list, because that's - # what makes the most sense for email headers. - unparsed[name] = value - continue - - # If this is one of our string fields, then we'll check to see if our - # value is a list of a single item. If it is then we'll assume that - # it was emitted as a single string, and unwrap the str from inside - # the list. - # - # If it's any other kind of data, then we haven't the faintest clue - # what we should parse it as, and we have to just add it to our list - # of unparsed stuff. - if raw_name in _STRING_FIELDS and len(value) == 1: - raw[raw_name] = value[0] - # If this is one of our list of string fields, then we can just assign - # the value, since email *only* has strings, and our get_all() call - # above ensures that this is a list. - elif raw_name in _LIST_FIELDS: - raw[raw_name] = value - # Special Case: Keywords - # The keywords field is implemented in the metadata spec as a str, - # but it conceptually is a list of strings, and is serialized using - # ", ".join(keywords), so we'll do some light data massaging to turn - # this into what it logically is. - elif raw_name == "keywords" and len(value) == 1: - raw[raw_name] = _parse_keywords(value[0]) - # Special Case: Project-URL - # The project urls is implemented in the metadata spec as a list of - # specially-formatted strings that represent a key and a value, which - # is fundamentally a mapping, however the email format doesn't support - # mappings in a sane way, so it was crammed into a list of strings - # instead. - # - # We will do a little light data massaging to turn this into a map as - # it logically should be. - elif raw_name == "project_urls": - try: - raw[raw_name] = _parse_project_urls(value) - except KeyError: - unparsed[name] = value - # Nothing that we've done has managed to parse this, so it'll just - # throw it in our unparseable data and move on. - else: - unparsed[name] = value - - # We need to support getting the Description from the message payload in - # addition to getting it from the the headers. This does mean, though, there - # is the possibility of it being set both ways, in which case we put both - # in 'unparsed' since we don't know which is right. - try: - payload = _get_payload(parsed, data) - except ValueError: - unparsed.setdefault("description", []).append( - parsed.get_payload(decode=isinstance(data, bytes)) # type: ignore[call-overload] - ) - else: - if payload: - # Check to see if we've already got a description, if so then both - # it, and this body move to unparseable. - if "description" in raw: - description_header = cast(str, raw.pop("description")) - unparsed.setdefault("description", []).extend( - [description_header, payload] - ) - elif "description" in unparsed: - unparsed["description"].append(payload) - else: - raw["description"] = payload - - # We need to cast our `raw` to a metadata, because a TypedDict only support - # literal key names, but we're computing our key names on purpose, but the - # way this function is implemented, our `TypedDict` can only have valid key - # names. - return cast(RawMetadata, raw), unparsed - - -_NOT_FOUND = object() - - -# Keep the two values in sync. -_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"] -_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"] - -_REQUIRED_ATTRS = frozenset(["metadata_version", "name", "version"]) - - -class _Validator(Generic[T]): - """Validate a metadata field. - - All _process_*() methods correspond to a core metadata field. The method is - called with the field's raw value. If the raw value is valid it is returned - in its "enriched" form (e.g. ``version.Version`` for the ``Version`` field). - If the raw value is invalid, :exc:`InvalidMetadata` is raised (with a cause - as appropriate). - """ - - name: str - raw_name: str - added: _MetadataVersion - - def __init__( - self, - *, - added: _MetadataVersion = "1.0", - ) -> None: - self.added = added - - def __set_name__(self, _owner: Metadata, name: str) -> None: - self.name = name - self.raw_name = _RAW_TO_EMAIL_MAPPING[name] - - def __get__(self, instance: Metadata, _owner: type[Metadata]) -> T: - # With Python 3.8, the caching can be replaced with functools.cached_property(). - # No need to check the cache as attribute lookup will resolve into the - # instance's __dict__ before __get__ is called. - cache = instance.__dict__ - value = instance._raw.get(self.name) - - # To make the _process_* methods easier, we'll check if the value is None - # and if this field is NOT a required attribute, and if both of those - # things are true, we'll skip the the converter. This will mean that the - # converters never have to deal with the None union. - if self.name in _REQUIRED_ATTRS or value is not None: - try: - converter: Callable[[Any], T] = getattr(self, f"_process_{self.name}") - except AttributeError: - pass - else: - value = converter(value) - - cache[self.name] = value - try: - del instance._raw[self.name] # type: ignore[misc] - except KeyError: - pass - - return cast(T, value) - - def _invalid_metadata( - self, msg: str, cause: Exception | None = None - ) -> InvalidMetadata: - exc = InvalidMetadata( - self.raw_name, msg.format_map({"field": repr(self.raw_name)}) - ) - exc.__cause__ = cause - return exc - - def _process_metadata_version(self, value: str) -> _MetadataVersion: - # Implicitly makes Metadata-Version required. - if value not in _VALID_METADATA_VERSIONS: - raise self._invalid_metadata(f"{value!r} is not a valid metadata version") - return cast(_MetadataVersion, value) - - def _process_name(self, value: str) -> str: - if not value: - raise self._invalid_metadata("{field} is a required field") - # Validate the name as a side-effect. - try: - utils.canonicalize_name(value, validate=True) - except utils.InvalidName as exc: - raise self._invalid_metadata( - f"{value!r} is invalid for {{field}}", cause=exc - ) from exc - else: - return value - - def _process_version(self, value: str) -> version_module.Version: - if not value: - raise self._invalid_metadata("{field} is a required field") - try: - return version_module.parse(value) - except version_module.InvalidVersion as exc: - raise self._invalid_metadata( - f"{value!r} is invalid for {{field}}", cause=exc - ) from exc - - def _process_summary(self, value: str) -> str: - """Check the field contains no newlines.""" - if "\n" in value: - raise self._invalid_metadata("{field} must be a single line") - return value - - def _process_description_content_type(self, value: str) -> str: - content_types = {"text/plain", "text/x-rst", "text/markdown"} - message = email.message.EmailMessage() - message["content-type"] = value - - content_type, parameters = ( - # Defaults to `text/plain` if parsing failed. - message.get_content_type().lower(), - message["content-type"].params, - ) - # Check if content-type is valid or defaulted to `text/plain` and thus was - # not parseable. - if content_type not in content_types or content_type not in value.lower(): - raise self._invalid_metadata( - f"{{field}} must be one of {list(content_types)}, not {value!r}" - ) - - charset = parameters.get("charset", "UTF-8") - if charset != "UTF-8": - raise self._invalid_metadata( - f"{{field}} can only specify the UTF-8 charset, not {list(charset)}" - ) - - markdown_variants = {"GFM", "CommonMark"} - variant = parameters.get("variant", "GFM") # Use an acceptable default. - if content_type == "text/markdown" and variant not in markdown_variants: - raise self._invalid_metadata( - f"valid Markdown variants for {{field}} are {list(markdown_variants)}, " - f"not {variant!r}", - ) - return value - - def _process_dynamic(self, value: list[str]) -> list[str]: - for dynamic_field in map(str.lower, value): - if dynamic_field in {"name", "version", "metadata-version"}: - raise self._invalid_metadata( - f"{dynamic_field!r} is not allowed as a dynamic field" - ) - elif dynamic_field not in _EMAIL_TO_RAW_MAPPING: - raise self._invalid_metadata( - f"{dynamic_field!r} is not a valid dynamic field" - ) - return list(map(str.lower, value)) - - def _process_provides_extra( - self, - value: list[str], - ) -> list[utils.NormalizedName]: - normalized_names = [] - try: - for name in value: - normalized_names.append(utils.canonicalize_name(name, validate=True)) - except utils.InvalidName as exc: - raise self._invalid_metadata( - f"{name!r} is invalid for {{field}}", cause=exc - ) from exc - else: - return normalized_names - - def _process_requires_python(self, value: str) -> specifiers.SpecifierSet: - try: - return specifiers.SpecifierSet(value) - except specifiers.InvalidSpecifier as exc: - raise self._invalid_metadata( - f"{value!r} is invalid for {{field}}", cause=exc - ) from exc - - def _process_requires_dist( - self, - value: list[str], - ) -> list[requirements.Requirement]: - reqs = [] - try: - for req in value: - reqs.append(requirements.Requirement(req)) - except requirements.InvalidRequirement as exc: - raise self._invalid_metadata( - f"{req!r} is invalid for {{field}}", cause=exc - ) from exc - else: - return reqs - - def _process_license_expression( - self, value: str - ) -> NormalizedLicenseExpression | None: - try: - return licenses.canonicalize_license_expression(value) - except ValueError as exc: - raise self._invalid_metadata( - f"{value!r} is invalid for {{field}}", cause=exc - ) from exc - - def _process_license_files(self, value: list[str]) -> list[str]: - paths = [] - for path in value: - if ".." in path: - raise self._invalid_metadata( - f"{path!r} is invalid for {{field}}, " - "parent directory indicators are not allowed" - ) - if "*" in path: - raise self._invalid_metadata( - f"{path!r} is invalid for {{field}}, paths must be resolved" - ) - if ( - pathlib.PurePosixPath(path).is_absolute() - or pathlib.PureWindowsPath(path).is_absolute() - ): - raise self._invalid_metadata( - f"{path!r} is invalid for {{field}}, paths must be relative" - ) - if pathlib.PureWindowsPath(path).as_posix() != path: - raise self._invalid_metadata( - f"{path!r} is invalid for {{field}}, " - "paths must use '/' delimiter" - ) - paths.append(path) - return paths - - -class Metadata: - """Representation of distribution metadata. - - Compared to :class:`RawMetadata`, this class provides objects representing - metadata fields instead of only using built-in types. Any invalid metadata - will cause :exc:`InvalidMetadata` to be raised (with a - :py:attr:`~BaseException.__cause__` attribute as appropriate). - """ - - _raw: RawMetadata - - @classmethod - def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> Metadata: - """Create an instance from :class:`RawMetadata`. - - If *validate* is true, all metadata will be validated. All exceptions - related to validation will be gathered and raised as an :class:`ExceptionGroup`. - """ - ins = cls() - ins._raw = data.copy() # Mutations occur due to caching enriched values. - - if validate: - exceptions: list[Exception] = [] - try: - metadata_version = ins.metadata_version - metadata_age = _VALID_METADATA_VERSIONS.index(metadata_version) - except InvalidMetadata as metadata_version_exc: - exceptions.append(metadata_version_exc) - metadata_version = None - - # Make sure to check for the fields that are present, the required - # fields (so their absence can be reported). - fields_to_check = frozenset(ins._raw) | _REQUIRED_ATTRS - # Remove fields that have already been checked. - fields_to_check -= {"metadata_version"} - - for key in fields_to_check: - try: - if metadata_version: - # Can't use getattr() as that triggers descriptor protocol which - # will fail due to no value for the instance argument. - try: - field_metadata_version = cls.__dict__[key].added - except KeyError: - exc = InvalidMetadata(key, f"unrecognized field: {key!r}") - exceptions.append(exc) - continue - field_age = _VALID_METADATA_VERSIONS.index( - field_metadata_version - ) - if field_age > metadata_age: - field = _RAW_TO_EMAIL_MAPPING[key] - exc = InvalidMetadata( - field, - f"{field} introduced in metadata version " - f"{field_metadata_version}, not {metadata_version}", - ) - exceptions.append(exc) - continue - getattr(ins, key) - except InvalidMetadata as exc: - exceptions.append(exc) - - if exceptions: - raise ExceptionGroup("invalid metadata", exceptions) - - return ins - - @classmethod - def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata: - """Parse metadata from email headers. - - If *validate* is true, the metadata will be validated. All exceptions - related to validation will be gathered and raised as an :class:`ExceptionGroup`. - """ - raw, unparsed = parse_email(data) - - if validate: - exceptions: list[Exception] = [] - for unparsed_key in unparsed: - if unparsed_key in _EMAIL_TO_RAW_MAPPING: - message = f"{unparsed_key!r} has invalid data" - else: - message = f"unrecognized field: {unparsed_key!r}" - exceptions.append(InvalidMetadata(unparsed_key, message)) - - if exceptions: - raise ExceptionGroup("unparsed", exceptions) - - try: - return cls.from_raw(raw, validate=validate) - except ExceptionGroup as exc_group: - raise ExceptionGroup( - "invalid or unparsed metadata", exc_group.exceptions - ) from None - - metadata_version: _Validator[_MetadataVersion] = _Validator() - """:external:ref:`core-metadata-metadata-version` - (required; validated to be a valid metadata version)""" - # `name` is not normalized/typed to NormalizedName so as to provide access to - # the original/raw name. - name: _Validator[str] = _Validator() - """:external:ref:`core-metadata-name` - (required; validated using :func:`~packaging.utils.canonicalize_name` and its - *validate* parameter)""" - version: _Validator[version_module.Version] = _Validator() - """:external:ref:`core-metadata-version` (required)""" - dynamic: _Validator[list[str] | None] = _Validator( - added="2.2", - ) - """:external:ref:`core-metadata-dynamic` - (validated against core metadata field names and lowercased)""" - platforms: _Validator[list[str] | None] = _Validator() - """:external:ref:`core-metadata-platform`""" - supported_platforms: _Validator[list[str] | None] = _Validator(added="1.1") - """:external:ref:`core-metadata-supported-platform`""" - summary: _Validator[str | None] = _Validator() - """:external:ref:`core-metadata-summary` (validated to contain no newlines)""" - description: _Validator[str | None] = _Validator() # TODO 2.1: can be in body - """:external:ref:`core-metadata-description`""" - description_content_type: _Validator[str | None] = _Validator(added="2.1") - """:external:ref:`core-metadata-description-content-type` (validated)""" - keywords: _Validator[list[str] | None] = _Validator() - """:external:ref:`core-metadata-keywords`""" - home_page: _Validator[str | None] = _Validator() - """:external:ref:`core-metadata-home-page`""" - download_url: _Validator[str | None] = _Validator(added="1.1") - """:external:ref:`core-metadata-download-url`""" - author: _Validator[str | None] = _Validator() - """:external:ref:`core-metadata-author`""" - author_email: _Validator[str | None] = _Validator() - """:external:ref:`core-metadata-author-email`""" - maintainer: _Validator[str | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-maintainer`""" - maintainer_email: _Validator[str | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-maintainer-email`""" - license: _Validator[str | None] = _Validator() - """:external:ref:`core-metadata-license`""" - license_expression: _Validator[NormalizedLicenseExpression | None] = _Validator( - added="2.4" - ) - """:external:ref:`core-metadata-license-expression`""" - license_files: _Validator[list[str] | None] = _Validator(added="2.4") - """:external:ref:`core-metadata-license-file`""" - classifiers: _Validator[list[str] | None] = _Validator(added="1.1") - """:external:ref:`core-metadata-classifier`""" - requires_dist: _Validator[list[requirements.Requirement] | None] = _Validator( - added="1.2" - ) - """:external:ref:`core-metadata-requires-dist`""" - requires_python: _Validator[specifiers.SpecifierSet | None] = _Validator( - added="1.2" - ) - """:external:ref:`core-metadata-requires-python`""" - # Because `Requires-External` allows for non-PEP 440 version specifiers, we - # don't do any processing on the values. - requires_external: _Validator[list[str] | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-requires-external`""" - project_urls: _Validator[dict[str, str] | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-project-url`""" - # PEP 685 lets us raise an error if an extra doesn't pass `Name` validation - # regardless of metadata version. - provides_extra: _Validator[list[utils.NormalizedName] | None] = _Validator( - added="2.1", - ) - """:external:ref:`core-metadata-provides-extra`""" - provides_dist: _Validator[list[str] | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-provides-dist`""" - obsoletes_dist: _Validator[list[str] | None] = _Validator(added="1.2") - """:external:ref:`core-metadata-obsoletes-dist`""" - requires: _Validator[list[str] | None] = _Validator(added="1.1") - """``Requires`` (deprecated)""" - provides: _Validator[list[str] | None] = _Validator(added="1.1") - """``Provides`` (deprecated)""" - obsoletes: _Validator[list[str] | None] = _Validator(added="1.1") - """``Obsoletes`` (deprecated)""" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/requirements.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/requirements.py index 4e068c9..0d93231 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/requirements.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/requirements.py @@ -1,15 +1,27 @@ # This file is dual licensed under the terms of the Apache License, Version # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -from __future__ import annotations -from typing import Any, Iterator +import re +import string +import urllib.parse +from typing import List, Optional as TOptional, Set -from ._parser import parse_requirement as _parse_requirement -from ._tokenizer import ParserSyntaxError -from .markers import Marker, _normalize_extra_values -from .specifiers import SpecifierSet -from .utils import canonicalize_name +from setuptools.extern.pyparsing import ( # noqa + Combine, + Literal as L, + Optional, + ParseException, + Regex, + Word, + ZeroOrMore, + originalTextFor, + stringEnd, + stringStart, +) + +from .markers import MARKER_EXPR, Marker +from .specifiers import LegacySpecifier, Specifier, SpecifierSet class InvalidRequirement(ValueError): @@ -18,6 +30,60 @@ class InvalidRequirement(ValueError): """ +ALPHANUM = Word(string.ascii_letters + string.digits) + +LBRACKET = L("[").suppress() +RBRACKET = L("]").suppress() +LPAREN = L("(").suppress() +RPAREN = L(")").suppress() +COMMA = L(",").suppress() +SEMICOLON = L(";").suppress() +AT = L("@").suppress() + +PUNCTUATION = Word("-_.") +IDENTIFIER_END = ALPHANUM | (ZeroOrMore(PUNCTUATION) + ALPHANUM) +IDENTIFIER = Combine(ALPHANUM + ZeroOrMore(IDENTIFIER_END)) + +NAME = IDENTIFIER("name") +EXTRA = IDENTIFIER + +URI = Regex(r"[^ ]+")("url") +URL = AT + URI + +EXTRAS_LIST = EXTRA + ZeroOrMore(COMMA + EXTRA) +EXTRAS = (LBRACKET + Optional(EXTRAS_LIST) + RBRACKET)("extras") + +VERSION_PEP440 = Regex(Specifier._regex_str, re.VERBOSE | re.IGNORECASE) +VERSION_LEGACY = Regex(LegacySpecifier._regex_str, re.VERBOSE | re.IGNORECASE) + +VERSION_ONE = VERSION_PEP440 ^ VERSION_LEGACY +VERSION_MANY = Combine( + VERSION_ONE + ZeroOrMore(COMMA + VERSION_ONE), joinString=",", adjacent=False +)("_raw_spec") +_VERSION_SPEC = Optional((LPAREN + VERSION_MANY + RPAREN) | VERSION_MANY) +_VERSION_SPEC.setParseAction(lambda s, l, t: t._raw_spec or "") + +VERSION_SPEC = originalTextFor(_VERSION_SPEC)("specifier") +VERSION_SPEC.setParseAction(lambda s, l, t: t[1]) + +MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker") +MARKER_EXPR.setParseAction( + lambda s, l, t: Marker(s[t._original_start : t._original_end]) +) +MARKER_SEPARATOR = SEMICOLON +MARKER = MARKER_SEPARATOR + MARKER_EXPR + +VERSION_AND_MARKER = VERSION_SPEC + Optional(MARKER) +URL_AND_MARKER = URL + Optional(MARKER) + +NAMED_REQUIREMENT = NAME + Optional(EXTRAS) + (URL_AND_MARKER | VERSION_AND_MARKER) + +REQUIREMENT = stringStart + NAMED_REQUIREMENT + stringEnd +# setuptools.extern.pyparsing isn't thread safe during initialization, so we do it eagerly, see +# issue #104 +REQUIREMENT.parseString("x[]") + + class Requirement: """Parse a requirement. @@ -33,59 +99,48 @@ class Requirement: def __init__(self, requirement_string: str) -> None: try: - parsed = _parse_requirement(requirement_string) - except ParserSyntaxError as e: - raise InvalidRequirement(str(e)) from e + req = REQUIREMENT.parseString(requirement_string) + except ParseException as e: + raise InvalidRequirement( + f'Parse error at "{ requirement_string[e.loc : e.loc + 8]!r}": {e.msg}' + ) - self.name: str = parsed.name - self.url: str | None = parsed.url or None - self.extras: set[str] = set(parsed.extras or []) - self.specifier: SpecifierSet = SpecifierSet(parsed.specifier) - self.marker: Marker | None = None - if parsed.marker is not None: - self.marker = Marker.__new__(Marker) - self.marker._markers = _normalize_extra_values(parsed.marker) + self.name: str = req.name + if req.url: + parsed_url = urllib.parse.urlparse(req.url) + if parsed_url.scheme == "file": + if urllib.parse.urlunparse(parsed_url) != req.url: + raise InvalidRequirement("Invalid URL given") + elif not (parsed_url.scheme and parsed_url.netloc) or ( + not parsed_url.scheme and not parsed_url.netloc + ): + raise InvalidRequirement(f"Invalid URL: {req.url}") + self.url: TOptional[str] = req.url + else: + self.url = None + self.extras: Set[str] = set(req.extras.asList() if req.extras else []) + self.specifier: SpecifierSet = SpecifierSet(req.specifier) + self.marker: TOptional[Marker] = req.marker if req.marker else None - def _iter_parts(self, name: str) -> Iterator[str]: - yield name + def __str__(self) -> str: + parts: List[str] = [self.name] if self.extras: formatted_extras = ",".join(sorted(self.extras)) - yield f"[{formatted_extras}]" + parts.append(f"[{formatted_extras}]") if self.specifier: - yield str(self.specifier) + parts.append(str(self.specifier)) if self.url: - yield f"@ {self.url}" + parts.append(f"@ {self.url}") if self.marker: - yield " " + parts.append(" ") if self.marker: - yield f"; {self.marker}" + parts.append(f"; {self.marker}") - def __str__(self) -> str: - return "".join(self._iter_parts(self.name)) + return "".join(parts) def __repr__(self) -> str: return f"" - - def __hash__(self) -> int: - return hash( - ( - self.__class__.__name__, - *self._iter_parts(canonicalize_name(self.name)), - ) - ) - - def __eq__(self, other: Any) -> bool: - if not isinstance(other, Requirement): - return NotImplemented - - return ( - canonicalize_name(self.name) == canonicalize_name(other.name) - and self.extras == other.extras - and self.specifier == other.specifier - and self.url == other.url - and self.marker == other.marker - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/specifiers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/specifiers.py index b30926a..0e218a6 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/specifiers.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/specifiers.py @@ -1,43 +1,38 @@ # This file is dual licensed under the terms of the Apache License, Version # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -""" -.. testsetup:: - - from packaging.specifiers import Specifier, SpecifierSet, InvalidSpecifier - from packaging.version import Version -""" - -from __future__ import annotations import abc +import functools import itertools import re -from typing import Callable, Iterable, Iterator, TypeVar, Union +import warnings +from typing import ( + Callable, + Dict, + Iterable, + Iterator, + List, + Optional, + Pattern, + Set, + Tuple, + TypeVar, + Union, +) from .utils import canonicalize_version -from .version import Version +from .version import LegacyVersion, Version, parse -UnparsedVersion = Union[Version, str] -UnparsedVersionVar = TypeVar("UnparsedVersionVar", bound=UnparsedVersion) -CallableOperator = Callable[[Version, str], bool] - - -def _coerce_version(version: UnparsedVersion) -> Version: - if not isinstance(version, Version): - version = Version(version) - return version +ParsedVersion = Union[Version, LegacyVersion] +UnparsedVersion = Union[Version, LegacyVersion, str] +VersionTypeVar = TypeVar("VersionTypeVar", bound=UnparsedVersion) +CallableOperator = Callable[[ParsedVersion, str], bool] class InvalidSpecifier(ValueError): """ - Raised when attempting to create a :class:`Specifier` with a specifier - string that is invalid. - - >>> Specifier("lolwat") - Traceback (most recent call last): - ... - packaging.specifiers.InvalidSpecifier: Invalid specifier: 'lolwat' + An invalid specifier was found, users should refer to PEP 440. """ @@ -45,71 +40,266 @@ class BaseSpecifier(metaclass=abc.ABCMeta): @abc.abstractmethod def __str__(self) -> str: """ - Returns the str representation of this Specifier-like object. This + Returns the str representation of this Specifier like object. This should be representative of the Specifier itself. """ @abc.abstractmethod def __hash__(self) -> int: """ - Returns a hash value for this Specifier-like object. + Returns a hash value for this Specifier like object. """ @abc.abstractmethod def __eq__(self, other: object) -> bool: """ - Returns a boolean representing whether or not the two Specifier-like + Returns a boolean representing whether or not the two Specifier like objects are equal. - - :param other: The other object to check against. """ - @property - @abc.abstractmethod - def prereleases(self) -> bool | None: - """Whether or not pre-releases as a whole are allowed. - - This can be set to either ``True`` or ``False`` to explicitly enable or disable - prereleases or it can be set to ``None`` (the default) to use default semantics. + @abc.abstractproperty + def prereleases(self) -> Optional[bool]: + """ + Returns whether or not pre-releases as a whole are allowed by this + specifier. """ @prereleases.setter def prereleases(self, value: bool) -> None: - """Setter for :attr:`prereleases`. - - :param value: The value to set. + """ + Sets whether or not pre-releases as a whole are allowed by this + specifier. """ @abc.abstractmethod - def contains(self, item: str, prereleases: bool | None = None) -> bool: + def contains(self, item: str, prereleases: Optional[bool] = None) -> bool: """ Determines if the given item is contained within this specifier. """ @abc.abstractmethod def filter( - self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None - ) -> Iterator[UnparsedVersionVar]: + self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None + ) -> Iterable[VersionTypeVar]: """ Takes an iterable of items and filters them so that only items which are contained within this specifier are allowed in it. """ -class Specifier(BaseSpecifier): - """This class abstracts handling of version specifiers. +class _IndividualSpecifier(BaseSpecifier): - .. tip:: + _operators: Dict[str, str] = {} + _regex: Pattern[str] - It is generally not required to instantiate this manually. You should instead - prefer to work with :class:`SpecifierSet` instead, which can parse - comma-separated version specifiers (which is what package metadata contains). - """ + def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None: + match = self._regex.search(spec) + if not match: + raise InvalidSpecifier(f"Invalid specifier: '{spec}'") - _operator_regex_str = r""" - (?P(~=|==|!=|<=|>=|<|>|===)) + self._spec: Tuple[str, str] = ( + match.group("operator").strip(), + match.group("version").strip(), + ) + + # Store whether or not this Specifier should accept prereleases + self._prereleases = prereleases + + def __repr__(self) -> str: + pre = ( + f", prereleases={self.prereleases!r}" + if self._prereleases is not None + else "" + ) + + return f"<{self.__class__.__name__}({str(self)!r}{pre})>" + + def __str__(self) -> str: + return "{}{}".format(*self._spec) + + @property + def _canonical_spec(self) -> Tuple[str, str]: + return self._spec[0], canonicalize_version(self._spec[1]) + + def __hash__(self) -> int: + return hash(self._canonical_spec) + + def __eq__(self, other: object) -> bool: + if isinstance(other, str): + try: + other = self.__class__(str(other)) + except InvalidSpecifier: + return NotImplemented + elif not isinstance(other, self.__class__): + return NotImplemented + + return self._canonical_spec == other._canonical_spec + + def _get_operator(self, op: str) -> CallableOperator: + operator_callable: CallableOperator = getattr( + self, f"_compare_{self._operators[op]}" + ) + return operator_callable + + def _coerce_version(self, version: UnparsedVersion) -> ParsedVersion: + if not isinstance(version, (LegacyVersion, Version)): + version = parse(version) + return version + + @property + def operator(self) -> str: + return self._spec[0] + + @property + def version(self) -> str: + return self._spec[1] + + @property + def prereleases(self) -> Optional[bool]: + return self._prereleases + + @prereleases.setter + def prereleases(self, value: bool) -> None: + self._prereleases = value + + def __contains__(self, item: str) -> bool: + return self.contains(item) + + def contains( + self, item: UnparsedVersion, prereleases: Optional[bool] = None + ) -> bool: + + # Determine if prereleases are to be allowed or not. + if prereleases is None: + prereleases = self.prereleases + + # Normalize item to a Version or LegacyVersion, this allows us to have + # a shortcut for ``"2.0" in Specifier(">=2") + normalized_item = self._coerce_version(item) + + # Determine if we should be supporting prereleases in this specifier + # or not, if we do not support prereleases than we can short circuit + # logic if this version is a prereleases. + if normalized_item.is_prerelease and not prereleases: + return False + + # Actually do the comparison to determine if this item is contained + # within this Specifier or not. + operator_callable: CallableOperator = self._get_operator(self.operator) + return operator_callable(normalized_item, self.version) + + def filter( + self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None + ) -> Iterable[VersionTypeVar]: + + yielded = False + found_prereleases = [] + + kw = {"prereleases": prereleases if prereleases is not None else True} + + # Attempt to iterate over all the values in the iterable and if any of + # them match, yield them. + for version in iterable: + parsed_version = self._coerce_version(version) + + if self.contains(parsed_version, **kw): + # If our version is a prerelease, and we were not set to allow + # prereleases, then we'll store it for later in case nothing + # else matches this specifier. + if parsed_version.is_prerelease and not ( + prereleases or self.prereleases + ): + found_prereleases.append(version) + # Either this is not a prerelease, or we should have been + # accepting prereleases from the beginning. + else: + yielded = True + yield version + + # Now that we've iterated over everything, determine if we've yielded + # any values, and if we have not and we have any prereleases stored up + # then we will go ahead and yield the prereleases. + if not yielded and found_prereleases: + for version in found_prereleases: + yield version + + +class LegacySpecifier(_IndividualSpecifier): + + _regex_str = r""" + (?P(==|!=|<=|>=|<|>)) + \s* + (?P + [^,;\s)]* # Since this is a "legacy" specifier, and the version + # string can be just about anything, we match everything + # except for whitespace, a semi-colon for marker support, + # a closing paren since versions can be enclosed in + # them, and a comma since it's a version separator. + ) """ - _version_regex_str = r""" + + _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE) + + _operators = { + "==": "equal", + "!=": "not_equal", + "<=": "less_than_equal", + ">=": "greater_than_equal", + "<": "less_than", + ">": "greater_than", + } + + def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None: + super().__init__(spec, prereleases) + + warnings.warn( + "Creating a LegacyVersion has been deprecated and will be " + "removed in the next major release", + DeprecationWarning, + ) + + def _coerce_version(self, version: UnparsedVersion) -> LegacyVersion: + if not isinstance(version, LegacyVersion): + version = LegacyVersion(str(version)) + return version + + def _compare_equal(self, prospective: LegacyVersion, spec: str) -> bool: + return prospective == self._coerce_version(spec) + + def _compare_not_equal(self, prospective: LegacyVersion, spec: str) -> bool: + return prospective != self._coerce_version(spec) + + def _compare_less_than_equal(self, prospective: LegacyVersion, spec: str) -> bool: + return prospective <= self._coerce_version(spec) + + def _compare_greater_than_equal( + self, prospective: LegacyVersion, spec: str + ) -> bool: + return prospective >= self._coerce_version(spec) + + def _compare_less_than(self, prospective: LegacyVersion, spec: str) -> bool: + return prospective < self._coerce_version(spec) + + def _compare_greater_than(self, prospective: LegacyVersion, spec: str) -> bool: + return prospective > self._coerce_version(spec) + + +def _require_version_compare( + fn: Callable[["Specifier", ParsedVersion, str], bool] +) -> Callable[["Specifier", ParsedVersion, str], bool]: + @functools.wraps(fn) + def wrapped(self: "Specifier", prospective: ParsedVersion, spec: str) -> bool: + if not isinstance(prospective, Version): + return False + return fn(self, prospective, spec) + + return wrapped + + +class Specifier(_IndividualSpecifier): + + _regex_str = r""" + (?P(~=|==|!=|<=|>=|<|>|===)) (?P (?: # The identity operators allow for an escape hatch that will @@ -119,10 +309,8 @@ class Specifier(BaseSpecifier): # but included entirely as an escape hatch. (?<====) # Only match for the identity operator \s* - [^\s;)]* # The arbitrary version can be just about anything, - # we match everything except for whitespace, a - # semi-colon for marker support, and a closing paren - # since versions can be enclosed in them. + [^\s]* # We just match everything, except for whitespace + # since we are only testing for strict identity. ) | (?: @@ -135,23 +323,23 @@ class Specifier(BaseSpecifier): v? (?:[0-9]+!)? # epoch [0-9]+(?:\.[0-9]+)* # release + (?: # pre release + [-_\.]? + (a|b|c|rc|alpha|beta|pre|preview) + [-_\.]? + [0-9]* + )? + (?: # post release + (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) + )? - # You cannot use a wild card and a pre-release, post-release, a dev or - # local version together so group them with a | and make them optional. + # You cannot use a wild card and a dev or local version + # together so group them with a | and make them optional. (?: - \.\* # Wild card syntax of .* - | - (?: # pre release - [-_\.]? - (alpha|beta|preview|pre|a|b|c|rc) - [-_\.]? - [0-9]* - )? - (?: # post release - (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*) - )? (?:[-_\.]?dev[-_\.]?[0-9]*)? # dev release (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local + | + \.\* # Wild card syntax of .* )? ) | @@ -166,7 +354,7 @@ class Specifier(BaseSpecifier): [0-9]+(?:\.[0-9]+)+ # release (We have a + instead of a *) (?: # pre release [-_\.]? - (alpha|beta|preview|pre|a|b|c|rc) + (a|b|c|rc|alpha|beta|pre|preview) [-_\.]? [0-9]* )? @@ -191,7 +379,7 @@ class Specifier(BaseSpecifier): [0-9]+(?:\.[0-9]+)* # release (?: # pre release [-_\.]? - (alpha|beta|preview|pre|a|b|c|rc) + (a|b|c|rc|alpha|beta|pre|preview) [-_\.]? [0-9]* )? @@ -203,10 +391,7 @@ class Specifier(BaseSpecifier): ) """ - _regex = re.compile( - r"^\s*" + _operator_regex_str + _version_regex_str + r"\s*$", - re.VERBOSE | re.IGNORECASE, - ) + _regex = re.compile(r"^\s*" + _regex_str + r"\s*$", re.VERBOSE | re.IGNORECASE) _operators = { "~=": "compatible", @@ -219,153 +404,9 @@ class Specifier(BaseSpecifier): "===": "arbitrary", } - def __init__(self, spec: str = "", prereleases: bool | None = None) -> None: - """Initialize a Specifier instance. + @_require_version_compare + def _compare_compatible(self, prospective: ParsedVersion, spec: str) -> bool: - :param spec: - The string representation of a specifier which will be parsed and - normalized before use. - :param prereleases: - This tells the specifier if it should accept prerelease versions if - applicable or not. The default of ``None`` will autodetect it from the - given specifiers. - :raises InvalidSpecifier: - If the given specifier is invalid (i.e. bad syntax). - """ - match = self._regex.search(spec) - if not match: - raise InvalidSpecifier(f"Invalid specifier: {spec!r}") - - self._spec: tuple[str, str] = ( - match.group("operator").strip(), - match.group("version").strip(), - ) - - # Store whether or not this Specifier should accept prereleases - self._prereleases = prereleases - - # https://github.com/python/mypy/pull/13475#pullrequestreview-1079784515 - @property # type: ignore[override] - def prereleases(self) -> bool: - # If there is an explicit prereleases set for this, then we'll just - # blindly use that. - if self._prereleases is not None: - return self._prereleases - - # Look at all of our specifiers and determine if they are inclusive - # operators, and if they are if they are including an explicit - # prerelease. - operator, version = self._spec - if operator in ["==", ">=", "<=", "~=", "===", ">", "<"]: - # The == specifier can include a trailing .*, if it does we - # want to remove before parsing. - if operator == "==" and version.endswith(".*"): - version = version[:-2] - - # Parse the version, and if it is a pre-release than this - # specifier allows pre-releases. - if Version(version).is_prerelease: - return True - - return False - - @prereleases.setter - def prereleases(self, value: bool) -> None: - self._prereleases = value - - @property - def operator(self) -> str: - """The operator of this specifier. - - >>> Specifier("==1.2.3").operator - '==' - """ - return self._spec[0] - - @property - def version(self) -> str: - """The version of this specifier. - - >>> Specifier("==1.2.3").version - '1.2.3' - """ - return self._spec[1] - - def __repr__(self) -> str: - """A representation of the Specifier that shows all internal state. - - >>> Specifier('>=1.0.0') - =1.0.0')> - >>> Specifier('>=1.0.0', prereleases=False) - =1.0.0', prereleases=False)> - >>> Specifier('>=1.0.0', prereleases=True) - =1.0.0', prereleases=True)> - """ - pre = ( - f", prereleases={self.prereleases!r}" - if self._prereleases is not None - else "" - ) - - return f"<{self.__class__.__name__}({str(self)!r}{pre})>" - - def __str__(self) -> str: - """A string representation of the Specifier that can be round-tripped. - - >>> str(Specifier('>=1.0.0')) - '>=1.0.0' - >>> str(Specifier('>=1.0.0', prereleases=False)) - '>=1.0.0' - """ - return "{}{}".format(*self._spec) - - @property - def _canonical_spec(self) -> tuple[str, str]: - canonical_version = canonicalize_version( - self._spec[1], - strip_trailing_zero=(self._spec[0] != "~="), - ) - return self._spec[0], canonical_version - - def __hash__(self) -> int: - return hash(self._canonical_spec) - - def __eq__(self, other: object) -> bool: - """Whether or not the two Specifier-like objects are equal. - - :param other: The other object to check against. - - The value of :attr:`prereleases` is ignored. - - >>> Specifier("==1.2.3") == Specifier("== 1.2.3.0") - True - >>> (Specifier("==1.2.3", prereleases=False) == - ... Specifier("==1.2.3", prereleases=True)) - True - >>> Specifier("==1.2.3") == "==1.2.3" - True - >>> Specifier("==1.2.3") == Specifier("==1.2.4") - False - >>> Specifier("==1.2.3") == Specifier("~=1.2.3") - False - """ - if isinstance(other, str): - try: - other = self.__class__(str(other)) - except InvalidSpecifier: - return NotImplemented - elif not isinstance(other, self.__class__): - return NotImplemented - - return self._canonical_spec == other._canonical_spec - - def _get_operator(self, op: str) -> CallableOperator: - operator_callable: CallableOperator = getattr( - self, f"_compare_{self._operators[op]}" - ) - return operator_callable - - def _compare_compatible(self, prospective: Version, spec: str) -> bool: # Compatible releases have an equivalent combination of >= and ==. That # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to # implement this in terms of the other specifiers instead of @@ -374,7 +415,7 @@ class Specifier(BaseSpecifier): # We want everything but the last item in the version, but we want to # ignore suffix segments. - prefix = _version_join( + prefix = ".".join( list(itertools.takewhile(_is_not_suffix, _version_split(spec)))[:-1] ) @@ -385,34 +426,34 @@ class Specifier(BaseSpecifier): prospective, prefix ) - def _compare_equal(self, prospective: Version, spec: str) -> bool: + @_require_version_compare + def _compare_equal(self, prospective: ParsedVersion, spec: str) -> bool: + # We need special logic to handle prefix matching if spec.endswith(".*"): # In the case of prefix matching we want to ignore local segment. - normalized_prospective = canonicalize_version( - prospective.public, strip_trailing_zero=False - ) - # Get the normalized version string ignoring the trailing .* - normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False) - # Split the spec out by bangs and dots, and pretend that there is - # an implicit dot in between a release segment and a pre-release segment. - split_spec = _version_split(normalized_spec) + prospective = Version(prospective.public) + # Split the spec out by dots, and pretend that there is an implicit + # dot in between a release segment and a pre-release segment. + split_spec = _version_split(spec[:-2]) # Remove the trailing .* - # Split the prospective version out by bangs and dots, and pretend - # that there is an implicit dot in between a release segment and - # a pre-release segment. - split_prospective = _version_split(normalized_prospective) - - # 0-pad the prospective version before shortening it to get the correct - # shortened version. - padded_prospective, _ = _pad_version(split_prospective, split_spec) + # Split the prospective version out by dots, and pretend that there + # is an implicit dot in between a release segment and a pre-release + # segment. + split_prospective = _version_split(str(prospective)) # Shorten the prospective version to be the same length as the spec # so that we can determine if the specifier is a prefix of the # prospective version or not. - shortened_prospective = padded_prospective[: len(split_spec)] + shortened_prospective = split_prospective[: len(split_spec)] - return shortened_prospective == split_spec + # Pad out our two sides with zeros so that they both equal the same + # length. + padded_spec, padded_prospective = _pad_version( + split_spec, shortened_prospective + ) + + return padded_prospective == padded_spec else: # Convert our spec string into a Version spec_version = Version(spec) @@ -425,22 +466,31 @@ class Specifier(BaseSpecifier): return prospective == spec_version - def _compare_not_equal(self, prospective: Version, spec: str) -> bool: + @_require_version_compare + def _compare_not_equal(self, prospective: ParsedVersion, spec: str) -> bool: return not self._compare_equal(prospective, spec) - def _compare_less_than_equal(self, prospective: Version, spec: str) -> bool: + @_require_version_compare + def _compare_less_than_equal(self, prospective: ParsedVersion, spec: str) -> bool: + # NB: Local version identifiers are NOT permitted in the version # specifier, so local version labels can be universally removed from # the prospective version. return Version(prospective.public) <= Version(spec) - def _compare_greater_than_equal(self, prospective: Version, spec: str) -> bool: + @_require_version_compare + def _compare_greater_than_equal( + self, prospective: ParsedVersion, spec: str + ) -> bool: + # NB: Local version identifiers are NOT permitted in the version # specifier, so local version labels can be universally removed from # the prospective version. return Version(prospective.public) >= Version(spec) - def _compare_less_than(self, prospective: Version, spec_str: str) -> bool: + @_require_version_compare + def _compare_less_than(self, prospective: ParsedVersion, spec_str: str) -> bool: + # Convert our spec to a Version instance, since we'll want to work with # it as a version. spec = Version(spec_str) @@ -464,7 +514,9 @@ class Specifier(BaseSpecifier): # version in the spec. return True - def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool: + @_require_version_compare + def _compare_greater_than(self, prospective: ParsedVersion, spec_str: str) -> bool: + # Convert our spec to a Version instance, since we'll want to work with # it as a version. spec = Version(spec_str) @@ -497,150 +549,42 @@ class Specifier(BaseSpecifier): def _compare_arbitrary(self, prospective: Version, spec: str) -> bool: return str(prospective).lower() == str(spec).lower() - def __contains__(self, item: str | Version) -> bool: - """Return whether or not the item is contained in this specifier. + @property + def prereleases(self) -> bool: - :param item: The item to check for. + # If there is an explicit prereleases set for this, then we'll just + # blindly use that. + if self._prereleases is not None: + return self._prereleases - This is used for the ``in`` operator and behaves the same as - :meth:`contains` with no ``prereleases`` argument passed. + # Look at all of our specifiers and determine if they are inclusive + # operators, and if they are if they are including an explicit + # prerelease. + operator, version = self._spec + if operator in ["==", ">=", "<=", "~=", "==="]: + # The == specifier can include a trailing .*, if it does we + # want to remove before parsing. + if operator == "==" and version.endswith(".*"): + version = version[:-2] - >>> "1.2.3" in Specifier(">=1.2.3") - True - >>> Version("1.2.3") in Specifier(">=1.2.3") - True - >>> "1.0.0" in Specifier(">=1.2.3") - False - >>> "1.3.0a1" in Specifier(">=1.2.3") - False - >>> "1.3.0a1" in Specifier(">=1.2.3", prereleases=True) - True - """ - return self.contains(item) + # Parse the version, and if it is a pre-release than this + # specifier allows pre-releases. + if parse(version).is_prerelease: + return True - def contains(self, item: UnparsedVersion, prereleases: bool | None = None) -> bool: - """Return whether or not the item is contained in this specifier. + return False - :param item: - The item to check for, which can be a version string or a - :class:`Version` instance. - :param prereleases: - Whether or not to match prereleases with this Specifier. If set to - ``None`` (the default), it uses :attr:`prereleases` to determine - whether or not prereleases are allowed. - - >>> Specifier(">=1.2.3").contains("1.2.3") - True - >>> Specifier(">=1.2.3").contains(Version("1.2.3")) - True - >>> Specifier(">=1.2.3").contains("1.0.0") - False - >>> Specifier(">=1.2.3").contains("1.3.0a1") - False - >>> Specifier(">=1.2.3", prereleases=True).contains("1.3.0a1") - True - >>> Specifier(">=1.2.3").contains("1.3.0a1", prereleases=True) - True - """ - - # Determine if prereleases are to be allowed or not. - if prereleases is None: - prereleases = self.prereleases - - # Normalize item to a Version, this allows us to have a shortcut for - # "2.0" in Specifier(">=2") - normalized_item = _coerce_version(item) - - # Determine if we should be supporting prereleases in this specifier - # or not, if we do not support prereleases than we can short circuit - # logic if this version is a prereleases. - if normalized_item.is_prerelease and not prereleases: - return False - - # Actually do the comparison to determine if this item is contained - # within this Specifier or not. - operator_callable: CallableOperator = self._get_operator(self.operator) - return operator_callable(normalized_item, self.version) - - def filter( - self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None - ) -> Iterator[UnparsedVersionVar]: - """Filter items in the given iterable, that match the specifier. - - :param iterable: - An iterable that can contain version strings and :class:`Version` instances. - The items in the iterable will be filtered according to the specifier. - :param prereleases: - Whether or not to allow prereleases in the returned iterator. If set to - ``None`` (the default), it will be intelligently decide whether to allow - prereleases or not (based on the :attr:`prereleases` attribute, and - whether the only versions matching are prereleases). - - This method is smarter than just ``filter(Specifier().contains, [...])`` - because it implements the rule from :pep:`440` that a prerelease item - SHOULD be accepted if no other versions match the given specifier. - - >>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"])) - ['1.3'] - >>> list(Specifier(">=1.2.3").filter(["1.2", "1.2.3", "1.3", Version("1.4")])) - ['1.2.3', '1.3', ] - >>> list(Specifier(">=1.2.3").filter(["1.2", "1.5a1"])) - ['1.5a1'] - >>> list(Specifier(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True)) - ['1.3', '1.5a1'] - >>> list(Specifier(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"])) - ['1.3', '1.5a1'] - """ - - yielded = False - found_prereleases = [] - - kw = {"prereleases": prereleases if prereleases is not None else True} - - # Attempt to iterate over all the values in the iterable and if any of - # them match, yield them. - for version in iterable: - parsed_version = _coerce_version(version) - - if self.contains(parsed_version, **kw): - # If our version is a prerelease, and we were not set to allow - # prereleases, then we'll store it for later in case nothing - # else matches this specifier. - if parsed_version.is_prerelease and not ( - prereleases or self.prereleases - ): - found_prereleases.append(version) - # Either this is not a prerelease, or we should have been - # accepting prereleases from the beginning. - else: - yielded = True - yield version - - # Now that we've iterated over everything, determine if we've yielded - # any values, and if we have not and we have any prereleases stored up - # then we will go ahead and yield the prereleases. - if not yielded and found_prereleases: - for version in found_prereleases: - yield version + @prereleases.setter + def prereleases(self, value: bool) -> None: + self._prereleases = value _prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$") -def _version_split(version: str) -> list[str]: - """Split version into components. - - The split components are intended for version comparison. The logic does - not attempt to retain the original version string, so joining the - components back with :func:`_version_join` may not produce the original - version string. - """ - result: list[str] = [] - - epoch, _, rest = version.rpartition("!") - result.append(epoch or "0") - - for item in rest.split("."): +def _version_split(version: str) -> List[str]: + result: List[str] = [] + for item in version.split("."): match = _prefix_regex.search(item) if match: result.extend(match.groups()) @@ -649,24 +593,13 @@ def _version_split(version: str) -> list[str]: return result -def _version_join(components: list[str]) -> str: - """Join split version components into a version string. - - This function assumes the input came from :func:`_version_split`, where the - first component must be the epoch (either empty or numeric), and all other - components numeric. - """ - epoch, *rest = components - return f"{epoch}!{'.'.join(rest)}" - - def _is_not_suffix(segment: str) -> bool: return not any( segment.startswith(prefix) for prefix in ("dev", "a", "b", "rc", "post") ) -def _pad_version(left: list[str], right: list[str]) -> tuple[list[str], list[str]]: +def _pad_version(left: List[str], right: List[str]) -> Tuple[List[str], List[str]]: left_split, right_split = [], [] # Get the release segment of our versions @@ -681,91 +614,35 @@ def _pad_version(left: list[str], right: list[str]) -> tuple[list[str], list[str left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0]))) right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0]))) - return ( - list(itertools.chain.from_iterable(left_split)), - list(itertools.chain.from_iterable(right_split)), - ) + return (list(itertools.chain(*left_split)), list(itertools.chain(*right_split))) class SpecifierSet(BaseSpecifier): - """This class abstracts handling of a set of version specifiers. - - It can be passed a single specifier (``>=3.0``), a comma-separated list of - specifiers (``>=3.0,!=3.1``), or no specifier at all. - """ - def __init__( - self, - specifiers: str | Iterable[Specifier] = "", - prereleases: bool | None = None, + self, specifiers: str = "", prereleases: Optional[bool] = None ) -> None: - """Initialize a SpecifierSet instance. - :param specifiers: - The string representation of a specifier or a comma-separated list of - specifiers which will be parsed and normalized before use. - May also be an iterable of ``Specifier`` instances, which will be used - as is. - :param prereleases: - This tells the SpecifierSet if it should accept prerelease versions if - applicable or not. The default of ``None`` will autodetect it from the - given specifiers. + # Split on , to break each individual specifier into it's own item, and + # strip each item to remove leading/trailing whitespace. + split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()] - :raises InvalidSpecifier: - If the given ``specifiers`` are not parseable than this exception will be - raised. - """ + # Parsed each individual specifier, attempting first to make it a + # Specifier and falling back to a LegacySpecifier. + parsed: Set[_IndividualSpecifier] = set() + for specifier in split_specifiers: + try: + parsed.add(Specifier(specifier)) + except InvalidSpecifier: + parsed.add(LegacySpecifier(specifier)) - if isinstance(specifiers, str): - # Split on `,` to break each individual specifier into its own item, and - # strip each item to remove leading/trailing whitespace. - split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()] - - # Make each individual specifier a Specifier and save in a frozen set - # for later. - self._specs = frozenset(map(Specifier, split_specifiers)) - else: - # Save the supplied specifiers in a frozen set. - self._specs = frozenset(specifiers) + # Turn our parsed specifiers into a frozen set and save them for later. + self._specs = frozenset(parsed) # Store our prereleases value so we can use it later to determine if # we accept prereleases or not. self._prereleases = prereleases - @property - def prereleases(self) -> bool | None: - # If we have been given an explicit prerelease modifier, then we'll - # pass that through here. - if self._prereleases is not None: - return self._prereleases - - # If we don't have any specifiers, and we don't have a forced value, - # then we'll just return None since we don't know if this should have - # pre-releases or not. - if not self._specs: - return None - - # Otherwise we'll see if any of the given specifiers accept - # prereleases, if any of them do we'll return True, otherwise False. - return any(s.prereleases for s in self._specs) - - @prereleases.setter - def prereleases(self, value: bool) -> None: - self._prereleases = value - def __repr__(self) -> str: - """A representation of the specifier set that shows all internal state. - - Note that the ordering of the individual specifiers within the set may not - match the input string. - - >>> SpecifierSet('>=1.0.0,!=2.0.0') - =1.0.0')> - >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=False) - =1.0.0', prereleases=False)> - >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=True) - =1.0.0', prereleases=True)> - """ pre = ( f", prereleases={self.prereleases!r}" if self._prereleases is not None @@ -775,31 +652,12 @@ class SpecifierSet(BaseSpecifier): return f"" def __str__(self) -> str: - """A string representation of the specifier set that can be round-tripped. - - Note that the ordering of the individual specifiers within the set may not - match the input string. - - >>> str(SpecifierSet(">=1.0.0,!=1.0.1")) - '!=1.0.1,>=1.0.0' - >>> str(SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False)) - '!=1.0.1,>=1.0.0' - """ return ",".join(sorted(str(s) for s in self._specs)) def __hash__(self) -> int: return hash(self._specs) - def __and__(self, other: SpecifierSet | str) -> SpecifierSet: - """Return a SpecifierSet which is a combination of the two sets. - - :param other: The other object to combine with. - - >>> SpecifierSet(">=1.0.0,!=1.0.1") & '<=2.0.0,!=2.0.1' - =1.0.0')> - >>> SpecifierSet(">=1.0.0,!=1.0.1") & SpecifierSet('<=2.0.0,!=2.0.1') - =1.0.0')> - """ + def __and__(self, other: Union["SpecifierSet", str]) -> "SpecifierSet": if isinstance(other, str): other = SpecifierSet(other) elif not isinstance(other, SpecifierSet): @@ -823,25 +681,7 @@ class SpecifierSet(BaseSpecifier): return specifier def __eq__(self, other: object) -> bool: - """Whether or not the two SpecifierSet-like objects are equal. - - :param other: The other object to check against. - - The value of :attr:`prereleases` is ignored. - - >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.1") - True - >>> (SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False) == - ... SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True)) - True - >>> SpecifierSet(">=1.0.0,!=1.0.1") == ">=1.0.0,!=1.0.1" - True - >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0") - False - >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.2") - False - """ - if isinstance(other, (str, Specifier)): + if isinstance(other, (str, _IndividualSpecifier)): other = SpecifierSet(str(other)) elif not isinstance(other, SpecifierSet): return NotImplemented @@ -849,72 +689,43 @@ class SpecifierSet(BaseSpecifier): return self._specs == other._specs def __len__(self) -> int: - """Returns the number of specifiers in this specifier set.""" return len(self._specs) - def __iter__(self) -> Iterator[Specifier]: - """ - Returns an iterator over all the underlying :class:`Specifier` instances - in this specifier set. - - >>> sorted(SpecifierSet(">=1.0.0,!=1.0.1"), key=str) - [, =1.0.0')>] - """ + def __iter__(self) -> Iterator[_IndividualSpecifier]: return iter(self._specs) + @property + def prereleases(self) -> Optional[bool]: + + # If we have been given an explicit prerelease modifier, then we'll + # pass that through here. + if self._prereleases is not None: + return self._prereleases + + # If we don't have any specifiers, and we don't have a forced value, + # then we'll just return None since we don't know if this should have + # pre-releases or not. + if not self._specs: + return None + + # Otherwise we'll see if any of the given specifiers accept + # prereleases, if any of them do we'll return True, otherwise False. + return any(s.prereleases for s in self._specs) + + @prereleases.setter + def prereleases(self, value: bool) -> None: + self._prereleases = value + def __contains__(self, item: UnparsedVersion) -> bool: - """Return whether or not the item is contained in this specifier. - - :param item: The item to check for. - - This is used for the ``in`` operator and behaves the same as - :meth:`contains` with no ``prereleases`` argument passed. - - >>> "1.2.3" in SpecifierSet(">=1.0.0,!=1.0.1") - True - >>> Version("1.2.3") in SpecifierSet(">=1.0.0,!=1.0.1") - True - >>> "1.0.1" in SpecifierSet(">=1.0.0,!=1.0.1") - False - >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1") - False - >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True) - True - """ return self.contains(item) def contains( - self, - item: UnparsedVersion, - prereleases: bool | None = None, - installed: bool | None = None, + self, item: UnparsedVersion, prereleases: Optional[bool] = None ) -> bool: - """Return whether or not the item is contained in this SpecifierSet. - :param item: - The item to check for, which can be a version string or a - :class:`Version` instance. - :param prereleases: - Whether or not to match prereleases with this SpecifierSet. If set to - ``None`` (the default), it uses :attr:`prereleases` to determine - whether or not prereleases are allowed. - - >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.2.3") - True - >>> SpecifierSet(">=1.0.0,!=1.0.1").contains(Version("1.2.3")) - True - >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.0.1") - False - >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1") - False - >>> SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True).contains("1.3.0a1") - True - >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1", prereleases=True) - True - """ - # Ensure that our item is a Version instance. - if not isinstance(item, Version): - item = Version(item) + # Ensure that our item is a Version or LegacyVersion instance. + if not isinstance(item, (LegacyVersion, Version)): + item = parse(item) # Determine if we're forcing a prerelease or not, if we're not forcing # one for this particular filter call, then we'll use whatever the @@ -931,9 +742,6 @@ class SpecifierSet(BaseSpecifier): if not prereleases and item.is_prerelease: return False - if installed and item.is_prerelease: - item = Version(item.base_version) - # We simply dispatch to the underlying specs here to make sure that the # given version is contained within all of them. # Note: This use of all() here means that an empty set of specifiers @@ -941,46 +749,9 @@ class SpecifierSet(BaseSpecifier): return all(s.contains(item, prereleases=prereleases) for s in self._specs) def filter( - self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None - ) -> Iterator[UnparsedVersionVar]: - """Filter items in the given iterable, that match the specifiers in this set. + self, iterable: Iterable[VersionTypeVar], prereleases: Optional[bool] = None + ) -> Iterable[VersionTypeVar]: - :param iterable: - An iterable that can contain version strings and :class:`Version` instances. - The items in the iterable will be filtered according to the specifier. - :param prereleases: - Whether or not to allow prereleases in the returned iterator. If set to - ``None`` (the default), it will be intelligently decide whether to allow - prereleases or not (based on the :attr:`prereleases` attribute, and - whether the only versions matching are prereleases). - - This method is smarter than just ``filter(SpecifierSet(...).contains, [...])`` - because it implements the rule from :pep:`440` that a prerelease item - SHOULD be accepted if no other versions match the given specifier. - - >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", "1.5a1"])) - ['1.3'] - >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", Version("1.4")])) - ['1.3', ] - >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.5a1"])) - [] - >>> list(SpecifierSet(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True)) - ['1.3', '1.5a1'] - >>> list(SpecifierSet(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"])) - ['1.3', '1.5a1'] - - An "empty" SpecifierSet will filter items based on the presence of prerelease - versions in the set. - - >>> list(SpecifierSet("").filter(["1.3", "1.5a1"])) - ['1.3'] - >>> list(SpecifierSet("").filter(["1.5a1"])) - ['1.5a1'] - >>> list(SpecifierSet("", prereleases=True).filter(["1.3", "1.5a1"])) - ['1.3', '1.5a1'] - >>> list(SpecifierSet("").filter(["1.3", "1.5a1"], prereleases=True)) - ['1.3', '1.5a1'] - """ # Determine if we're forcing a prerelease or not, if we're not forcing # one for this particular filter call, then we'll use whatever the # SpecifierSet thinks for whether or not we should support prereleases. @@ -993,16 +764,27 @@ class SpecifierSet(BaseSpecifier): if self._specs: for spec in self._specs: iterable = spec.filter(iterable, prereleases=bool(prereleases)) - return iter(iterable) + return iterable # If we do not have any specifiers, then we need to have a rough filter # which will filter out any pre-releases, unless there are no final - # releases. + # releases, and which will filter out LegacyVersion in general. else: - filtered: list[UnparsedVersionVar] = [] - found_prereleases: list[UnparsedVersionVar] = [] + filtered: List[VersionTypeVar] = [] + found_prereleases: List[VersionTypeVar] = [] + + item: UnparsedVersion + parsed_version: Union[Version, LegacyVersion] for item in iterable: - parsed_version = _coerce_version(item) + # Ensure that we some kind of Version class for this item. + if not isinstance(item, (LegacyVersion, Version)): + parsed_version = parse(item) + else: + parsed_version = item + + # Filter out any item which is parsed as a LegacyVersion + if isinstance(parsed_version, LegacyVersion): + continue # Store any item which is a pre-release for later unless we've # already found a final version or we are accepting prereleases @@ -1015,6 +797,6 @@ class SpecifierSet(BaseSpecifier): # If we've found no items except for pre-releases, then we'll go # ahead and use the pre-releases if not filtered and found_prereleases and prereleases is None: - return iter(found_prereleases) + return found_prereleases - return iter(filtered) + return filtered diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/tags.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/tags.py index f590340..9a3d25a 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/tags.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/tags.py @@ -2,21 +2,21 @@ # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -from __future__ import annotations - import logging import platform -import re -import struct -import subprocess import sys import sysconfig from importlib.machinery import EXTENSION_SUFFIXES from typing import ( + Dict, + FrozenSet, Iterable, Iterator, + List, + Optional, Sequence, Tuple, + Union, cast, ) @@ -25,9 +25,9 @@ from . import _manylinux, _musllinux logger = logging.getLogger(__name__) PythonVersion = Sequence[int] -AppleVersion = Tuple[int, int] +MacVersion = Tuple[int, int] -INTERPRETER_SHORT_NAMES: dict[str, str] = { +INTERPRETER_SHORT_NAMES: Dict[str, str] = { "python": "py", # Generic. "cpython": "cp", "pypy": "pp", @@ -36,7 +36,7 @@ INTERPRETER_SHORT_NAMES: dict[str, str] = { } -_32_BIT_INTERPRETER = struct.calcsize("P") == 4 +_32_BIT_INTERPRETER = sys.maxsize <= 2 ** 32 class Tag: @@ -47,7 +47,7 @@ class Tag: is also supported. """ - __slots__ = ["_abi", "_hash", "_interpreter", "_platform"] + __slots__ = ["_interpreter", "_abi", "_platform", "_hash"] def __init__(self, interpreter: str, abi: str, platform: str) -> None: self._interpreter = interpreter.lower() @@ -93,7 +93,7 @@ class Tag: return f"<{self} @ {id(self)}>" -def parse_tag(tag: str) -> frozenset[Tag]: +def parse_tag(tag: str) -> FrozenSet[Tag]: """ Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances. @@ -109,8 +109,8 @@ def parse_tag(tag: str) -> frozenset[Tag]: return frozenset(tags) -def _get_config_var(name: str, warn: bool = False) -> int | str | None: - value: int | str | None = sysconfig.get_config_var(name) +def _get_config_var(name: str, warn: bool = False) -> Union[int, str, None]: + value = sysconfig.get_config_var(name) if value is None and warn: logger.debug( "Config variable '%s' is unset, Python ABI tag may be incorrect", name @@ -119,40 +119,23 @@ def _get_config_var(name: str, warn: bool = False) -> int | str | None: def _normalize_string(string: str) -> str: - return string.replace(".", "_").replace("-", "_").replace(" ", "_") + return string.replace(".", "_").replace("-", "_") -def _is_threaded_cpython(abis: list[str]) -> bool: - """ - Determine if the ABI corresponds to a threaded (`--disable-gil`) build. - - The threaded builds are indicated by a "t" in the abiflags. - """ - if len(abis) == 0: - return False - # expect e.g., cp313 - m = re.match(r"cp\d+(.*)", abis[0]) - if not m: - return False - abiflags = m.group(1) - return "t" in abiflags - - -def _abi3_applies(python_version: PythonVersion, threading: bool) -> bool: +def _abi3_applies(python_version: PythonVersion) -> bool: """ Determine if the Python version supports abi3. - PEP 384 was first implemented in Python 3.2. The threaded (`--disable-gil`) - builds do not support abi3. + PEP 384 was first implemented in Python 3.2. """ - return len(python_version) > 1 and tuple(python_version) >= (3, 2) and not threading + return len(python_version) > 1 and tuple(python_version) >= (3, 2) -def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> list[str]: +def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]: py_version = tuple(py_version) # To allow for version comparison. abis = [] version = _version_nodot(py_version[:2]) - threading = debug = pymalloc = ucs4 = "" + debug = pymalloc = ucs4 = "" with_debug = _get_config_var("Py_DEBUG", warn) has_refcount = hasattr(sys, "gettotalrefcount") # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled @@ -161,8 +144,6 @@ def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> list[str]: has_ext = "_d.pyd" in EXTENSION_SUFFIXES if with_debug or (with_debug is None and (has_refcount or has_ext)): debug = "d" - if py_version >= (3, 13) and _get_config_var("Py_GIL_DISABLED", warn): - threading = "t" if py_version < (3, 8): with_pymalloc = _get_config_var("WITH_PYMALLOC", warn) if with_pymalloc or with_pymalloc is None: @@ -176,15 +157,20 @@ def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> list[str]: elif debug: # Debug builds can also load "normal" extension modules. # We can also assume no UCS-4 or pymalloc requirement. - abis.append(f"cp{version}{threading}") - abis.insert(0, f"cp{version}{threading}{debug}{pymalloc}{ucs4}") + abis.append(f"cp{version}") + abis.insert( + 0, + "cp{version}{debug}{pymalloc}{ucs4}".format( + version=version, debug=debug, pymalloc=pymalloc, ucs4=ucs4 + ), + ) return abis def cpython_tags( - python_version: PythonVersion | None = None, - abis: Iterable[str] | None = None, - platforms: Iterable[str] | None = None, + python_version: Optional[PythonVersion] = None, + abis: Optional[Iterable[str]] = None, + platforms: Optional[Iterable[str]] = None, *, warn: bool = False, ) -> Iterator[Tag]: @@ -225,66 +211,29 @@ def cpython_tags( for abi in abis: for platform_ in platforms: yield Tag(interpreter, abi, platform_) - - threading = _is_threaded_cpython(abis) - use_abi3 = _abi3_applies(python_version, threading) - if use_abi3: + if _abi3_applies(python_version): yield from (Tag(interpreter, "abi3", platform_) for platform_ in platforms) yield from (Tag(interpreter, "none", platform_) for platform_ in platforms) - if use_abi3: + if _abi3_applies(python_version): for minor_version in range(python_version[1] - 1, 1, -1): for platform_ in platforms: - version = _version_nodot((python_version[0], minor_version)) - interpreter = f"cp{version}" + interpreter = "cp{version}".format( + version=_version_nodot((python_version[0], minor_version)) + ) yield Tag(interpreter, "abi3", platform_) -def _generic_abi() -> list[str]: - """ - Return the ABI tag based on EXT_SUFFIX. - """ - # The following are examples of `EXT_SUFFIX`. - # We want to keep the parts which are related to the ABI and remove the - # parts which are related to the platform: - # - linux: '.cpython-310-x86_64-linux-gnu.so' => cp310 - # - mac: '.cpython-310-darwin.so' => cp310 - # - win: '.cp310-win_amd64.pyd' => cp310 - # - win: '.pyd' => cp37 (uses _cpython_abis()) - # - pypy: '.pypy38-pp73-x86_64-linux-gnu.so' => pypy38_pp73 - # - graalpy: '.graalpy-38-native-x86_64-darwin.dylib' - # => graalpy_38_native - - ext_suffix = _get_config_var("EXT_SUFFIX", warn=True) - if not isinstance(ext_suffix, str) or ext_suffix[0] != ".": - raise SystemError("invalid sysconfig.get_config_var('EXT_SUFFIX')") - parts = ext_suffix.split(".") - if len(parts) < 3: - # CPython3.7 and earlier uses ".pyd" on Windows. - return _cpython_abis(sys.version_info[:2]) - soabi = parts[1] - if soabi.startswith("cpython"): - # non-windows - abi = "cp" + soabi.split("-")[1] - elif soabi.startswith("cp"): - # windows - abi = soabi.split("-")[0] - elif soabi.startswith("pypy"): - abi = "-".join(soabi.split("-")[:2]) - elif soabi.startswith("graalpy"): - abi = "-".join(soabi.split("-")[:3]) - elif soabi: - # pyston, ironpython, others? - abi = soabi - else: - return [] - return [_normalize_string(abi)] +def _generic_abi() -> Iterator[str]: + abi = sysconfig.get_config_var("SOABI") + if abi: + yield _normalize_string(abi) def generic_tags( - interpreter: str | None = None, - abis: Iterable[str] | None = None, - platforms: Iterable[str] | None = None, + interpreter: Optional[str] = None, + abis: Optional[Iterable[str]] = None, + platforms: Optional[Iterable[str]] = None, *, warn: bool = False, ) -> Iterator[Tag]: @@ -302,9 +251,8 @@ def generic_tags( interpreter = "".join([interp_name, interp_version]) if abis is None: abis = _generic_abi() - else: - abis = list(abis) platforms = list(platforms or platform_tags()) + abis = list(abis) if "none" not in abis: abis.append("none") for abi in abis: @@ -328,9 +276,9 @@ def _py_interpreter_range(py_version: PythonVersion) -> Iterator[str]: def compatible_tags( - python_version: PythonVersion | None = None, - interpreter: str | None = None, - platforms: Iterable[str] | None = None, + python_version: Optional[PythonVersion] = None, + interpreter: Optional[str] = None, + platforms: Optional[Iterable[str]] = None, ) -> Iterator[Tag]: """ Yields the sequence of tags that are compatible with a specific version of Python. @@ -362,7 +310,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str: return "i386" -def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]: +def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> List[str]: formats = [cpu_arch] if cpu_arch == "x86_64": if version < (10, 4): @@ -395,7 +343,7 @@ def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]: def mac_platforms( - version: AppleVersion | None = None, arch: str | None = None + version: Optional[MacVersion] = None, arch: Optional[str] = None ) -> Iterator[str]: """ Yields the platform tags for a macOS system. @@ -407,23 +355,7 @@ def mac_platforms( """ version_str, _, cpu_arch = platform.mac_ver() if version is None: - version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2]))) - if version == (10, 16): - # When built against an older macOS SDK, Python will report macOS 10.16 - # instead of the real version. - version_str = subprocess.run( - [ - sys.executable, - "-sS", - "-c", - "import platform; print(platform.mac_ver()[0])", - ], - check=True, - env={"SYSTEM_VERSION_COMPAT": "0"}, - stdout=subprocess.PIPE, - text=True, - ).stdout - version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2]))) + version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2]))) else: version = version if arch is None: @@ -434,22 +366,24 @@ def mac_platforms( if (10, 0) <= version and version < (11, 0): # Prior to Mac OS 11, each yearly release of Mac OS bumped the # "minor" version number. The major version was always 10. - major_version = 10 for minor_version in range(version[1], -1, -1): - compat_version = major_version, minor_version + compat_version = 10, minor_version binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_{major_version}_{minor_version}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=10, minor=minor_version, binary_format=binary_format + ) if version >= (11, 0): # Starting with Mac OS 11, each yearly release bumps the major version # number. The minor versions are now the midyear updates. - minor_version = 0 for major_version in range(version[0], 10, -1): - compat_version = major_version, minor_version + compat_version = major_version, 0 binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_{major_version}_{minor_version}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=major_version, minor=0, binary_format=binary_format + ) if version >= (11, 0): # Mac OS 11 on x86_64 is compatible with binaries from previous releases. @@ -459,94 +393,38 @@ def mac_platforms( # However, the "universal2" binary format can have a # macOS version earlier than 11.0 when the x86_64 part of the binary supports # that version of macOS. - major_version = 10 if arch == "x86_64": for minor_version in range(16, 3, -1): - compat_version = major_version, minor_version + compat_version = 10, minor_version binary_formats = _mac_binary_formats(compat_version, arch) for binary_format in binary_formats: - yield f"macosx_{major_version}_{minor_version}_{binary_format}" + yield "macosx_{major}_{minor}_{binary_format}".format( + major=compat_version[0], + minor=compat_version[1], + binary_format=binary_format, + ) else: for minor_version in range(16, 3, -1): - compat_version = major_version, minor_version + compat_version = 10, minor_version binary_format = "universal2" - yield f"macosx_{major_version}_{minor_version}_{binary_format}" - - -def ios_platforms( - version: AppleVersion | None = None, multiarch: str | None = None -) -> Iterator[str]: - """ - Yields the platform tags for an iOS system. - - :param version: A two-item tuple specifying the iOS version to generate - platform tags for. Defaults to the current iOS version. - :param multiarch: The CPU architecture+ABI to generate platform tags for - - (the value used by `sys.implementation._multiarch` e.g., - `arm64_iphoneos` or `x84_64_iphonesimulator`). Defaults to the current - multiarch value. - """ - if version is None: - # if iOS is the current platform, ios_ver *must* be defined. However, - # it won't exist for CPython versions before 3.13, which causes a mypy - # error. - _, release, _, _ = platform.ios_ver() # type: ignore[attr-defined, unused-ignore] - version = cast("AppleVersion", tuple(map(int, release.split(".")[:2]))) - - if multiarch is None: - multiarch = sys.implementation._multiarch - multiarch = multiarch.replace("-", "_") - - ios_platform_template = "ios_{major}_{minor}_{multiarch}" - - # Consider any iOS major.minor version from the version requested, down to - # 12.0. 12.0 is the first iOS version that is known to have enough features - # to support CPython. Consider every possible minor release up to X.9. There - # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra - # candidates that won't ever match doesn't really hurt, and it saves us from - # having to keep an explicit list of known iOS versions in the code. Return - # the results descending order of version number. - - # If the requested major version is less than 12, there won't be any matches. - if version[0] < 12: - return - - # Consider the actual X.Y version that was requested. - yield ios_platform_template.format( - major=version[0], minor=version[1], multiarch=multiarch - ) - - # Consider every minor version from X.0 to the minor version prior to the - # version requested by the platform. - for minor in range(version[1] - 1, -1, -1): - yield ios_platform_template.format( - major=version[0], minor=minor, multiarch=multiarch - ) - - for major in range(version[0] - 1, 11, -1): - for minor in range(9, -1, -1): - yield ios_platform_template.format( - major=major, minor=minor, multiarch=multiarch - ) + yield "macosx_{major}_{minor}_{binary_format}".format( + major=compat_version[0], + minor=compat_version[1], + binary_format=binary_format, + ) def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]: linux = _normalize_string(sysconfig.get_platform()) - if not linux.startswith("linux_"): - # we should never be here, just yield the sysconfig one and return - yield linux - return if is_32bit: if linux == "linux_x86_64": linux = "linux_i686" elif linux == "linux_aarch64": - linux = "linux_armv8l" + linux = "linux_armv7l" _, arch = linux.split("_", 1) - archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch]) - yield from _manylinux.platform_tags(archs) - yield from _musllinux.platform_tags(archs) - for arch in archs: - yield f"linux_{arch}" + yield from _manylinux.platform_tags(linux, arch) + yield from _musllinux.platform_tags(arch) + yield linux def _generic_platforms() -> Iterator[str]: @@ -559,8 +437,6 @@ def platform_tags() -> Iterator[str]: """ if platform.system() == "Darwin": return mac_platforms() - elif platform.system() == "iOS": - return ios_platforms() elif platform.system() == "Linux": return _linux_platforms() else: @@ -570,9 +446,6 @@ def platform_tags() -> Iterator[str]: def interpreter_name() -> str: """ Returns the name of the running interpreter. - - Some implementations have a reserved, two-letter abbreviation which will - be returned when appropriate. """ name = sys.implementation.name return INTERPRETER_SHORT_NAMES.get(name) or name @@ -609,9 +482,6 @@ def sys_tags(*, warn: bool = False) -> Iterator[Tag]: yield from generic_tags() if interp_name == "pp": - interp = "pp3" - elif interp_name == "cp": - interp = "cp" + interpreter_version(warn=warn) + yield from compatible_tags(interpreter="pp3") else: - interp = None - yield from compatible_tags(interpreter=interp) + yield from compatible_tags() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/utils.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/utils.py index 2345095..bab11b8 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/utils.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/utils.py @@ -2,25 +2,16 @@ # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -from __future__ import annotations - -import functools import re -from typing import NewType, Tuple, Union, cast +from typing import FrozenSet, NewType, Tuple, Union, cast from .tags import Tag, parse_tag -from .version import InvalidVersion, Version, _TrimmedRelease +from .version import InvalidVersion, Version BuildTag = Union[Tuple[()], Tuple[int, str]] NormalizedName = NewType("NormalizedName", str) -class InvalidName(ValueError): - """ - An invalid distribution name; users should refer to the packaging user guide. - """ - - class InvalidWheelFilename(ValueError): """ An invalid wheel filename was found, users should refer to PEP 427. @@ -33,99 +24,88 @@ class InvalidSdistFilename(ValueError): """ -# Core metadata spec for `Name` -_validate_regex = re.compile( - r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE -) _canonicalize_regex = re.compile(r"[-_.]+") -_normalized_regex = re.compile(r"^([a-z0-9]|[a-z0-9]([a-z0-9-](?!--))*[a-z0-9])$") # PEP 427: The build number must start with a digit. _build_tag_regex = re.compile(r"(\d+)(.*)") -def canonicalize_name(name: str, *, validate: bool = False) -> NormalizedName: - if validate and not _validate_regex.match(name): - raise InvalidName(f"name is invalid: {name!r}") +def canonicalize_name(name: str) -> NormalizedName: # This is taken from PEP 503. value = _canonicalize_regex.sub("-", name).lower() return cast(NormalizedName, value) -def is_normalized_name(name: str) -> bool: - return _normalized_regex.match(name) is not None - - -@functools.singledispatch -def canonicalize_version( - version: Version | str, *, strip_trailing_zero: bool = True -) -> str: +def canonicalize_version(version: Union[Version, str]) -> str: """ - Return a canonical form of a version as a string. - - >>> canonicalize_version('1.0.1') - '1.0.1' - - Per PEP 625, versions may have multiple canonical forms, differing - only by trailing zeros. - - >>> canonicalize_version('1.0.0') - '1' - >>> canonicalize_version('1.0.0', strip_trailing_zero=False) - '1.0.0' - - Invalid versions are returned unaltered. - - >>> canonicalize_version('foo bar baz') - 'foo bar baz' + This is very similar to Version.__str__, but has one subtle difference + with the way it handles the release segment. """ - return str(_TrimmedRelease(str(version)) if strip_trailing_zero else version) + if isinstance(version, str): + try: + parsed = Version(version) + except InvalidVersion: + # Legacy versions cannot be normalized + return version + else: + parsed = version + parts = [] -@canonicalize_version.register -def _(version: str, *, strip_trailing_zero: bool = True) -> str: - try: - parsed = Version(version) - except InvalidVersion: - # Legacy versions cannot be normalized - return version - return canonicalize_version(parsed, strip_trailing_zero=strip_trailing_zero) + # Epoch + if parsed.epoch != 0: + parts.append(f"{parsed.epoch}!") + + # Release segment + # NB: This strips trailing '.0's to normalize + parts.append(re.sub(r"(\.0)+$", "", ".".join(str(x) for x in parsed.release))) + + # Pre-release + if parsed.pre is not None: + parts.append("".join(str(x) for x in parsed.pre)) + + # Post-release + if parsed.post is not None: + parts.append(f".post{parsed.post}") + + # Development release + if parsed.dev is not None: + parts.append(f".dev{parsed.dev}") + + # Local version segment + if parsed.local is not None: + parts.append(f"+{parsed.local}") + + return "".join(parts) def parse_wheel_filename( filename: str, -) -> tuple[NormalizedName, Version, BuildTag, frozenset[Tag]]: +) -> Tuple[NormalizedName, Version, BuildTag, FrozenSet[Tag]]: if not filename.endswith(".whl"): raise InvalidWheelFilename( - f"Invalid wheel filename (extension must be '.whl'): {filename!r}" + f"Invalid wheel filename (extension must be '.whl'): {filename}" ) filename = filename[:-4] dashes = filename.count("-") if dashes not in (4, 5): raise InvalidWheelFilename( - f"Invalid wheel filename (wrong number of parts): {filename!r}" + f"Invalid wheel filename (wrong number of parts): {filename}" ) parts = filename.split("-", dashes - 2) name_part = parts[0] - # See PEP 427 for the rules on escaping the project name. + # See PEP 427 for the rules on escaping the project name if "__" in name_part or re.match(r"^[\w\d._]*$", name_part, re.UNICODE) is None: - raise InvalidWheelFilename(f"Invalid project name: {filename!r}") + raise InvalidWheelFilename(f"Invalid project name: {filename}") name = canonicalize_name(name_part) - - try: - version = Version(parts[1]) - except InvalidVersion as e: - raise InvalidWheelFilename( - f"Invalid wheel filename (invalid version): {filename!r}" - ) from e - + version = Version(parts[1]) if dashes == 5: build_part = parts[2] build_match = _build_tag_regex.match(build_part) if build_match is None: raise InvalidWheelFilename( - f"Invalid build number: {build_part} in {filename!r}" + f"Invalid build number: {build_part} in '{filename}'" ) build = cast(BuildTag, (int(build_match.group(1)), build_match.group(2))) else: @@ -134,7 +114,7 @@ def parse_wheel_filename( return (name, version, build, tags) -def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]: +def parse_sdist_filename(filename: str) -> Tuple[NormalizedName, Version]: if filename.endswith(".tar.gz"): file_stem = filename[: -len(".tar.gz")] elif filename.endswith(".zip"): @@ -142,22 +122,15 @@ def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]: else: raise InvalidSdistFilename( f"Invalid sdist filename (extension must be '.tar.gz' or '.zip'):" - f" {filename!r}" + f" {filename}" ) # We are requiring a PEP 440 version, which cannot contain dashes, # so we split on the last dash. name_part, sep, version_part = file_stem.rpartition("-") if not sep: - raise InvalidSdistFilename(f"Invalid sdist filename: {filename!r}") + raise InvalidSdistFilename(f"Invalid sdist filename: {filename}") name = canonicalize_name(name_part) - - try: - version = Version(version_part) - except InvalidVersion as e: - raise InvalidSdistFilename( - f"Invalid sdist filename (invalid version): {filename!r}" - ) from e - + version = Version(version_part) return (name, version) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/version.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/version.py index c9bbda2..de9a09a 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/version.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/packaging/version.py @@ -1,73 +1,64 @@ # This file is dual licensed under the terms of the Apache License, Version # 2.0, and the BSD License. See the LICENSE file in the root of this repository # for complete details. -""" -.. testsetup:: - - from packaging.version import parse, Version -""" - -from __future__ import annotations +import collections import itertools import re -from typing import Any, Callable, NamedTuple, SupportsInt, Tuple, Union +import warnings +from typing import Callable, Iterator, List, Optional, SupportsInt, Tuple, Union from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType -__all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"] +__all__ = ["parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"] -LocalType = Tuple[Union[int, str], ...] - -CmpPrePostDevType = Union[InfinityType, NegativeInfinityType, Tuple[str, int]] -CmpLocalType = Union[ +InfiniteTypes = Union[InfinityType, NegativeInfinityType] +PrePostDevType = Union[InfiniteTypes, Tuple[str, int]] +SubLocalType = Union[InfiniteTypes, int, str] +LocalType = Union[ NegativeInfinityType, - Tuple[Union[Tuple[int, str], Tuple[NegativeInfinityType, Union[int, str]]], ...], + Tuple[ + Union[ + SubLocalType, + Tuple[SubLocalType, str], + Tuple[NegativeInfinityType, SubLocalType], + ], + ..., + ], ] CmpKey = Tuple[ - int, - Tuple[int, ...], - CmpPrePostDevType, - CmpPrePostDevType, - CmpPrePostDevType, - CmpLocalType, + int, Tuple[int, ...], PrePostDevType, PrePostDevType, PrePostDevType, LocalType ] -VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool] +LegacyCmpKey = Tuple[int, Tuple[str, ...]] +VersionComparisonMethod = Callable[ + [Union[CmpKey, LegacyCmpKey], Union[CmpKey, LegacyCmpKey]], bool +] + +_Version = collections.namedtuple( + "_Version", ["epoch", "release", "dev", "pre", "post", "local"] +) -class _Version(NamedTuple): - epoch: int - release: tuple[int, ...] - dev: tuple[str, int] | None - pre: tuple[str, int] | None - post: tuple[str, int] | None - local: LocalType | None - - -def parse(version: str) -> Version: - """Parse the given version string. - - >>> parse('1.0.dev1') - - - :param version: The version string to parse. - :raises InvalidVersion: When the version string is not a valid version. +def parse(version: str) -> Union["LegacyVersion", "Version"]: """ - return Version(version) + Parse the given version string and return either a :class:`Version` object + or a :class:`LegacyVersion` object depending on if the given version is + a valid PEP 440 version or a legacy version. + """ + try: + return Version(version) + except InvalidVersion: + return LegacyVersion(version) class InvalidVersion(ValueError): - """Raised when a version string is not a valid version. - - >>> Version("invalid") - Traceback (most recent call last): - ... - packaging.version.InvalidVersion: Invalid version: 'invalid' + """ + An invalid version was found, users should refer to PEP 440. """ class _BaseVersion: - _key: tuple[Any, ...] + _key: Union[CmpKey, LegacyCmpKey] def __hash__(self) -> int: return hash(self._key) @@ -75,13 +66,13 @@ class _BaseVersion: # Please keep the duplicated `isinstance` check # in the six comparisons hereunder # unless you find a way to avoid adding overhead function calls. - def __lt__(self, other: _BaseVersion) -> bool: + def __lt__(self, other: "_BaseVersion") -> bool: if not isinstance(other, _BaseVersion): return NotImplemented return self._key < other._key - def __le__(self, other: _BaseVersion) -> bool: + def __le__(self, other: "_BaseVersion") -> bool: if not isinstance(other, _BaseVersion): return NotImplemented @@ -93,13 +84,13 @@ class _BaseVersion: return self._key == other._key - def __ge__(self, other: _BaseVersion) -> bool: + def __ge__(self, other: "_BaseVersion") -> bool: if not isinstance(other, _BaseVersion): return NotImplemented return self._key >= other._key - def __gt__(self, other: _BaseVersion) -> bool: + def __gt__(self, other: "_BaseVersion") -> bool: if not isinstance(other, _BaseVersion): return NotImplemented @@ -112,16 +103,133 @@ class _BaseVersion: return self._key != other._key +class LegacyVersion(_BaseVersion): + def __init__(self, version: str) -> None: + self._version = str(version) + self._key = _legacy_cmpkey(self._version) + + warnings.warn( + "Creating a LegacyVersion has been deprecated and will be " + "removed in the next major release", + DeprecationWarning, + ) + + def __str__(self) -> str: + return self._version + + def __repr__(self) -> str: + return f"" + + @property + def public(self) -> str: + return self._version + + @property + def base_version(self) -> str: + return self._version + + @property + def epoch(self) -> int: + return -1 + + @property + def release(self) -> None: + return None + + @property + def pre(self) -> None: + return None + + @property + def post(self) -> None: + return None + + @property + def dev(self) -> None: + return None + + @property + def local(self) -> None: + return None + + @property + def is_prerelease(self) -> bool: + return False + + @property + def is_postrelease(self) -> bool: + return False + + @property + def is_devrelease(self) -> bool: + return False + + +_legacy_version_component_re = re.compile(r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE) + +_legacy_version_replacement_map = { + "pre": "c", + "preview": "c", + "-": "final-", + "rc": "c", + "dev": "@", +} + + +def _parse_version_parts(s: str) -> Iterator[str]: + for part in _legacy_version_component_re.split(s): + part = _legacy_version_replacement_map.get(part, part) + + if not part or part == ".": + continue + + if part[:1] in "0123456789": + # pad for numeric comparison + yield part.zfill(8) + else: + yield "*" + part + + # ensure that alpha/beta/candidate are before final + yield "*final" + + +def _legacy_cmpkey(version: str) -> LegacyCmpKey: + + # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch + # greater than or equal to 0. This will effectively put the LegacyVersion, + # which uses the defacto standard originally implemented by setuptools, + # as before all PEP 440 versions. + epoch = -1 + + # This scheme is taken from pkg_resources.parse_version setuptools prior to + # it's adoption of the packaging library. + parts: List[str] = [] + for part in _parse_version_parts(version.lower()): + if part.startswith("*"): + # remove "-" before a prerelease tag + if part < "*final": + while parts and parts[-1] == "*final-": + parts.pop() + + # remove trailing zeros from each series of numeric parts + while parts and parts[-1] == "00000000": + parts.pop() + + parts.append(part) + + return epoch, tuple(parts) + + # Deliberately not anchored to the start and end of the string, to make it # easier for 3rd party code to reuse -_VERSION_PATTERN = r""" +VERSION_PATTERN = r""" v? (?: (?:(?P[0-9]+)!)? # epoch (?P[0-9]+(?:\.[0-9]+)*) # release segment (?P
                                          # pre-release
             [-_\.]?
-            (?Palpha|a|beta|b|preview|pre|c|rc)
+            (?P(a|b|c|rc|alpha|beta|pre|preview))
             [-_\.]?
             (?P[0-9]+)?
         )?
@@ -145,61 +253,17 @@ _VERSION_PATTERN = r"""
     (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
 """
 
-VERSION_PATTERN = _VERSION_PATTERN
-"""
-A string containing the regular expression used to match a valid version.
-
-The pattern is not anchored at either end, and is intended for embedding in larger
-expressions (for example, matching a version number as part of a file name). The
-regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
-flags set.
-
-:meta hide-value:
-"""
-
 
 class Version(_BaseVersion):
-    """This class abstracts handling of a project's versions.
-
-    A :class:`Version` instance is comparison aware and can be compared and
-    sorted using the standard Python interfaces.
-
-    >>> v1 = Version("1.0a5")
-    >>> v2 = Version("1.0")
-    >>> v1
-    
-    >>> v2
-    
-    >>> v1 < v2
-    True
-    >>> v1 == v2
-    False
-    >>> v1 > v2
-    False
-    >>> v1 >= v2
-    False
-    >>> v1 <= v2
-    True
-    """
 
     _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
-    _key: CmpKey
 
     def __init__(self, version: str) -> None:
-        """Initialize a Version object.
-
-        :param version:
-            The string representation of a version which will be parsed and normalized
-            before use.
-        :raises InvalidVersion:
-            If the ``version`` does not conform to PEP 440 in any way then this
-            exception will be raised.
-        """
 
         # Validate the version and parse it into pieces
         match = self._regex.search(version)
         if not match:
-            raise InvalidVersion(f"Invalid version: {version!r}")
+            raise InvalidVersion(f"Invalid version: '{version}'")
 
         # Store the parsed out pieces of the version
         self._version = _Version(
@@ -224,19 +288,9 @@ class Version(_BaseVersion):
         )
 
     def __repr__(self) -> str:
-        """A representation of the Version that shows all internal state.
-
-        >>> Version('1.0.0')
-        
-        """
         return f""
 
     def __str__(self) -> str:
-        """A string representation of the version that can be round-tripped.
-
-        >>> str(Version("1.0a5"))
-        '1.0a5'
-        """
         parts = []
 
         # Epoch
@@ -266,77 +320,29 @@ class Version(_BaseVersion):
 
     @property
     def epoch(self) -> int:
-        """The epoch of the version.
-
-        >>> Version("2.0.0").epoch
-        0
-        >>> Version("1!2.0.0").epoch
-        1
-        """
-        return self._version.epoch
+        _epoch: int = self._version.epoch
+        return _epoch
 
     @property
-    def release(self) -> tuple[int, ...]:
-        """The components of the "release" segment of the version.
-
-        >>> Version("1.2.3").release
-        (1, 2, 3)
-        >>> Version("2.0.0").release
-        (2, 0, 0)
-        >>> Version("1!2.0.0.post0").release
-        (2, 0, 0)
-
-        Includes trailing zeroes but not the epoch or any pre-release / development /
-        post-release suffixes.
-        """
-        return self._version.release
+    def release(self) -> Tuple[int, ...]:
+        _release: Tuple[int, ...] = self._version.release
+        return _release
 
     @property
-    def pre(self) -> tuple[str, int] | None:
-        """The pre-release segment of the version.
-
-        >>> print(Version("1.2.3").pre)
-        None
-        >>> Version("1.2.3a1").pre
-        ('a', 1)
-        >>> Version("1.2.3b1").pre
-        ('b', 1)
-        >>> Version("1.2.3rc1").pre
-        ('rc', 1)
-        """
-        return self._version.pre
+    def pre(self) -> Optional[Tuple[str, int]]:
+        _pre: Optional[Tuple[str, int]] = self._version.pre
+        return _pre
 
     @property
-    def post(self) -> int | None:
-        """The post-release number of the version.
-
-        >>> print(Version("1.2.3").post)
-        None
-        >>> Version("1.2.3.post1").post
-        1
-        """
+    def post(self) -> Optional[int]:
         return self._version.post[1] if self._version.post else None
 
     @property
-    def dev(self) -> int | None:
-        """The development number of the version.
-
-        >>> print(Version("1.2.3").dev)
-        None
-        >>> Version("1.2.3.dev1").dev
-        1
-        """
+    def dev(self) -> Optional[int]:
         return self._version.dev[1] if self._version.dev else None
 
     @property
-    def local(self) -> str | None:
-        """The local version segment of the version.
-
-        >>> print(Version("1.2.3").local)
-        None
-        >>> Version("1.2.3+abc").local
-        'abc'
-        """
+    def local(self) -> Optional[str]:
         if self._version.local:
             return ".".join(str(x) for x in self._version.local)
         else:
@@ -344,31 +350,10 @@ class Version(_BaseVersion):
 
     @property
     def public(self) -> str:
-        """The public portion of the version.
-
-        >>> Version("1.2.3").public
-        '1.2.3'
-        >>> Version("1.2.3+abc").public
-        '1.2.3'
-        >>> Version("1!1.2.3dev1+abc").public
-        '1!1.2.3.dev1'
-        """
         return str(self).split("+", 1)[0]
 
     @property
     def base_version(self) -> str:
-        """The "base version" of the version.
-
-        >>> Version("1.2.3").base_version
-        '1.2.3'
-        >>> Version("1.2.3+abc").base_version
-        '1.2.3'
-        >>> Version("1!1.2.3dev1+abc").base_version
-        '1!1.2.3'
-
-        The "base version" is the public version of the project without any pre or post
-        release markers.
-        """
         parts = []
 
         # Epoch
@@ -382,95 +367,33 @@ class Version(_BaseVersion):
 
     @property
     def is_prerelease(self) -> bool:
-        """Whether this version is a pre-release.
-
-        >>> Version("1.2.3").is_prerelease
-        False
-        >>> Version("1.2.3a1").is_prerelease
-        True
-        >>> Version("1.2.3b1").is_prerelease
-        True
-        >>> Version("1.2.3rc1").is_prerelease
-        True
-        >>> Version("1.2.3dev1").is_prerelease
-        True
-        """
         return self.dev is not None or self.pre is not None
 
     @property
     def is_postrelease(self) -> bool:
-        """Whether this version is a post-release.
-
-        >>> Version("1.2.3").is_postrelease
-        False
-        >>> Version("1.2.3.post1").is_postrelease
-        True
-        """
         return self.post is not None
 
     @property
     def is_devrelease(self) -> bool:
-        """Whether this version is a development release.
-
-        >>> Version("1.2.3").is_devrelease
-        False
-        >>> Version("1.2.3.dev1").is_devrelease
-        True
-        """
         return self.dev is not None
 
     @property
     def major(self) -> int:
-        """The first item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").major
-        1
-        """
         return self.release[0] if len(self.release) >= 1 else 0
 
     @property
     def minor(self) -> int:
-        """The second item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").minor
-        2
-        >>> Version("1").minor
-        0
-        """
         return self.release[1] if len(self.release) >= 2 else 0
 
     @property
     def micro(self) -> int:
-        """The third item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").micro
-        3
-        >>> Version("1").micro
-        0
-        """
         return self.release[2] if len(self.release) >= 3 else 0
 
 
-class _TrimmedRelease(Version):
-    @property
-    def release(self) -> tuple[int, ...]:
-        """
-        Release segment without any trailing zeros.
-
-        >>> _TrimmedRelease('1.0.0').release
-        (1,)
-        >>> _TrimmedRelease('0.0').release
-        (0,)
-        """
-        rel = super().release
-        nonzeros = (index for index, val in enumerate(rel) if val)
-        last_nonzero = max(nonzeros, default=0)
-        return rel[: last_nonzero + 1]
-
-
 def _parse_letter_version(
-    letter: str | None, number: str | bytes | SupportsInt | None
-) -> tuple[str, int] | None:
+    letter: str, number: Union[str, bytes, SupportsInt]
+) -> Optional[Tuple[str, int]]:
+
     if letter:
         # We consider there to be an implicit 0 in a pre-release if there is
         # not a numeral associated with it.
@@ -493,9 +416,7 @@ def _parse_letter_version(
             letter = "post"
 
         return letter, int(number)
-
-    assert not letter
-    if number:
+    if not letter and number:
         # We assume if we are given a number, but we are not given a letter
         # then this is using the implicit post release syntax (e.g. 1.0-1)
         letter = "post"
@@ -508,7 +429,7 @@ def _parse_letter_version(
 _local_version_separators = re.compile(r"[\._-]")
 
 
-def _parse_local_version(local: str | None) -> LocalType | None:
+def _parse_local_version(local: str) -> Optional[LocalType]:
     """
     Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
     """
@@ -522,12 +443,13 @@ def _parse_local_version(local: str | None) -> LocalType | None:
 
 def _cmpkey(
     epoch: int,
-    release: tuple[int, ...],
-    pre: tuple[str, int] | None,
-    post: tuple[str, int] | None,
-    dev: tuple[str, int] | None,
-    local: LocalType | None,
+    release: Tuple[int, ...],
+    pre: Optional[Tuple[str, int]],
+    post: Optional[Tuple[str, int]],
+    dev: Optional[Tuple[str, int]],
+    local: Optional[Tuple[SubLocalType]],
 ) -> CmpKey:
+
     # When we compare a release version, we want to compare it with all of the
     # trailing zeros removed. So we'll use a reverse the list, drop all the now
     # leading zeros until we come to something non zero, then take the rest
@@ -542,7 +464,7 @@ def _cmpkey(
     # if there is not a pre or a post segment. If we have one of those then
     # the normal sorting rules will handle this case correctly.
     if pre is None and post is None and dev is not None:
-        _pre: CmpPrePostDevType = NegativeInfinity
+        _pre: PrePostDevType = NegativeInfinity
     # Versions without a pre-release (except as noted above) should sort after
     # those with one.
     elif pre is None:
@@ -552,21 +474,21 @@ def _cmpkey(
 
     # Versions without a post segment should sort before those with one.
     if post is None:
-        _post: CmpPrePostDevType = NegativeInfinity
+        _post: PrePostDevType = NegativeInfinity
 
     else:
         _post = post
 
     # Versions without a development segment should sort after those with one.
     if dev is None:
-        _dev: CmpPrePostDevType = Infinity
+        _dev: PrePostDevType = Infinity
 
     else:
         _dev = dev
 
     if local is None:
         # Versions without a local segment should sort before those with one.
-        _local: CmpLocalType = NegativeInfinity
+        _local: LocalType = NegativeInfinity
     else:
         # Versions with a local segment need that segment parsed to implement
         # the sorting rules in PEP440.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/METADATA
deleted file mode 100644
index ab51ef3..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/METADATA
+++ /dev/null
@@ -1,319 +0,0 @@
-Metadata-Version: 2.3
-Name: platformdirs
-Version: 4.2.2
-Summary: A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`.
-Project-URL: Documentation, https://platformdirs.readthedocs.io
-Project-URL: Homepage, https://github.com/platformdirs/platformdirs
-Project-URL: Source, https://github.com/platformdirs/platformdirs
-Project-URL: Tracker, https://github.com/platformdirs/platformdirs/issues
-Maintainer-email: Bernát Gábor , Julian Berman , Ofek Lev , Ronny Pfannschmidt 
-License-Expression: MIT
-License-File: LICENSE
-Keywords: appdirs,application,cache,directory,log,user
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
-Provides-Extra: docs
-Requires-Dist: furo>=2023.9.10; extra == 'docs'
-Requires-Dist: proselint>=0.13; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints>=1.25.2; extra == 'docs'
-Requires-Dist: sphinx>=7.2.6; extra == 'docs'
-Provides-Extra: test
-Requires-Dist: appdirs==1.4.4; extra == 'test'
-Requires-Dist: covdefaults>=2.3; extra == 'test'
-Requires-Dist: pytest-cov>=4.1; extra == 'test'
-Requires-Dist: pytest-mock>=3.12; extra == 'test'
-Requires-Dist: pytest>=7.4.3; extra == 'test'
-Provides-Extra: type
-Requires-Dist: mypy>=1.8; extra == 'type'
-Description-Content-Type: text/x-rst
-
-The problem
-===========
-
-.. image:: https://github.com/platformdirs/platformdirs/actions/workflows/check.yml/badge.svg
-   :target: https://github.com/platformdirs/platformdirs/actions
-
-When writing desktop application, finding the right location to store user data
-and configuration varies per platform. Even for single-platform apps, there
-may by plenty of nuances in figuring out the right location.
-
-For example, if running on macOS, you should use::
-
-    ~/Library/Application Support/
-
-If on Windows (at least English Win) that should be::
-
-    C:\Documents and Settings\\Application Data\Local Settings\\
-
-or possibly::
-
-    C:\Documents and Settings\\Application Data\\
-
-for `roaming profiles `_ but that is another story.
-
-On Linux (and other Unices), according to the `XDG Basedir Spec`_, it should be::
-
-    ~/.local/share/
-
-.. _XDG Basedir Spec: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-``platformdirs`` to the rescue
-==============================
-
-This kind of thing is what the ``platformdirs`` package is for.
-``platformdirs`` will help you choose an appropriate:
-
-- user data dir (``user_data_dir``)
-- user config dir (``user_config_dir``)
-- user cache dir (``user_cache_dir``)
-- site data dir (``site_data_dir``)
-- site config dir (``site_config_dir``)
-- user log dir (``user_log_dir``)
-- user documents dir (``user_documents_dir``)
-- user downloads dir (``user_downloads_dir``)
-- user pictures dir (``user_pictures_dir``)
-- user videos dir (``user_videos_dir``)
-- user music dir (``user_music_dir``)
-- user desktop dir (``user_desktop_dir``)
-- user runtime dir (``user_runtime_dir``)
-
-And also:
-
-- Is slightly opinionated on the directory names used. Look for "OPINION" in
-  documentation and code for when an opinion is being applied.
-
-Example output
-==============
-
-On macOS:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/Users/trentm/Library/Application Support/SuperApp'
-    >>> site_data_dir(appname, appauthor)
-    '/Library/Application Support/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/Users/trentm/Library/Caches/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/Users/trentm/Library/Logs/SuperApp'
-    >>> user_documents_dir()
-    '/Users/trentm/Documents'
-    >>> user_downloads_dir()
-    '/Users/trentm/Downloads'
-    >>> user_pictures_dir()
-    '/Users/trentm/Pictures'
-    >>> user_videos_dir()
-    '/Users/trentm/Movies'
-    >>> user_music_dir()
-    '/Users/trentm/Music'
-    >>> user_desktop_dir()
-    '/Users/trentm/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp'
-
-On Windows:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp'
-    >>> user_data_dir(appname, appauthor, roaming=True)
-    'C:\\Users\\trentm\\AppData\\Roaming\\Acme\\SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Cache'
-    >>> user_log_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Logs'
-    >>> user_documents_dir()
-    'C:\\Users\\trentm\\Documents'
-    >>> user_downloads_dir()
-    'C:\\Users\\trentm\\Downloads'
-    >>> user_pictures_dir()
-    'C:\\Users\\trentm\\Pictures'
-    >>> user_videos_dir()
-    'C:\\Users\\trentm\\Videos'
-    >>> user_music_dir()
-    'C:\\Users\\trentm\\Music'
-    >>> user_desktop_dir()
-    'C:\\Users\\trentm\\Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Temp\\Acme\\SuperApp'
-
-On Linux:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/home/trentm/.local/share/SuperApp'
-    >>> site_data_dir(appname, appauthor)
-    '/usr/local/share/SuperApp'
-    >>> site_data_dir(appname, appauthor, multipath=True)
-    '/usr/local/share/SuperApp:/usr/share/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/home/trentm/.cache/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/home/trentm/.local/state/SuperApp/log'
-    >>> user_config_dir(appname)
-    '/home/trentm/.config/SuperApp'
-    >>> user_documents_dir()
-    '/home/trentm/Documents'
-    >>> user_downloads_dir()
-    '/home/trentm/Downloads'
-    >>> user_pictures_dir()
-    '/home/trentm/Pictures'
-    >>> user_videos_dir()
-    '/home/trentm/Videos'
-    >>> user_music_dir()
-    '/home/trentm/Music'
-    >>> user_desktop_dir()
-    '/home/trentm/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/run/user/{os.getuid()}/SuperApp'
-    >>> site_config_dir(appname)
-    '/etc/xdg/SuperApp'
-    >>> os.environ["XDG_CONFIG_DIRS"] = "/etc:/usr/local/etc"
-    >>> site_config_dir(appname, multipath=True)
-    '/etc/SuperApp:/usr/local/etc/SuperApp'
-
-On Android::
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/data/data/com.myApp/files/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp/log'
-    >>> user_config_dir(appname)
-    '/data/data/com.myApp/shared_prefs/SuperApp'
-    >>> user_documents_dir()
-    '/storage/emulated/0/Documents'
-    >>> user_downloads_dir()
-    '/storage/emulated/0/Downloads'
-    >>> user_pictures_dir()
-    '/storage/emulated/0/Pictures'
-    >>> user_videos_dir()
-    '/storage/emulated/0/DCIM/Camera'
-    >>> user_music_dir()
-    '/storage/emulated/0/Music'
-    >>> user_desktop_dir()
-    '/storage/emulated/0/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp/tmp'
-
-Note: Some android apps like Termux and Pydroid are used as shells. These
-apps are used by the end user to emulate Linux environment. Presence of
-``SHELL`` environment variable is used by Platformdirs to differentiate
-between general android apps and android apps used as shells. Shell android
-apps also support ``XDG_*`` environment variables.
-
-
-``PlatformDirs`` for convenience
-================================
-
-.. code-block:: pycon
-
-    >>> from platformdirs import PlatformDirs
-    >>> dirs = PlatformDirs("SuperApp", "Acme")
-    >>> dirs.user_data_dir
-    '/Users/trentm/Library/Application Support/SuperApp'
-    >>> dirs.site_data_dir
-    '/Library/Application Support/SuperApp'
-    >>> dirs.user_cache_dir
-    '/Users/trentm/Library/Caches/SuperApp'
-    >>> dirs.user_log_dir
-    '/Users/trentm/Library/Logs/SuperApp'
-    >>> dirs.user_documents_dir
-    '/Users/trentm/Documents'
-    >>> dirs.user_downloads_dir
-    '/Users/trentm/Downloads'
-    >>> dirs.user_pictures_dir
-    '/Users/trentm/Pictures'
-    >>> dirs.user_videos_dir
-    '/Users/trentm/Movies'
-    >>> dirs.user_music_dir
-    '/Users/trentm/Music'
-    >>> dirs.user_desktop_dir
-    '/Users/trentm/Desktop'
-    >>> dirs.user_runtime_dir
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp'
-
-Per-version isolation
-=====================
-
-If you have multiple versions of your app in use that you want to be
-able to run side-by-side, then you may want version-isolation for these
-dirs::
-
-    >>> from platformdirs import PlatformDirs
-    >>> dirs = PlatformDirs("SuperApp", "Acme", version="1.0")
-    >>> dirs.user_data_dir
-    '/Users/trentm/Library/Application Support/SuperApp/1.0'
-    >>> dirs.site_data_dir
-    '/Library/Application Support/SuperApp/1.0'
-    >>> dirs.user_cache_dir
-    '/Users/trentm/Library/Caches/SuperApp/1.0'
-    >>> dirs.user_log_dir
-    '/Users/trentm/Library/Logs/SuperApp/1.0'
-    >>> dirs.user_documents_dir
-    '/Users/trentm/Documents'
-    >>> dirs.user_downloads_dir
-    '/Users/trentm/Downloads'
-    >>> dirs.user_pictures_dir
-    '/Users/trentm/Pictures'
-    >>> dirs.user_videos_dir
-    '/Users/trentm/Movies'
-    >>> dirs.user_music_dir
-    '/Users/trentm/Music'
-    >>> dirs.user_desktop_dir
-    '/Users/trentm/Desktop'
-    >>> dirs.user_runtime_dir
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp/1.0'
-
-Be wary of using this for configuration files though; you'll need to handle
-migrating configuration files manually.
-
-Why this Fork?
-==============
-
-This repository is a friendly fork of the wonderful work started by
-`ActiveState `_ who created
-``appdirs``, this package's ancestor.
-
-Maintaining an open source project is no easy task, particularly
-from within an organization, and the Python community is indebted
-to ``appdirs`` (and to Trent Mick and Jeff Rouse in particular) for
-creating an incredibly useful simple module, as evidenced by the wide
-number of users it has attracted over the years.
-
-Nonetheless, given the number of long-standing open issues
-and pull requests, and no clear path towards `ensuring
-that maintenance of the package would continue or grow
-`_, this fork was
-created.
-
-Contributions are most welcome.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/RECORD
deleted file mode 100644
index 64c0c8e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/RECORD
+++ /dev/null
@@ -1,23 +0,0 @@
-platformdirs-4.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-platformdirs-4.2.2.dist-info/METADATA,sha256=zmsie01G1MtXR0wgIv5XpVeTO7idr0WWvfmxKsKWuGk,11429
-platformdirs-4.2.2.dist-info/RECORD,,
-platformdirs-4.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs-4.2.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-platformdirs-4.2.2.dist-info/licenses/LICENSE,sha256=KeD9YukphQ6G6yjD_czwzv30-pSHkBHP-z0NS-1tTbY,1089
-platformdirs/__init__.py,sha256=EMGE8qeHRR9CzDFr8kL3tA8hdZZniYjXBVZd0UGTWK0,22225
-platformdirs/__main__.py,sha256=HnsUQHpiBaiTxwcmwVw-nFaPdVNZtQIdi1eWDtI-MzI,1493
-platformdirs/__pycache__/__init__.cpython-312.pyc,,
-platformdirs/__pycache__/__main__.cpython-312.pyc,,
-platformdirs/__pycache__/android.cpython-312.pyc,,
-platformdirs/__pycache__/api.cpython-312.pyc,,
-platformdirs/__pycache__/macos.cpython-312.pyc,,
-platformdirs/__pycache__/unix.cpython-312.pyc,,
-platformdirs/__pycache__/version.cpython-312.pyc,,
-platformdirs/__pycache__/windows.cpython-312.pyc,,
-platformdirs/android.py,sha256=xZXY9Jd46WOsxT2U6-5HsNtDZ-IQqxcEUrBLl3hYk4o,9016
-platformdirs/api.py,sha256=QBYdUac2eC521ek_y53uD1Dcq-lJX8IgSRVd4InC6uc,8996
-platformdirs/macos.py,sha256=wftsbsvq6nZ0WORXSiCrZNkRHz_WKuktl0a6mC7MFkI,5580
-platformdirs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs/unix.py,sha256=Cci9Wqt35dAMsg6HT9nRGHSBW5obb0pR3AE1JJnsCXg,10643
-platformdirs/version.py,sha256=r7F76tZRjgQKzrpx_I0_ZMQOMU-PS7eGnHD7zEK3KB0,411
-platformdirs/windows.py,sha256=IFpiohUBwxPtCzlyKwNtxyW4Jk8haa6W8o59mfrDXVo,10125
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/REQUESTED
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/WHEEL
deleted file mode 100644
index 516596c..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.24.2
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/licenses/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/licenses/LICENSE
deleted file mode 100644
index f35fed9..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs-4.2.2.dist-info/licenses/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2010-202x The platformdirs developers
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__init__.py
deleted file mode 100644
index 3f7d949..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__init__.py
+++ /dev/null
@@ -1,627 +0,0 @@
-"""
-Utilities for determining application-specific dirs.
-
-See  for details and usage.
-
-"""
-
-from __future__ import annotations
-
-import os
-import sys
-from typing import TYPE_CHECKING
-
-from .api import PlatformDirsABC
-from .version import __version__
-from .version import __version_tuple__ as __version_info__
-
-if TYPE_CHECKING:
-    from pathlib import Path
-    from typing import Literal
-
-
-def _set_platform_dir_class() -> type[PlatformDirsABC]:
-    if sys.platform == "win32":
-        from platformdirs.windows import Windows as Result  # noqa: PLC0415
-    elif sys.platform == "darwin":
-        from platformdirs.macos import MacOS as Result  # noqa: PLC0415
-    else:
-        from platformdirs.unix import Unix as Result  # noqa: PLC0415
-
-    if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
-        if os.getenv("SHELL") or os.getenv("PREFIX"):
-            return Result
-
-        from platformdirs.android import _android_folder  # noqa: PLC0415
-
-        if _android_folder() is not None:
-            from platformdirs.android import Android  # noqa: PLC0415
-
-            return Android  # return to avoid redefinition of a result
-
-    return Result
-
-
-PlatformDirs = _set_platform_dir_class()  #: Currently active platform
-AppDirs = PlatformDirs  #: Backwards compatibility with appdirs
-
-
-def user_data_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: data directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_data_dir
-
-
-def site_data_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param multipath: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: data directory shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_data_dir
-
-
-def user_config_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: config directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_config_dir
-
-
-def site_config_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param multipath: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: config directory shared by the users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_config_dir
-
-
-def user_cache_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_cache_dir
-
-
-def site_cache_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_cache_dir
-
-
-def user_state_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: state directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_state_dir
-
-
-def user_log_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: log directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_log_dir
-
-
-def user_documents_dir() -> str:
-    """:returns: documents directory tied to the user"""
-    return PlatformDirs().user_documents_dir
-
-
-def user_downloads_dir() -> str:
-    """:returns: downloads directory tied to the user"""
-    return PlatformDirs().user_downloads_dir
-
-
-def user_pictures_dir() -> str:
-    """:returns: pictures directory tied to the user"""
-    return PlatformDirs().user_pictures_dir
-
-
-def user_videos_dir() -> str:
-    """:returns: videos directory tied to the user"""
-    return PlatformDirs().user_videos_dir
-
-
-def user_music_dir() -> str:
-    """:returns: music directory tied to the user"""
-    return PlatformDirs().user_music_dir
-
-
-def user_desktop_dir() -> str:
-    """:returns: desktop directory tied to the user"""
-    return PlatformDirs().user_desktop_dir
-
-
-def user_runtime_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: runtime directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_runtime_dir
-
-
-def site_runtime_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: runtime directory shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_runtime_dir
-
-
-def user_data_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: data path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_data_path
-
-
-def site_data_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param multipath: See `multipath `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: data path shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_data_path
-
-
-def user_config_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: config path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_config_path
-
-
-def site_config_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param multipath: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: config path shared by the users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_config_path
-
-
-def site_cache_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_cache_path
-
-
-def user_cache_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: cache path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_cache_path
-
-
-def user_state_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param roaming: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: state path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_state_path
-
-
-def user_log_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `roaming `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: log path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_log_path
-
-
-def user_documents_path() -> Path:
-    """:returns: documents a path tied to the user"""
-    return PlatformDirs().user_documents_path
-
-
-def user_downloads_path() -> Path:
-    """:returns: downloads path tied to the user"""
-    return PlatformDirs().user_downloads_path
-
-
-def user_pictures_path() -> Path:
-    """:returns: pictures path tied to the user"""
-    return PlatformDirs().user_pictures_path
-
-
-def user_videos_path() -> Path:
-    """:returns: videos path tied to the user"""
-    return PlatformDirs().user_videos_path
-
-
-def user_music_path() -> Path:
-    """:returns: music path tied to the user"""
-    return PlatformDirs().user_music_path
-
-
-def user_desktop_path() -> Path:
-    """:returns: desktop path tied to the user"""
-    return PlatformDirs().user_desktop_path
-
-
-def user_runtime_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: runtime path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_runtime_path
-
-
-def site_runtime_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname `.
-    :param appauthor: See `appauthor `.
-    :param version: See `version `.
-    :param opinion: See `opinion `.
-    :param ensure_exists: See `ensure_exists `.
-    :returns: runtime path shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_runtime_path
-
-
-__all__ = [
-    "AppDirs",
-    "PlatformDirs",
-    "PlatformDirsABC",
-    "__version__",
-    "__version_info__",
-    "site_cache_dir",
-    "site_cache_path",
-    "site_config_dir",
-    "site_config_path",
-    "site_data_dir",
-    "site_data_path",
-    "site_runtime_dir",
-    "site_runtime_path",
-    "user_cache_dir",
-    "user_cache_path",
-    "user_config_dir",
-    "user_config_path",
-    "user_data_dir",
-    "user_data_path",
-    "user_desktop_dir",
-    "user_desktop_path",
-    "user_documents_dir",
-    "user_documents_path",
-    "user_downloads_dir",
-    "user_downloads_path",
-    "user_log_dir",
-    "user_log_path",
-    "user_music_dir",
-    "user_music_path",
-    "user_pictures_dir",
-    "user_pictures_path",
-    "user_runtime_dir",
-    "user_runtime_path",
-    "user_state_dir",
-    "user_state_path",
-    "user_videos_dir",
-    "user_videos_path",
-]
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__main__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__main__.py
deleted file mode 100644
index 922c521..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__main__.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""Main entry point."""
-
-from __future__ import annotations
-
-from platformdirs import PlatformDirs, __version__
-
-PROPS = (
-    "user_data_dir",
-    "user_config_dir",
-    "user_cache_dir",
-    "user_state_dir",
-    "user_log_dir",
-    "user_documents_dir",
-    "user_downloads_dir",
-    "user_pictures_dir",
-    "user_videos_dir",
-    "user_music_dir",
-    "user_runtime_dir",
-    "site_data_dir",
-    "site_config_dir",
-    "site_cache_dir",
-    "site_runtime_dir",
-)
-
-
-def main() -> None:
-    """Run the main entry point."""
-    app_name = "MyApp"
-    app_author = "MyCompany"
-
-    print(f"-- platformdirs {__version__} --")  # noqa: T201
-
-    print("-- app dirs (with optional 'version')")  # noqa: T201
-    dirs = PlatformDirs(app_name, app_author, version="1.0")
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (without optional 'version')")  # noqa: T201
-    dirs = PlatformDirs(app_name, app_author)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (without optional 'appauthor')")  # noqa: T201
-    dirs = PlatformDirs(app_name)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (with disabled 'appauthor')")  # noqa: T201
-    dirs = PlatformDirs(app_name, appauthor=False)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-
-if __name__ == "__main__":
-    main()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index b5547e8..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc
deleted file mode 100644
index 3d74987..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/__main__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/android.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/android.cpython-311.pyc
deleted file mode 100644
index 62c15aa..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/android.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/api.cpython-311.pyc
deleted file mode 100644
index 876d352..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/api.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc
deleted file mode 100644
index a6040e2..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/macos.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc
deleted file mode 100644
index 70376a8..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/unix.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/version.cpython-311.pyc
deleted file mode 100644
index b765f09..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/version.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc
deleted file mode 100644
index 200a04e..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/__pycache__/windows.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/android.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/android.py
deleted file mode 100644
index afd3141..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/android.py
+++ /dev/null
@@ -1,249 +0,0 @@
-"""Android."""
-
-from __future__ import annotations
-
-import os
-import re
-import sys
-from functools import lru_cache
-from typing import TYPE_CHECKING, cast
-
-from .api import PlatformDirsABC
-
-
-class Android(PlatformDirsABC):
-    """
-    Follows the guidance `from here `_.
-
-    Makes use of the `appname `, `version
-    `, `ensure_exists `.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``/data/user///files/``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "files")
-
-    @property
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. \
-        ``/data/user///shared_prefs/``
-        """
-        return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs")
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `user_config_dir`"""
-        return self.user_config_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g.,``/data/user///cache/``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, same as `user_cache_dir`"""
-        return self.user_cache_dir
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """
-        :return: log directory tied to the user, same as `user_cache_dir` if not opinionated else ``log`` in it,
-          e.g. ``/data/user///cache//log``
-        """
-        path = self.user_cache_dir
-        if self.opinion:
-            path = os.path.join(path, "log")  # noqa: PTH118
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``"""
-        return _android_documents_folder()
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``"""
-        return _android_downloads_folder()
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``"""
-        return _android_pictures_folder()
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``"""
-        return _android_videos_folder()
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
-        return _android_music_folder()
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
-        return "/storage/emulated/0/Desktop"
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, same as `user_cache_dir` if not opinionated else ``tmp`` in it,
-          e.g. ``/data/user///cache//tmp``
-        """
-        path = self.user_cache_dir
-        if self.opinion:
-            path = os.path.join(path, "tmp")  # noqa: PTH118
-        return path
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-@lru_cache(maxsize=1)
-def _android_folder() -> str | None:  # noqa: C901, PLR0912
-    """:return: base folder for the Android OS or None if it cannot be found"""
-    result: str | None = None
-    # type checker isn't happy with our "import android", just don't do this when type checking see
-    # https://stackoverflow.com/a/61394121
-    if not TYPE_CHECKING:
-        try:
-            # First try to get a path to android app using python4android (if available)...
-            from android import mActivity  # noqa: PLC0415
-
-            context = cast("android.content.Context", mActivity.getApplicationContext())  # noqa: F821
-            result = context.getFilesDir().getParentFile().getAbsolutePath()
-        except Exception:  # noqa: BLE001
-            result = None
-    if result is None:
-        try:
-            # ...and fall back to using plain pyjnius, if python4android isn't available or doesn't deliver any useful
-            # result...
-            from jnius import autoclass  # noqa: PLC0415
-
-            context = autoclass("android.content.Context")
-            result = context.getFilesDir().getParentFile().getAbsolutePath()
-        except Exception:  # noqa: BLE001
-            result = None
-    if result is None:
-        # and if that fails, too, find an android folder looking at path on the sys.path
-        # warning: only works for apps installed under /data, not adopted storage etc.
-        pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
-        for path in sys.path:
-            if pattern.match(path):
-                result = path.split("/files")[0]
-                break
-        else:
-            result = None
-    if result is None:
-        # one last try: find an android folder looking at path on the sys.path taking adopted storage paths into
-        # account
-        pattern = re.compile(r"/mnt/expand/[a-fA-F0-9-]{36}/(data|user/\d+)/(.+)/files")
-        for path in sys.path:
-            if pattern.match(path):
-                result = path.split("/files")[0]
-                break
-        else:
-            result = None
-    return result
-
-
-@lru_cache(maxsize=1)
-def _android_documents_folder() -> str:
-    """:return: documents folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        documents_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOCUMENTS).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        documents_dir = "/storage/emulated/0/Documents"
-
-    return documents_dir
-
-
-@lru_cache(maxsize=1)
-def _android_downloads_folder() -> str:
-    """:return: downloads folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        downloads_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOWNLOADS).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        downloads_dir = "/storage/emulated/0/Downloads"
-
-    return downloads_dir
-
-
-@lru_cache(maxsize=1)
-def _android_pictures_folder() -> str:
-    """:return: pictures folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        pictures_dir: str = context.getExternalFilesDir(environment.DIRECTORY_PICTURES).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        pictures_dir = "/storage/emulated/0/Pictures"
-
-    return pictures_dir
-
-
-@lru_cache(maxsize=1)
-def _android_videos_folder() -> str:
-    """:return: videos folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        videos_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DCIM).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        videos_dir = "/storage/emulated/0/DCIM/Camera"
-
-    return videos_dir
-
-
-@lru_cache(maxsize=1)
-def _android_music_folder() -> str:
-    """:return: music folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        music_dir: str = context.getExternalFilesDir(environment.DIRECTORY_MUSIC).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        music_dir = "/storage/emulated/0/Music"
-
-    return music_dir
-
-
-__all__ = [
-    "Android",
-]
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/api.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/api.py
deleted file mode 100644
index c50caa6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/api.py
+++ /dev/null
@@ -1,292 +0,0 @@
-"""Base API."""
-
-from __future__ import annotations
-
-import os
-from abc import ABC, abstractmethod
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Iterator, Literal
-
-
-class PlatformDirsABC(ABC):  # noqa: PLR0904
-    """Abstract base class for platform directories."""
-
-    def __init__(  # noqa: PLR0913, PLR0917
-        self,
-        appname: str | None = None,
-        appauthor: str | None | Literal[False] = None,
-        version: str | None = None,
-        roaming: bool = False,  # noqa: FBT001, FBT002
-        multipath: bool = False,  # noqa: FBT001, FBT002
-        opinion: bool = True,  # noqa: FBT001, FBT002
-        ensure_exists: bool = False,  # noqa: FBT001, FBT002
-    ) -> None:
-        """
-        Create a new platform directory.
-
-        :param appname: See `appname`.
-        :param appauthor: See `appauthor`.
-        :param version: See `version`.
-        :param roaming: See `roaming`.
-        :param multipath: See `multipath`.
-        :param opinion: See `opinion`.
-        :param ensure_exists: See `ensure_exists`.
-
-        """
-        self.appname = appname  #: The name of application.
-        self.appauthor = appauthor
-        """
-        The name of the app author or distributing body for this application.
-
-        Typically, it is the owning company name. Defaults to `appname`. You may pass ``False`` to disable it.
-
-        """
-        self.version = version
-        """
-        An optional version path element to append to the path.
-
-        You might want to use this if you want multiple versions of your app to be able to run independently. If used,
-        this would typically be ``.``.
-
-        """
-        self.roaming = roaming
-        """
-        Whether to use the roaming appdata directory on Windows.
-
-        That means that for users on a Windows network setup for roaming profiles, this user data will be synced on
-        login (see
-        `here `_).
-
-        """
-        self.multipath = multipath
-        """
-        An optional parameter which indicates that the entire list of data dirs should be returned.
-
-        By default, the first item would only be returned.
-
-        """
-        self.opinion = opinion  #: A flag to indicating to use opinionated values.
-        self.ensure_exists = ensure_exists
-        """
-        Optionally create the directory (and any missing parents) upon access if it does not exist.
-
-        By default, no directories are created.
-
-        """
-
-    def _append_app_name_and_version(self, *base: str) -> str:
-        params = list(base[1:])
-        if self.appname:
-            params.append(self.appname)
-            if self.version:
-                params.append(self.version)
-        path = os.path.join(base[0], *params)  # noqa: PTH118
-        self._optionally_create_directory(path)
-        return path
-
-    def _optionally_create_directory(self, path: str) -> None:
-        if self.ensure_exists:
-            Path(path).mkdir(parents=True, exist_ok=True)
-
-    @property
-    @abstractmethod
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users"""
-
-    @property
-    @abstractmethod
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users"""
-
-    @property
-    @abstractmethod
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users"""
-
-    @property
-    @abstractmethod
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users"""
-
-    @property
-    def user_data_path(self) -> Path:
-        """:return: data path tied to the user"""
-        return Path(self.user_data_dir)
-
-    @property
-    def site_data_path(self) -> Path:
-        """:return: data path shared by users"""
-        return Path(self.site_data_dir)
-
-    @property
-    def user_config_path(self) -> Path:
-        """:return: config path tied to the user"""
-        return Path(self.user_config_dir)
-
-    @property
-    def site_config_path(self) -> Path:
-        """:return: config path shared by the users"""
-        return Path(self.site_config_dir)
-
-    @property
-    def user_cache_path(self) -> Path:
-        """:return: cache path tied to the user"""
-        return Path(self.user_cache_dir)
-
-    @property
-    def site_cache_path(self) -> Path:
-        """:return: cache path shared by users"""
-        return Path(self.site_cache_dir)
-
-    @property
-    def user_state_path(self) -> Path:
-        """:return: state path tied to the user"""
-        return Path(self.user_state_dir)
-
-    @property
-    def user_log_path(self) -> Path:
-        """:return: log path tied to the user"""
-        return Path(self.user_log_dir)
-
-    @property
-    def user_documents_path(self) -> Path:
-        """:return: documents a path tied to the user"""
-        return Path(self.user_documents_dir)
-
-    @property
-    def user_downloads_path(self) -> Path:
-        """:return: downloads path tied to the user"""
-        return Path(self.user_downloads_dir)
-
-    @property
-    def user_pictures_path(self) -> Path:
-        """:return: pictures path tied to the user"""
-        return Path(self.user_pictures_dir)
-
-    @property
-    def user_videos_path(self) -> Path:
-        """:return: videos path tied to the user"""
-        return Path(self.user_videos_dir)
-
-    @property
-    def user_music_path(self) -> Path:
-        """:return: music path tied to the user"""
-        return Path(self.user_music_dir)
-
-    @property
-    def user_desktop_path(self) -> Path:
-        """:return: desktop path tied to the user"""
-        return Path(self.user_desktop_dir)
-
-    @property
-    def user_runtime_path(self) -> Path:
-        """:return: runtime path tied to the user"""
-        return Path(self.user_runtime_dir)
-
-    @property
-    def site_runtime_path(self) -> Path:
-        """:return: runtime path shared by users"""
-        return Path(self.site_runtime_dir)
-
-    def iter_config_dirs(self) -> Iterator[str]:
-        """:yield: all user and site configuration directories."""
-        yield self.user_config_dir
-        yield self.site_config_dir
-
-    def iter_data_dirs(self) -> Iterator[str]:
-        """:yield: all user and site data directories."""
-        yield self.user_data_dir
-        yield self.site_data_dir
-
-    def iter_cache_dirs(self) -> Iterator[str]:
-        """:yield: all user and site cache directories."""
-        yield self.user_cache_dir
-        yield self.site_cache_dir
-
-    def iter_runtime_dirs(self) -> Iterator[str]:
-        """:yield: all user and site runtime directories."""
-        yield self.user_runtime_dir
-        yield self.site_runtime_dir
-
-    def iter_config_paths(self) -> Iterator[Path]:
-        """:yield: all user and site configuration paths."""
-        for path in self.iter_config_dirs():
-            yield Path(path)
-
-    def iter_data_paths(self) -> Iterator[Path]:
-        """:yield: all user and site data paths."""
-        for path in self.iter_data_dirs():
-            yield Path(path)
-
-    def iter_cache_paths(self) -> Iterator[Path]:
-        """:yield: all user and site cache paths."""
-        for path in self.iter_cache_dirs():
-            yield Path(path)
-
-    def iter_runtime_paths(self) -> Iterator[Path]:
-        """:yield: all user and site runtime paths."""
-        for path in self.iter_runtime_dirs():
-            yield Path(path)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/macos.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/macos.py
deleted file mode 100644
index eb1ba5d..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/macos.py
+++ /dev/null
@@ -1,130 +0,0 @@
-"""macOS."""
-
-from __future__ import annotations
-
-import os.path
-import sys
-
-from .api import PlatformDirsABC
-
-
-class MacOS(PlatformDirsABC):
-    """
-    Platform directories for the macOS operating system.
-
-    Follows the guidance from
-    `Apple documentation `_.
-    Makes use of the `appname `,
-    `version `,
-    `ensure_exists `.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support"))  # noqa: PTH111
-
-    @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew `_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/share/$appname/$version``.
-          If `multipath ` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/share/$appname/$version:/Library/Application Support/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/share")] if is_homebrew else []
-        path_list.append(self._append_app_name_and_version("/Library/Application Support"))
-        if self.multipath:
-            return os.pathsep.join(path_list)
-        return path_list[0]
-
-    @property
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
-        return self.site_data_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches"))  # noqa: PTH111
-
-    @property
-    def site_cache_dir(self) -> str:
-        """
-        :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew `_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/var/cache/$appname/$version``.
-          If `multipath ` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/var/cache/$appname/$version:/Library/Caches/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/var/cache")] if is_homebrew else []
-        path_list.append(self._append_app_name_and_version("/Library/Caches"))
-        if self.multipath:
-            return os.pathsep.join(path_list)
-        return path_list[0]
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs"))  # noqa: PTH111
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
-        return os.path.expanduser("~/Documents")  # noqa: PTH111
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
-        return os.path.expanduser("~/Downloads")  # noqa: PTH111
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
-        return os.path.expanduser("~/Pictures")  # noqa: PTH111
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Movies``"""
-        return os.path.expanduser("~/Movies")  # noqa: PTH111
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
-        return os.path.expanduser("~/Music")  # noqa: PTH111
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
-        return os.path.expanduser("~/Desktop")  # noqa: PTH111
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems"))  # noqa: PTH111
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-__all__ = [
-    "MacOS",
-]
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/py.typed
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/unix.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/unix.py
deleted file mode 100644
index 9500ade..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/unix.py
+++ /dev/null
@@ -1,275 +0,0 @@
-"""Unix."""
-
-from __future__ import annotations
-
-import os
-import sys
-from configparser import ConfigParser
-from pathlib import Path
-from typing import Iterator, NoReturn
-
-from .api import PlatformDirsABC
-
-if sys.platform == "win32":
-
-    def getuid() -> NoReturn:
-        msg = "should only be used on Unix"
-        raise RuntimeError(msg)
-
-else:
-    from os import getuid
-
-
-class Unix(PlatformDirsABC):  # noqa: PLR0904
-    """
-    On Unix/Linux, we follow the `XDG Basedir Spec `_.
-
-    The spec allows overriding directories with environment variables. The examples shown are the default values,
-    alongside the name of the environment variable that overrides them. Makes use of the `appname
-    `, `version `, `multipath
-    `, `opinion `, `ensure_exists
-    `.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g. ``~/.local/share/$appname/$version`` or
-         ``$XDG_DATA_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_DATA_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/share")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def _site_data_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_DATA_DIRS", "")
-        if not path.strip():
-            path = f"/usr/local/share{os.pathsep}/usr/share"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directories shared by users (if `multipath ` is
-         enabled and ``XDG_DATA_DIRS`` is set and a multi path the response is also a multi path separated by the
-         OS path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
-        """
-        # XDG default for $XDG_DATA_DIRS; only first, if multipath is False
-        dirs = self._site_data_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
-
-    @property
-    def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. ``~/.config/$appname/$version`` or
-         ``$XDG_CONFIG_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CONFIG_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.config")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def _site_config_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_CONFIG_DIRS", "")
-        if not path.strip():
-            path = "/etc/xdg"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_config_dir(self) -> str:
-        """
-        :return: config directories shared by users (if `multipath `
-         is enabled and ``XDG_CONFIG_DIRS`` is set and a multi path the response is also a multi path separated by
-         the OS path separator), e.g. ``/etc/xdg/$appname/$version``
-        """
-        # XDG default for $XDG_CONFIG_DIRS only first, if multipath is False
-        dirs = self._site_config_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
-
-    @property
-    def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user, e.g. ``~/.cache/$appname/$version`` or
-         ``~/$XDG_CACHE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CACHE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.cache")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
-        return self._append_app_name_and_version("/var/cache")
-
-    @property
-    def user_state_dir(self) -> str:
-        """
-        :return: state directory tied to the user, e.g. ``~/.local/state/$appname/$version`` or
-         ``$XDG_STATE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_STATE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/state")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it"""
-        path = self.user_state_dir
-        if self.opinion:
-            path = os.path.join(path, "log")  # noqa: PTH118
-            self._optionally_create_directory(path)
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
-        return _get_user_media_dir("XDG_DOCUMENTS_DIR", "~/Documents")
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
-        return _get_user_media_dir("XDG_DOWNLOAD_DIR", "~/Downloads")
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
-        return _get_user_media_dir("XDG_PICTURES_DIR", "~/Pictures")
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Videos``"""
-        return _get_user_media_dir("XDG_VIDEOS_DIR", "~/Videos")
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
-        return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music")
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
-        return _get_user_media_dir("XDG_DESKTOP_DIR", "~/Desktop")
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g. ``/run/user/$(id -u)/$appname/$version`` or
-         ``$XDG_RUNTIME_DIR/$appname/$version``.
-
-         For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/user/$(id -u)/$appname/$version`` if
-         exists, otherwise ``/tmp/runtime-$(id -u)/$appname/$version``, if``$XDG_RUNTIME_DIR``
-         is not set.
-        """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = f"/var/run/user/{getuid()}"
-                if not Path(path).exists():
-                    path = f"/tmp/runtime-{getuid()}"  # noqa: S108
-            else:
-                path = f"/run/user/{getuid()}"
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """
-        :return: runtime directory shared by users, e.g. ``/run/$appname/$version`` or \
-        ``$XDG_RUNTIME_DIR/$appname/$version``.
-
-        Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will
-        fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
-
-        If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir`
-        instead.
-
-        For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/$appname/$version`` if ``$XDG_RUNTIME_DIR`` is not set.
-        """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = "/var/run"
-            else:
-                path = "/run"
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_data_dir)
-
-    @property
-    def site_config_path(self) -> Path:
-        """:return: config path shared by the users, returns the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_config_dir)
-
-    @property
-    def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_cache_dir)
-
-    def _first_item_as_path_if_multipath(self, directory: str) -> Path:
-        if self.multipath:
-            # If multipath is True, the first path is returned.
-            directory = directory.split(os.pathsep)[0]
-        return Path(directory)
-
-    def iter_config_dirs(self) -> Iterator[str]:
-        """:yield: all user and site configuration directories."""
-        yield self.user_config_dir
-        yield from self._site_config_dirs
-
-    def iter_data_dirs(self) -> Iterator[str]:
-        """:yield: all user and site data directories."""
-        yield self.user_data_dir
-        yield from self._site_data_dirs
-
-
-def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
-    media_dir = _get_user_dirs_folder(env_var)
-    if media_dir is None:
-        media_dir = os.environ.get(env_var, "").strip()
-        if not media_dir:
-            media_dir = os.path.expanduser(fallback_tilde_path)  # noqa: PTH111
-
-    return media_dir
-
-
-def _get_user_dirs_folder(key: str) -> str | None:
-    """
-    Return directory from user-dirs.dirs config file.
-
-    See https://freedesktop.org/wiki/Software/xdg-user-dirs/.
-
-    """
-    user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs"
-    if user_dirs_config_path.exists():
-        parser = ConfigParser()
-
-        with user_dirs_config_path.open() as stream:
-            # Add fake section header, so ConfigParser doesn't complain
-            parser.read_string(f"[top]\n{stream.read()}")
-
-        if key not in parser["top"]:
-            return None
-
-        path = parser["top"][key].strip('"')
-        # Handle relative home paths
-        return path.replace("$HOME", os.path.expanduser("~"))  # noqa: PTH111
-
-    return None
-
-
-__all__ = [
-    "Unix",
-]
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/version.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/version.py
deleted file mode 100644
index 6483ddc..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/version.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '4.2.2'
-__version_tuple__ = version_tuple = (4, 2, 2)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/windows.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/windows.py
deleted file mode 100644
index d7bc960..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/platformdirs/windows.py
+++ /dev/null
@@ -1,272 +0,0 @@
-"""Windows."""
-
-from __future__ import annotations
-
-import os
-import sys
-from functools import lru_cache
-from typing import TYPE_CHECKING
-
-from .api import PlatformDirsABC
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-
-class Windows(PlatformDirsABC):
-    """
-    `MSDN on where to store app data files `_.
-
-    Makes use of the `appname `, `appauthor
-    `, `version `, `roaming
-    `, `opinion `, `ensure_exists
-    `.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname`` (not roaming) or
-         ``%USERPROFILE%\\AppData\\Roaming\\$appauthor\\$appname`` (roaming)
-        """
-        const = "CSIDL_APPDATA" if self.roaming else "CSIDL_LOCAL_APPDATA"
-        path = os.path.normpath(get_win_folder(const))
-        return self._append_parts(path)
-
-    def _append_parts(self, path: str, *, opinion_value: str | None = None) -> str:
-        params = []
-        if self.appname:
-            if self.appauthor is not False:
-                author = self.appauthor or self.appname
-                params.append(author)
-            params.append(self.appname)
-            if opinion_value is not None and self.opinion:
-                params.append(opinion_value)
-            if self.version:
-                params.append(self.version)
-        path = os.path.join(path, *params)  # noqa: PTH118
-        self._optionally_create_directory(path)
-        return path
-
-    @property
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname``"""
-        path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
-        return self._append_parts(path)
-
-    @property
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
-        return self.site_data_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user (if opinionated with ``Cache`` folder within ``$appname``) e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname\\Cache\\$version``
-        """
-        path = os.path.normpath(get_win_folder("CSIDL_LOCAL_APPDATA"))
-        return self._append_parts(path, opinion_value="Cache")
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname\\Cache\\$version``"""
-        path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
-        return self._append_parts(path, opinion_value="Cache")
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it"""
-        path = self.user_data_dir
-        if self.opinion:
-            path = os.path.join(path, "Logs")  # noqa: PTH118
-            self._optionally_create_directory(path)
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``"""
-        return os.path.normpath(get_win_folder("CSIDL_PERSONAL"))
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``%USERPROFILE%\\Downloads``"""
-        return os.path.normpath(get_win_folder("CSIDL_DOWNLOADS"))
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``%USERPROFILE%\\Pictures``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYPICTURES"))
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``%USERPROFILE%\\Videos``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYVIDEO"))
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYMUSIC"))
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``%USERPROFILE%\\Desktop``"""
-        return os.path.normpath(get_win_folder("CSIDL_DESKTOPDIRECTORY"))
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\Temp\\$appauthor\\$appname``
-        """
-        path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp"))  # noqa: PTH118
-        return self._append_parts(path)
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-def get_win_folder_from_env_vars(csidl_name: str) -> str:
-    """Get folder from environment variables."""
-    result = get_win_folder_if_csidl_name_not_env_var(csidl_name)
-    if result is not None:
-        return result
-
-    env_var_name = {
-        "CSIDL_APPDATA": "APPDATA",
-        "CSIDL_COMMON_APPDATA": "ALLUSERSPROFILE",
-        "CSIDL_LOCAL_APPDATA": "LOCALAPPDATA",
-    }.get(csidl_name)
-    if env_var_name is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-    result = os.environ.get(env_var_name)
-    if result is None:
-        msg = f"Unset environment variable: {env_var_name}"
-        raise ValueError(msg)
-    return result
-
-
-def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
-    """Get a folder for a CSIDL name that does not exist as an environment variable."""
-    if csidl_name == "CSIDL_PERSONAL":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_DOWNLOADS":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Downloads")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYPICTURES":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Pictures")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYVIDEO":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Videos")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYMUSIC":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Music")  # noqa: PTH118
-    return None
-
-
-def get_win_folder_from_registry(csidl_name: str) -> str:
-    """
-    Get folder from the registry.
-
-    This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer
-    for all CSIDL_* names.
-
-    """
-    shell_folder_name = {
-        "CSIDL_APPDATA": "AppData",
-        "CSIDL_COMMON_APPDATA": "Common AppData",
-        "CSIDL_LOCAL_APPDATA": "Local AppData",
-        "CSIDL_PERSONAL": "Personal",
-        "CSIDL_DOWNLOADS": "{374DE290-123F-4565-9164-39C4925E467B}",
-        "CSIDL_MYPICTURES": "My Pictures",
-        "CSIDL_MYVIDEO": "My Video",
-        "CSIDL_MYMUSIC": "My Music",
-    }.get(csidl_name)
-    if shell_folder_name is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-    if sys.platform != "win32":  # only needed for mypy type checker to know that this code runs only on Windows
-        raise NotImplementedError
-    import winreg  # noqa: PLC0415
-
-    key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
-    directory, _ = winreg.QueryValueEx(key, shell_folder_name)
-    return str(directory)
-
-
-def get_win_folder_via_ctypes(csidl_name: str) -> str:
-    """Get folder with ctypes."""
-    # There is no 'CSIDL_DOWNLOADS'.
-    # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead.
-    # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid
-
-    import ctypes  # noqa: PLC0415
-
-    csidl_const = {
-        "CSIDL_APPDATA": 26,
-        "CSIDL_COMMON_APPDATA": 35,
-        "CSIDL_LOCAL_APPDATA": 28,
-        "CSIDL_PERSONAL": 5,
-        "CSIDL_MYPICTURES": 39,
-        "CSIDL_MYVIDEO": 14,
-        "CSIDL_MYMUSIC": 13,
-        "CSIDL_DOWNLOADS": 40,
-        "CSIDL_DESKTOPDIRECTORY": 16,
-    }.get(csidl_name)
-    if csidl_const is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-
-    buf = ctypes.create_unicode_buffer(1024)
-    windll = getattr(ctypes, "windll")  # noqa: B009 # using getattr to avoid false positive with mypy type checker
-    windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
-
-    # Downgrade to short path name if it has high-bit chars.
-    if any(ord(c) > 255 for c in buf):  # noqa: PLR2004
-        buf2 = ctypes.create_unicode_buffer(1024)
-        if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
-            buf = buf2
-
-    if csidl_name == "CSIDL_DOWNLOADS":
-        return os.path.join(buf.value, "Downloads")  # noqa: PTH118
-
-    return buf.value
-
-
-def _pick_get_win_folder() -> Callable[[str], str]:
-    try:
-        import ctypes  # noqa: PLC0415
-    except ImportError:
-        pass
-    else:
-        if hasattr(ctypes, "windll"):
-            return get_win_folder_via_ctypes
-    try:
-        import winreg  # noqa: PLC0415, F401
-    except ImportError:
-        return get_win_folder_from_env_vars
-    else:
-        return get_win_folder_from_registry
-
-
-get_win_folder = lru_cache(maxsize=None)(_pick_get_win_folder())
-
-__all__ = [
-    "Windows",
-]
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/LICENSE
deleted file mode 100644
index e859590..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Taneli Hukkinen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/METADATA
deleted file mode 100644
index efd87ec..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/METADATA
+++ /dev/null
@@ -1,206 +0,0 @@
-Metadata-Version: 2.1
-Name: tomli
-Version: 2.0.1
-Summary: A lil' TOML parser
-Keywords: toml
-Author-email: Taneli Hukkinen 
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Typing :: Typed
-Project-URL: Changelog, https://github.com/hukkin/tomli/blob/master/CHANGELOG.md
-Project-URL: Homepage, https://github.com/hukkin/tomli
-
-[![Build Status](https://github.com/hukkin/tomli/workflows/Tests/badge.svg?branch=master)](https://github.com/hukkin/tomli/actions?query=workflow%3ATests+branch%3Amaster+event%3Apush)
-[![codecov.io](https://codecov.io/gh/hukkin/tomli/branch/master/graph/badge.svg)](https://codecov.io/gh/hukkin/tomli)
-[![PyPI version](https://img.shields.io/pypi/v/tomli)](https://pypi.org/project/tomli)
-
-# Tomli
-
-> A lil' TOML parser
-
-**Table of Contents**  *generated with [mdformat-toc](https://github.com/hukkin/mdformat-toc)*
-
-
-
-- [Intro](#intro)
-- [Installation](#installation)
-- [Usage](#usage)
-  - [Parse a TOML string](#parse-a-toml-string)
-  - [Parse a TOML file](#parse-a-toml-file)
-  - [Handle invalid TOML](#handle-invalid-toml)
-  - [Construct `decimal.Decimal`s from TOML floats](#construct-decimaldecimals-from-toml-floats)
-- [FAQ](#faq)
-  - [Why this parser?](#why-this-parser)
-  - [Is comment preserving round-trip parsing supported?](#is-comment-preserving-round-trip-parsing-supported)
-  - [Is there a `dumps`, `write` or `encode` function?](#is-there-a-dumps-write-or-encode-function)
-  - [How do TOML types map into Python types?](#how-do-toml-types-map-into-python-types)
-- [Performance](#performance)
-
-
-
-## Intro
-
-Tomli is a Python library for parsing [TOML](https://toml.io).
-Tomli is fully compatible with [TOML v1.0.0](https://toml.io/en/v1.0.0).
-
-## Installation
-
-```bash
-pip install tomli
-```
-
-## Usage
-
-### Parse a TOML string
-
-```python
-import tomli
-
-toml_str = """
-           gretzky = 99
-
-           [kurri]
-           jari = 17
-           """
-
-toml_dict = tomli.loads(toml_str)
-assert toml_dict == {"gretzky": 99, "kurri": {"jari": 17}}
-```
-
-### Parse a TOML file
-
-```python
-import tomli
-
-with open("path_to_file/conf.toml", "rb") as f:
-    toml_dict = tomli.load(f)
-```
-
-The file must be opened in binary mode (with the `"rb"` flag).
-Binary mode will enforce decoding the file as UTF-8 with universal newlines disabled,
-both of which are required to correctly parse TOML.
-
-### Handle invalid TOML
-
-```python
-import tomli
-
-try:
-    toml_dict = tomli.loads("]] this is invalid TOML [[")
-except tomli.TOMLDecodeError:
-    print("Yep, definitely not valid.")
-```
-
-Note that error messages are considered informational only.
-They should not be assumed to stay constant across Tomli versions.
-
-### Construct `decimal.Decimal`s from TOML floats
-
-```python
-from decimal import Decimal
-import tomli
-
-toml_dict = tomli.loads("precision-matters = 0.982492", parse_float=Decimal)
-assert toml_dict["precision-matters"] == Decimal("0.982492")
-```
-
-Note that `decimal.Decimal` can be replaced with another callable that converts a TOML float from string to a Python type.
-The `decimal.Decimal` is, however, a practical choice for use cases where float inaccuracies can not be tolerated.
-
-Illegal types are `dict` and `list`, and their subtypes.
-A `ValueError` will be raised if `parse_float` produces illegal types.
-
-## FAQ
-
-### Why this parser?
-
-- it's lil'
-- pure Python with zero dependencies
-- the fastest pure Python parser [\*](#performance):
-  15x as fast as [tomlkit](https://pypi.org/project/tomlkit/),
-  2.4x as fast as [toml](https://pypi.org/project/toml/)
-- outputs [basic data types](#how-do-toml-types-map-into-python-types) only
-- 100% spec compliant: passes all tests in
-  [a test set](https://github.com/toml-lang/compliance/pull/8)
-  soon to be merged to the official
-  [compliance tests for TOML](https://github.com/toml-lang/compliance)
-  repository
-- thoroughly tested: 100% branch coverage
-
-### Is comment preserving round-trip parsing supported?
-
-No.
-
-The `tomli.loads` function returns a plain `dict` that is populated with builtin types and types from the standard library only.
-Preserving comments requires a custom type to be returned so will not be supported,
-at least not by the `tomli.loads` and `tomli.load` functions.
-
-Look into [TOML Kit](https://github.com/sdispater/tomlkit) if preservation of style is what you need.
-
-### Is there a `dumps`, `write` or `encode` function?
-
-[Tomli-W](https://github.com/hukkin/tomli-w) is the write-only counterpart of Tomli, providing `dump` and `dumps` functions.
-
-The core library does not include write capability, as most TOML use cases are read-only, and Tomli intends to be minimal.
-
-### How do TOML types map into Python types?
-
-| TOML type        | Python type         | Details                                                      |
-| ---------------- | ------------------- | ------------------------------------------------------------ |
-| Document Root    | `dict`              |                                                              |
-| Key              | `str`               |                                                              |
-| String           | `str`               |                                                              |
-| Integer          | `int`               |                                                              |
-| Float            | `float`             |                                                              |
-| Boolean          | `bool`              |                                                              |
-| Offset Date-Time | `datetime.datetime` | `tzinfo` attribute set to an instance of `datetime.timezone` |
-| Local Date-Time  | `datetime.datetime` | `tzinfo` attribute set to `None`                             |
-| Local Date       | `datetime.date`     |                                                              |
-| Local Time       | `datetime.time`     |                                                              |
-| Array            | `list`              |                                                              |
-| Table            | `dict`              |                                                              |
-| Inline Table     | `dict`              |                                                              |
-
-## Performance
-
-The `benchmark/` folder in this repository contains a performance benchmark for comparing the various Python TOML parsers.
-The benchmark can be run with `tox -e benchmark-pypi`.
-Running the benchmark on my personal computer output the following:
-
-```console
-foo@bar:~/dev/tomli$ tox -e benchmark-pypi
-benchmark-pypi installed: attrs==19.3.0,click==7.1.2,pytomlpp==1.0.2,qtoml==0.3.0,rtoml==0.7.0,toml==0.10.2,tomli==1.1.0,tomlkit==0.7.2
-benchmark-pypi run-test-pre: PYTHONHASHSEED='2658546909'
-benchmark-pypi run-test: commands[0] | python -c 'import datetime; print(datetime.date.today())'
-2021-07-23
-benchmark-pypi run-test: commands[1] | python --version
-Python 3.8.10
-benchmark-pypi run-test: commands[2] | python benchmark/run.py
-Parsing data.toml 5000 times:
-------------------------------------------------------
-    parser |  exec time | performance (more is better)
------------+------------+-----------------------------
-     rtoml |    0.901 s | baseline (100%)
-  pytomlpp |     1.08 s | 83.15%
-     tomli |     3.89 s | 23.15%
-      toml |     9.36 s | 9.63%
-     qtoml |     11.5 s | 7.82%
-   tomlkit |     56.8 s | 1.59%
-```
-
-The parsers are ordered from fastest to slowest, using the fastest parser as baseline.
-Tomli performed the best out of all pure Python TOML parsers,
-losing only to pytomlpp (wraps C++) and rtoml (wraps Rust).
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/RECORD
deleted file mode 100644
index 1db8063..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-tomli-2.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tomli-2.0.1.dist-info/LICENSE,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072
-tomli-2.0.1.dist-info/METADATA,sha256=zPDceKmPwJGLWtZykrHixL7WVXWmJGzZ1jyRT5lCoPI,8875
-tomli-2.0.1.dist-info/RECORD,,
-tomli-2.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomli-2.0.1.dist-info/WHEEL,sha256=jPMR_Dzkc4X4icQtmz81lnNY_kAsfog7ry7qoRvYLXw,81
-tomli/__init__.py,sha256=JhUwV66DB1g4Hvt1UQCVMdfCu-IgAV8FXmvDU9onxd4,396
-tomli/__pycache__/__init__.cpython-312.pyc,,
-tomli/__pycache__/_parser.cpython-312.pyc,,
-tomli/__pycache__/_re.cpython-312.pyc,,
-tomli/__pycache__/_types.cpython-312.pyc,,
-tomli/_parser.py,sha256=g9-ENaALS-B8dokYpCuzUFalWlog7T-SIYMjLZSWrtM,22633
-tomli/_re.py,sha256=dbjg5ChZT23Ka9z9DHOXfdtSpPwUfdgMXnj8NOoly-w,2943
-tomli/_types.py,sha256=-GTG2VUqkpxwMqzmVO4F7ybKddIbAnuAHXfmWQcTi3Q,254
-tomli/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/REQUESTED
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/WHEEL
deleted file mode 100644
index c727d14..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli-2.0.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.6.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/__init__.cpython-311.pyc
index 7bad2ab..ed205e0 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/__init__.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_parser.cpython-311.pyc
index d93fb2b..5d760da 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_parser.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_re.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_re.cpython-311.pyc
index 0533912..7c491b2 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_re.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_re.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_types.cpython-311.pyc
index df285a0..be87a68 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/__pycache__/_types.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/py.typed
deleted file mode 100644
index 7632ecf..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/tomli/py.typed
+++ /dev/null
@@ -1 +0,0 @@
-# Marker file for PEP 561
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/LICENSE
deleted file mode 100644
index 07806f8..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-This is the MIT license: http://www.opensource.org/licenses/mit-license.php
-
-Copyright (c) Alex Grönholm
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this
-software and associated documentation files (the "Software"), to deal in the Software
-without restriction, including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/METADATA
deleted file mode 100644
index 6e5750b..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/METADATA
+++ /dev/null
@@ -1,81 +0,0 @@
-Metadata-Version: 2.1
-Name: typeguard
-Version: 4.3.0
-Summary: Run-time type checker for Python
-Author-email: Alex Grönholm 
-License: MIT
-Project-URL: Documentation, https://typeguard.readthedocs.io/en/latest/
-Project-URL: Change log, https://typeguard.readthedocs.io/en/latest/versionhistory.html
-Project-URL: Source code, https://github.com/agronholm/typeguard
-Project-URL: Issue tracker, https://github.com/agronholm/typeguard/issues
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: typing-extensions >=4.10.0
-Requires-Dist: importlib-metadata >=3.6 ; python_version < "3.10"
-Provides-Extra: doc
-Requires-Dist: packaging ; extra == 'doc'
-Requires-Dist: Sphinx >=7 ; extra == 'doc'
-Requires-Dist: sphinx-autodoc-typehints >=1.2.0 ; extra == 'doc'
-Requires-Dist: sphinx-rtd-theme >=1.3.0 ; extra == 'doc'
-Provides-Extra: test
-Requires-Dist: coverage[toml] >=7 ; extra == 'test'
-Requires-Dist: pytest >=7 ; extra == 'test'
-Requires-Dist: mypy >=1.2.0 ; (platform_python_implementation != "PyPy") and extra == 'test'
-
-.. image:: https://github.com/agronholm/typeguard/actions/workflows/test.yml/badge.svg
-  :target: https://github.com/agronholm/typeguard/actions/workflows/test.yml
-  :alt: Build Status
-.. image:: https://coveralls.io/repos/agronholm/typeguard/badge.svg?branch=master&service=github
-  :target: https://coveralls.io/github/agronholm/typeguard?branch=master
-  :alt: Code Coverage
-.. image:: https://readthedocs.org/projects/typeguard/badge/?version=latest
-  :target: https://typeguard.readthedocs.io/en/latest/?badge=latest
-  :alt: Documentation
-
-This library provides run-time type checking for functions defined with
-`PEP 484 `_ argument (and return) type
-annotations, and any arbitrary objects. It can be used together with static type
-checkers as an additional layer of type safety, to catch type violations that could only
-be detected at run time.
-
-Two principal ways to do type checking are provided:
-
-#. The ``check_type`` function:
-
-   * like ``isinstance()``, but supports arbitrary type annotations (within limits)
-   * can be used as a ``cast()`` replacement, but with actual checking of the value
-#. Code instrumentation:
-
-   * entire modules, or individual functions (via ``@typechecked``) are recompiled, with
-     type checking code injected into them
-   * automatically checks function arguments, return values and assignments to annotated
-     local variables
-   * for generator functions (regular and async), checks yield and send values
-   * requires the original source code of the instrumented module(s) to be accessible
-
-Two options are provided for code instrumentation:
-
-#. the ``@typechecked`` function:
-
-   * can be applied to functions individually
-#. the import hook (``typeguard.install_import_hook()``):
-
-   * automatically instruments targeted modules on import
-   * no manual code changes required in the target modules
-   * requires the import hook to be installed before the targeted modules are imported
-   * may clash with other import hooks
-
-See the documentation_ for further information.
-
-.. _documentation: https://typeguard.readthedocs.io/en/latest/
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/RECORD
deleted file mode 100644
index 801e733..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-typeguard-4.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-typeguard-4.3.0.dist-info/LICENSE,sha256=YWP3mH37ONa8MgzitwsvArhivEESZRbVUu8c1DJH51g,1130
-typeguard-4.3.0.dist-info/METADATA,sha256=z2dcHAp0TwhYCFU5Deh8x31nazElgujUz9tbuP0pjSE,3717
-typeguard-4.3.0.dist-info/RECORD,,
-typeguard-4.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-typeguard-4.3.0.dist-info/entry_points.txt,sha256=qp7NQ1aLtiSgMQqo6gWlfGpy0IIXzoMJmeQTLpzqFZQ,48
-typeguard-4.3.0.dist-info/top_level.txt,sha256=4z28AhuDodwRS_c1J_l8H51t5QuwfTseskYzlxp6grs,10
-typeguard/__init__.py,sha256=Onh4w38elPCjtlcU3JY9k3h70NjsxXIkAflmQn-Z0FY,2071
-typeguard/__pycache__/__init__.cpython-312.pyc,,
-typeguard/__pycache__/_checkers.cpython-312.pyc,,
-typeguard/__pycache__/_config.cpython-312.pyc,,
-typeguard/__pycache__/_decorators.cpython-312.pyc,,
-typeguard/__pycache__/_exceptions.cpython-312.pyc,,
-typeguard/__pycache__/_functions.cpython-312.pyc,,
-typeguard/__pycache__/_importhook.cpython-312.pyc,,
-typeguard/__pycache__/_memo.cpython-312.pyc,,
-typeguard/__pycache__/_pytest_plugin.cpython-312.pyc,,
-typeguard/__pycache__/_suppression.cpython-312.pyc,,
-typeguard/__pycache__/_transformer.cpython-312.pyc,,
-typeguard/__pycache__/_union_transformer.cpython-312.pyc,,
-typeguard/__pycache__/_utils.cpython-312.pyc,,
-typeguard/_checkers.py,sha256=JRrgKicdOEfIBoNEtegYCEIlhpad-a1u1Em7GCj0WCI,31360
-typeguard/_config.py,sha256=nIz8QwDa-oFO3L9O8_6srzlmd99pSby2wOM4Wb7F_B0,2846
-typeguard/_decorators.py,sha256=v6dsIeWvPhExGLP_wXF-RmDUyjZf_Ak28g7gBJ_v0-0,9033
-typeguard/_exceptions.py,sha256=ZIPeiV-FBd5Emw2EaWd2Fvlsrwi4ocwT2fVGBIAtHcQ,1121
-typeguard/_functions.py,sha256=ibgSAKa5ptIm1eR9ARG0BSozAFJPFNASZqhPVyQeqig,10393
-typeguard/_importhook.py,sha256=ugjCDvFcdWMU7UugqlJG91IpVNpEIxtRr-99s0h1k7M,6389
-typeguard/_memo.py,sha256=1juQV_vxnD2JYKbSrebiQuj4oKHz6n67v9pYA-CCISg,1303
-typeguard/_pytest_plugin.py,sha256=-fcSqkv54rIfIF8pDavY5YQPkj4OX8GMt_lL7CQSD4I,4416
-typeguard/_suppression.py,sha256=VQfzxcwIbu3if0f7VBkKM7hkYOA7tNFw9a7jMBsmMg4,2266
-typeguard/_transformer.py,sha256=9Ha7_QhdwoUni_6hvdY-hZbuEergowHrNL2vzHIakFY,44937
-typeguard/_union_transformer.py,sha256=v_42r7-6HuRX2SoFwnyJ-E5PlxXpVeUJPJR1-HU9qSo,1354
-typeguard/_utils.py,sha256=5HhO1rPn5f1M6ymkVAEv7Xmlz1cX-j0OnTMlyHqqrR8,5270
-typeguard/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/WHEEL
deleted file mode 100644
index bab98d6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/entry_points.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/entry_points.txt
deleted file mode 100644
index 47c9d0b..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/entry_points.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest11]
-typeguard = typeguard._pytest_plugin
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/top_level.txt
deleted file mode 100644
index be5ec23..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard-4.3.0.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-typeguard
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__init__.py
deleted file mode 100644
index 6781cad..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__init__.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import os
-from typing import Any
-
-from ._checkers import TypeCheckerCallable as TypeCheckerCallable
-from ._checkers import TypeCheckLookupCallback as TypeCheckLookupCallback
-from ._checkers import check_type_internal as check_type_internal
-from ._checkers import checker_lookup_functions as checker_lookup_functions
-from ._checkers import load_plugins as load_plugins
-from ._config import CollectionCheckStrategy as CollectionCheckStrategy
-from ._config import ForwardRefPolicy as ForwardRefPolicy
-from ._config import TypeCheckConfiguration as TypeCheckConfiguration
-from ._decorators import typechecked as typechecked
-from ._decorators import typeguard_ignore as typeguard_ignore
-from ._exceptions import InstrumentationWarning as InstrumentationWarning
-from ._exceptions import TypeCheckError as TypeCheckError
-from ._exceptions import TypeCheckWarning as TypeCheckWarning
-from ._exceptions import TypeHintWarning as TypeHintWarning
-from ._functions import TypeCheckFailCallback as TypeCheckFailCallback
-from ._functions import check_type as check_type
-from ._functions import warn_on_error as warn_on_error
-from ._importhook import ImportHookManager as ImportHookManager
-from ._importhook import TypeguardFinder as TypeguardFinder
-from ._importhook import install_import_hook as install_import_hook
-from ._memo import TypeCheckMemo as TypeCheckMemo
-from ._suppression import suppress_type_checks as suppress_type_checks
-from ._utils import Unset as Unset
-
-# Re-export imports so they look like they live directly in this package
-for value in list(locals().values()):
-    if getattr(value, "__module__", "").startswith(f"{__name__}."):
-        value.__module__ = __name__
-
-
-config: TypeCheckConfiguration
-
-
-def __getattr__(name: str) -> Any:
-    if name == "config":
-        from ._config import global_config
-
-        return global_config
-
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-
-# Automatically load checker lookup functions unless explicitly disabled
-if "TYPEGUARD_DISABLE_PLUGIN_AUTOLOAD" not in os.environ:
-    load_plugins()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index eed9059..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_checkers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_checkers.cpython-311.pyc
deleted file mode 100644
index d3e8091..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_checkers.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_config.cpython-311.pyc
deleted file mode 100644
index 5a4f799..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_config.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_decorators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_decorators.cpython-311.pyc
deleted file mode 100644
index de0bbd2..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_decorators.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_exceptions.cpython-311.pyc
deleted file mode 100644
index 91ebc8a..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_exceptions.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_functions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_functions.cpython-311.pyc
deleted file mode 100644
index 8451908..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_functions.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_importhook.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_importhook.cpython-311.pyc
deleted file mode 100644
index ed8efa9..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_importhook.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_memo.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_memo.cpython-311.pyc
deleted file mode 100644
index e55fb36..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_memo.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_pytest_plugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_pytest_plugin.cpython-311.pyc
deleted file mode 100644
index 666cdbd..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_pytest_plugin.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_suppression.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_suppression.cpython-311.pyc
deleted file mode 100644
index 050695a..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_suppression.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_transformer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_transformer.cpython-311.pyc
deleted file mode 100644
index d9e43cd..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_transformer.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_union_transformer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_union_transformer.cpython-311.pyc
deleted file mode 100644
index 6e4b5a7..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_union_transformer.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_utils.cpython-311.pyc
deleted file mode 100644
index ff5fc0c..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/__pycache__/_utils.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_checkers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_checkers.py
deleted file mode 100644
index 67dd5ad..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_checkers.py
+++ /dev/null
@@ -1,993 +0,0 @@
-from __future__ import annotations
-
-import collections.abc
-import inspect
-import sys
-import types
-import typing
-import warnings
-from enum import Enum
-from inspect import Parameter, isclass, isfunction
-from io import BufferedIOBase, IOBase, RawIOBase, TextIOBase
-from textwrap import indent
-from typing import (
-    IO,
-    AbstractSet,
-    Any,
-    BinaryIO,
-    Callable,
-    Dict,
-    ForwardRef,
-    List,
-    Mapping,
-    MutableMapping,
-    NewType,
-    Optional,
-    Sequence,
-    Set,
-    TextIO,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
-from unittest.mock import Mock
-from weakref import WeakKeyDictionary
-
-try:
-    import typing_extensions
-except ImportError:
-    typing_extensions = None  # type: ignore[assignment]
-
-# Must use this because typing.is_typeddict does not recognize
-# TypedDict from typing_extensions, and as of version 4.12.0
-# typing_extensions.TypedDict is different from typing.TypedDict
-# on all versions.
-from typing_extensions import is_typeddict
-
-from ._config import ForwardRefPolicy
-from ._exceptions import TypeCheckError, TypeHintWarning
-from ._memo import TypeCheckMemo
-from ._utils import evaluate_forwardref, get_stacklevel, get_type_name, qualified_name
-
-if sys.version_info >= (3, 11):
-    from typing import (
-        Annotated,
-        NotRequired,
-        TypeAlias,
-        get_args,
-        get_origin,
-    )
-
-    SubclassableAny = Any
-else:
-    from typing_extensions import (
-        Annotated,
-        NotRequired,
-        TypeAlias,
-        get_args,
-        get_origin,
-    )
-    from typing_extensions import Any as SubclassableAny
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import entry_points
-    from typing import ParamSpec
-else:
-    from importlib_metadata import entry_points
-    from typing_extensions import ParamSpec
-
-TypeCheckerCallable: TypeAlias = Callable[
-    [Any, Any, Tuple[Any, ...], TypeCheckMemo], Any
-]
-TypeCheckLookupCallback: TypeAlias = Callable[
-    [Any, Tuple[Any, ...], Tuple[Any, ...]], Optional[TypeCheckerCallable]
-]
-
-checker_lookup_functions: list[TypeCheckLookupCallback] = []
-generic_alias_types: tuple[type, ...] = (type(List), type(List[Any]))
-if sys.version_info >= (3, 9):
-    generic_alias_types += (types.GenericAlias,)
-
-protocol_check_cache: WeakKeyDictionary[
-    type[Any], dict[type[Any], TypeCheckError | None]
-] = WeakKeyDictionary()
-
-# Sentinel
-_missing = object()
-
-# Lifted from mypy.sharedparse
-BINARY_MAGIC_METHODS = {
-    "__add__",
-    "__and__",
-    "__cmp__",
-    "__divmod__",
-    "__div__",
-    "__eq__",
-    "__floordiv__",
-    "__ge__",
-    "__gt__",
-    "__iadd__",
-    "__iand__",
-    "__idiv__",
-    "__ifloordiv__",
-    "__ilshift__",
-    "__imatmul__",
-    "__imod__",
-    "__imul__",
-    "__ior__",
-    "__ipow__",
-    "__irshift__",
-    "__isub__",
-    "__itruediv__",
-    "__ixor__",
-    "__le__",
-    "__lshift__",
-    "__lt__",
-    "__matmul__",
-    "__mod__",
-    "__mul__",
-    "__ne__",
-    "__or__",
-    "__pow__",
-    "__radd__",
-    "__rand__",
-    "__rdiv__",
-    "__rfloordiv__",
-    "__rlshift__",
-    "__rmatmul__",
-    "__rmod__",
-    "__rmul__",
-    "__ror__",
-    "__rpow__",
-    "__rrshift__",
-    "__rshift__",
-    "__rsub__",
-    "__rtruediv__",
-    "__rxor__",
-    "__sub__",
-    "__truediv__",
-    "__xor__",
-}
-
-
-def check_callable(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not callable(value):
-        raise TypeCheckError("is not callable")
-
-    if args:
-        try:
-            signature = inspect.signature(value)
-        except (TypeError, ValueError):
-            return
-
-        argument_types = args[0]
-        if isinstance(argument_types, list) and not any(
-            type(item) is ParamSpec for item in argument_types
-        ):
-            # The callable must not have keyword-only arguments without defaults
-            unfulfilled_kwonlyargs = [
-                param.name
-                for param in signature.parameters.values()
-                if param.kind == Parameter.KEYWORD_ONLY
-                and param.default == Parameter.empty
-            ]
-            if unfulfilled_kwonlyargs:
-                raise TypeCheckError(
-                    f"has mandatory keyword-only arguments in its declaration: "
-                    f'{", ".join(unfulfilled_kwonlyargs)}'
-                )
-
-            num_positional_args = num_mandatory_pos_args = 0
-            has_varargs = False
-            for param in signature.parameters.values():
-                if param.kind in (
-                    Parameter.POSITIONAL_ONLY,
-                    Parameter.POSITIONAL_OR_KEYWORD,
-                ):
-                    num_positional_args += 1
-                    if param.default is Parameter.empty:
-                        num_mandatory_pos_args += 1
-                elif param.kind == Parameter.VAR_POSITIONAL:
-                    has_varargs = True
-
-            if num_mandatory_pos_args > len(argument_types):
-                raise TypeCheckError(
-                    f"has too many mandatory positional arguments in its declaration; "
-                    f"expected {len(argument_types)} but {num_mandatory_pos_args} "
-                    f"mandatory positional argument(s) declared"
-                )
-            elif not has_varargs and num_positional_args < len(argument_types):
-                raise TypeCheckError(
-                    f"has too few arguments in its declaration; expected "
-                    f"{len(argument_types)} but {num_positional_args} argument(s) "
-                    f"declared"
-                )
-
-
-def check_mapping(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is Dict or origin_type is dict:
-        if not isinstance(value, dict):
-            raise TypeCheckError("is not a dict")
-    if origin_type is MutableMapping or origin_type is collections.abc.MutableMapping:
-        if not isinstance(value, collections.abc.MutableMapping):
-            raise TypeCheckError("is not a mutable mapping")
-    elif not isinstance(value, collections.abc.Mapping):
-        raise TypeCheckError("is not a mapping")
-
-    if args:
-        key_type, value_type = args
-        if key_type is not Any or value_type is not Any:
-            samples = memo.config.collection_check_strategy.iterate_samples(
-                value.items()
-            )
-            for k, v in samples:
-                try:
-                    check_type_internal(k, key_type, memo)
-                except TypeCheckError as exc:
-                    exc.append_path_element(f"key {k!r}")
-                    raise
-
-                try:
-                    check_type_internal(v, value_type, memo)
-                except TypeCheckError as exc:
-                    exc.append_path_element(f"value of key {k!r}")
-                    raise
-
-
-def check_typed_dict(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, dict):
-        raise TypeCheckError("is not a dict")
-
-    declared_keys = frozenset(origin_type.__annotations__)
-    if hasattr(origin_type, "__required_keys__"):
-        required_keys = set(origin_type.__required_keys__)
-    else:  # py3.8 and lower
-        required_keys = set(declared_keys) if origin_type.__total__ else set()
-
-    existing_keys = set(value)
-    extra_keys = existing_keys - declared_keys
-    if extra_keys:
-        keys_formatted = ", ".join(f'"{key}"' for key in sorted(extra_keys, key=repr))
-        raise TypeCheckError(f"has unexpected extra key(s): {keys_formatted}")
-
-    # Detect NotRequired fields which are hidden by get_type_hints()
-    type_hints: dict[str, type] = {}
-    for key, annotation in origin_type.__annotations__.items():
-        if isinstance(annotation, ForwardRef):
-            annotation = evaluate_forwardref(annotation, memo)
-            if get_origin(annotation) is NotRequired:
-                required_keys.discard(key)
-                annotation = get_args(annotation)[0]
-
-        type_hints[key] = annotation
-
-    missing_keys = required_keys - existing_keys
-    if missing_keys:
-        keys_formatted = ", ".join(f'"{key}"' for key in sorted(missing_keys, key=repr))
-        raise TypeCheckError(f"is missing required key(s): {keys_formatted}")
-
-    for key, argtype in type_hints.items():
-        argvalue = value.get(key, _missing)
-        if argvalue is not _missing:
-            try:
-                check_type_internal(argvalue, argtype, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"value of key {key!r}")
-                raise
-
-
-def check_list(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, list):
-        raise TypeCheckError("is not a list")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, v in enumerate(samples):
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_sequence(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, collections.abc.Sequence):
-        raise TypeCheckError("is not a sequence")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, v in enumerate(samples):
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_set(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is frozenset:
-        if not isinstance(value, frozenset):
-            raise TypeCheckError("is not a frozenset")
-    elif not isinstance(value, AbstractSet):
-        raise TypeCheckError("is not a set")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for v in samples:
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"[{v}]")
-                raise
-
-
-def check_tuple(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    # Specialized check for NamedTuples
-    if field_types := getattr(origin_type, "__annotations__", None):
-        if not isinstance(value, origin_type):
-            raise TypeCheckError(
-                f"is not a named tuple of type {qualified_name(origin_type)}"
-            )
-
-        for name, field_type in field_types.items():
-            try:
-                check_type_internal(getattr(value, name), field_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"attribute {name!r}")
-                raise
-
-        return
-    elif not isinstance(value, tuple):
-        raise TypeCheckError("is not a tuple")
-
-    if args:
-        use_ellipsis = args[-1] is Ellipsis
-        tuple_params = args[: -1 if use_ellipsis else None]
-    else:
-        # Unparametrized Tuple or plain tuple
-        return
-
-    if use_ellipsis:
-        element_type = tuple_params[0]
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, element in enumerate(samples):
-            try:
-                check_type_internal(element, element_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-    elif tuple_params == ((),):
-        if value != ():
-            raise TypeCheckError("is not an empty tuple")
-    else:
-        if len(value) != len(tuple_params):
-            raise TypeCheckError(
-                f"has wrong number of elements (expected {len(tuple_params)}, got "
-                f"{len(value)} instead)"
-            )
-
-        for i, (element, element_type) in enumerate(zip(value, tuple_params)):
-            try:
-                check_type_internal(element, element_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_union(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    errors: dict[str, TypeCheckError] = {}
-    try:
-        for type_ in args:
-            try:
-                check_type_internal(value, type_, memo)
-                return
-            except TypeCheckError as exc:
-                errors[get_type_name(type_)] = exc
-
-        formatted_errors = indent(
-            "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-        )
-    finally:
-        del errors  # avoid creating ref cycle
-    raise TypeCheckError(f"did not match any element in the union:\n{formatted_errors}")
-
-
-def check_uniontype(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    errors: dict[str, TypeCheckError] = {}
-    for type_ in args:
-        try:
-            check_type_internal(value, type_, memo)
-            return
-        except TypeCheckError as exc:
-            errors[get_type_name(type_)] = exc
-
-    formatted_errors = indent(
-        "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-    )
-    raise TypeCheckError(f"did not match any element in the union:\n{formatted_errors}")
-
-
-def check_class(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isclass(value) and not isinstance(value, generic_alias_types):
-        raise TypeCheckError("is not a class")
-
-    if not args:
-        return
-
-    if isinstance(args[0], ForwardRef):
-        expected_class = evaluate_forwardref(args[0], memo)
-    else:
-        expected_class = args[0]
-
-    if expected_class is Any:
-        return
-    elif getattr(expected_class, "_is_protocol", False):
-        check_protocol(value, expected_class, (), memo)
-    elif isinstance(expected_class, TypeVar):
-        check_typevar(value, expected_class, (), memo, subclass_check=True)
-    elif get_origin(expected_class) is Union:
-        errors: dict[str, TypeCheckError] = {}
-        for arg in get_args(expected_class):
-            if arg is Any:
-                return
-
-            try:
-                check_class(value, type, (arg,), memo)
-                return
-            except TypeCheckError as exc:
-                errors[get_type_name(arg)] = exc
-        else:
-            formatted_errors = indent(
-                "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-            )
-            raise TypeCheckError(
-                f"did not match any element in the union:\n{formatted_errors}"
-            )
-    elif not issubclass(value, expected_class):  # type: ignore[arg-type]
-        raise TypeCheckError(f"is not a subclass of {qualified_name(expected_class)}")
-
-
-def check_newtype(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, origin_type.__supertype__, memo)
-
-
-def check_instance(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, origin_type):
-        raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-
-
-def check_typevar(
-    value: Any,
-    origin_type: TypeVar,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-    *,
-    subclass_check: bool = False,
-) -> None:
-    if origin_type.__bound__ is not None:
-        annotation = (
-            Type[origin_type.__bound__] if subclass_check else origin_type.__bound__
-        )
-        check_type_internal(value, annotation, memo)
-    elif origin_type.__constraints__:
-        for constraint in origin_type.__constraints__:
-            annotation = Type[constraint] if subclass_check else constraint
-            try:
-                check_type_internal(value, annotation, memo)
-            except TypeCheckError:
-                pass
-            else:
-                break
-        else:
-            formatted_constraints = ", ".join(
-                get_type_name(constraint) for constraint in origin_type.__constraints__
-            )
-            raise TypeCheckError(
-                f"does not match any of the constraints " f"({formatted_constraints})"
-            )
-
-
-if typing_extensions is None:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal
-
-else:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal or typ is typing_extensions.Literal
-
-
-def check_literal(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    def get_literal_args(literal_args: tuple[Any, ...]) -> tuple[Any, ...]:
-        retval: list[Any] = []
-        for arg in literal_args:
-            if _is_literal_type(get_origin(arg)):
-                retval.extend(get_literal_args(arg.__args__))
-            elif arg is None or isinstance(arg, (int, str, bytes, bool, Enum)):
-                retval.append(arg)
-            else:
-                raise TypeError(
-                    f"Illegal literal value: {arg}"
-                )  # TypeError here is deliberate
-
-        return tuple(retval)
-
-    final_args = tuple(get_literal_args(args))
-    try:
-        index = final_args.index(value)
-    except ValueError:
-        pass
-    else:
-        if type(final_args[index]) is type(value):
-            return
-
-    formatted_args = ", ".join(repr(arg) for arg in final_args)
-    raise TypeCheckError(f"is not any of ({formatted_args})") from None
-
-
-def check_literal_string(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, str, memo)
-
-
-def check_typeguard(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, bool, memo)
-
-
-def check_none(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if value is not None:
-        raise TypeCheckError("is not None")
-
-
-def check_number(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is complex and not isinstance(value, (complex, float, int)):
-        raise TypeCheckError("is neither complex, float or int")
-    elif origin_type is float and not isinstance(value, (float, int)):
-        raise TypeCheckError("is neither float or int")
-
-
-def check_io(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is TextIO or (origin_type is IO and args == (str,)):
-        if not isinstance(value, TextIOBase):
-            raise TypeCheckError("is not a text based I/O object")
-    elif origin_type is BinaryIO or (origin_type is IO and args == (bytes,)):
-        if not isinstance(value, (RawIOBase, BufferedIOBase)):
-            raise TypeCheckError("is not a binary I/O object")
-    elif not isinstance(value, IOBase):
-        raise TypeCheckError("is not an I/O object")
-
-
-def check_protocol(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    subject: type[Any] = value if isclass(value) else type(value)
-
-    if subject in protocol_check_cache:
-        result_map = protocol_check_cache[subject]
-        if origin_type in result_map:
-            if exc := result_map[origin_type]:
-                raise exc
-            else:
-                return
-
-    # Collect a set of methods and non-method attributes present in the protocol
-    ignored_attrs = set(dir(typing.Protocol)) | {
-        "__annotations__",
-        "__non_callable_proto_members__",
-    }
-    expected_methods: dict[str, tuple[Any, Any]] = {}
-    expected_noncallable_members: dict[str, Any] = {}
-    for attrname in dir(origin_type):
-        # Skip attributes present in typing.Protocol
-        if attrname in ignored_attrs:
-            continue
-
-        member = getattr(origin_type, attrname)
-        if callable(member):
-            signature = inspect.signature(member)
-            argtypes = [
-                (p.annotation if p.annotation is not Parameter.empty else Any)
-                for p in signature.parameters.values()
-                if p.kind is not Parameter.KEYWORD_ONLY
-            ] or Ellipsis
-            return_annotation = (
-                signature.return_annotation
-                if signature.return_annotation is not Parameter.empty
-                else Any
-            )
-            expected_methods[attrname] = argtypes, return_annotation
-        else:
-            expected_noncallable_members[attrname] = member
-
-    for attrname, annotation in typing.get_type_hints(origin_type).items():
-        expected_noncallable_members[attrname] = annotation
-
-    subject_annotations = typing.get_type_hints(subject)
-
-    # Check that all required methods are present and their signatures are compatible
-    result_map = protocol_check_cache.setdefault(subject, {})
-    try:
-        for attrname, callable_args in expected_methods.items():
-            try:
-                method = getattr(subject, attrname)
-            except AttributeError:
-                if attrname in subject_annotations:
-                    raise TypeCheckError(
-                        f"is not compatible with the {origin_type.__qualname__} protocol "
-                        f"because its {attrname!r} attribute is not a method"
-                    ) from None
-                else:
-                    raise TypeCheckError(
-                        f"is not compatible with the {origin_type.__qualname__} protocol "
-                        f"because it has no method named {attrname!r}"
-                    ) from None
-
-            if not callable(method):
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because its {attrname!r} attribute is not a callable"
-                )
-
-            # TODO: raise exception on added keyword-only arguments without defaults
-            try:
-                check_callable(method, Callable, callable_args, memo)
-            except TypeCheckError as exc:
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because its {attrname!r} method {exc}"
-                ) from None
-
-        # Check that all required non-callable members are present
-        for attrname in expected_noncallable_members:
-            # TODO: implement assignability checks for non-callable members
-            if attrname not in subject_annotations and not hasattr(subject, attrname):
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because it has no attribute named {attrname!r}"
-                )
-    except TypeCheckError as exc:
-        result_map[origin_type] = exc
-        raise
-    else:
-        result_map[origin_type] = None
-
-
-def check_byteslike(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, (bytearray, bytes, memoryview)):
-        raise TypeCheckError("is not bytes-like")
-
-
-def check_self(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if memo.self_type is None:
-        raise TypeCheckError("cannot be checked against Self outside of a method call")
-
-    if isclass(value):
-        if not issubclass(value, memo.self_type):
-            raise TypeCheckError(
-                f"is not an instance of the self type "
-                f"({qualified_name(memo.self_type)})"
-            )
-    elif not isinstance(value, memo.self_type):
-        raise TypeCheckError(
-            f"is not an instance of the self type ({qualified_name(memo.self_type)})"
-        )
-
-
-def check_paramspec(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    pass  # No-op for now
-
-
-def check_instanceof(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, origin_type):
-        raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-
-
-def check_type_internal(
-    value: Any,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> None:
-    """
-    Check that the given object is compatible with the given type annotation.
-
-    This function should only be used by type checker callables. Applications should use
-    :func:`~.check_type` instead.
-
-    :param value: the value to check
-    :param annotation: the type annotation to check against
-    :param memo: a memo object containing configuration and information necessary for
-        looking up forward references
-    """
-
-    if isinstance(annotation, ForwardRef):
-        try:
-            annotation = evaluate_forwardref(annotation, memo)
-        except NameError:
-            if memo.config.forward_ref_policy is ForwardRefPolicy.ERROR:
-                raise
-            elif memo.config.forward_ref_policy is ForwardRefPolicy.WARN:
-                warnings.warn(
-                    f"Cannot resolve forward reference {annotation.__forward_arg__!r}",
-                    TypeHintWarning,
-                    stacklevel=get_stacklevel(),
-                )
-
-            return
-
-    if annotation is Any or annotation is SubclassableAny or isinstance(value, Mock):
-        return
-
-    # Skip type checks if value is an instance of a class that inherits from Any
-    if not isclass(value) and SubclassableAny in type(value).__bases__:
-        return
-
-    extras: tuple[Any, ...]
-    origin_type = get_origin(annotation)
-    if origin_type is Annotated:
-        annotation, *extras_ = get_args(annotation)
-        extras = tuple(extras_)
-        origin_type = get_origin(annotation)
-    else:
-        extras = ()
-
-    if origin_type is not None:
-        args = get_args(annotation)
-
-        # Compatibility hack to distinguish between unparametrized and empty tuple
-        # (tuple[()]), necessary due to https://github.com/python/cpython/issues/91137
-        if origin_type in (tuple, Tuple) and annotation is not Tuple and not args:
-            args = ((),)
-    else:
-        origin_type = annotation
-        args = ()
-
-    for lookup_func in checker_lookup_functions:
-        checker = lookup_func(origin_type, args, extras)
-        if checker:
-            checker(value, origin_type, args, memo)
-            return
-
-    if isclass(origin_type):
-        if not isinstance(value, origin_type):
-            raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-    elif type(origin_type) is str:  # noqa: E721
-        warnings.warn(
-            f"Skipping type check against {origin_type!r}; this looks like a "
-            f"string-form forward reference imported from another module",
-            TypeHintWarning,
-            stacklevel=get_stacklevel(),
-        )
-
-
-# Equality checks are applied to these
-origin_type_checkers = {
-    bytes: check_byteslike,
-    AbstractSet: check_set,
-    BinaryIO: check_io,
-    Callable: check_callable,
-    collections.abc.Callable: check_callable,
-    complex: check_number,
-    dict: check_mapping,
-    Dict: check_mapping,
-    float: check_number,
-    frozenset: check_set,
-    IO: check_io,
-    list: check_list,
-    List: check_list,
-    typing.Literal: check_literal,
-    Mapping: check_mapping,
-    MutableMapping: check_mapping,
-    None: check_none,
-    collections.abc.Mapping: check_mapping,
-    collections.abc.MutableMapping: check_mapping,
-    Sequence: check_sequence,
-    collections.abc.Sequence: check_sequence,
-    collections.abc.Set: check_set,
-    set: check_set,
-    Set: check_set,
-    TextIO: check_io,
-    tuple: check_tuple,
-    Tuple: check_tuple,
-    type: check_class,
-    Type: check_class,
-    Union: check_union,
-}
-if sys.version_info >= (3, 10):
-    origin_type_checkers[types.UnionType] = check_uniontype
-    origin_type_checkers[typing.TypeGuard] = check_typeguard
-if sys.version_info >= (3, 11):
-    origin_type_checkers.update(
-        {typing.LiteralString: check_literal_string, typing.Self: check_self}
-    )
-if typing_extensions is not None:
-    # On some Python versions, these may simply be re-exports from typing,
-    # but exactly which Python versions is subject to change,
-    # so it's best to err on the safe side
-    # and update the dictionary on all Python versions
-    # if typing_extensions is installed
-    origin_type_checkers[typing_extensions.Literal] = check_literal
-    origin_type_checkers[typing_extensions.LiteralString] = check_literal_string
-    origin_type_checkers[typing_extensions.Self] = check_self
-    origin_type_checkers[typing_extensions.TypeGuard] = check_typeguard
-
-
-def builtin_checker_lookup(
-    origin_type: Any, args: tuple[Any, ...], extras: tuple[Any, ...]
-) -> TypeCheckerCallable | None:
-    checker = origin_type_checkers.get(origin_type)
-    if checker is not None:
-        return checker
-    elif is_typeddict(origin_type):
-        return check_typed_dict
-    elif isclass(origin_type) and issubclass(
-        origin_type,
-        Tuple,  # type: ignore[arg-type]
-    ):
-        # NamedTuple
-        return check_tuple
-    elif getattr(origin_type, "_is_protocol", False):
-        return check_protocol
-    elif isinstance(origin_type, ParamSpec):
-        return check_paramspec
-    elif isinstance(origin_type, TypeVar):
-        return check_typevar
-    elif origin_type.__class__ is NewType:
-        # typing.NewType on Python 3.10+
-        return check_newtype
-    elif (
-        isfunction(origin_type)
-        and getattr(origin_type, "__module__", None) == "typing"
-        and getattr(origin_type, "__qualname__", "").startswith("NewType.")
-        and hasattr(origin_type, "__supertype__")
-    ):
-        # typing.NewType on Python 3.9 and below
-        return check_newtype
-
-    return None
-
-
-checker_lookup_functions.append(builtin_checker_lookup)
-
-
-def load_plugins() -> None:
-    """
-    Load all type checker lookup functions from entry points.
-
-    All entry points from the ``typeguard.checker_lookup`` group are loaded, and the
-    returned lookup functions are added to :data:`typeguard.checker_lookup_functions`.
-
-    .. note:: This function is called implicitly on import, unless the
-        ``TYPEGUARD_DISABLE_PLUGIN_AUTOLOAD`` environment variable is present.
-    """
-
-    for ep in entry_points(group="typeguard.checker_lookup"):
-        try:
-            plugin = ep.load()
-        except Exception as exc:
-            warnings.warn(
-                f"Failed to load plugin {ep.name!r}: " f"{qualified_name(exc)}: {exc}",
-                stacklevel=2,
-            )
-            continue
-
-        if not callable(plugin):
-            warnings.warn(
-                f"Plugin {ep} returned a non-callable object: {plugin!r}", stacklevel=2
-            )
-            continue
-
-        checker_lookup_functions.insert(0, plugin)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_config.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_config.py
deleted file mode 100644
index 36efad5..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_config.py
+++ /dev/null
@@ -1,108 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Iterable
-from dataclasses import dataclass
-from enum import Enum, auto
-from typing import TYPE_CHECKING, TypeVar
-
-if TYPE_CHECKING:
-    from ._functions import TypeCheckFailCallback
-
-T = TypeVar("T")
-
-
-class ForwardRefPolicy(Enum):
-    """
-    Defines how unresolved forward references are handled.
-
-    Members:
-
-    * ``ERROR``: propagate the :exc:`NameError` when the forward reference lookup fails
-    * ``WARN``: emit a :class:`~.TypeHintWarning` if the forward reference lookup fails
-    * ``IGNORE``: silently skip checks for unresolveable forward references
-    """
-
-    ERROR = auto()
-    WARN = auto()
-    IGNORE = auto()
-
-
-class CollectionCheckStrategy(Enum):
-    """
-    Specifies how thoroughly the contents of collections are type checked.
-
-    This has an effect on the following built-in checkers:
-
-    * ``AbstractSet``
-    * ``Dict``
-    * ``List``
-    * ``Mapping``
-    * ``Set``
-    * ``Tuple[, ...]`` (arbitrarily sized tuples)
-
-    Members:
-
-    * ``FIRST_ITEM``: check only the first item
-    * ``ALL_ITEMS``: check all items
-    """
-
-    FIRST_ITEM = auto()
-    ALL_ITEMS = auto()
-
-    def iterate_samples(self, collection: Iterable[T]) -> Iterable[T]:
-        if self is CollectionCheckStrategy.FIRST_ITEM:
-            try:
-                return [next(iter(collection))]
-            except StopIteration:
-                return ()
-        else:
-            return collection
-
-
-@dataclass
-class TypeCheckConfiguration:
-    """
-     You can change Typeguard's behavior with these settings.
-
-    .. attribute:: typecheck_fail_callback
-       :type: Callable[[TypeCheckError, TypeCheckMemo], Any]
-
-         Callable that is called when type checking fails.
-
-         Default: ``None`` (the :exc:`~.TypeCheckError` is raised directly)
-
-    .. attribute:: forward_ref_policy
-       :type: ForwardRefPolicy
-
-         Specifies what to do when a forward reference fails to resolve.
-
-         Default: ``WARN``
-
-    .. attribute:: collection_check_strategy
-       :type: CollectionCheckStrategy
-
-         Specifies how thoroughly the contents of collections (list, dict, etc.) are
-         type checked.
-
-         Default: ``FIRST_ITEM``
-
-    .. attribute:: debug_instrumentation
-       :type: bool
-
-         If set to ``True``, the code of modules or functions instrumented by typeguard
-         is printed to ``sys.stderr`` after the instrumentation is done
-
-         Requires Python 3.9 or newer.
-
-         Default: ``False``
-    """
-
-    forward_ref_policy: ForwardRefPolicy = ForwardRefPolicy.WARN
-    typecheck_fail_callback: TypeCheckFailCallback | None = None
-    collection_check_strategy: CollectionCheckStrategy = (
-        CollectionCheckStrategy.FIRST_ITEM
-    )
-    debug_instrumentation: bool = False
-
-
-global_config = TypeCheckConfiguration()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_decorators.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_decorators.py
deleted file mode 100644
index cf32533..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_decorators.py
+++ /dev/null
@@ -1,235 +0,0 @@
-from __future__ import annotations
-
-import ast
-import inspect
-import sys
-from collections.abc import Sequence
-from functools import partial
-from inspect import isclass, isfunction
-from types import CodeType, FrameType, FunctionType
-from typing import TYPE_CHECKING, Any, Callable, ForwardRef, TypeVar, cast, overload
-from warnings import warn
-
-from ._config import CollectionCheckStrategy, ForwardRefPolicy, global_config
-from ._exceptions import InstrumentationWarning
-from ._functions import TypeCheckFailCallback
-from ._transformer import TypeguardTransformer
-from ._utils import Unset, function_name, get_stacklevel, is_method_of, unset
-
-if TYPE_CHECKING:
-    from typeshed.stdlib.types import _Cell
-
-    _F = TypeVar("_F")
-
-    def typeguard_ignore(f: _F) -> _F:
-        """This decorator is a noop during static type-checking."""
-        return f
-
-else:
-    from typing import no_type_check as typeguard_ignore  # noqa: F401
-
-T_CallableOrType = TypeVar("T_CallableOrType", bound=Callable[..., Any])
-
-
-def make_cell(value: object) -> _Cell:
-    return (lambda: value).__closure__[0]  # type: ignore[index]
-
-
-def find_target_function(
-    new_code: CodeType, target_path: Sequence[str], firstlineno: int
-) -> CodeType | None:
-    target_name = target_path[0]
-    for const in new_code.co_consts:
-        if isinstance(const, CodeType):
-            if const.co_name == target_name:
-                if const.co_firstlineno == firstlineno:
-                    return const
-                elif len(target_path) > 1:
-                    target_code = find_target_function(
-                        const, target_path[1:], firstlineno
-                    )
-                    if target_code:
-                        return target_code
-
-    return None
-
-
-def instrument(f: T_CallableOrType) -> FunctionType | str:
-    if not getattr(f, "__code__", None):
-        return "no code associated"
-    elif not getattr(f, "__module__", None):
-        return "__module__ attribute is not set"
-    elif f.__code__.co_filename == "":
-        return "cannot instrument functions defined in a REPL"
-    elif hasattr(f, "__wrapped__"):
-        return (
-            "@typechecked only supports instrumenting functions wrapped with "
-            "@classmethod, @staticmethod or @property"
-        )
-
-    target_path = [item for item in f.__qualname__.split(".") if item != ""]
-    module_source = inspect.getsource(sys.modules[f.__module__])
-    module_ast = ast.parse(module_source)
-    instrumentor = TypeguardTransformer(target_path, f.__code__.co_firstlineno)
-    instrumentor.visit(module_ast)
-
-    if not instrumentor.target_node or instrumentor.target_lineno is None:
-        return "instrumentor did not find the target function"
-
-    module_code = compile(module_ast, f.__code__.co_filename, "exec", dont_inherit=True)
-    new_code = find_target_function(
-        module_code, target_path, instrumentor.target_lineno
-    )
-    if not new_code:
-        return "cannot find the target function in the AST"
-
-    if global_config.debug_instrumentation and sys.version_info >= (3, 9):
-        # Find the matching AST node, then unparse it to source and print to stdout
-        print(
-            f"Source code of {f.__qualname__}() after instrumentation:"
-            "\n----------------------------------------------",
-            file=sys.stderr,
-        )
-        print(ast.unparse(instrumentor.target_node), file=sys.stderr)
-        print(
-            "----------------------------------------------",
-            file=sys.stderr,
-        )
-
-    closure = f.__closure__
-    if new_code.co_freevars != f.__code__.co_freevars:
-        # Create a new closure and find values for the new free variables
-        frame = cast(FrameType, inspect.currentframe())
-        frame = cast(FrameType, frame.f_back)
-        frame_locals = cast(FrameType, frame.f_back).f_locals
-        cells: list[_Cell] = []
-        for key in new_code.co_freevars:
-            if key in instrumentor.names_used_in_annotations:
-                # Find the value and make a new cell from it
-                value = frame_locals.get(key) or ForwardRef(key)
-                cells.append(make_cell(value))
-            else:
-                # Reuse the cell from the existing closure
-                assert f.__closure__
-                cells.append(f.__closure__[f.__code__.co_freevars.index(key)])
-
-        closure = tuple(cells)
-
-    new_function = FunctionType(new_code, f.__globals__, f.__name__, closure=closure)
-    new_function.__module__ = f.__module__
-    new_function.__name__ = f.__name__
-    new_function.__qualname__ = f.__qualname__
-    new_function.__annotations__ = f.__annotations__
-    new_function.__doc__ = f.__doc__
-    new_function.__defaults__ = f.__defaults__
-    new_function.__kwdefaults__ = f.__kwdefaults__
-    return new_function
-
-
-@overload
-def typechecked(
-    *,
-    forward_ref_policy: ForwardRefPolicy | Unset = unset,
-    typecheck_fail_callback: TypeCheckFailCallback | Unset = unset,
-    collection_check_strategy: CollectionCheckStrategy | Unset = unset,
-    debug_instrumentation: bool | Unset = unset,
-) -> Callable[[T_CallableOrType], T_CallableOrType]: ...
-
-
-@overload
-def typechecked(target: T_CallableOrType) -> T_CallableOrType: ...
-
-
-def typechecked(
-    target: T_CallableOrType | None = None,
-    *,
-    forward_ref_policy: ForwardRefPolicy | Unset = unset,
-    typecheck_fail_callback: TypeCheckFailCallback | Unset = unset,
-    collection_check_strategy: CollectionCheckStrategy | Unset = unset,
-    debug_instrumentation: bool | Unset = unset,
-) -> Any:
-    """
-    Instrument the target function to perform run-time type checking.
-
-    This decorator recompiles the target function, injecting code to type check
-    arguments, return values, yield values (excluding ``yield from``) and assignments to
-    annotated local variables.
-
-    This can also be used as a class decorator. This will instrument all type annotated
-    methods, including :func:`@classmethod `,
-    :func:`@staticmethod `,  and :class:`@property ` decorated
-    methods in the class.
-
-    .. note:: When Python is run in optimized mode (``-O`` or ``-OO``, this decorator
-        is a no-op). This is a feature meant for selectively introducing type checking
-        into a code base where the checks aren't meant to be run in production.
-
-    :param target: the function or class to enable type checking for
-    :param forward_ref_policy: override for
-        :attr:`.TypeCheckConfiguration.forward_ref_policy`
-    :param typecheck_fail_callback: override for
-        :attr:`.TypeCheckConfiguration.typecheck_fail_callback`
-    :param collection_check_strategy: override for
-        :attr:`.TypeCheckConfiguration.collection_check_strategy`
-    :param debug_instrumentation: override for
-        :attr:`.TypeCheckConfiguration.debug_instrumentation`
-
-    """
-    if target is None:
-        return partial(
-            typechecked,
-            forward_ref_policy=forward_ref_policy,
-            typecheck_fail_callback=typecheck_fail_callback,
-            collection_check_strategy=collection_check_strategy,
-            debug_instrumentation=debug_instrumentation,
-        )
-
-    if not __debug__:
-        return target
-
-    if isclass(target):
-        for key, attr in target.__dict__.items():
-            if is_method_of(attr, target):
-                retval = instrument(attr)
-                if isfunction(retval):
-                    setattr(target, key, retval)
-            elif isinstance(attr, (classmethod, staticmethod)):
-                if is_method_of(attr.__func__, target):
-                    retval = instrument(attr.__func__)
-                    if isfunction(retval):
-                        wrapper = attr.__class__(retval)
-                        setattr(target, key, wrapper)
-            elif isinstance(attr, property):
-                kwargs: dict[str, Any] = dict(doc=attr.__doc__)
-                for name in ("fset", "fget", "fdel"):
-                    property_func = kwargs[name] = getattr(attr, name)
-                    if is_method_of(property_func, target):
-                        retval = instrument(property_func)
-                        if isfunction(retval):
-                            kwargs[name] = retval
-
-                setattr(target, key, attr.__class__(**kwargs))
-
-        return target
-
-    # Find either the first Python wrapper or the actual function
-    wrapper_class: (
-        type[classmethod[Any, Any, Any]] | type[staticmethod[Any, Any]] | None
-    ) = None
-    if isinstance(target, (classmethod, staticmethod)):
-        wrapper_class = target.__class__
-        target = target.__func__
-
-    retval = instrument(target)
-    if isinstance(retval, str):
-        warn(
-            f"{retval} -- not typechecking {function_name(target)}",
-            InstrumentationWarning,
-            stacklevel=get_stacklevel(),
-        )
-        return target
-
-    if wrapper_class is None:
-        return retval
-    else:
-        return wrapper_class(retval)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_exceptions.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_exceptions.py
deleted file mode 100644
index 625437a..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_exceptions.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from collections import deque
-from typing import Deque
-
-
-class TypeHintWarning(UserWarning):
-    """
-    A warning that is emitted when a type hint in string form could not be resolved to
-    an actual type.
-    """
-
-
-class TypeCheckWarning(UserWarning):
-    """Emitted by typeguard's type checkers when a type mismatch is detected."""
-
-    def __init__(self, message: str):
-        super().__init__(message)
-
-
-class InstrumentationWarning(UserWarning):
-    """Emitted when there's a problem with instrumenting a function for type checks."""
-
-    def __init__(self, message: str):
-        super().__init__(message)
-
-
-class TypeCheckError(Exception):
-    """
-    Raised by typeguard's type checkers when a type mismatch is detected.
-    """
-
-    def __init__(self, message: str):
-        super().__init__(message)
-        self._path: Deque[str] = deque()
-
-    def append_path_element(self, element: str) -> None:
-        self._path.append(element)
-
-    def __str__(self) -> str:
-        if self._path:
-            return " of ".join(self._path) + " " + str(self.args[0])
-        else:
-            return str(self.args[0])
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_functions.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_functions.py
deleted file mode 100644
index 2849785..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_functions.py
+++ /dev/null
@@ -1,308 +0,0 @@
-from __future__ import annotations
-
-import sys
-import warnings
-from typing import Any, Callable, NoReturn, TypeVar, Union, overload
-
-from . import _suppression
-from ._checkers import BINARY_MAGIC_METHODS, check_type_internal
-from ._config import (
-    CollectionCheckStrategy,
-    ForwardRefPolicy,
-    TypeCheckConfiguration,
-)
-from ._exceptions import TypeCheckError, TypeCheckWarning
-from ._memo import TypeCheckMemo
-from ._utils import get_stacklevel, qualified_name
-
-if sys.version_info >= (3, 11):
-    from typing import Literal, Never, TypeAlias
-else:
-    from typing_extensions import Literal, Never, TypeAlias
-
-T = TypeVar("T")
-TypeCheckFailCallback: TypeAlias = Callable[[TypeCheckError, TypeCheckMemo], Any]
-
-
-@overload
-def check_type(
-    value: object,
-    expected_type: type[T],
-    *,
-    forward_ref_policy: ForwardRefPolicy = ...,
-    typecheck_fail_callback: TypeCheckFailCallback | None = ...,
-    collection_check_strategy: CollectionCheckStrategy = ...,
-) -> T: ...
-
-
-@overload
-def check_type(
-    value: object,
-    expected_type: Any,
-    *,
-    forward_ref_policy: ForwardRefPolicy = ...,
-    typecheck_fail_callback: TypeCheckFailCallback | None = ...,
-    collection_check_strategy: CollectionCheckStrategy = ...,
-) -> Any: ...
-
-
-def check_type(
-    value: object,
-    expected_type: Any,
-    *,
-    forward_ref_policy: ForwardRefPolicy = TypeCheckConfiguration().forward_ref_policy,
-    typecheck_fail_callback: TypeCheckFailCallback | None = (
-        TypeCheckConfiguration().typecheck_fail_callback
-    ),
-    collection_check_strategy: CollectionCheckStrategy = (
-        TypeCheckConfiguration().collection_check_strategy
-    ),
-) -> Any:
-    """
-    Ensure that ``value`` matches ``expected_type``.
-
-    The types from the :mod:`typing` module do not support :func:`isinstance` or
-    :func:`issubclass` so a number of type specific checks are required. This function
-    knows which checker to call for which type.
-
-    This function wraps :func:`~.check_type_internal` in the following ways:
-
-    * Respects type checking suppression (:func:`~.suppress_type_checks`)
-    * Forms a :class:`~.TypeCheckMemo` from the current stack frame
-    * Calls the configured type check fail callback if the check fails
-
-    Note that this function is independent of the globally shared configuration in
-    :data:`typeguard.config`. This means that usage within libraries is safe from being
-    affected configuration changes made by other libraries or by the integrating
-    application. Instead, configuration options have the same default values as their
-    corresponding fields in :class:`TypeCheckConfiguration`.
-
-    :param value: value to be checked against ``expected_type``
-    :param expected_type: a class or generic type instance, or a tuple of such things
-    :param forward_ref_policy: see :attr:`TypeCheckConfiguration.forward_ref_policy`
-    :param typecheck_fail_callback:
-        see :attr`TypeCheckConfiguration.typecheck_fail_callback`
-    :param collection_check_strategy:
-        see :attr:`TypeCheckConfiguration.collection_check_strategy`
-    :return: ``value``, unmodified
-    :raises TypeCheckError: if there is a type mismatch
-
-    """
-    if type(expected_type) is tuple:
-        expected_type = Union[expected_type]
-
-    config = TypeCheckConfiguration(
-        forward_ref_policy=forward_ref_policy,
-        typecheck_fail_callback=typecheck_fail_callback,
-        collection_check_strategy=collection_check_strategy,
-    )
-
-    if _suppression.type_checks_suppressed or expected_type is Any:
-        return value
-
-    frame = sys._getframe(1)
-    memo = TypeCheckMemo(frame.f_globals, frame.f_locals, config=config)
-    try:
-        check_type_internal(value, expected_type, memo)
-    except TypeCheckError as exc:
-        exc.append_path_element(qualified_name(value, add_class_prefix=True))
-        if config.typecheck_fail_callback:
-            config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return value
-
-
-def check_argument_types(
-    func_name: str,
-    arguments: dict[str, tuple[Any, Any]],
-    memo: TypeCheckMemo,
-) -> Literal[True]:
-    if _suppression.type_checks_suppressed:
-        return True
-
-    for argname, (value, annotation) in arguments.items():
-        if annotation is NoReturn or annotation is Never:
-            exc = TypeCheckError(
-                f"{func_name}() was declared never to be called but it was"
-            )
-            if memo.config.typecheck_fail_callback:
-                memo.config.typecheck_fail_callback(exc, memo)
-            else:
-                raise exc
-
-        try:
-            check_type_internal(value, annotation, memo)
-        except TypeCheckError as exc:
-            qualname = qualified_name(value, add_class_prefix=True)
-            exc.append_path_element(f'argument "{argname}" ({qualname})')
-            if memo.config.typecheck_fail_callback:
-                memo.config.typecheck_fail_callback(exc, memo)
-            else:
-                raise
-
-    return True
-
-
-def check_return_type(
-    func_name: str,
-    retval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return retval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(f"{func_name}() was declared never to return but it did")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(retval, annotation, memo)
-    except TypeCheckError as exc:
-        # Allow NotImplemented if this is a binary magic method (__eq__() et al)
-        if retval is NotImplemented and annotation is bool:
-            # This does (and cannot) not check if it's actually a method
-            func_name = func_name.rsplit(".", 1)[-1]
-            if func_name in BINARY_MAGIC_METHODS:
-                return retval
-
-        qualname = qualified_name(retval, add_class_prefix=True)
-        exc.append_path_element(f"the return value ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return retval
-
-
-def check_send_type(
-    func_name: str,
-    sendval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return sendval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(
-            f"{func_name}() was declared never to be sent a value to but it was"
-        )
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(sendval, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(sendval, add_class_prefix=True)
-        exc.append_path_element(f"the value sent to generator ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return sendval
-
-
-def check_yield_type(
-    func_name: str,
-    yieldval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return yieldval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(f"{func_name}() was declared never to yield but it did")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(yieldval, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(yieldval, add_class_prefix=True)
-        exc.append_path_element(f"the yielded value ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return yieldval
-
-
-def check_variable_assignment(
-    value: object, varname: str, annotation: Any, memo: TypeCheckMemo
-) -> Any:
-    if _suppression.type_checks_suppressed:
-        return value
-
-    try:
-        check_type_internal(value, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(value, add_class_prefix=True)
-        exc.append_path_element(f"value assigned to {varname} ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return value
-
-
-def check_multi_variable_assignment(
-    value: Any, targets: list[dict[str, Any]], memo: TypeCheckMemo
-) -> Any:
-    if max(len(target) for target in targets) == 1:
-        iterated_values = [value]
-    else:
-        iterated_values = list(value)
-
-    if not _suppression.type_checks_suppressed:
-        for expected_types in targets:
-            value_index = 0
-            for ann_index, (varname, expected_type) in enumerate(
-                expected_types.items()
-            ):
-                if varname.startswith("*"):
-                    varname = varname[1:]
-                    keys_left = len(expected_types) - 1 - ann_index
-                    next_value_index = len(iterated_values) - keys_left
-                    obj: object = iterated_values[value_index:next_value_index]
-                    value_index = next_value_index
-                else:
-                    obj = iterated_values[value_index]
-                    value_index += 1
-
-                try:
-                    check_type_internal(obj, expected_type, memo)
-                except TypeCheckError as exc:
-                    qualname = qualified_name(obj, add_class_prefix=True)
-                    exc.append_path_element(f"value assigned to {varname} ({qualname})")
-                    if memo.config.typecheck_fail_callback:
-                        memo.config.typecheck_fail_callback(exc, memo)
-                    else:
-                        raise
-
-    return iterated_values[0] if len(iterated_values) == 1 else iterated_values
-
-
-def warn_on_error(exc: TypeCheckError, memo: TypeCheckMemo) -> None:
-    """
-    Emit a warning on a type mismatch.
-
-    This is intended to be used as an error handler in
-    :attr:`TypeCheckConfiguration.typecheck_fail_callback`.
-
-    """
-    warnings.warn(TypeCheckWarning(str(exc)), stacklevel=get_stacklevel())
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_importhook.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_importhook.py
deleted file mode 100644
index 8590540..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_importhook.py
+++ /dev/null
@@ -1,213 +0,0 @@
-from __future__ import annotations
-
-import ast
-import sys
-import types
-from collections.abc import Callable, Iterable
-from importlib.abc import MetaPathFinder
-from importlib.machinery import ModuleSpec, SourceFileLoader
-from importlib.util import cache_from_source, decode_source
-from inspect import isclass
-from os import PathLike
-from types import CodeType, ModuleType, TracebackType
-from typing import Sequence, TypeVar
-from unittest.mock import patch
-
-from ._config import global_config
-from ._transformer import TypeguardTransformer
-
-if sys.version_info >= (3, 12):
-    from collections.abc import Buffer
-else:
-    from typing_extensions import Buffer
-
-if sys.version_info >= (3, 11):
-    from typing import ParamSpec
-else:
-    from typing_extensions import ParamSpec
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import PackageNotFoundError, version
-else:
-    from importlib_metadata import PackageNotFoundError, version
-
-try:
-    OPTIMIZATION = "typeguard" + "".join(version("typeguard").split(".")[:3])
-except PackageNotFoundError:
-    OPTIMIZATION = "typeguard"
-
-P = ParamSpec("P")
-T = TypeVar("T")
-
-
-# The name of this function is magical
-def _call_with_frames_removed(
-    f: Callable[P, T], *args: P.args, **kwargs: P.kwargs
-) -> T:
-    return f(*args, **kwargs)
-
-
-def optimized_cache_from_source(path: str, debug_override: bool | None = None) -> str:
-    return cache_from_source(path, debug_override, optimization=OPTIMIZATION)
-
-
-class TypeguardLoader(SourceFileLoader):
-    @staticmethod
-    def source_to_code(
-        data: Buffer | str | ast.Module | ast.Expression | ast.Interactive,
-        path: Buffer | str | PathLike[str] = "",
-    ) -> CodeType:
-        if isinstance(data, (ast.Module, ast.Expression, ast.Interactive)):
-            tree = data
-        else:
-            if isinstance(data, str):
-                source = data
-            else:
-                source = decode_source(data)
-
-            tree = _call_with_frames_removed(
-                ast.parse,
-                source,
-                path,
-                "exec",
-            )
-
-        tree = TypeguardTransformer().visit(tree)
-        ast.fix_missing_locations(tree)
-
-        if global_config.debug_instrumentation and sys.version_info >= (3, 9):
-            print(
-                f"Source code of {path!r} after instrumentation:\n"
-                "----------------------------------------------",
-                file=sys.stderr,
-            )
-            print(ast.unparse(tree), file=sys.stderr)
-            print("----------------------------------------------", file=sys.stderr)
-
-        return _call_with_frames_removed(
-            compile, tree, path, "exec", 0, dont_inherit=True
-        )
-
-    def exec_module(self, module: ModuleType) -> None:
-        # Use a custom optimization marker – the import lock should make this monkey
-        # patch safe
-        with patch(
-            "importlib._bootstrap_external.cache_from_source",
-            optimized_cache_from_source,
-        ):
-            super().exec_module(module)
-
-
-class TypeguardFinder(MetaPathFinder):
-    """
-    Wraps another path finder and instruments the module with
-    :func:`@typechecked ` if :meth:`should_instrument` returns
-    ``True``.
-
-    Should not be used directly, but rather via :func:`~.install_import_hook`.
-
-    .. versionadded:: 2.6
-    """
-
-    def __init__(self, packages: list[str] | None, original_pathfinder: MetaPathFinder):
-        self.packages = packages
-        self._original_pathfinder = original_pathfinder
-
-    def find_spec(
-        self,
-        fullname: str,
-        path: Sequence[str] | None,
-        target: types.ModuleType | None = None,
-    ) -> ModuleSpec | None:
-        if self.should_instrument(fullname):
-            spec = self._original_pathfinder.find_spec(fullname, path, target)
-            if spec is not None and isinstance(spec.loader, SourceFileLoader):
-                spec.loader = TypeguardLoader(spec.loader.name, spec.loader.path)
-                return spec
-
-        return None
-
-    def should_instrument(self, module_name: str) -> bool:
-        """
-        Determine whether the module with the given name should be instrumented.
-
-        :param module_name: full name of the module that is about to be imported (e.g.
-            ``xyz.abc``)
-
-        """
-        if self.packages is None:
-            return True
-
-        for package in self.packages:
-            if module_name == package or module_name.startswith(package + "."):
-                return True
-
-        return False
-
-
-class ImportHookManager:
-    """
-    A handle that can be used to uninstall the Typeguard import hook.
-    """
-
-    def __init__(self, hook: MetaPathFinder):
-        self.hook = hook
-
-    def __enter__(self) -> None:
-        pass
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException],
-        exc_val: BaseException,
-        exc_tb: TracebackType,
-    ) -> None:
-        self.uninstall()
-
-    def uninstall(self) -> None:
-        """Uninstall the import hook."""
-        try:
-            sys.meta_path.remove(self.hook)
-        except ValueError:
-            pass  # already removed
-
-
-def install_import_hook(
-    packages: Iterable[str] | None = None,
-    *,
-    cls: type[TypeguardFinder] = TypeguardFinder,
-) -> ImportHookManager:
-    """
-    Install an import hook that instruments functions for automatic type checking.
-
-    This only affects modules loaded **after** this hook has been installed.
-
-    :param packages: an iterable of package names to instrument, or ``None`` to
-        instrument all packages
-    :param cls: a custom meta path finder class
-    :return: a context manager that uninstalls the hook on exit (or when you call
-        ``.uninstall()``)
-
-    .. versionadded:: 2.6
-
-    """
-    if packages is None:
-        target_packages: list[str] | None = None
-    elif isinstance(packages, str):
-        target_packages = [packages]
-    else:
-        target_packages = list(packages)
-
-    for finder in sys.meta_path:
-        if (
-            isclass(finder)
-            and finder.__name__ == "PathFinder"
-            and hasattr(finder, "find_spec")
-        ):
-            break
-    else:
-        raise RuntimeError("Cannot find a PathFinder in sys.meta_path")
-
-    hook = cls(target_packages, finder)
-    sys.meta_path.insert(0, hook)
-    return ImportHookManager(hook)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_memo.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_memo.py
deleted file mode 100644
index 1d0d80c..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_memo.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from typeguard._config import TypeCheckConfiguration, global_config
-
-
-class TypeCheckMemo:
-    """
-    Contains information necessary for type checkers to do their work.
-
-    .. attribute:: globals
-       :type: dict[str, Any]
-
-        Dictionary of global variables to use for resolving forward references.
-
-    .. attribute:: locals
-       :type: dict[str, Any]
-
-        Dictionary of local variables to use for resolving forward references.
-
-    .. attribute:: self_type
-       :type: type | None
-
-        When running type checks within an instance method or class method, this is the
-        class object that the first argument (usually named ``self`` or ``cls``) refers
-        to.
-
-    .. attribute:: config
-       :type: TypeCheckConfiguration
-
-         Contains the configuration for a particular set of type checking operations.
-    """
-
-    __slots__ = "globals", "locals", "self_type", "config"
-
-    def __init__(
-        self,
-        globals: dict[str, Any],
-        locals: dict[str, Any],
-        *,
-        self_type: type | None = None,
-        config: TypeCheckConfiguration = global_config,
-    ):
-        self.globals = globals
-        self.locals = locals
-        self.self_type = self_type
-        self.config = config
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_pytest_plugin.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_pytest_plugin.py
deleted file mode 100644
index 7b2f494..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_pytest_plugin.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from __future__ import annotations
-
-import sys
-import warnings
-from typing import TYPE_CHECKING, Any, Literal
-
-from typeguard._config import CollectionCheckStrategy, ForwardRefPolicy, global_config
-from typeguard._exceptions import InstrumentationWarning
-from typeguard._importhook import install_import_hook
-from typeguard._utils import qualified_name, resolve_reference
-
-if TYPE_CHECKING:
-    from pytest import Config, Parser
-
-
-def pytest_addoption(parser: Parser) -> None:
-    def add_ini_option(
-        opt_type: (
-            Literal["string", "paths", "pathlist", "args", "linelist", "bool"] | None
-        ),
-    ) -> None:
-        parser.addini(
-            group.options[-1].names()[0][2:],
-            group.options[-1].attrs()["help"],
-            opt_type,
-        )
-
-    group = parser.getgroup("typeguard")
-    group.addoption(
-        "--typeguard-packages",
-        action="store",
-        help="comma separated name list of packages and modules to instrument for "
-        "type checking, or :all: to instrument all modules loaded after typeguard",
-    )
-    add_ini_option("linelist")
-
-    group.addoption(
-        "--typeguard-debug-instrumentation",
-        action="store_true",
-        help="print all instrumented code to stderr",
-    )
-    add_ini_option("bool")
-
-    group.addoption(
-        "--typeguard-typecheck-fail-callback",
-        action="store",
-        help=(
-            "a module:varname (e.g. typeguard:warn_on_error) reference to a function "
-            "that is called (with the exception, and memo object as arguments) to "
-            "handle a TypeCheckError"
-        ),
-    )
-    add_ini_option("string")
-
-    group.addoption(
-        "--typeguard-forward-ref-policy",
-        action="store",
-        choices=list(ForwardRefPolicy.__members__),
-        help=(
-            "determines how to deal with unresolveable forward references in type "
-            "annotations"
-        ),
-    )
-    add_ini_option("string")
-
-    group.addoption(
-        "--typeguard-collection-check-strategy",
-        action="store",
-        choices=list(CollectionCheckStrategy.__members__),
-        help="determines how thoroughly to check collections (list, dict, etc)",
-    )
-    add_ini_option("string")
-
-
-def pytest_configure(config: Config) -> None:
-    def getoption(name: str) -> Any:
-        return config.getoption(name.replace("-", "_")) or config.getini(name)
-
-    packages: list[str] | None = []
-    if packages_option := config.getoption("typeguard_packages"):
-        packages = [pkg.strip() for pkg in packages_option.split(",")]
-    elif packages_ini := config.getini("typeguard-packages"):
-        packages = packages_ini
-
-    if packages:
-        if packages == [":all:"]:
-            packages = None
-        else:
-            already_imported_packages = sorted(
-                package for package in packages if package in sys.modules
-            )
-            if already_imported_packages:
-                warnings.warn(
-                    f"typeguard cannot check these packages because they are already "
-                    f"imported: {', '.join(already_imported_packages)}",
-                    InstrumentationWarning,
-                    stacklevel=1,
-                )
-
-        install_import_hook(packages=packages)
-
-    debug_option = getoption("typeguard-debug-instrumentation")
-    if debug_option:
-        global_config.debug_instrumentation = True
-
-    fail_callback_option = getoption("typeguard-typecheck-fail-callback")
-    if fail_callback_option:
-        callback = resolve_reference(fail_callback_option)
-        if not callable(callback):
-            raise TypeError(
-                f"{fail_callback_option} ({qualified_name(callback.__class__)}) is not "
-                f"a callable"
-            )
-
-        global_config.typecheck_fail_callback = callback
-
-    forward_ref_policy_option = getoption("typeguard-forward-ref-policy")
-    if forward_ref_policy_option:
-        forward_ref_policy = ForwardRefPolicy.__members__[forward_ref_policy_option]
-        global_config.forward_ref_policy = forward_ref_policy
-
-    collection_check_strategy_option = getoption("typeguard-collection-check-strategy")
-    if collection_check_strategy_option:
-        collection_check_strategy = CollectionCheckStrategy.__members__[
-            collection_check_strategy_option
-        ]
-        global_config.collection_check_strategy = collection_check_strategy
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_suppression.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_suppression.py
deleted file mode 100644
index bbbfbfb..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_suppression.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from __future__ import annotations
-
-import sys
-from collections.abc import Callable, Generator
-from contextlib import contextmanager
-from functools import update_wrapper
-from threading import Lock
-from typing import ContextManager, TypeVar, overload
-
-if sys.version_info >= (3, 10):
-    from typing import ParamSpec
-else:
-    from typing_extensions import ParamSpec
-
-P = ParamSpec("P")
-T = TypeVar("T")
-
-type_checks_suppressed = 0
-type_checks_suppress_lock = Lock()
-
-
-@overload
-def suppress_type_checks(func: Callable[P, T]) -> Callable[P, T]: ...
-
-
-@overload
-def suppress_type_checks() -> ContextManager[None]: ...
-
-
-def suppress_type_checks(
-    func: Callable[P, T] | None = None,
-) -> Callable[P, T] | ContextManager[None]:
-    """
-    Temporarily suppress all type checking.
-
-    This function has two operating modes, based on how it's used:
-
-    #. as a context manager (``with suppress_type_checks(): ...``)
-    #. as a decorator (``@suppress_type_checks``)
-
-    When used as a context manager, :func:`check_type` and any automatically
-    instrumented functions skip the actual type checking. These context managers can be
-    nested.
-
-    When used as a decorator, all type checking is suppressed while the function is
-    running.
-
-    Type checking will resume once no more context managers are active and no decorated
-    functions are running.
-
-    Both operating modes are thread-safe.
-
-    """
-
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-        global type_checks_suppressed
-
-        with type_checks_suppress_lock:
-            type_checks_suppressed += 1
-
-        assert func is not None
-        try:
-            return func(*args, **kwargs)
-        finally:
-            with type_checks_suppress_lock:
-                type_checks_suppressed -= 1
-
-    def cm() -> Generator[None, None, None]:
-        global type_checks_suppressed
-
-        with type_checks_suppress_lock:
-            type_checks_suppressed += 1
-
-        try:
-            yield
-        finally:
-            with type_checks_suppress_lock:
-                type_checks_suppressed -= 1
-
-    if func is None:
-        # Context manager mode
-        return contextmanager(cm)()
-    else:
-        # Decorator mode
-        update_wrapper(wrapper, func)
-        return wrapper
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_transformer.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_transformer.py
deleted file mode 100644
index 13ac363..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_transformer.py
+++ /dev/null
@@ -1,1229 +0,0 @@
-from __future__ import annotations
-
-import ast
-import builtins
-import sys
-import typing
-from ast import (
-    AST,
-    Add,
-    AnnAssign,
-    Assign,
-    AsyncFunctionDef,
-    Attribute,
-    AugAssign,
-    BinOp,
-    BitAnd,
-    BitOr,
-    BitXor,
-    Call,
-    ClassDef,
-    Constant,
-    Dict,
-    Div,
-    Expr,
-    Expression,
-    FloorDiv,
-    FunctionDef,
-    If,
-    Import,
-    ImportFrom,
-    Index,
-    List,
-    Load,
-    LShift,
-    MatMult,
-    Mod,
-    Module,
-    Mult,
-    Name,
-    NamedExpr,
-    NodeTransformer,
-    NodeVisitor,
-    Pass,
-    Pow,
-    Return,
-    RShift,
-    Starred,
-    Store,
-    Sub,
-    Subscript,
-    Tuple,
-    Yield,
-    YieldFrom,
-    alias,
-    copy_location,
-    expr,
-    fix_missing_locations,
-    keyword,
-    walk,
-)
-from collections import defaultdict
-from collections.abc import Generator, Sequence
-from contextlib import contextmanager
-from copy import deepcopy
-from dataclasses import dataclass, field
-from typing import Any, ClassVar, cast, overload
-
-generator_names = (
-    "typing.Generator",
-    "collections.abc.Generator",
-    "typing.Iterator",
-    "collections.abc.Iterator",
-    "typing.Iterable",
-    "collections.abc.Iterable",
-    "typing.AsyncIterator",
-    "collections.abc.AsyncIterator",
-    "typing.AsyncIterable",
-    "collections.abc.AsyncIterable",
-    "typing.AsyncGenerator",
-    "collections.abc.AsyncGenerator",
-)
-anytype_names = (
-    "typing.Any",
-    "typing_extensions.Any",
-)
-literal_names = (
-    "typing.Literal",
-    "typing_extensions.Literal",
-)
-annotated_names = (
-    "typing.Annotated",
-    "typing_extensions.Annotated",
-)
-ignore_decorators = (
-    "typing.no_type_check",
-    "typeguard.typeguard_ignore",
-)
-aug_assign_functions = {
-    Add: "iadd",
-    Sub: "isub",
-    Mult: "imul",
-    MatMult: "imatmul",
-    Div: "itruediv",
-    FloorDiv: "ifloordiv",
-    Mod: "imod",
-    Pow: "ipow",
-    LShift: "ilshift",
-    RShift: "irshift",
-    BitAnd: "iand",
-    BitXor: "ixor",
-    BitOr: "ior",
-}
-
-
-@dataclass
-class TransformMemo:
-    node: Module | ClassDef | FunctionDef | AsyncFunctionDef | None
-    parent: TransformMemo | None
-    path: tuple[str, ...]
-    joined_path: Constant = field(init=False)
-    return_annotation: expr | None = None
-    yield_annotation: expr | None = None
-    send_annotation: expr | None = None
-    is_async: bool = False
-    local_names: set[str] = field(init=False, default_factory=set)
-    imported_names: dict[str, str] = field(init=False, default_factory=dict)
-    ignored_names: set[str] = field(init=False, default_factory=set)
-    load_names: defaultdict[str, dict[str, Name]] = field(
-        init=False, default_factory=lambda: defaultdict(dict)
-    )
-    has_yield_expressions: bool = field(init=False, default=False)
-    has_return_expressions: bool = field(init=False, default=False)
-    memo_var_name: Name | None = field(init=False, default=None)
-    should_instrument: bool = field(init=False, default=True)
-    variable_annotations: dict[str, expr] = field(init=False, default_factory=dict)
-    configuration_overrides: dict[str, Any] = field(init=False, default_factory=dict)
-    code_inject_index: int = field(init=False, default=0)
-
-    def __post_init__(self) -> None:
-        elements: list[str] = []
-        memo = self
-        while isinstance(memo.node, (ClassDef, FunctionDef, AsyncFunctionDef)):
-            elements.insert(0, memo.node.name)
-            if not memo.parent:
-                break
-
-            memo = memo.parent
-            if isinstance(memo.node, (FunctionDef, AsyncFunctionDef)):
-                elements.insert(0, "")
-
-        self.joined_path = Constant(".".join(elements))
-
-        # Figure out where to insert instrumentation code
-        if self.node:
-            for index, child in enumerate(self.node.body):
-                if isinstance(child, ImportFrom) and child.module == "__future__":
-                    # (module only) __future__ imports must come first
-                    continue
-                elif (
-                    isinstance(child, Expr)
-                    and isinstance(child.value, Constant)
-                    and isinstance(child.value.value, str)
-                ):
-                    continue  # docstring
-
-                self.code_inject_index = index
-                break
-
-    def get_unused_name(self, name: str) -> str:
-        memo: TransformMemo | None = self
-        while memo is not None:
-            if name in memo.local_names:
-                memo = self
-                name += "_"
-            else:
-                memo = memo.parent
-
-        self.local_names.add(name)
-        return name
-
-    def is_ignored_name(self, expression: expr | Expr | None) -> bool:
-        top_expression = (
-            expression.value if isinstance(expression, Expr) else expression
-        )
-
-        if isinstance(top_expression, Attribute) and isinstance(
-            top_expression.value, Name
-        ):
-            name = top_expression.value.id
-        elif isinstance(top_expression, Name):
-            name = top_expression.id
-        else:
-            return False
-
-        memo: TransformMemo | None = self
-        while memo is not None:
-            if name in memo.ignored_names:
-                return True
-
-            memo = memo.parent
-
-        return False
-
-    def get_memo_name(self) -> Name:
-        if not self.memo_var_name:
-            self.memo_var_name = Name(id="memo", ctx=Load())
-
-        return self.memo_var_name
-
-    def get_import(self, module: str, name: str) -> Name:
-        if module in self.load_names and name in self.load_names[module]:
-            return self.load_names[module][name]
-
-        qualified_name = f"{module}.{name}"
-        if name in self.imported_names and self.imported_names[name] == qualified_name:
-            return Name(id=name, ctx=Load())
-
-        alias = self.get_unused_name(name)
-        node = self.load_names[module][name] = Name(id=alias, ctx=Load())
-        self.imported_names[name] = qualified_name
-        return node
-
-    def insert_imports(self, node: Module | FunctionDef | AsyncFunctionDef) -> None:
-        """Insert imports needed by injected code."""
-        if not self.load_names:
-            return
-
-        # Insert imports after any "from __future__ ..." imports and any docstring
-        for modulename, names in self.load_names.items():
-            aliases = [
-                alias(orig_name, new_name.id if orig_name != new_name.id else None)
-                for orig_name, new_name in sorted(names.items())
-            ]
-            node.body.insert(self.code_inject_index, ImportFrom(modulename, aliases, 0))
-
-    def name_matches(self, expression: expr | Expr | None, *names: str) -> bool:
-        if expression is None:
-            return False
-
-        path: list[str] = []
-        top_expression = (
-            expression.value if isinstance(expression, Expr) else expression
-        )
-
-        if isinstance(top_expression, Subscript):
-            top_expression = top_expression.value
-        elif isinstance(top_expression, Call):
-            top_expression = top_expression.func
-
-        while isinstance(top_expression, Attribute):
-            path.insert(0, top_expression.attr)
-            top_expression = top_expression.value
-
-        if not isinstance(top_expression, Name):
-            return False
-
-        if top_expression.id in self.imported_names:
-            translated = self.imported_names[top_expression.id]
-        elif hasattr(builtins, top_expression.id):
-            translated = "builtins." + top_expression.id
-        else:
-            translated = top_expression.id
-
-        path.insert(0, translated)
-        joined_path = ".".join(path)
-        if joined_path in names:
-            return True
-        elif self.parent:
-            return self.parent.name_matches(expression, *names)
-        else:
-            return False
-
-    def get_config_keywords(self) -> list[keyword]:
-        if self.parent and isinstance(self.parent.node, ClassDef):
-            overrides = self.parent.configuration_overrides.copy()
-        else:
-            overrides = {}
-
-        overrides.update(self.configuration_overrides)
-        return [keyword(key, value) for key, value in overrides.items()]
-
-
-class NameCollector(NodeVisitor):
-    def __init__(self) -> None:
-        self.names: set[str] = set()
-
-    def visit_Import(self, node: Import) -> None:
-        for name in node.names:
-            self.names.add(name.asname or name.name)
-
-    def visit_ImportFrom(self, node: ImportFrom) -> None:
-        for name in node.names:
-            self.names.add(name.asname or name.name)
-
-    def visit_Assign(self, node: Assign) -> None:
-        for target in node.targets:
-            if isinstance(target, Name):
-                self.names.add(target.id)
-
-    def visit_NamedExpr(self, node: NamedExpr) -> Any:
-        if isinstance(node.target, Name):
-            self.names.add(node.target.id)
-
-    def visit_FunctionDef(self, node: FunctionDef) -> None:
-        pass
-
-    def visit_ClassDef(self, node: ClassDef) -> None:
-        pass
-
-
-class GeneratorDetector(NodeVisitor):
-    """Detects if a function node is a generator function."""
-
-    contains_yields: bool = False
-    in_root_function: bool = False
-
-    def visit_Yield(self, node: Yield) -> Any:
-        self.contains_yields = True
-
-    def visit_YieldFrom(self, node: YieldFrom) -> Any:
-        self.contains_yields = True
-
-    def visit_ClassDef(self, node: ClassDef) -> Any:
-        pass
-
-    def visit_FunctionDef(self, node: FunctionDef | AsyncFunctionDef) -> Any:
-        if not self.in_root_function:
-            self.in_root_function = True
-            self.generic_visit(node)
-            self.in_root_function = False
-
-    def visit_AsyncFunctionDef(self, node: AsyncFunctionDef) -> Any:
-        self.visit_FunctionDef(node)
-
-
-class AnnotationTransformer(NodeTransformer):
-    type_substitutions: ClassVar[dict[str, tuple[str, str]]] = {
-        "builtins.dict": ("typing", "Dict"),
-        "builtins.list": ("typing", "List"),
-        "builtins.tuple": ("typing", "Tuple"),
-        "builtins.set": ("typing", "Set"),
-        "builtins.frozenset": ("typing", "FrozenSet"),
-    }
-
-    def __init__(self, transformer: TypeguardTransformer):
-        self.transformer = transformer
-        self._memo = transformer._memo
-        self._level = 0
-
-    def visit(self, node: AST) -> Any:
-        # Don't process Literals
-        if isinstance(node, expr) and self._memo.name_matches(node, *literal_names):
-            return node
-
-        self._level += 1
-        new_node = super().visit(node)
-        self._level -= 1
-
-        if isinstance(new_node, Expression) and not hasattr(new_node, "body"):
-            return None
-
-        # Return None if this new node matches a variation of typing.Any
-        if (
-            self._level == 0
-            and isinstance(new_node, expr)
-            and self._memo.name_matches(new_node, *anytype_names)
-        ):
-            return None
-
-        return new_node
-
-    def visit_BinOp(self, node: BinOp) -> Any:
-        self.generic_visit(node)
-
-        if isinstance(node.op, BitOr):
-            # If either branch of the BinOp has been transformed to `None`, it means
-            # that a type in the union was ignored, so the entire annotation should e
-            # ignored
-            if not hasattr(node, "left") or not hasattr(node, "right"):
-                return None
-
-            # Return Any if either side is Any
-            if self._memo.name_matches(node.left, *anytype_names):
-                return node.left
-            elif self._memo.name_matches(node.right, *anytype_names):
-                return node.right
-
-            if sys.version_info < (3, 10):
-                union_name = self.transformer._get_import("typing", "Union")
-                return Subscript(
-                    value=union_name,
-                    slice=Index(
-                        Tuple(elts=[node.left, node.right], ctx=Load()), ctx=Load()
-                    ),
-                    ctx=Load(),
-                )
-
-        return node
-
-    def visit_Attribute(self, node: Attribute) -> Any:
-        if self._memo.is_ignored_name(node):
-            return None
-
-        return node
-
-    def visit_Subscript(self, node: Subscript) -> Any:
-        if self._memo.is_ignored_name(node.value):
-            return None
-
-        # The subscript of typing(_extensions).Literal can be any arbitrary string, so
-        # don't try to evaluate it as code
-        if node.slice:
-            if isinstance(node.slice, Index):
-                # Python 3.8
-                slice_value = node.slice.value  # type: ignore[attr-defined]
-            else:
-                slice_value = node.slice
-
-            if isinstance(slice_value, Tuple):
-                if self._memo.name_matches(node.value, *annotated_names):
-                    # Only treat the first argument to typing.Annotated as a potential
-                    # forward reference
-                    items = cast(
-                        typing.List[expr],
-                        [self.visit(slice_value.elts[0])] + slice_value.elts[1:],
-                    )
-                else:
-                    items = cast(
-                        typing.List[expr],
-                        [self.visit(item) for item in slice_value.elts],
-                    )
-
-                # If this is a Union and any of the items is Any, erase the entire
-                # annotation
-                if self._memo.name_matches(node.value, "typing.Union") and any(
-                    item is None
-                    or (
-                        isinstance(item, expr)
-                        and self._memo.name_matches(item, *anytype_names)
-                    )
-                    for item in items
-                ):
-                    return None
-
-                # If all items in the subscript were Any, erase the subscript entirely
-                if all(item is None for item in items):
-                    return node.value
-
-                for index, item in enumerate(items):
-                    if item is None:
-                        items[index] = self.transformer._get_import("typing", "Any")
-
-                slice_value.elts = items
-            else:
-                self.generic_visit(node)
-
-                # If the transformer erased the slice entirely, just return the node
-                # value without the subscript (unless it's Optional, in which case erase
-                # the node entirely
-                if self._memo.name_matches(
-                    node.value, "typing.Optional"
-                ) and not hasattr(node, "slice"):
-                    return None
-                if sys.version_info >= (3, 9) and not hasattr(node, "slice"):
-                    return node.value
-                elif sys.version_info < (3, 9) and not hasattr(node.slice, "value"):
-                    return node.value
-
-        return node
-
-    def visit_Name(self, node: Name) -> Any:
-        if self._memo.is_ignored_name(node):
-            return None
-
-        if sys.version_info < (3, 9):
-            for typename, substitute in self.type_substitutions.items():
-                if self._memo.name_matches(node, typename):
-                    new_node = self.transformer._get_import(*substitute)
-                    return copy_location(new_node, node)
-
-        return node
-
-    def visit_Call(self, node: Call) -> Any:
-        # Don't recurse into calls
-        return node
-
-    def visit_Constant(self, node: Constant) -> Any:
-        if isinstance(node.value, str):
-            expression = ast.parse(node.value, mode="eval")
-            new_node = self.visit(expression)
-            if new_node:
-                return copy_location(new_node.body, node)
-            else:
-                return None
-
-        return node
-
-
-class TypeguardTransformer(NodeTransformer):
-    def __init__(
-        self, target_path: Sequence[str] | None = None, target_lineno: int | None = None
-    ) -> None:
-        self._target_path = tuple(target_path) if target_path else None
-        self._memo = self._module_memo = TransformMemo(None, None, ())
-        self.names_used_in_annotations: set[str] = set()
-        self.target_node: FunctionDef | AsyncFunctionDef | None = None
-        self.target_lineno = target_lineno
-
-    def generic_visit(self, node: AST) -> AST:
-        has_non_empty_body_initially = bool(getattr(node, "body", None))
-        initial_type = type(node)
-
-        node = super().generic_visit(node)
-
-        if (
-            type(node) is initial_type
-            and has_non_empty_body_initially
-            and hasattr(node, "body")
-            and not node.body
-        ):
-            # If we have still the same node type after transformation
-            # but we've optimised it's body away, we add a `pass` statement.
-            node.body = [Pass()]
-
-        return node
-
-    @contextmanager
-    def _use_memo(
-        self, node: ClassDef | FunctionDef | AsyncFunctionDef
-    ) -> Generator[None, Any, None]:
-        new_memo = TransformMemo(node, self._memo, self._memo.path + (node.name,))
-        old_memo = self._memo
-        self._memo = new_memo
-
-        if isinstance(node, (FunctionDef, AsyncFunctionDef)):
-            new_memo.should_instrument = (
-                self._target_path is None or new_memo.path == self._target_path
-            )
-            if new_memo.should_instrument:
-                # Check if the function is a generator function
-                detector = GeneratorDetector()
-                detector.visit(node)
-
-                # Extract yield, send and return types where possible from a subscripted
-                # annotation like Generator[int, str, bool]
-                return_annotation = deepcopy(node.returns)
-                if detector.contains_yields and new_memo.name_matches(
-                    return_annotation, *generator_names
-                ):
-                    if isinstance(return_annotation, Subscript):
-                        annotation_slice = return_annotation.slice
-
-                        # Python < 3.9
-                        if isinstance(annotation_slice, Index):
-                            annotation_slice = (
-                                annotation_slice.value  # type: ignore[attr-defined]
-                            )
-
-                        if isinstance(annotation_slice, Tuple):
-                            items = annotation_slice.elts
-                        else:
-                            items = [annotation_slice]
-
-                        if len(items) > 0:
-                            new_memo.yield_annotation = self._convert_annotation(
-                                items[0]
-                            )
-
-                        if len(items) > 1:
-                            new_memo.send_annotation = self._convert_annotation(
-                                items[1]
-                            )
-
-                        if len(items) > 2:
-                            new_memo.return_annotation = self._convert_annotation(
-                                items[2]
-                            )
-                else:
-                    new_memo.return_annotation = self._convert_annotation(
-                        return_annotation
-                    )
-
-        if isinstance(node, AsyncFunctionDef):
-            new_memo.is_async = True
-
-        yield
-        self._memo = old_memo
-
-    def _get_import(self, module: str, name: str) -> Name:
-        memo = self._memo if self._target_path else self._module_memo
-        return memo.get_import(module, name)
-
-    @overload
-    def _convert_annotation(self, annotation: None) -> None: ...
-
-    @overload
-    def _convert_annotation(self, annotation: expr) -> expr: ...
-
-    def _convert_annotation(self, annotation: expr | None) -> expr | None:
-        if annotation is None:
-            return None
-
-        # Convert PEP 604 unions (x | y) and generic built-in collections where
-        # necessary, and undo forward references
-        new_annotation = cast(expr, AnnotationTransformer(self).visit(annotation))
-        if isinstance(new_annotation, expr):
-            new_annotation = ast.copy_location(new_annotation, annotation)
-
-            # Store names used in the annotation
-            names = {node.id for node in walk(new_annotation) if isinstance(node, Name)}
-            self.names_used_in_annotations.update(names)
-
-        return new_annotation
-
-    def visit_Name(self, node: Name) -> Name:
-        self._memo.local_names.add(node.id)
-        return node
-
-    def visit_Module(self, node: Module) -> Module:
-        self._module_memo = self._memo = TransformMemo(node, None, ())
-        self.generic_visit(node)
-        self._module_memo.insert_imports(node)
-
-        fix_missing_locations(node)
-        return node
-
-    def visit_Import(self, node: Import) -> Import:
-        for name in node.names:
-            self._memo.local_names.add(name.asname or name.name)
-            self._memo.imported_names[name.asname or name.name] = name.name
-
-        return node
-
-    def visit_ImportFrom(self, node: ImportFrom) -> ImportFrom:
-        for name in node.names:
-            if name.name != "*":
-                alias = name.asname or name.name
-                self._memo.local_names.add(alias)
-                self._memo.imported_names[alias] = f"{node.module}.{name.name}"
-
-        return node
-
-    def visit_ClassDef(self, node: ClassDef) -> ClassDef | None:
-        self._memo.local_names.add(node.name)
-
-        # Eliminate top level classes not belonging to the target path
-        if (
-            self._target_path is not None
-            and not self._memo.path
-            and node.name != self._target_path[0]
-        ):
-            return None
-
-        with self._use_memo(node):
-            for decorator in node.decorator_list.copy():
-                if self._memo.name_matches(decorator, "typeguard.typechecked"):
-                    # Remove the decorator to prevent duplicate instrumentation
-                    node.decorator_list.remove(decorator)
-
-                    # Store any configuration overrides
-                    if isinstance(decorator, Call) and decorator.keywords:
-                        self._memo.configuration_overrides.update(
-                            {kw.arg: kw.value for kw in decorator.keywords if kw.arg}
-                        )
-
-            self.generic_visit(node)
-            return node
-
-    def visit_FunctionDef(
-        self, node: FunctionDef | AsyncFunctionDef
-    ) -> FunctionDef | AsyncFunctionDef | None:
-        """
-        Injects type checks for function arguments, and for a return of None if the
-        function is annotated to return something else than Any or None, and the body
-        ends without an explicit "return".
-
-        """
-        self._memo.local_names.add(node.name)
-
-        # Eliminate top level functions not belonging to the target path
-        if (
-            self._target_path is not None
-            and not self._memo.path
-            and node.name != self._target_path[0]
-        ):
-            return None
-
-        # Skip instrumentation if we're instrumenting the whole module and the function
-        # contains either @no_type_check or @typeguard_ignore
-        if self._target_path is None:
-            for decorator in node.decorator_list:
-                if self._memo.name_matches(decorator, *ignore_decorators):
-                    return node
-
-        with self._use_memo(node):
-            arg_annotations: dict[str, Any] = {}
-            if self._target_path is None or self._memo.path == self._target_path:
-                # Find line number we're supposed to match against
-                if node.decorator_list:
-                    first_lineno = node.decorator_list[0].lineno
-                else:
-                    first_lineno = node.lineno
-
-                for decorator in node.decorator_list.copy():
-                    if self._memo.name_matches(decorator, "typing.overload"):
-                        # Remove overloads entirely
-                        return None
-                    elif self._memo.name_matches(decorator, "typeguard.typechecked"):
-                        # Remove the decorator to prevent duplicate instrumentation
-                        node.decorator_list.remove(decorator)
-
-                        # Store any configuration overrides
-                        if isinstance(decorator, Call) and decorator.keywords:
-                            self._memo.configuration_overrides = {
-                                kw.arg: kw.value for kw in decorator.keywords if kw.arg
-                            }
-
-                if self.target_lineno == first_lineno:
-                    assert self.target_node is None
-                    self.target_node = node
-                    if node.decorator_list:
-                        self.target_lineno = node.decorator_list[0].lineno
-                    else:
-                        self.target_lineno = node.lineno
-
-                all_args = node.args.args + node.args.kwonlyargs + node.args.posonlyargs
-
-                # Ensure that any type shadowed by the positional or keyword-only
-                # argument names are ignored in this function
-                for arg in all_args:
-                    self._memo.ignored_names.add(arg.arg)
-
-                # Ensure that any type shadowed by the variable positional argument name
-                # (e.g. "args" in *args) is ignored this function
-                if node.args.vararg:
-                    self._memo.ignored_names.add(node.args.vararg.arg)
-
-                # Ensure that any type shadowed by the variable keywrod argument name
-                # (e.g. "kwargs" in *kwargs) is ignored this function
-                if node.args.kwarg:
-                    self._memo.ignored_names.add(node.args.kwarg.arg)
-
-                for arg in all_args:
-                    annotation = self._convert_annotation(deepcopy(arg.annotation))
-                    if annotation:
-                        arg_annotations[arg.arg] = annotation
-
-                if node.args.vararg:
-                    annotation_ = self._convert_annotation(node.args.vararg.annotation)
-                    if annotation_:
-                        if sys.version_info >= (3, 9):
-                            container = Name("tuple", ctx=Load())
-                        else:
-                            container = self._get_import("typing", "Tuple")
-
-                        subscript_slice: Tuple | Index = Tuple(
-                            [
-                                annotation_,
-                                Constant(Ellipsis),
-                            ],
-                            ctx=Load(),
-                        )
-                        if sys.version_info < (3, 9):
-                            subscript_slice = Index(subscript_slice, ctx=Load())
-
-                        arg_annotations[node.args.vararg.arg] = Subscript(
-                            container, subscript_slice, ctx=Load()
-                        )
-
-                if node.args.kwarg:
-                    annotation_ = self._convert_annotation(node.args.kwarg.annotation)
-                    if annotation_:
-                        if sys.version_info >= (3, 9):
-                            container = Name("dict", ctx=Load())
-                        else:
-                            container = self._get_import("typing", "Dict")
-
-                        subscript_slice = Tuple(
-                            [
-                                Name("str", ctx=Load()),
-                                annotation_,
-                            ],
-                            ctx=Load(),
-                        )
-                        if sys.version_info < (3, 9):
-                            subscript_slice = Index(subscript_slice, ctx=Load())
-
-                        arg_annotations[node.args.kwarg.arg] = Subscript(
-                            container, subscript_slice, ctx=Load()
-                        )
-
-                if arg_annotations:
-                    self._memo.variable_annotations.update(arg_annotations)
-
-            self.generic_visit(node)
-
-            if arg_annotations:
-                annotations_dict = Dict(
-                    keys=[Constant(key) for key in arg_annotations.keys()],
-                    values=[
-                        Tuple([Name(key, ctx=Load()), annotation], ctx=Load())
-                        for key, annotation in arg_annotations.items()
-                    ],
-                )
-                func_name = self._get_import(
-                    "typeguard._functions", "check_argument_types"
-                )
-                args = [
-                    self._memo.joined_path,
-                    annotations_dict,
-                    self._memo.get_memo_name(),
-                ]
-                node.body.insert(
-                    self._memo.code_inject_index, Expr(Call(func_name, args, []))
-                )
-
-            # Add a checked "return None" to the end if there's no explicit return
-            # Skip if the return annotation is None or Any
-            if (
-                self._memo.return_annotation
-                and (not self._memo.is_async or not self._memo.has_yield_expressions)
-                and not isinstance(node.body[-1], Return)
-                and (
-                    not isinstance(self._memo.return_annotation, Constant)
-                    or self._memo.return_annotation.value is not None
-                )
-            ):
-                func_name = self._get_import(
-                    "typeguard._functions", "check_return_type"
-                )
-                return_node = Return(
-                    Call(
-                        func_name,
-                        [
-                            self._memo.joined_path,
-                            Constant(None),
-                            self._memo.return_annotation,
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-                )
-
-                # Replace a placeholder "pass" at the end
-                if isinstance(node.body[-1], Pass):
-                    copy_location(return_node, node.body[-1])
-                    del node.body[-1]
-
-                node.body.append(return_node)
-
-            # Insert code to create the call memo, if it was ever needed for this
-            # function
-            if self._memo.memo_var_name:
-                memo_kwargs: dict[str, Any] = {}
-                if self._memo.parent and isinstance(self._memo.parent.node, ClassDef):
-                    for decorator in node.decorator_list:
-                        if (
-                            isinstance(decorator, Name)
-                            and decorator.id == "staticmethod"
-                        ):
-                            break
-                        elif (
-                            isinstance(decorator, Name)
-                            and decorator.id == "classmethod"
-                        ):
-                            memo_kwargs["self_type"] = Name(
-                                id=node.args.args[0].arg, ctx=Load()
-                            )
-                            break
-                    else:
-                        if node.args.args:
-                            if node.name == "__new__":
-                                memo_kwargs["self_type"] = Name(
-                                    id=node.args.args[0].arg, ctx=Load()
-                                )
-                            else:
-                                memo_kwargs["self_type"] = Attribute(
-                                    Name(id=node.args.args[0].arg, ctx=Load()),
-                                    "__class__",
-                                    ctx=Load(),
-                                )
-
-                # Construct the function reference
-                # Nested functions get special treatment: the function name is added
-                # to free variables (and the closure of the resulting function)
-                names: list[str] = [node.name]
-                memo = self._memo.parent
-                while memo:
-                    if isinstance(memo.node, (FunctionDef, AsyncFunctionDef)):
-                        # This is a nested function. Use the function name as-is.
-                        del names[:-1]
-                        break
-                    elif not isinstance(memo.node, ClassDef):
-                        break
-
-                    names.insert(0, memo.node.name)
-                    memo = memo.parent
-
-                config_keywords = self._memo.get_config_keywords()
-                if config_keywords:
-                    memo_kwargs["config"] = Call(
-                        self._get_import("dataclasses", "replace"),
-                        [self._get_import("typeguard._config", "global_config")],
-                        config_keywords,
-                    )
-
-                self._memo.memo_var_name.id = self._memo.get_unused_name("memo")
-                memo_store_name = Name(id=self._memo.memo_var_name.id, ctx=Store())
-                globals_call = Call(Name(id="globals", ctx=Load()), [], [])
-                locals_call = Call(Name(id="locals", ctx=Load()), [], [])
-                memo_expr = Call(
-                    self._get_import("typeguard", "TypeCheckMemo"),
-                    [globals_call, locals_call],
-                    [keyword(key, value) for key, value in memo_kwargs.items()],
-                )
-                node.body.insert(
-                    self._memo.code_inject_index,
-                    Assign([memo_store_name], memo_expr),
-                )
-
-                self._memo.insert_imports(node)
-
-                # Special case the __new__() method to create a local alias from the
-                # class name to the first argument (usually "cls")
-                if (
-                    isinstance(node, FunctionDef)
-                    and node.args
-                    and self._memo.parent is not None
-                    and isinstance(self._memo.parent.node, ClassDef)
-                    and node.name == "__new__"
-                ):
-                    first_args_expr = Name(node.args.args[0].arg, ctx=Load())
-                    cls_name = Name(self._memo.parent.node.name, ctx=Store())
-                    node.body.insert(
-                        self._memo.code_inject_index,
-                        Assign([cls_name], first_args_expr),
-                    )
-
-                # Rmove any placeholder "pass" at the end
-                if isinstance(node.body[-1], Pass):
-                    del node.body[-1]
-
-        return node
-
-    def visit_AsyncFunctionDef(
-        self, node: AsyncFunctionDef
-    ) -> FunctionDef | AsyncFunctionDef | None:
-        return self.visit_FunctionDef(node)
-
-    def visit_Return(self, node: Return) -> Return:
-        """This injects type checks into "return" statements."""
-        self.generic_visit(node)
-        if (
-            self._memo.return_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.return_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_return_type")
-            old_node = node
-            retval = old_node.value or Constant(None)
-            node = Return(
-                Call(
-                    func_name,
-                    [
-                        self._memo.joined_path,
-                        retval,
-                        self._memo.return_annotation,
-                        self._memo.get_memo_name(),
-                    ],
-                    [],
-                )
-            )
-            copy_location(node, old_node)
-
-        return node
-
-    def visit_Yield(self, node: Yield) -> Yield | Call:
-        """
-        This injects type checks into "yield" expressions, checking both the yielded
-        value and the value sent back to the generator, when appropriate.
-
-        """
-        self._memo.has_yield_expressions = True
-        self.generic_visit(node)
-
-        if (
-            self._memo.yield_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.yield_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_yield_type")
-            yieldval = node.value or Constant(None)
-            node.value = Call(
-                func_name,
-                [
-                    self._memo.joined_path,
-                    yieldval,
-                    self._memo.yield_annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-
-        if (
-            self._memo.send_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.send_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_send_type")
-            old_node = node
-            call_node = Call(
-                func_name,
-                [
-                    self._memo.joined_path,
-                    old_node,
-                    self._memo.send_annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-            copy_location(call_node, old_node)
-            return call_node
-
-        return node
-
-    def visit_AnnAssign(self, node: AnnAssign) -> Any:
-        """
-        This injects a type check into a local variable annotation-assignment within a
-        function body.
-
-        """
-        self.generic_visit(node)
-
-        if (
-            isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef))
-            and node.annotation
-            and isinstance(node.target, Name)
-        ):
-            self._memo.ignored_names.add(node.target.id)
-            annotation = self._convert_annotation(deepcopy(node.annotation))
-            if annotation:
-                self._memo.variable_annotations[node.target.id] = annotation
-                if node.value:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_variable_assignment"
-                    )
-                    node.value = Call(
-                        func_name,
-                        [
-                            node.value,
-                            Constant(node.target.id),
-                            annotation,
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-
-        return node
-
-    def visit_Assign(self, node: Assign) -> Any:
-        """
-        This injects a type check into a local variable assignment within a function
-        body. The variable must have been annotated earlier in the function body.
-
-        """
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)):
-            targets: list[dict[Constant, expr | None]] = []
-            check_required = False
-            for target in node.targets:
-                elts: Sequence[expr]
-                if isinstance(target, Name):
-                    elts = [target]
-                elif isinstance(target, Tuple):
-                    elts = target.elts
-                else:
-                    continue
-
-                annotations_: dict[Constant, expr | None] = {}
-                for exp in elts:
-                    prefix = ""
-                    if isinstance(exp, Starred):
-                        exp = exp.value
-                        prefix = "*"
-
-                    if isinstance(exp, Name):
-                        self._memo.ignored_names.add(exp.id)
-                        name = prefix + exp.id
-                        annotation = self._memo.variable_annotations.get(exp.id)
-                        if annotation:
-                            annotations_[Constant(name)] = annotation
-                            check_required = True
-                        else:
-                            annotations_[Constant(name)] = None
-
-                targets.append(annotations_)
-
-            if check_required:
-                # Replace missing annotations with typing.Any
-                for item in targets:
-                    for key, expression in item.items():
-                        if expression is None:
-                            item[key] = self._get_import("typing", "Any")
-
-                if len(targets) == 1 and len(targets[0]) == 1:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_variable_assignment"
-                    )
-                    target_varname = next(iter(targets[0]))
-                    node.value = Call(
-                        func_name,
-                        [
-                            node.value,
-                            target_varname,
-                            targets[0][target_varname],
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-                elif targets:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_multi_variable_assignment"
-                    )
-                    targets_arg = List(
-                        [
-                            Dict(keys=list(target), values=list(target.values()))
-                            for target in targets
-                        ],
-                        ctx=Load(),
-                    )
-                    node.value = Call(
-                        func_name,
-                        [node.value, targets_arg, self._memo.get_memo_name()],
-                        [],
-                    )
-
-        return node
-
-    def visit_NamedExpr(self, node: NamedExpr) -> Any:
-        """This injects a type check into an assignment expression (a := foo())."""
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)) and isinstance(
-            node.target, Name
-        ):
-            self._memo.ignored_names.add(node.target.id)
-
-            # Bail out if no matching annotation is found
-            annotation = self._memo.variable_annotations.get(node.target.id)
-            if annotation is None:
-                return node
-
-            func_name = self._get_import(
-                "typeguard._functions", "check_variable_assignment"
-            )
-            node.value = Call(
-                func_name,
-                [
-                    node.value,
-                    Constant(node.target.id),
-                    annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-
-        return node
-
-    def visit_AugAssign(self, node: AugAssign) -> Any:
-        """
-        This injects a type check into an augmented assignment expression (a += 1).
-
-        """
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)) and isinstance(
-            node.target, Name
-        ):
-            # Bail out if no matching annotation is found
-            annotation = self._memo.variable_annotations.get(node.target.id)
-            if annotation is None:
-                return node
-
-            # Bail out if the operator is not found (newer Python version?)
-            try:
-                operator_func_name = aug_assign_functions[node.op.__class__]
-            except KeyError:
-                return node
-
-            operator_func = self._get_import("operator", operator_func_name)
-            operator_call = Call(
-                operator_func, [Name(node.target.id, ctx=Load()), node.value], []
-            )
-            check_call = Call(
-                self._get_import("typeguard._functions", "check_variable_assignment"),
-                [
-                    operator_call,
-                    Constant(node.target.id),
-                    annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-            return Assign(targets=[node.target], value=check_call)
-
-        return node
-
-    def visit_If(self, node: If) -> Any:
-        """
-        This blocks names from being collected from a module-level
-        "if typing.TYPE_CHECKING:" block, so that they won't be type checked.
-
-        """
-        self.generic_visit(node)
-
-        if (
-            self._memo is self._module_memo
-            and isinstance(node.test, Name)
-            and self._memo.name_matches(node.test, "typing.TYPE_CHECKING")
-        ):
-            collector = NameCollector()
-            collector.visit(node)
-            self._memo.ignored_names.update(collector.names)
-
-        return node
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_union_transformer.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_union_transformer.py
deleted file mode 100644
index 19617e6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_union_transformer.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-Transforms lazily evaluated PEP 604 unions into typing.Unions, for compatibility with
-Python versions older than 3.10.
-"""
-
-from __future__ import annotations
-
-from ast import (
-    BinOp,
-    BitOr,
-    Index,
-    Load,
-    Name,
-    NodeTransformer,
-    Subscript,
-    fix_missing_locations,
-    parse,
-)
-from ast import Tuple as ASTTuple
-from types import CodeType
-from typing import Any, Dict, FrozenSet, List, Set, Tuple, Union
-
-type_substitutions = {
-    "dict": Dict,
-    "list": List,
-    "tuple": Tuple,
-    "set": Set,
-    "frozenset": FrozenSet,
-    "Union": Union,
-}
-
-
-class UnionTransformer(NodeTransformer):
-    def __init__(self, union_name: Name | None = None):
-        self.union_name = union_name or Name(id="Union", ctx=Load())
-
-    def visit_BinOp(self, node: BinOp) -> Any:
-        self.generic_visit(node)
-        if isinstance(node.op, BitOr):
-            return Subscript(
-                value=self.union_name,
-                slice=Index(
-                    ASTTuple(elts=[node.left, node.right], ctx=Load()), ctx=Load()
-                ),
-                ctx=Load(),
-            )
-
-        return node
-
-
-def compile_type_hint(hint: str) -> CodeType:
-    parsed = parse(hint, "", "eval")
-    UnionTransformer().visit(parsed)
-    fix_missing_locations(parsed)
-    return compile(parsed, "", "eval", flags=0)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_utils.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_utils.py
deleted file mode 100644
index 9bcc841..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/_utils.py
+++ /dev/null
@@ -1,173 +0,0 @@
-from __future__ import annotations
-
-import inspect
-import sys
-from importlib import import_module
-from inspect import currentframe
-from types import CodeType, FrameType, FunctionType
-from typing import TYPE_CHECKING, Any, Callable, ForwardRef, Union, cast, final
-from weakref import WeakValueDictionary
-
-if TYPE_CHECKING:
-    from ._memo import TypeCheckMemo
-
-if sys.version_info >= (3, 13):
-    from typing import get_args, get_origin
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        return forwardref._evaluate(
-            memo.globals, memo.locals, type_params=(), recursive_guard=frozenset()
-        )
-
-elif sys.version_info >= (3, 10):
-    from typing import get_args, get_origin
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        return forwardref._evaluate(
-            memo.globals, memo.locals, recursive_guard=frozenset()
-        )
-
-else:
-    from typing_extensions import get_args, get_origin
-
-    evaluate_extra_args: tuple[frozenset[Any], ...] = (
-        (frozenset(),) if sys.version_info >= (3, 9) else ()
-    )
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        from ._union_transformer import compile_type_hint, type_substitutions
-
-        if not forwardref.__forward_evaluated__:
-            forwardref.__forward_code__ = compile_type_hint(forwardref.__forward_arg__)
-
-        try:
-            return forwardref._evaluate(memo.globals, memo.locals, *evaluate_extra_args)
-        except NameError:
-            if sys.version_info < (3, 10):
-                # Try again, with the type substitutions (list -> List etc.) in place
-                new_globals = memo.globals.copy()
-                new_globals.setdefault("Union", Union)
-                if sys.version_info < (3, 9):
-                    new_globals.update(type_substitutions)
-
-                return forwardref._evaluate(
-                    new_globals, memo.locals or new_globals, *evaluate_extra_args
-                )
-
-            raise
-
-
-_functions_map: WeakValueDictionary[CodeType, FunctionType] = WeakValueDictionary()
-
-
-def get_type_name(type_: Any) -> str:
-    name: str
-    for attrname in "__name__", "_name", "__forward_arg__":
-        candidate = getattr(type_, attrname, None)
-        if isinstance(candidate, str):
-            name = candidate
-            break
-    else:
-        origin = get_origin(type_)
-        candidate = getattr(origin, "_name", None)
-        if candidate is None:
-            candidate = type_.__class__.__name__.strip("_")
-
-        if isinstance(candidate, str):
-            name = candidate
-        else:
-            return "(unknown)"
-
-    args = get_args(type_)
-    if args:
-        if name == "Literal":
-            formatted_args = ", ".join(repr(arg) for arg in args)
-        else:
-            formatted_args = ", ".join(get_type_name(arg) for arg in args)
-
-        name += f"[{formatted_args}]"
-
-    module = getattr(type_, "__module__", None)
-    if module and module not in (None, "typing", "typing_extensions", "builtins"):
-        name = module + "." + name
-
-    return name
-
-
-def qualified_name(obj: Any, *, add_class_prefix: bool = False) -> str:
-    """
-    Return the qualified name (e.g. package.module.Type) for the given object.
-
-    Builtins and types from the :mod:`typing` package get special treatment by having
-    the module name stripped from the generated name.
-
-    """
-    if obj is None:
-        return "None"
-    elif inspect.isclass(obj):
-        prefix = "class " if add_class_prefix else ""
-        type_ = obj
-    else:
-        prefix = ""
-        type_ = type(obj)
-
-    module = type_.__module__
-    qualname = type_.__qualname__
-    name = qualname if module in ("typing", "builtins") else f"{module}.{qualname}"
-    return prefix + name
-
-
-def function_name(func: Callable[..., Any]) -> str:
-    """
-    Return the qualified name of the given function.
-
-    Builtins and types from the :mod:`typing` package get special treatment by having
-    the module name stripped from the generated name.
-
-    """
-    # For partial functions and objects with __call__ defined, __qualname__ does not
-    # exist
-    module = getattr(func, "__module__", "")
-    qualname = (module + ".") if module not in ("builtins", "") else ""
-    return qualname + getattr(func, "__qualname__", repr(func))
-
-
-def resolve_reference(reference: str) -> Any:
-    modulename, varname = reference.partition(":")[::2]
-    if not modulename or not varname:
-        raise ValueError(f"{reference!r} is not a module:varname reference")
-
-    obj = import_module(modulename)
-    for attr in varname.split("."):
-        obj = getattr(obj, attr)
-
-    return obj
-
-
-def is_method_of(obj: object, cls: type) -> bool:
-    return (
-        inspect.isfunction(obj)
-        and obj.__module__ == cls.__module__
-        and obj.__qualname__.startswith(cls.__qualname__ + ".")
-    )
-
-
-def get_stacklevel() -> int:
-    level = 1
-    frame = cast(FrameType, currentframe()).f_back
-    while frame and frame.f_globals.get("__name__", "").startswith("typeguard."):
-        level += 1
-        frame = frame.f_back
-
-    return level
-
-
-@final
-class Unset:
-    __slots__ = ()
-
-    def __repr__(self) -> str:
-        return ""
-
-
-unset = Unset()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/py.typed b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typeguard/py.typed
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/LICENSE
deleted file mode 100644
index f26bcf4..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/LICENSE
+++ /dev/null
@@ -1,279 +0,0 @@
-A. HISTORY OF THE SOFTWARE
-==========================
-
-Python was created in the early 1990s by Guido van Rossum at Stichting
-Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
-as a successor of a language called ABC.  Guido remains Python's
-principal author, although it includes many contributions from others.
-
-In 1995, Guido continued his work on Python at the Corporation for
-National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
-in Reston, Virginia where he released several versions of the
-software.
-
-In May 2000, Guido and the Python core development team moved to
-BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
-year, the PythonLabs team moved to Digital Creations, which became
-Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
-https://www.python.org/psf/) was formed, a non-profit organization
-created specifically to own Python-related Intellectual Property.
-Zope Corporation was a sponsoring member of the PSF.
-
-All Python releases are Open Source (see https://opensource.org for
-the Open Source Definition).  Historically, most, but not all, Python
-releases have also been GPL-compatible; the table below summarizes
-the various releases.
-
-    Release         Derived     Year        Owner       GPL-
-                    from                                compatible? (1)
-
-    0.9.0 thru 1.2              1991-1995   CWI         yes
-    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
-    1.6             1.5.2       2000        CNRI        no
-    2.0             1.6         2000        BeOpen.com  no
-    1.6.1           1.6         2001        CNRI        yes (2)
-    2.1             2.0+1.6.1   2001        PSF         no
-    2.0.1           2.0+1.6.1   2001        PSF         yes
-    2.1.1           2.1+2.0.1   2001        PSF         yes
-    2.1.2           2.1.1       2002        PSF         yes
-    2.1.3           2.1.2       2002        PSF         yes
-    2.2 and above   2.1.1       2001-now    PSF         yes
-
-Footnotes:
-
-(1) GPL-compatible doesn't mean that we're distributing Python under
-    the GPL.  All Python licenses, unlike the GPL, let you distribute
-    a modified version without making your changes open source.  The
-    GPL-compatible licenses make it possible to combine Python with
-    other software that is released under the GPL; the others don't.
-
-(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
-    because its license has a choice of law clause.  According to
-    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
-    is "not incompatible" with the GPL.
-
-Thanks to the many outside volunteers who have worked under Guido's
-direction to make these releases possible.
-
-
-B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
-===============================================================
-
-Python software and documentation are licensed under the
-Python Software Foundation License Version 2.
-
-Starting with Python 3.8.6, examples, recipes, and other code in
-the documentation are dual licensed under the PSF License Version 2
-and the Zero-Clause BSD license.
-
-Some software incorporated into Python is under different licenses.
-The licenses are listed with code falling under that license.
-
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF hereby
-grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-analyze, test, perform and/or display publicly, prepare derivative works,
-distribute, and otherwise use Python alone or in any derivative version,
-provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee.  This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-
-CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
----------------------------------------
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6.1 software in
-source or binary form and its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 1.6.1
-alone or in any derivative version, provided, however, that CNRI's
-License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
-1995-2001 Corporation for National Research Initiatives; All Rights
-Reserved" are retained in Python 1.6.1 alone or in any derivative
-version prepared by Licensee.  Alternately, in lieu of CNRI's License
-Agreement, Licensee may substitute the following text (omitting the
-quotes): "Python 1.6.1 is made available subject to the terms and
-conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the internet using the following
-unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the internet
-using the following URL: http://hdl.handle.net/1895.22/1013".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6.1 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 1.6.1.
-
-4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
-basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by the federal
-intellectual property law of the United States, including without
-limitation the federal copyright law, and, to the extent such
-U.S. federal law does not apply, by the law of the Commonwealth of
-Virginia, excluding Virginia's conflict of law provisions.
-Notwithstanding the foregoing, with regard to derivative works based
-on Python 1.6.1 that incorporate non-separable material that was
-previously distributed under the GNU General Public License (GPL), the
-law of the Commonwealth of Virginia shall govern this License
-Agreement only as to issues arising under or with respect to
-Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
-License Agreement shall be deemed to create any relationship of
-agency, partnership, or joint venture between CNRI and Licensee.  This
-License Agreement does not grant permission to use CNRI trademarks or
-trade name in a trademark sense to endorse or promote products or
-services of Licensee, or any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6.1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-        ACCEPT
-
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
-----------------------------------------------------------------------
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/METADATA
deleted file mode 100644
index f15e2b3..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/METADATA
+++ /dev/null
@@ -1,67 +0,0 @@
-Metadata-Version: 2.1
-Name: typing_extensions
-Version: 4.12.2
-Summary: Backported and Experimental Type Hints for Python 3.8+
-Keywords: annotations,backport,checker,checking,function,hinting,hints,type,typechecking,typehinting,typehints,typing
-Author-email: "Guido van Rossum, Jukka Lehtosalo, Łukasz Langa, Michael Lee" 
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Python Software Foundation License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development
-Project-URL: Bug Tracker, https://github.com/python/typing_extensions/issues
-Project-URL: Changes, https://github.com/python/typing_extensions/blob/main/CHANGELOG.md
-Project-URL: Documentation, https://typing-extensions.readthedocs.io/
-Project-URL: Home, https://github.com/python/typing_extensions
-Project-URL: Q & A, https://github.com/python/typing/discussions
-Project-URL: Repository, https://github.com/python/typing_extensions
-
-# Typing Extensions
-
-[![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing)
-
-[Documentation](https://typing-extensions.readthedocs.io/en/latest/#) –
-[PyPI](https://pypi.org/project/typing-extensions/)
-
-## Overview
-
-The `typing_extensions` module serves two related purposes:
-
-- Enable use of new type system features on older Python versions. For example,
-  `typing.TypeGuard` is new in Python 3.10, but `typing_extensions` allows
-  users on previous Python versions to use it too.
-- Enable experimentation with new type system PEPs before they are accepted and
-  added to the `typing` module.
-
-`typing_extensions` is treated specially by static type checkers such as
-mypy and pyright. Objects defined in `typing_extensions` are treated the same
-way as equivalent forms in `typing`.
-
-`typing_extensions` uses
-[Semantic Versioning](https://semver.org/). The
-major version will be incremented only for backwards-incompatible changes.
-Therefore, it's safe to depend
-on `typing_extensions` like this: `typing_extensions >=x.y, <(x+1)`,
-where `x.y` is the first version that includes all features you need.
-
-## Included items
-
-See [the documentation](https://typing-extensions.readthedocs.io/en/latest/#) for a
-complete listing of module contents.
-
-## Contributing
-
-See [CONTRIBUTING.md](https://github.com/python/typing_extensions/blob/main/CONTRIBUTING.md)
-for how to contribute to `typing_extensions`.
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/RECORD
deleted file mode 100644
index bc7b453..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/RECORD
+++ /dev/null
@@ -1,7 +0,0 @@
-__pycache__/typing_extensions.cpython-312.pyc,,
-typing_extensions-4.12.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-typing_extensions-4.12.2.dist-info/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
-typing_extensions-4.12.2.dist-info/METADATA,sha256=BeUQIa8cnYbrjWx-N8TOznM9UGW5Gm2DicVpDtRA8W0,3018
-typing_extensions-4.12.2.dist-info/RECORD,,
-typing_extensions-4.12.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-typing_extensions.py,sha256=gwekpyG9DVG3lxWKX4ni8u7nk3We5slG98mA9F3DJQw,134451
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/WHEEL
deleted file mode 100644
index 3b5e64b..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions-4.12.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.9.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions.py
index dec429c..9f1c7aa 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/typing_extensions.py
@@ -1,30 +1,52 @@
 import abc
 import collections
 import collections.abc
-import contextlib
-import functools
-import inspect
 import operator
 import sys
-import types as _types
 import typing
-import warnings
 
+# After PEP 560, internal typing API was substantially reworked.
+# This is especially important for Protocol class which uses internal APIs
+# quite extensively.
+PEP_560 = sys.version_info[:3] >= (3, 7, 0)
+
+if PEP_560:
+    GenericMeta = type
+else:
+    # 3.6
+    from typing import GenericMeta, _type_vars  # noqa
+
+# The two functions below are copies of typing internal helpers.
+# They are needed by _ProtocolMeta
+
+
+def _no_slots_copy(dct):
+    dict_copy = dict(dct)
+    if '__slots__' in dict_copy:
+        for slot in dict_copy['__slots__']:
+            dict_copy.pop(slot, None)
+    return dict_copy
+
+
+def _check_generic(cls, parameters):
+    if not cls.__parameters__:
+        raise TypeError(f"{cls} is not a generic class")
+    alen = len(parameters)
+    elen = len(cls.__parameters__)
+    if alen != elen:
+        raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments for {cls};"
+                        f" actual {alen}, expected {elen}")
+
+
+# Please keep __all__ alphabetized within each category.
 __all__ = [
     # Super-special typing primitives.
-    'Any',
     'ClassVar',
     'Concatenate',
     'Final',
-    'LiteralString',
     'ParamSpec',
-    'ParamSpecArgs',
-    'ParamSpecKwargs',
     'Self',
     'Type',
-    'TypeVar',
-    'TypeVarTuple',
-    'Unpack',
 
     # ABCs (from collections.abc).
     'Awaitable',
@@ -33,7 +55,6 @@ __all__ = [
     'Coroutine',
     'AsyncGenerator',
     'AsyncContextManager',
-    'Buffer',
     'ChainMap',
 
     # Concrete collection types.
@@ -41,129 +62,57 @@ __all__ = [
     'Counter',
     'Deque',
     'DefaultDict',
-    'NamedTuple',
     'OrderedDict',
     'TypedDict',
 
     # Structural checks, a.k.a. protocols.
-    'SupportsAbs',
-    'SupportsBytes',
-    'SupportsComplex',
-    'SupportsFloat',
     'SupportsIndex',
-    'SupportsInt',
-    'SupportsRound',
 
     # One-off things.
     'Annotated',
-    'assert_never',
-    'assert_type',
-    'clear_overloads',
-    'dataclass_transform',
-    'deprecated',
-    'Doc',
-    'get_overloads',
     'final',
-    'get_args',
-    'get_origin',
-    'get_original_bases',
-    'get_protocol_members',
-    'get_type_hints',
     'IntVar',
-    'is_protocol',
-    'is_typeddict',
     'Literal',
     'NewType',
     'overload',
-    'override',
     'Protocol',
-    'reveal_type',
     'runtime',
     'runtime_checkable',
     'Text',
     'TypeAlias',
-    'TypeAliasType',
     'TypeGuard',
-    'TypeIs',
     'TYPE_CHECKING',
-    'Never',
-    'NoReturn',
-    'ReadOnly',
-    'Required',
-    'NotRequired',
-
-    # Pure aliases, have always been in typing
-    'AbstractSet',
-    'AnyStr',
-    'BinaryIO',
-    'Callable',
-    'Collection',
-    'Container',
-    'Dict',
-    'ForwardRef',
-    'FrozenSet',
-    'Generator',
-    'Generic',
-    'Hashable',
-    'IO',
-    'ItemsView',
-    'Iterable',
-    'Iterator',
-    'KeysView',
-    'List',
-    'Mapping',
-    'MappingView',
-    'Match',
-    'MutableMapping',
-    'MutableSequence',
-    'MutableSet',
-    'NoDefault',
-    'Optional',
-    'Pattern',
-    'Reversible',
-    'Sequence',
-    'Set',
-    'Sized',
-    'TextIO',
-    'Tuple',
-    'Union',
-    'ValuesView',
-    'cast',
-    'no_type_check',
-    'no_type_check_decorator',
 ]
 
-# for backward compatibility
-PEP_560 = True
-GenericMeta = type
-_PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
+if PEP_560:
+    __all__.extend(["get_args", "get_origin", "get_type_hints"])
 
-# The functions below are modified copies of typing internal helpers.
-# They are needed by _ProtocolMeta and they provide support for PEP 646.
-
-
-class _Sentinel:
-    def __repr__(self):
-        return ""
-
-
-_marker = _Sentinel()
-
-
-if sys.version_info >= (3, 10):
-    def _should_collect_from_parameters(t):
-        return isinstance(
-            t, (typing._GenericAlias, _types.GenericAlias, _types.UnionType)
-        )
-elif sys.version_info >= (3, 9):
-    def _should_collect_from_parameters(t):
-        return isinstance(t, (typing._GenericAlias, _types.GenericAlias))
+# 3.6.2+
+if hasattr(typing, 'NoReturn'):
+    NoReturn = typing.NoReturn
+# 3.6.0-3.6.1
 else:
-    def _should_collect_from_parameters(t):
-        return isinstance(t, typing._GenericAlias) and not t._special
+    class _NoReturn(typing._FinalTypingBase, _root=True):
+        """Special type indicating functions that never return.
+        Example::
 
+          from typing import NoReturn
 
-NoReturn = typing.NoReturn
+          def stop() -> NoReturn:
+              raise Exception('no way')
+
+        This type is invalid in other positions, e.g., ``List[NoReturn]``
+        will fail in static type checkers.
+        """
+        __slots__ = ()
+
+        def __instancecheck__(self, obj):
+            raise TypeError("NoReturn cannot be used with isinstance().")
+
+        def __subclasscheck__(self, cls):
+            raise TypeError("NoReturn cannot be used with issubclass().")
+
+    NoReturn = _NoReturn(_root=True)
 
 # Some unconstrained type variables.  These are used by the container types.
 # (These are not for export.)
@@ -173,53 +122,99 @@ VT = typing.TypeVar('VT')  # Value type.
 T_co = typing.TypeVar('T_co', covariant=True)  # Any type covariant containers.
 T_contra = typing.TypeVar('T_contra', contravariant=True)  # Ditto contravariant.
 
-
-if sys.version_info >= (3, 11):
-    from typing import Any
-else:
-
-    class _AnyMeta(type):
-        def __instancecheck__(self, obj):
-            if self is Any:
-                raise TypeError("typing_extensions.Any cannot be used with isinstance()")
-            return super().__instancecheck__(obj)
-
-        def __repr__(self):
-            if self is Any:
-                return "typing_extensions.Any"
-            return super().__repr__()
-
-    class Any(metaclass=_AnyMeta):
-        """Special type indicating an unconstrained type.
-        - Any is compatible with every type.
-        - Any assumed to have all methods.
-        - All values assumed to be instances of Any.
-        Note that all the above statements are true from the point of view of
-        static type checkers. At runtime, Any should not be used with instance
-        checks.
-        """
-        def __new__(cls, *args, **kwargs):
-            if cls is Any:
-                raise TypeError("Any cannot be instantiated")
-            return super().__new__(cls, *args, **kwargs)
-
-
 ClassVar = typing.ClassVar
 
+# On older versions of typing there is an internal class named "Final".
+# 3.8+
+if hasattr(typing, 'Final') and sys.version_info[:2] >= (3, 7):
+    Final = typing.Final
+# 3.7
+elif sys.version_info[:2] >= (3, 7):
+    class _FinalForm(typing._SpecialForm, _root=True):
 
-class _ExtensionsSpecialForm(typing._SpecialForm, _root=True):
-    def __repr__(self):
-        return 'typing_extensions.' + self._name
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
 
+        def __getitem__(self, parameters):
+            item = typing._type_check(parameters,
+                                      f'{self._name} accepts only single type')
+            return typing._GenericAlias(self, (item,))
 
-Final = typing.Final
+    Final = _FinalForm('Final',
+                       doc="""A special typing construct to indicate that a name
+                       cannot be re-assigned or overridden in a subclass.
+                       For example:
 
-if sys.version_info >= (3, 11):
+                           MAX_SIZE: Final = 9000
+                           MAX_SIZE += 1  # Error reported by type checker
+
+                           class Connection:
+                               TIMEOUT: Final[int] = 10
+                           class FastConnector(Connection):
+                               TIMEOUT = 1  # Error reported by type checker
+
+                       There is no runtime checking of these properties.""")
+# 3.6
+else:
+    class _Final(typing._FinalTypingBase, _root=True):
+        """A special typing construct to indicate that a name
+        cannot be re-assigned or overridden in a subclass.
+        For example:
+
+            MAX_SIZE: Final = 9000
+            MAX_SIZE += 1  # Error reported by type checker
+
+            class Connection:
+                TIMEOUT: Final[int] = 10
+            class FastConnector(Connection):
+                TIMEOUT = 1  # Error reported by type checker
+
+        There is no runtime checking of these properties.
+        """
+
+        __slots__ = ('__type__',)
+
+        def __init__(self, tp=None, **kwds):
+            self.__type__ = tp
+
+        def __getitem__(self, item):
+            cls = type(self)
+            if self.__type__ is None:
+                return cls(typing._type_check(item,
+                           f'{cls.__name__[1:]} accepts only single type.'),
+                           _root=True)
+            raise TypeError(f'{cls.__name__[1:]} cannot be further subscripted')
+
+        def _eval_type(self, globalns, localns):
+            new_tp = typing._eval_type(self.__type__, globalns, localns)
+            if new_tp == self.__type__:
+                return self
+            return type(self)(new_tp, _root=True)
+
+        def __repr__(self):
+            r = super().__repr__()
+            if self.__type__ is not None:
+                r += f'[{typing._type_repr(self.__type__)}]'
+            return r
+
+        def __hash__(self):
+            return hash((type(self).__name__, self.__type__))
+
+        def __eq__(self, other):
+            if not isinstance(other, _Final):
+                return NotImplemented
+            if self.__type__ is not None:
+                return self.__type__ == other.__type__
+            return self is other
+
+    Final = _Final(_root=True)
+
+
+# 3.8+
+if hasattr(typing, 'final'):
     final = typing.final
+# 3.6-3.7
 else:
-    # @final exists in 3.8+, but we backport it for all versions
-    # before 3.11 to keep support for the __final__ attribute.
-    # See https://bugs.python.org/issue46342
     def final(f):
         """This decorator can be used to indicate to type checkers that
         the decorated method cannot be overridden, and decorated class
@@ -238,17 +233,8 @@ else:
             class Other(Leaf):  # Error reported by type checker
                 ...
 
-        There is no runtime checking of these properties. The decorator
-        sets the ``__final__`` attribute to ``True`` on the decorated object
-        to allow runtime introspection.
+        There is no runtime checking of these properties.
         """
-        try:
-            f.__final__ = True
-        except (AttributeError, TypeError):
-            # Skip the attribute silently if it is not writable.
-            # AttributeError happens if the object has __slots__ or a
-            # read-only property, TypeError if it's a builtin class.
-            pass
         return f
 
 
@@ -256,67 +242,21 @@ def IntVar(name):
     return typing.TypeVar(name)
 
 
-# A Literal bug was fixed in 3.11.0, 3.10.1 and 3.9.8
-if sys.version_info >= (3, 10, 1):
+# 3.8+:
+if hasattr(typing, 'Literal'):
     Literal = typing.Literal
-else:
-    def _flatten_literal_params(parameters):
-        """An internal helper for Literal creation: flatten Literals among parameters"""
-        params = []
-        for p in parameters:
-            if isinstance(p, _LiteralGenericAlias):
-                params.extend(p.__args__)
-            else:
-                params.append(p)
-        return tuple(params)
+# 3.7:
+elif sys.version_info[:2] >= (3, 7):
+    class _LiteralForm(typing._SpecialForm, _root=True):
 
-    def _value_and_type_iter(params):
-        for p in params:
-            yield p, type(p)
-
-    class _LiteralGenericAlias(typing._GenericAlias, _root=True):
-        def __eq__(self, other):
-            if not isinstance(other, _LiteralGenericAlias):
-                return NotImplemented
-            these_args_deduped = set(_value_and_type_iter(self.__args__))
-            other_args_deduped = set(_value_and_type_iter(other.__args__))
-            return these_args_deduped == other_args_deduped
-
-        def __hash__(self):
-            return hash(frozenset(_value_and_type_iter(self.__args__)))
-
-    class _LiteralForm(_ExtensionsSpecialForm, _root=True):
-        def __init__(self, doc: str):
-            self._name = 'Literal'
-            self._doc = self.__doc__ = doc
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
 
         def __getitem__(self, parameters):
-            if not isinstance(parameters, tuple):
-                parameters = (parameters,)
+            return typing._GenericAlias(self, parameters)
 
-            parameters = _flatten_literal_params(parameters)
-
-            val_type_pairs = list(_value_and_type_iter(parameters))
-            try:
-                deduped_pairs = set(val_type_pairs)
-            except TypeError:
-                # unhashable parameters
-                pass
-            else:
-                # similar logic to typing._deduplicate on Python 3.9+
-                if len(deduped_pairs) < len(val_type_pairs):
-                    new_parameters = []
-                    for pair in val_type_pairs:
-                        if pair in deduped_pairs:
-                            new_parameters.append(pair[0])
-                            deduped_pairs.remove(pair)
-                    assert not deduped_pairs, deduped_pairs
-                    parameters = tuple(new_parameters)
-
-            return _LiteralGenericAlias(self, parameters)
-
-    Literal = _LiteralForm(doc="""\
-                           A type that can be used to indicate to type checkers
+    Literal = _LiteralForm('Literal',
+                           doc="""A type that can be used to indicate to type checkers
                            that the corresponding value has a value literally equivalent
                            to the provided parameter. For example:
 
@@ -328,75 +268,59 @@ else:
                            Literal[...] cannot be subclassed. There is no runtime
                            checking verifying that the parameter is actually a value
                            instead of a type.""")
-
-
-_overload_dummy = typing._overload_dummy
-
-
-if hasattr(typing, "get_overloads"):  # 3.11+
-    overload = typing.overload
-    get_overloads = typing.get_overloads
-    clear_overloads = typing.clear_overloads
+# 3.6:
 else:
-    # {module: {qualname: {firstlineno: func}}}
-    _overload_registry = collections.defaultdict(
-        functools.partial(collections.defaultdict, dict)
-    )
+    class _Literal(typing._FinalTypingBase, _root=True):
+        """A type that can be used to indicate to type checkers that the
+        corresponding value has a value literally equivalent to the
+        provided parameter. For example:
 
-    def overload(func):
-        """Decorator for overloaded functions/methods.
+            var: Literal[4] = 4
 
-        In a stub file, place two or more stub definitions for the same
-        function in a row, each decorated with @overload.  For example:
+        The type checker understands that 'var' is literally equal to the
+        value 4 and no other value.
 
-        @overload
-        def utf8(value: None) -> None: ...
-        @overload
-        def utf8(value: bytes) -> bytes: ...
-        @overload
-        def utf8(value: str) -> bytes: ...
-
-        In a non-stub file (i.e. a regular .py file), do the same but
-        follow it with an implementation.  The implementation should *not*
-        be decorated with @overload.  For example:
-
-        @overload
-        def utf8(value: None) -> None: ...
-        @overload
-        def utf8(value: bytes) -> bytes: ...
-        @overload
-        def utf8(value: str) -> bytes: ...
-        def utf8(value):
-            # implementation goes here
-
-        The overloads for a function can be retrieved at runtime using the
-        get_overloads() function.
+        Literal[...] cannot be subclassed. There is no runtime checking
+        verifying that the parameter is actually a value instead of a type.
         """
-        # classmethod and staticmethod
-        f = getattr(func, "__func__", func)
-        try:
-            _overload_registry[f.__module__][f.__qualname__][
-                f.__code__.co_firstlineno
-            ] = func
-        except AttributeError:
-            # Not a normal function; ignore.
-            pass
-        return _overload_dummy
 
-    def get_overloads(func):
-        """Return all defined overloads for *func* as a sequence."""
-        # classmethod and staticmethod
-        f = getattr(func, "__func__", func)
-        if f.__module__ not in _overload_registry:
-            return []
-        mod_dict = _overload_registry[f.__module__]
-        if f.__qualname__ not in mod_dict:
-            return []
-        return list(mod_dict[f.__qualname__].values())
+        __slots__ = ('__values__',)
 
-    def clear_overloads():
-        """Clear all overloads in the registry."""
-        _overload_registry.clear()
+        def __init__(self, values=None, **kwds):
+            self.__values__ = values
+
+        def __getitem__(self, values):
+            cls = type(self)
+            if self.__values__ is None:
+                if not isinstance(values, tuple):
+                    values = (values,)
+                return cls(values, _root=True)
+            raise TypeError(f'{cls.__name__[1:]} cannot be further subscripted')
+
+        def _eval_type(self, globalns, localns):
+            return self
+
+        def __repr__(self):
+            r = super().__repr__()
+            if self.__values__ is not None:
+                r += f'[{", ".join(map(typing._type_repr, self.__values__))}]'
+            return r
+
+        def __hash__(self):
+            return hash((type(self).__name__, self.__values__))
+
+        def __eq__(self, other):
+            if not isinstance(other, _Literal):
+                return NotImplemented
+            if self.__values__ is not None:
+                return self.__values__ == other.__values__
+            return self is other
+
+    Literal = _Literal(_root=True)
+
+
+_overload_dummy = typing._overload_dummy  # noqa
+overload = typing.overload
 
 
 # This is not a real generic class.  Don't use outside annotations.
@@ -404,423 +328,641 @@ Type = typing.Type
 
 # Various ABCs mimicking those in collections.abc.
 # A few are simply re-exported for completeness.
+
+
+class _ExtensionsGenericMeta(GenericMeta):
+    def __subclasscheck__(self, subclass):
+        """This mimics a more modern GenericMeta.__subclasscheck__() logic
+        (that does not have problems with recursion) to work around interactions
+        between collections, typing, and typing_extensions on older
+        versions of Python, see https://github.com/python/typing/issues/501.
+        """
+        if self.__origin__ is not None:
+            if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools']:
+                raise TypeError("Parameterized generics cannot be used with class "
+                                "or instance checks")
+            return False
+        if not self.__extra__:
+            return super().__subclasscheck__(subclass)
+        res = self.__extra__.__subclasshook__(subclass)
+        if res is not NotImplemented:
+            return res
+        if self.__extra__ in subclass.__mro__:
+            return True
+        for scls in self.__extra__.__subclasses__():
+            if isinstance(scls, GenericMeta):
+                continue
+            if issubclass(subclass, scls):
+                return True
+        return False
+
+
 Awaitable = typing.Awaitable
 Coroutine = typing.Coroutine
 AsyncIterable = typing.AsyncIterable
 AsyncIterator = typing.AsyncIterator
-Deque = typing.Deque
+
+# 3.6.1+
+if hasattr(typing, 'Deque'):
+    Deque = typing.Deque
+# 3.6.0
+else:
+    class Deque(collections.deque, typing.MutableSequence[T],
+                metaclass=_ExtensionsGenericMeta,
+                extra=collections.deque):
+        __slots__ = ()
+
+        def __new__(cls, *args, **kwds):
+            if cls._gorg is Deque:
+                return collections.deque(*args, **kwds)
+            return typing._generic_new(collections.deque, cls, *args, **kwds)
+
+ContextManager = typing.ContextManager
+# 3.6.2+
+if hasattr(typing, 'AsyncContextManager'):
+    AsyncContextManager = typing.AsyncContextManager
+# 3.6.0-3.6.1
+else:
+    from _collections_abc import _check_methods as _check_methods_in_mro  # noqa
+
+    class AsyncContextManager(typing.Generic[T_co]):
+        __slots__ = ()
+
+        async def __aenter__(self):
+            return self
+
+        @abc.abstractmethod
+        async def __aexit__(self, exc_type, exc_value, traceback):
+            return None
+
+        @classmethod
+        def __subclasshook__(cls, C):
+            if cls is AsyncContextManager:
+                return _check_methods_in_mro(C, "__aenter__", "__aexit__")
+            return NotImplemented
+
 DefaultDict = typing.DefaultDict
-OrderedDict = typing.OrderedDict
-Counter = typing.Counter
-ChainMap = typing.ChainMap
+
+# 3.7.2+
+if hasattr(typing, 'OrderedDict'):
+    OrderedDict = typing.OrderedDict
+# 3.7.0-3.7.2
+elif (3, 7, 0) <= sys.version_info[:3] < (3, 7, 2):
+    OrderedDict = typing._alias(collections.OrderedDict, (KT, VT))
+# 3.6
+else:
+    class OrderedDict(collections.OrderedDict, typing.MutableMapping[KT, VT],
+                      metaclass=_ExtensionsGenericMeta,
+                      extra=collections.OrderedDict):
+
+        __slots__ = ()
+
+        def __new__(cls, *args, **kwds):
+            if cls._gorg is OrderedDict:
+                return collections.OrderedDict(*args, **kwds)
+            return typing._generic_new(collections.OrderedDict, cls, *args, **kwds)
+
+# 3.6.2+
+if hasattr(typing, 'Counter'):
+    Counter = typing.Counter
+# 3.6.0-3.6.1
+else:
+    class Counter(collections.Counter,
+                  typing.Dict[T, int],
+                  metaclass=_ExtensionsGenericMeta, extra=collections.Counter):
+
+        __slots__ = ()
+
+        def __new__(cls, *args, **kwds):
+            if cls._gorg is Counter:
+                return collections.Counter(*args, **kwds)
+            return typing._generic_new(collections.Counter, cls, *args, **kwds)
+
+# 3.6.1+
+if hasattr(typing, 'ChainMap'):
+    ChainMap = typing.ChainMap
+elif hasattr(collections, 'ChainMap'):
+    class ChainMap(collections.ChainMap, typing.MutableMapping[KT, VT],
+                   metaclass=_ExtensionsGenericMeta,
+                   extra=collections.ChainMap):
+
+        __slots__ = ()
+
+        def __new__(cls, *args, **kwds):
+            if cls._gorg is ChainMap:
+                return collections.ChainMap(*args, **kwds)
+            return typing._generic_new(collections.ChainMap, cls, *args, **kwds)
+
+# 3.6.1+
+if hasattr(typing, 'AsyncGenerator'):
+    AsyncGenerator = typing.AsyncGenerator
+# 3.6.0
+else:
+    class AsyncGenerator(AsyncIterator[T_co], typing.Generic[T_co, T_contra],
+                         metaclass=_ExtensionsGenericMeta,
+                         extra=collections.abc.AsyncGenerator):
+        __slots__ = ()
+
+NewType = typing.NewType
 Text = typing.Text
 TYPE_CHECKING = typing.TYPE_CHECKING
 
 
-if sys.version_info >= (3, 13, 0, "beta"):
-    from typing import AsyncContextManager, AsyncGenerator, ContextManager, Generator
-else:
-    def _is_dunder(attr):
-        return attr.startswith('__') and attr.endswith('__')
-
-    # Python <3.9 doesn't have typing._SpecialGenericAlias
-    _special_generic_alias_base = getattr(
-        typing, "_SpecialGenericAlias", typing._GenericAlias
-    )
-
-    class _SpecialGenericAlias(_special_generic_alias_base, _root=True):
-        def __init__(self, origin, nparams, *, inst=True, name=None, defaults=()):
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                self.__origin__ = origin
-                self._nparams = nparams
-                super().__init__(origin, nparams, special=True, inst=inst, name=name)
-            else:
-                # Python >= 3.9
-                super().__init__(origin, nparams, inst=inst, name=name)
-            self._defaults = defaults
-
-        def __setattr__(self, attr, val):
-            allowed_attrs = {'_name', '_inst', '_nparams', '_defaults'}
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                allowed_attrs.add("__origin__")
-            if _is_dunder(attr) or attr in allowed_attrs:
-                object.__setattr__(self, attr, val)
-            else:
-                setattr(self.__origin__, attr, val)
-
-        @typing._tp_cache
-        def __getitem__(self, params):
-            if not isinstance(params, tuple):
-                params = (params,)
-            msg = "Parameters to generic types must be types."
-            params = tuple(typing._type_check(p, msg) for p in params)
-            if (
-                self._defaults
-                and len(params) < self._nparams
-                and len(params) + len(self._defaults) >= self._nparams
-            ):
-                params = (*params, *self._defaults[len(params) - self._nparams:])
-            actual_len = len(params)
-
-            if actual_len != self._nparams:
-                if self._defaults:
-                    expected = f"at least {self._nparams - len(self._defaults)}"
-                else:
-                    expected = str(self._nparams)
-                if not self._nparams:
-                    raise TypeError(f"{self} is not a generic class")
-                raise TypeError(
-                    f"Too {'many' if actual_len > self._nparams else 'few'}"
-                    f" arguments for {self};"
-                    f" actual {actual_len}, expected {expected}"
-                )
-            return self.copy_with(params)
-
-    _NoneType = type(None)
-    Generator = _SpecialGenericAlias(
-        collections.abc.Generator, 3, defaults=(_NoneType, _NoneType)
-    )
-    AsyncGenerator = _SpecialGenericAlias(
-        collections.abc.AsyncGenerator, 2, defaults=(_NoneType,)
-    )
-    ContextManager = _SpecialGenericAlias(
-        contextlib.AbstractContextManager,
-        2,
-        name="ContextManager",
-        defaults=(typing.Optional[bool],)
-    )
-    AsyncContextManager = _SpecialGenericAlias(
-        contextlib.AbstractAsyncContextManager,
-        2,
-        name="AsyncContextManager",
-        defaults=(typing.Optional[bool],)
-    )
+def _gorg(cls):
+    """This function exists for compatibility with old typing versions."""
+    assert isinstance(cls, GenericMeta)
+    if hasattr(cls, '_gorg'):
+        return cls._gorg
+    while cls.__origin__ is not None:
+        cls = cls.__origin__
+    return cls
 
 
-_PROTO_ALLOWLIST = {
-    'collections.abc': [
-        'Callable', 'Awaitable', 'Iterable', 'Iterator', 'AsyncIterable',
-        'Hashable', 'Sized', 'Container', 'Collection', 'Reversible', 'Buffer',
-    ],
-    'contextlib': ['AbstractContextManager', 'AbstractAsyncContextManager'],
-    'typing_extensions': ['Buffer'],
-}
-
-
-_EXCLUDED_ATTRS = frozenset(typing.EXCLUDED_ATTRIBUTES) | {
-    "__match_args__", "__protocol_attrs__", "__non_callable_proto_members__",
-    "__final__",
-}
+_PROTO_WHITELIST = ['Callable', 'Awaitable',
+                    'Iterable', 'Iterator', 'AsyncIterable', 'AsyncIterator',
+                    'Hashable', 'Sized', 'Container', 'Collection', 'Reversible',
+                    'ContextManager', 'AsyncContextManager']
 
 
 def _get_protocol_attrs(cls):
     attrs = set()
     for base in cls.__mro__[:-1]:  # without object
-        if base.__name__ in {'Protocol', 'Generic'}:
+        if base.__name__ in ('Protocol', 'Generic'):
             continue
         annotations = getattr(base, '__annotations__', {})
-        for attr in (*base.__dict__, *annotations):
-            if (not attr.startswith('_abc_') and attr not in _EXCLUDED_ATTRS):
+        for attr in list(base.__dict__.keys()) + list(annotations.keys()):
+            if (not attr.startswith('_abc_') and attr not in (
+                    '__abstractmethods__', '__annotations__', '__weakref__',
+                    '_is_protocol', '_is_runtime_protocol', '__dict__',
+                    '__args__', '__slots__',
+                    '__next_in_mro__', '__parameters__', '__origin__',
+                    '__orig_bases__', '__extra__', '__tree_hash__',
+                    '__doc__', '__subclasshook__', '__init__', '__new__',
+                    '__module__', '_MutableMapping__marker', '_gorg')):
                 attrs.add(attr)
     return attrs
 
 
-def _caller(depth=2):
-    try:
-        return sys._getframe(depth).f_globals.get('__name__', '__main__')
-    except (AttributeError, ValueError):  # For platforms without _getframe()
-        return None
+def _is_callable_members_only(cls):
+    return all(callable(getattr(cls, attr, None)) for attr in _get_protocol_attrs(cls))
 
 
-# `__match_args__` attribute was removed from protocol members in 3.13,
-# we want to backport this change to older Python versions.
-if sys.version_info >= (3, 13):
+# 3.8+
+if hasattr(typing, 'Protocol'):
     Protocol = typing.Protocol
-else:
-    def _allow_reckless_class_checks(depth=3):
-        """Allow instance and class checks for special stdlib modules.
-        The abc and functools modules indiscriminately call isinstance() and
-        issubclass() on the whole MRO of a user class, which may contain protocols.
-        """
-        return _caller(depth) in {'abc', 'functools', None}
+# 3.7
+elif PEP_560:
+    from typing import _collect_type_vars  # noqa
 
     def _no_init(self, *args, **kwargs):
         if type(self)._is_protocol:
             raise TypeError('Protocols cannot be instantiated')
 
-    def _type_check_issubclass_arg_1(arg):
-        """Raise TypeError if `arg` is not an instance of `type`
-        in `issubclass(arg, )`.
-
-        In most cases, this is verified by type.__subclasscheck__.
-        Checking it again unnecessarily would slow down issubclass() checks,
-        so, we don't perform this check unless we absolutely have to.
-
-        For various error paths, however,
-        we want to ensure that *this* error message is shown to the user
-        where relevant, rather than a typing.py-specific error message.
-        """
-        if not isinstance(arg, type):
-            # Same error message as for issubclass(1, int).
-            raise TypeError('issubclass() arg 1 must be a class')
-
-    # Inheriting from typing._ProtocolMeta isn't actually desirable,
-    # but is necessary to allow typing.Protocol and typing_extensions.Protocol
-    # to mix without getting TypeErrors about "metaclass conflict"
-    class _ProtocolMeta(type(typing.Protocol)):
-        # This metaclass is somewhat unfortunate,
-        # but is necessary for several reasons...
-        #
-        # NOTE: DO NOT call super() in any methods in this class
-        # That would call the methods on typing._ProtocolMeta on Python 3.8-3.11
-        # and those are slow
-        def __new__(mcls, name, bases, namespace, **kwargs):
-            if name == "Protocol" and len(bases) < 2:
-                pass
-            elif {Protocol, typing.Protocol} & set(bases):
-                for base in bases:
-                    if not (
-                        base in {object, typing.Generic, Protocol, typing.Protocol}
-                        or base.__name__ in _PROTO_ALLOWLIST.get(base.__module__, [])
-                        or is_protocol(base)
-                    ):
-                        raise TypeError(
-                            f"Protocols can only inherit from other protocols, "
-                            f"got {base!r}"
-                        )
-            return abc.ABCMeta.__new__(mcls, name, bases, namespace, **kwargs)
-
-        def __init__(cls, *args, **kwargs):
-            abc.ABCMeta.__init__(cls, *args, **kwargs)
-            if getattr(cls, "_is_protocol", False):
-                cls.__protocol_attrs__ = _get_protocol_attrs(cls)
-
-        def __subclasscheck__(cls, other):
-            if cls is Protocol:
-                return type.__subclasscheck__(cls, other)
-            if (
-                getattr(cls, '_is_protocol', False)
-                and not _allow_reckless_class_checks()
-            ):
-                if not getattr(cls, '_is_runtime_protocol', False):
-                    _type_check_issubclass_arg_1(other)
-                    raise TypeError(
-                        "Instance and class checks can only be used with "
-                        "@runtime_checkable protocols"
-                    )
-                if (
-                    # this attribute is set by @runtime_checkable:
-                    cls.__non_callable_proto_members__
-                    and cls.__dict__.get("__subclasshook__") is _proto_hook
-                ):
-                    _type_check_issubclass_arg_1(other)
-                    non_method_attrs = sorted(cls.__non_callable_proto_members__)
-                    raise TypeError(
-                        "Protocols with non-method members don't support issubclass()."
-                        f" Non-method members: {str(non_method_attrs)[1:-1]}."
-                    )
-            return abc.ABCMeta.__subclasscheck__(cls, other)
-
+    class _ProtocolMeta(abc.ABCMeta):
+        # This metaclass is a bit unfortunate and exists only because of the lack
+        # of __instancehook__.
         def __instancecheck__(cls, instance):
             # We need this method for situations where attributes are
             # assigned in __init__.
-            if cls is Protocol:
-                return type.__instancecheck__(cls, instance)
-            if not getattr(cls, "_is_protocol", False):
-                # i.e., it's a concrete subclass of a protocol
-                return abc.ABCMeta.__instancecheck__(cls, instance)
-
-            if (
-                not getattr(cls, '_is_runtime_protocol', False) and
-                not _allow_reckless_class_checks()
-            ):
-                raise TypeError("Instance and class checks can only be used with"
-                                " @runtime_checkable protocols")
-
-            if abc.ABCMeta.__instancecheck__(cls, instance):
+            if ((not getattr(cls, '_is_protocol', False) or
+                 _is_callable_members_only(cls)) and
+                    issubclass(instance.__class__, cls)):
                 return True
+            if cls._is_protocol:
+                if all(hasattr(instance, attr) and
+                       (not callable(getattr(cls, attr, None)) or
+                        getattr(instance, attr) is not None)
+                       for attr in _get_protocol_attrs(cls)):
+                    return True
+            return super().__instancecheck__(instance)
 
-            for attr in cls.__protocol_attrs__:
-                try:
-                    val = inspect.getattr_static(instance, attr)
-                except AttributeError:
-                    break
-                # this attribute is set by @runtime_checkable:
-                if val is None and attr not in cls.__non_callable_proto_members__:
-                    break
-            else:
-                return True
+    class Protocol(metaclass=_ProtocolMeta):
+        # There is quite a lot of overlapping code with typing.Generic.
+        # Unfortunately it is hard to avoid this while these live in two different
+        # modules. The duplicated code will be removed when Protocol is moved to typing.
+        """Base class for protocol classes. Protocol classes are defined as::
 
-            return False
+            class Proto(Protocol):
+                def meth(self) -> int:
+                    ...
 
-        def __eq__(cls, other):
-            # Hack so that typing.Generic.__class_getitem__
-            # treats typing_extensions.Protocol
-            # as equivalent to typing.Protocol
-            if abc.ABCMeta.__eq__(cls, other) is True:
-                return True
-            return cls is Protocol and other is typing.Protocol
+        Such classes are primarily used with static type checkers that recognize
+        structural subtyping (static duck-typing), for example::
 
-        # This has to be defined, or the abc-module cache
-        # complains about classes with this metaclass being unhashable,
-        # if we define only __eq__!
-        def __hash__(cls) -> int:
-            return type.__hash__(cls)
+            class C:
+                def meth(self) -> int:
+                    return 0
 
-    @classmethod
-    def _proto_hook(cls, other):
-        if not cls.__dict__.get('_is_protocol', False):
-            return NotImplemented
+            def func(x: Proto) -> int:
+                return x.meth()
 
-        for attr in cls.__protocol_attrs__:
-            for base in other.__mro__:
-                # Check if the members appears in the class dictionary...
-                if attr in base.__dict__:
-                    if base.__dict__[attr] is None:
-                        return NotImplemented
-                    break
+            func(C())  # Passes static type check
 
-                # ...or in annotations, if it is a sub-protocol.
-                annotations = getattr(base, '__annotations__', {})
-                if (
-                    isinstance(annotations, collections.abc.Mapping)
-                    and attr in annotations
-                    and is_protocol(other)
-                ):
-                    break
-            else:
-                return NotImplemented
-        return True
+        See PEP 544 for details. Protocol classes decorated with
+        @typing_extensions.runtime act as simple-minded runtime protocol that checks
+        only the presence of given attributes, ignoring their type signatures.
 
-    class Protocol(typing.Generic, metaclass=_ProtocolMeta):
-        __doc__ = typing.Protocol.__doc__
+        Protocol classes can be generic, they are defined as::
+
+            class GenProto(Protocol[T]):
+                def meth(self) -> T:
+                    ...
+        """
         __slots__ = ()
         _is_protocol = True
-        _is_runtime_protocol = False
+
+        def __new__(cls, *args, **kwds):
+            if cls is Protocol:
+                raise TypeError("Type Protocol cannot be instantiated; "
+                                "it can only be used as a base class")
+            return super().__new__(cls)
+
+        @typing._tp_cache
+        def __class_getitem__(cls, params):
+            if not isinstance(params, tuple):
+                params = (params,)
+            if not params and cls is not typing.Tuple:
+                raise TypeError(
+                    f"Parameter list to {cls.__qualname__}[...] cannot be empty")
+            msg = "Parameters to generic types must be types."
+            params = tuple(typing._type_check(p, msg) for p in params)  # noqa
+            if cls is Protocol:
+                # Generic can only be subscripted with unique type variables.
+                if not all(isinstance(p, typing.TypeVar) for p in params):
+                    i = 0
+                    while isinstance(params[i], typing.TypeVar):
+                        i += 1
+                    raise TypeError(
+                        "Parameters to Protocol[...] must all be type variables."
+                        f" Parameter {i + 1} is {params[i]}")
+                if len(set(params)) != len(params):
+                    raise TypeError(
+                        "Parameters to Protocol[...] must all be unique")
+            else:
+                # Subscripting a regular Generic subclass.
+                _check_generic(cls, params)
+            return typing._GenericAlias(cls, params)
 
         def __init_subclass__(cls, *args, **kwargs):
-            super().__init_subclass__(*args, **kwargs)
+            tvars = []
+            if '__orig_bases__' in cls.__dict__:
+                error = typing.Generic in cls.__orig_bases__
+            else:
+                error = typing.Generic in cls.__bases__
+            if error:
+                raise TypeError("Cannot inherit from plain Generic")
+            if '__orig_bases__' in cls.__dict__:
+                tvars = _collect_type_vars(cls.__orig_bases__)
+                # Look for Generic[T1, ..., Tn] or Protocol[T1, ..., Tn].
+                # If found, tvars must be a subset of it.
+                # If not found, tvars is it.
+                # Also check for and reject plain Generic,
+                # and reject multiple Generic[...] and/or Protocol[...].
+                gvars = None
+                for base in cls.__orig_bases__:
+                    if (isinstance(base, typing._GenericAlias) and
+                            base.__origin__ in (typing.Generic, Protocol)):
+                        # for error messages
+                        the_base = base.__origin__.__name__
+                        if gvars is not None:
+                            raise TypeError(
+                                "Cannot inherit from Generic[...]"
+                                " and/or Protocol[...] multiple types.")
+                        gvars = base.__parameters__
+                if gvars is None:
+                    gvars = tvars
+                else:
+                    tvarset = set(tvars)
+                    gvarset = set(gvars)
+                    if not tvarset <= gvarset:
+                        s_vars = ', '.join(str(t) for t in tvars if t not in gvarset)
+                        s_args = ', '.join(str(g) for g in gvars)
+                        raise TypeError(f"Some type variables ({s_vars}) are"
+                                        f" not listed in {the_base}[{s_args}]")
+                    tvars = gvars
+            cls.__parameters__ = tuple(tvars)
 
             # Determine if this is a protocol or a concrete subclass.
-            if not cls.__dict__.get('_is_protocol', False):
+            if not cls.__dict__.get('_is_protocol', None):
                 cls._is_protocol = any(b is Protocol for b in cls.__bases__)
 
             # Set (or override) the protocol subclass hook.
+            def _proto_hook(other):
+                if not cls.__dict__.get('_is_protocol', None):
+                    return NotImplemented
+                if not getattr(cls, '_is_runtime_protocol', False):
+                    if sys._getframe(2).f_globals['__name__'] in ['abc', 'functools']:
+                        return NotImplemented
+                    raise TypeError("Instance and class checks can only be used with"
+                                    " @runtime protocols")
+                if not _is_callable_members_only(cls):
+                    if sys._getframe(2).f_globals['__name__'] in ['abc', 'functools']:
+                        return NotImplemented
+                    raise TypeError("Protocols with non-method members"
+                                    " don't support issubclass()")
+                if not isinstance(other, type):
+                    # Same error as for issubclass(1, int)
+                    raise TypeError('issubclass() arg 1 must be a class')
+                for attr in _get_protocol_attrs(cls):
+                    for base in other.__mro__:
+                        if attr in base.__dict__:
+                            if base.__dict__[attr] is None:
+                                return NotImplemented
+                            break
+                        annotations = getattr(base, '__annotations__', {})
+                        if (isinstance(annotations, typing.Mapping) and
+                                attr in annotations and
+                                isinstance(other, _ProtocolMeta) and
+                                other._is_protocol):
+                            break
+                    else:
+                        return NotImplemented
+                return True
             if '__subclasshook__' not in cls.__dict__:
                 cls.__subclasshook__ = _proto_hook
 
-            # Prohibit instantiation for protocol classes
-            if cls._is_protocol and cls.__init__ is Protocol.__init__:
+            # We have nothing more to do for non-protocols.
+            if not cls._is_protocol:
+                return
+
+            # Check consistency of bases.
+            for base in cls.__bases__:
+                if not (base in (object, typing.Generic) or
+                        base.__module__ == 'collections.abc' and
+                        base.__name__ in _PROTO_WHITELIST or
+                        isinstance(base, _ProtocolMeta) and base._is_protocol):
+                    raise TypeError('Protocols can only inherit from other'
+                                    f' protocols, got {repr(base)}')
+            cls.__init__ = _no_init
+# 3.6
+else:
+    from typing import _next_in_mro, _type_check  # noqa
+
+    def _no_init(self, *args, **kwargs):
+        if type(self)._is_protocol:
+            raise TypeError('Protocols cannot be instantiated')
+
+    class _ProtocolMeta(GenericMeta):
+        """Internal metaclass for Protocol.
+
+        This exists so Protocol classes can be generic without deriving
+        from Generic.
+        """
+        def __new__(cls, name, bases, namespace,
+                    tvars=None, args=None, origin=None, extra=None, orig_bases=None):
+            # This is just a version copied from GenericMeta.__new__ that
+            # includes "Protocol" special treatment. (Comments removed for brevity.)
+            assert extra is None  # Protocols should not have extra
+            if tvars is not None:
+                assert origin is not None
+                assert all(isinstance(t, typing.TypeVar) for t in tvars), tvars
+            else:
+                tvars = _type_vars(bases)
+                gvars = None
+                for base in bases:
+                    if base is typing.Generic:
+                        raise TypeError("Cannot inherit from plain Generic")
+                    if (isinstance(base, GenericMeta) and
+                            base.__origin__ in (typing.Generic, Protocol)):
+                        if gvars is not None:
+                            raise TypeError(
+                                "Cannot inherit from Generic[...] or"
+                                " Protocol[...] multiple times.")
+                        gvars = base.__parameters__
+                if gvars is None:
+                    gvars = tvars
+                else:
+                    tvarset = set(tvars)
+                    gvarset = set(gvars)
+                    if not tvarset <= gvarset:
+                        s_vars = ", ".join(str(t) for t in tvars if t not in gvarset)
+                        s_args = ", ".join(str(g) for g in gvars)
+                        cls_name = "Generic" if any(b.__origin__ is typing.Generic
+                                                    for b in bases) else "Protocol"
+                        raise TypeError(f"Some type variables ({s_vars}) are"
+                                        f" not listed in {cls_name}[{s_args}]")
+                    tvars = gvars
+
+            initial_bases = bases
+            if (extra is not None and type(extra) is abc.ABCMeta and
+                    extra not in bases):
+                bases = (extra,) + bases
+            bases = tuple(_gorg(b) if isinstance(b, GenericMeta) else b
+                          for b in bases)
+            if any(isinstance(b, GenericMeta) and b is not typing.Generic for b in bases):
+                bases = tuple(b for b in bases if b is not typing.Generic)
+            namespace.update({'__origin__': origin, '__extra__': extra})
+            self = super(GenericMeta, cls).__new__(cls, name, bases, namespace,
+                                                   _root=True)
+            super(GenericMeta, self).__setattr__('_gorg',
+                                                 self if not origin else
+                                                 _gorg(origin))
+            self.__parameters__ = tvars
+            self.__args__ = tuple(... if a is typing._TypingEllipsis else
+                                  () if a is typing._TypingEmpty else
+                                  a for a in args) if args else None
+            self.__next_in_mro__ = _next_in_mro(self)
+            if orig_bases is None:
+                self.__orig_bases__ = initial_bases
+            elif origin is not None:
+                self._abc_registry = origin._abc_registry
+                self._abc_cache = origin._abc_cache
+            if hasattr(self, '_subs_tree'):
+                self.__tree_hash__ = (hash(self._subs_tree()) if origin else
+                                      super(GenericMeta, self).__hash__())
+            return self
+
+        def __init__(cls, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            if not cls.__dict__.get('_is_protocol', None):
+                cls._is_protocol = any(b is Protocol or
+                                       isinstance(b, _ProtocolMeta) and
+                                       b.__origin__ is Protocol
+                                       for b in cls.__bases__)
+            if cls._is_protocol:
+                for base in cls.__mro__[1:]:
+                    if not (base in (object, typing.Generic) or
+                            base.__module__ == 'collections.abc' and
+                            base.__name__ in _PROTO_WHITELIST or
+                            isinstance(base, typing.TypingMeta) and base._is_protocol or
+                            isinstance(base, GenericMeta) and
+                            base.__origin__ is typing.Generic):
+                        raise TypeError(f'Protocols can only inherit from other'
+                                        f' protocols, got {repr(base)}')
+
                 cls.__init__ = _no_init
 
+            def _proto_hook(other):
+                if not cls.__dict__.get('_is_protocol', None):
+                    return NotImplemented
+                if not isinstance(other, type):
+                    # Same error as for issubclass(1, int)
+                    raise TypeError('issubclass() arg 1 must be a class')
+                for attr in _get_protocol_attrs(cls):
+                    for base in other.__mro__:
+                        if attr in base.__dict__:
+                            if base.__dict__[attr] is None:
+                                return NotImplemented
+                            break
+                        annotations = getattr(base, '__annotations__', {})
+                        if (isinstance(annotations, typing.Mapping) and
+                                attr in annotations and
+                                isinstance(other, _ProtocolMeta) and
+                                other._is_protocol):
+                            break
+                    else:
+                        return NotImplemented
+                return True
+            if '__subclasshook__' not in cls.__dict__:
+                cls.__subclasshook__ = _proto_hook
 
-if sys.version_info >= (3, 13):
+        def __instancecheck__(self, instance):
+            # We need this method for situations where attributes are
+            # assigned in __init__.
+            if ((not getattr(self, '_is_protocol', False) or
+                    _is_callable_members_only(self)) and
+                    issubclass(instance.__class__, self)):
+                return True
+            if self._is_protocol:
+                if all(hasattr(instance, attr) and
+                        (not callable(getattr(self, attr, None)) or
+                         getattr(instance, attr) is not None)
+                        for attr in _get_protocol_attrs(self)):
+                    return True
+            return super(GenericMeta, self).__instancecheck__(instance)
+
+        def __subclasscheck__(self, cls):
+            if self.__origin__ is not None:
+                if sys._getframe(1).f_globals['__name__'] not in ['abc', 'functools']:
+                    raise TypeError("Parameterized generics cannot be used with class "
+                                    "or instance checks")
+                return False
+            if (self.__dict__.get('_is_protocol', None) and
+                    not self.__dict__.get('_is_runtime_protocol', None)):
+                if sys._getframe(1).f_globals['__name__'] in ['abc',
+                                                              'functools',
+                                                              'typing']:
+                    return False
+                raise TypeError("Instance and class checks can only be used with"
+                                " @runtime protocols")
+            if (self.__dict__.get('_is_runtime_protocol', None) and
+                    not _is_callable_members_only(self)):
+                if sys._getframe(1).f_globals['__name__'] in ['abc',
+                                                              'functools',
+                                                              'typing']:
+                    return super(GenericMeta, self).__subclasscheck__(cls)
+                raise TypeError("Protocols with non-method members"
+                                " don't support issubclass()")
+            return super(GenericMeta, self).__subclasscheck__(cls)
+
+        @typing._tp_cache
+        def __getitem__(self, params):
+            # We also need to copy this from GenericMeta.__getitem__ to get
+            # special treatment of "Protocol". (Comments removed for brevity.)
+            if not isinstance(params, tuple):
+                params = (params,)
+            if not params and _gorg(self) is not typing.Tuple:
+                raise TypeError(
+                    f"Parameter list to {self.__qualname__}[...] cannot be empty")
+            msg = "Parameters to generic types must be types."
+            params = tuple(_type_check(p, msg) for p in params)
+            if self in (typing.Generic, Protocol):
+                if not all(isinstance(p, typing.TypeVar) for p in params):
+                    raise TypeError(
+                        f"Parameters to {repr(self)}[...] must all be type variables")
+                if len(set(params)) != len(params):
+                    raise TypeError(
+                        f"Parameters to {repr(self)}[...] must all be unique")
+                tvars = params
+                args = params
+            elif self in (typing.Tuple, typing.Callable):
+                tvars = _type_vars(params)
+                args = params
+            elif self.__origin__ in (typing.Generic, Protocol):
+                raise TypeError(f"Cannot subscript already-subscripted {repr(self)}")
+            else:
+                _check_generic(self, params)
+                tvars = _type_vars(params)
+                args = params
+
+            prepend = (self,) if self.__origin__ is None else ()
+            return self.__class__(self.__name__,
+                                  prepend + self.__bases__,
+                                  _no_slots_copy(self.__dict__),
+                                  tvars=tvars,
+                                  args=args,
+                                  origin=self,
+                                  extra=self.__extra__,
+                                  orig_bases=self.__orig_bases__)
+
+    class Protocol(metaclass=_ProtocolMeta):
+        """Base class for protocol classes. Protocol classes are defined as::
+
+          class Proto(Protocol):
+              def meth(self) -> int:
+                  ...
+
+        Such classes are primarily used with static type checkers that recognize
+        structural subtyping (static duck-typing), for example::
+
+          class C:
+              def meth(self) -> int:
+                  return 0
+
+          def func(x: Proto) -> int:
+              return x.meth()
+
+          func(C())  # Passes static type check
+
+        See PEP 544 for details. Protocol classes decorated with
+        @typing_extensions.runtime act as simple-minded runtime protocol that checks
+        only the presence of given attributes, ignoring their type signatures.
+
+        Protocol classes can be generic, they are defined as::
+
+          class GenProto(Protocol[T]):
+              def meth(self) -> T:
+                  ...
+        """
+        __slots__ = ()
+        _is_protocol = True
+
+        def __new__(cls, *args, **kwds):
+            if _gorg(cls) is Protocol:
+                raise TypeError("Type Protocol cannot be instantiated; "
+                                "it can be used only as a base class")
+            return typing._generic_new(cls.__next_in_mro__, cls, *args, **kwds)
+
+
+# 3.8+
+if hasattr(typing, 'runtime_checkable'):
     runtime_checkable = typing.runtime_checkable
+# 3.6-3.7
 else:
     def runtime_checkable(cls):
-        """Mark a protocol class as a runtime protocol.
+        """Mark a protocol class as a runtime protocol, so that it
+        can be used with isinstance() and issubclass(). Raise TypeError
+        if applied to a non-protocol class.
 
-        Such protocol can be used with isinstance() and issubclass().
-        Raise TypeError if applied to a non-protocol class.
-        This allows a simple-minded structural check very similar to
-        one trick ponies in collections.abc such as Iterable.
-
-        For example::
-
-            @runtime_checkable
-            class Closable(Protocol):
-                def close(self): ...
-
-            assert isinstance(open('/some/file'), Closable)
-
-        Warning: this will check only the presence of the required methods,
-        not their type signatures!
+        This allows a simple-minded structural check very similar to the
+        one-offs in collections.abc such as Hashable.
         """
-        if not issubclass(cls, typing.Generic) or not getattr(cls, '_is_protocol', False):
-            raise TypeError(f'@runtime_checkable can be only applied to protocol classes,'
+        if not isinstance(cls, _ProtocolMeta) or not cls._is_protocol:
+            raise TypeError('@runtime_checkable can be only applied to protocol classes,'
                             f' got {cls!r}')
         cls._is_runtime_protocol = True
-
-        # typing.Protocol classes on <=3.11 break if we execute this block,
-        # because typing.Protocol classes on <=3.11 don't have a
-        # `__protocol_attrs__` attribute, and this block relies on the
-        # `__protocol_attrs__` attribute. Meanwhile, typing.Protocol classes on 3.12.2+
-        # break if we *don't* execute this block, because *they* assume that all
-        # protocol classes have a `__non_callable_proto_members__` attribute
-        # (which this block sets)
-        if isinstance(cls, _ProtocolMeta) or sys.version_info >= (3, 12, 2):
-            # PEP 544 prohibits using issubclass()
-            # with protocols that have non-method members.
-            # See gh-113320 for why we compute this attribute here,
-            # rather than in `_ProtocolMeta.__init__`
-            cls.__non_callable_proto_members__ = set()
-            for attr in cls.__protocol_attrs__:
-                try:
-                    is_callable = callable(getattr(cls, attr, None))
-                except Exception as e:
-                    raise TypeError(
-                        f"Failed to determine whether protocol member {attr!r} "
-                        "is a method member"
-                    ) from e
-                else:
-                    if not is_callable:
-                        cls.__non_callable_proto_members__.add(attr)
-
         return cls
 
 
-# The "runtime" alias exists for backwards compatibility.
+# Exists for backwards compatibility.
 runtime = runtime_checkable
 
 
-# Our version of runtime-checkable protocols is faster on Python 3.8-3.11
-if sys.version_info >= (3, 12):
-    SupportsInt = typing.SupportsInt
-    SupportsFloat = typing.SupportsFloat
-    SupportsComplex = typing.SupportsComplex
-    SupportsBytes = typing.SupportsBytes
+# 3.8+
+if hasattr(typing, 'SupportsIndex'):
     SupportsIndex = typing.SupportsIndex
-    SupportsAbs = typing.SupportsAbs
-    SupportsRound = typing.SupportsRound
+# 3.6-3.7
 else:
-    @runtime_checkable
-    class SupportsInt(Protocol):
-        """An ABC with one abstract method __int__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __int__(self) -> int:
-            pass
-
-    @runtime_checkable
-    class SupportsFloat(Protocol):
-        """An ABC with one abstract method __float__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __float__(self) -> float:
-            pass
-
-    @runtime_checkable
-    class SupportsComplex(Protocol):
-        """An ABC with one abstract method __complex__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __complex__(self) -> complex:
-            pass
-
-    @runtime_checkable
-    class SupportsBytes(Protocol):
-        """An ABC with one abstract method __bytes__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __bytes__(self) -> bytes:
-            pass
-
     @runtime_checkable
     class SupportsIndex(Protocol):
         __slots__ = ()
@@ -829,221 +971,133 @@ else:
         def __index__(self) -> int:
             pass
 
-    @runtime_checkable
-    class SupportsAbs(Protocol[T_co]):
-        """
-        An ABC with one abstract method __abs__ that is covariant in its return type.
-        """
-        __slots__ = ()
 
-        @abc.abstractmethod
-        def __abs__(self) -> T_co:
-            pass
-
-    @runtime_checkable
-    class SupportsRound(Protocol[T_co]):
-        """
-        An ABC with one abstract method __round__ that is covariant in its return type.
-        """
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __round__(self, ndigits: int = 0) -> T_co:
-            pass
-
-
-def _ensure_subclassable(mro_entries):
-    def inner(func):
-        if sys.implementation.name == "pypy" and sys.version_info < (3, 9):
-            cls_dict = {
-                "__call__": staticmethod(func),
-                "__mro_entries__": staticmethod(mro_entries)
-            }
-            t = type(func.__name__, (), cls_dict)
-            return functools.update_wrapper(t(), func)
-        else:
-            func.__mro_entries__ = mro_entries
-            return func
-    return inner
-
-
-# Update this to something like >=3.13.0b1 if and when
-# PEP 728 is implemented in CPython
-_PEP_728_IMPLEMENTED = False
-
-if _PEP_728_IMPLEMENTED:
+if sys.version_info >= (3, 9, 2):
     # The standard library TypedDict in Python 3.8 does not store runtime information
     # about which (if any) keys are optional.  See https://bugs.python.org/issue38834
     # The standard library TypedDict in Python 3.9.0/1 does not honour the "total"
     # keyword with old-style TypedDict().  See https://bugs.python.org/issue42059
-    # The standard library TypedDict below Python 3.11 does not store runtime
-    # information about optional and required keys when using Required or NotRequired.
-    # Generic TypedDicts are also impossible using typing.TypedDict on Python <3.11.
-    # Aaaand on 3.12 we add __orig_bases__ to TypedDict
-    # to enable better runtime introspection.
-    # On 3.13 we deprecate some odd ways of creating TypedDicts.
-    # Also on 3.13, PEP 705 adds the ReadOnly[] qualifier.
-    # PEP 728 (still pending) makes more changes.
     TypedDict = typing.TypedDict
-    _TypedDictMeta = typing._TypedDictMeta
-    is_typeddict = typing.is_typeddict
 else:
-    # 3.10.0 and later
-    _TAKES_MODULE = "module" in inspect.signature(typing._type_check).parameters
+    def _check_fails(cls, other):
+        try:
+            if sys._getframe(1).f_globals['__name__'] not in ['abc',
+                                                              'functools',
+                                                              'typing']:
+                # Typed dicts are only for static structural subtyping.
+                raise TypeError('TypedDict does not support instance and class checks')
+        except (AttributeError, ValueError):
+            pass
+        return False
 
-    def _get_typeddict_qualifiers(annotation_type):
-        while True:
-            annotation_origin = get_origin(annotation_type)
-            if annotation_origin is Annotated:
-                annotation_args = get_args(annotation_type)
-                if annotation_args:
-                    annotation_type = annotation_args[0]
-                else:
-                    break
-            elif annotation_origin is Required:
-                yield Required
-                annotation_type, = get_args(annotation_type)
-            elif annotation_origin is NotRequired:
-                yield NotRequired
-                annotation_type, = get_args(annotation_type)
-            elif annotation_origin is ReadOnly:
-                yield ReadOnly
-                annotation_type, = get_args(annotation_type)
-            else:
-                break
+    def _dict_new(*args, **kwargs):
+        if not args:
+            raise TypeError('TypedDict.__new__(): not enough arguments')
+        _, args = args[0], args[1:]  # allow the "cls" keyword be passed
+        return dict(*args, **kwargs)
+
+    _dict_new.__text_signature__ = '($cls, _typename, _fields=None, /, **kwargs)'
+
+    def _typeddict_new(*args, total=True, **kwargs):
+        if not args:
+            raise TypeError('TypedDict.__new__(): not enough arguments')
+        _, args = args[0], args[1:]  # allow the "cls" keyword be passed
+        if args:
+            typename, args = args[0], args[1:]  # allow the "_typename" keyword be passed
+        elif '_typename' in kwargs:
+            typename = kwargs.pop('_typename')
+            import warnings
+            warnings.warn("Passing '_typename' as keyword argument is deprecated",
+                          DeprecationWarning, stacklevel=2)
+        else:
+            raise TypeError("TypedDict.__new__() missing 1 required positional "
+                            "argument: '_typename'")
+        if args:
+            try:
+                fields, = args  # allow the "_fields" keyword be passed
+            except ValueError:
+                raise TypeError('TypedDict.__new__() takes from 2 to 3 '
+                                f'positional arguments but {len(args) + 2} '
+                                'were given')
+        elif '_fields' in kwargs and len(kwargs) == 1:
+            fields = kwargs.pop('_fields')
+            import warnings
+            warnings.warn("Passing '_fields' as keyword argument is deprecated",
+                          DeprecationWarning, stacklevel=2)
+        else:
+            fields = None
+
+        if fields is None:
+            fields = kwargs
+        elif kwargs:
+            raise TypeError("TypedDict takes either a dict or keyword arguments,"
+                            " but not both")
+
+        ns = {'__annotations__': dict(fields)}
+        try:
+            # Setting correct module is necessary to make typed dict classes pickleable.
+            ns['__module__'] = sys._getframe(1).f_globals.get('__name__', '__main__')
+        except (AttributeError, ValueError):
+            pass
+
+        return _TypedDictMeta(typename, (), ns, total=total)
+
+    _typeddict_new.__text_signature__ = ('($cls, _typename, _fields=None,'
+                                         ' /, *, total=True, **kwargs)')
 
     class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, *, total=True, closed=False):
-            """Create new typed dict class object.
+        def __init__(cls, name, bases, ns, total=True):
+            super().__init__(name, bases, ns)
 
-            This method is called when TypedDict is subclassed,
-            or when TypedDict is instantiated. This way
-            TypedDict supports all three syntax forms described in its docstring.
-            Subclasses and instances of TypedDict return actual dictionaries.
-            """
-            for base in bases:
-                if type(base) is not _TypedDictMeta and base is not typing.Generic:
-                    raise TypeError('cannot inherit from both a TypedDict type '
-                                    'and a non-TypedDict base class')
-
-            if any(issubclass(b, typing.Generic) for b in bases):
-                generic_base = (typing.Generic,)
-            else:
-                generic_base = ()
-
-            # typing.py generally doesn't let you inherit from plain Generic, unless
-            # the name of the class happens to be "Protocol"
-            tp_dict = type.__new__(_TypedDictMeta, "Protocol", (*generic_base, dict), ns)
-            tp_dict.__name__ = name
-            if tp_dict.__qualname__ == "Protocol":
-                tp_dict.__qualname__ = name
-
-            if not hasattr(tp_dict, '__orig_bases__'):
-                tp_dict.__orig_bases__ = bases
+        def __new__(cls, name, bases, ns, total=True):
+            # Create new typed dict class object.
+            # This method is called directly when TypedDict is subclassed,
+            # or via _typeddict_new when TypedDict is instantiated. This way
+            # TypedDict supports all three syntaxes described in its docstring.
+            # Subclasses and instances of TypedDict return actual dictionaries
+            # via _dict_new.
+            ns['__new__'] = _typeddict_new if name == 'TypedDict' else _dict_new
+            tp_dict = super().__new__(cls, name, (dict,), ns)
 
             annotations = {}
-            if "__annotations__" in ns:
-                own_annotations = ns["__annotations__"]
-            elif "__annotate__" in ns:
-                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
-                own_annotations = ns["__annotate__"](1)
-            else:
-                own_annotations = {}
+            own_annotations = ns.get('__annotations__', {})
+            own_annotation_keys = set(own_annotations.keys())
             msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
-            if _TAKES_MODULE:
-                own_annotations = {
-                    n: typing._type_check(tp, msg, module=tp_dict.__module__)
-                    for n, tp in own_annotations.items()
-                }
-            else:
-                own_annotations = {
-                    n: typing._type_check(tp, msg)
-                    for n, tp in own_annotations.items()
-                }
+            own_annotations = {
+                n: typing._type_check(tp, msg) for n, tp in own_annotations.items()
+            }
             required_keys = set()
             optional_keys = set()
-            readonly_keys = set()
-            mutable_keys = set()
-            extra_items_type = None
 
             for base in bases:
-                base_dict = base.__dict__
-
-                annotations.update(base_dict.get('__annotations__', {}))
-                required_keys.update(base_dict.get('__required_keys__', ()))
-                optional_keys.update(base_dict.get('__optional_keys__', ()))
-                readonly_keys.update(base_dict.get('__readonly_keys__', ()))
-                mutable_keys.update(base_dict.get('__mutable_keys__', ()))
-                base_extra_items_type = base_dict.get('__extra_items__', None)
-                if base_extra_items_type is not None:
-                    extra_items_type = base_extra_items_type
-
-            if closed and extra_items_type is None:
-                extra_items_type = Never
-            if closed and "__extra_items__" in own_annotations:
-                annotation_type = own_annotations.pop("__extra_items__")
-                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
-                if Required in qualifiers:
-                    raise TypeError(
-                        "Special key __extra_items__ does not support "
-                        "Required"
-                    )
-                if NotRequired in qualifiers:
-                    raise TypeError(
-                        "Special key __extra_items__ does not support "
-                        "NotRequired"
-                    )
-                extra_items_type = annotation_type
+                annotations.update(base.__dict__.get('__annotations__', {}))
+                required_keys.update(base.__dict__.get('__required_keys__', ()))
+                optional_keys.update(base.__dict__.get('__optional_keys__', ()))
 
             annotations.update(own_annotations)
-            for annotation_key, annotation_type in own_annotations.items():
-                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
-
-                if Required in qualifiers:
-                    required_keys.add(annotation_key)
-                elif NotRequired in qualifiers:
-                    optional_keys.add(annotation_key)
-                elif total:
-                    required_keys.add(annotation_key)
-                else:
-                    optional_keys.add(annotation_key)
-                if ReadOnly in qualifiers:
-                    mutable_keys.discard(annotation_key)
-                    readonly_keys.add(annotation_key)
-                else:
-                    mutable_keys.add(annotation_key)
-                    readonly_keys.discard(annotation_key)
+            if total:
+                required_keys.update(own_annotation_keys)
+            else:
+                optional_keys.update(own_annotation_keys)
 
             tp_dict.__annotations__ = annotations
             tp_dict.__required_keys__ = frozenset(required_keys)
             tp_dict.__optional_keys__ = frozenset(optional_keys)
-            tp_dict.__readonly_keys__ = frozenset(readonly_keys)
-            tp_dict.__mutable_keys__ = frozenset(mutable_keys)
             if not hasattr(tp_dict, '__total__'):
                 tp_dict.__total__ = total
-            tp_dict.__closed__ = closed
-            tp_dict.__extra_items__ = extra_items_type
             return tp_dict
 
-        __call__ = dict  # static method
+        __instancecheck__ = __subclasscheck__ = _check_fails
 
-        def __subclasscheck__(cls, other):
-            # Typed dicts are only for static structural subtyping.
-            raise TypeError('TypedDict does not support instance and class checks')
+    TypedDict = _TypedDictMeta('TypedDict', (dict,), {})
+    TypedDict.__module__ = __name__
+    TypedDict.__doc__ = \
+        """A simple typed name space. At runtime it is equivalent to a plain dict.
 
-        __instancecheck__ = __subclasscheck__
-
-    _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
-
-    @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs):
-        """A simple typed namespace. At runtime it is equivalent to a plain dict.
-
-        TypedDict creates a dictionary type such that a type checker will expect all
-        instances to have a certain set of keys, where each key is
+        TypedDict creates a dictionary type that expects all of its
+        instances to have a certain set of keys, with each key
         associated with a value of a consistent type. This expectation
-        is not checked at runtime.
-
+        is not checked at runtime but is only enforced by type checkers.
         Usage::
 
             class Point2D(TypedDict):
@@ -1058,193 +1112,25 @@ else:
 
         The type info can be accessed via the Point2D.__annotations__ dict, and
         the Point2D.__required_keys__ and Point2D.__optional_keys__ frozensets.
-        TypedDict supports an additional equivalent form::
+        TypedDict supports two additional equivalent forms::
 
+            Point2D = TypedDict('Point2D', x=int, y=int, label=str)
             Point2D = TypedDict('Point2D', {'x': int, 'y': int, 'label': str})
 
-        By default, all keys must be present in a TypedDict. It is possible
-        to override this by specifying totality::
-
-            class Point2D(TypedDict, total=False):
-                x: int
-                y: int
-
-        This means that a Point2D TypedDict can have any of the keys omitted. A type
-        checker is only expected to support a literal False or True as the value of
-        the total argument. True is the default, and makes all items defined in the
-        class body be required.
-
-        The Required and NotRequired special forms can also be used to mark
-        individual keys as being required or not required::
-
-            class Point2D(TypedDict):
-                x: int  # the "x" key must always be present (Required is the default)
-                y: NotRequired[int]  # the "y" key can be omitted
-
-        See PEP 655 for more details on Required and NotRequired.
+        The class syntax is only supported in Python 3.6+, while two other
+        syntax forms work for Python 2.7 and 3.2+
         """
-        if fields is _marker or fields is None:
-            if fields is _marker:
-                deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-            else:
-                deprecated_thing = "Passing `None` as the 'fields' parameter"
-
-            example = f"`{typename} = TypedDict({typename!r}, {{}})`"
-            deprecation_msg = (
-                f"{deprecated_thing} is deprecated and will be disallowed in "
-                "Python 3.15. To create a TypedDict class with 0 fields "
-                "using the functional syntax, pass an empty dictionary, e.g. "
-            ) + example + "."
-            warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
-            if closed is not False and closed is not True:
-                kwargs["closed"] = closed
-                closed = False
-            fields = kwargs
-        elif kwargs:
-            raise TypeError("TypedDict takes either a dict or keyword arguments,"
-                            " but not both")
-        if kwargs:
-            if sys.version_info >= (3, 13):
-                raise TypeError("TypedDict takes no keyword arguments")
-            warnings.warn(
-                "The kwargs-based syntax for TypedDict definitions is deprecated "
-                "in Python 3.11, will be removed in Python 3.13, and may not be "
-                "understood by third-party type checkers.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        ns = {'__annotations__': dict(fields)}
-        module = _caller()
-        if module is not None:
-            # Setting correct module is necessary to make typed dict classes pickleable.
-            ns['__module__'] = module
-
-        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed)
-        td.__orig_bases__ = (TypedDict,)
-        return td
-
-    if hasattr(typing, "_TypedDictMeta"):
-        _TYPEDDICT_TYPES = (typing._TypedDictMeta, _TypedDictMeta)
-    else:
-        _TYPEDDICT_TYPES = (_TypedDictMeta,)
-
-    def is_typeddict(tp):
-        """Check if an annotation is a TypedDict class
-
-        For example::
-            class Film(TypedDict):
-                title: str
-                year: int
-
-            is_typeddict(Film)  # => True
-            is_typeddict(Union[list, str])  # => False
-        """
-        # On 3.8, this would otherwise return True
-        if hasattr(typing, "TypedDict") and tp is typing.TypedDict:
-            return False
-        return isinstance(tp, _TYPEDDICT_TYPES)
 
 
-if hasattr(typing, "assert_type"):
-    assert_type = typing.assert_type
-
-else:
-    def assert_type(val, typ, /):
-        """Assert (to the type checker) that the value is of the given type.
-
-        When the type checker encounters a call to assert_type(), it
-        emits an error if the value is not of the specified type::
-
-            def greet(name: str) -> None:
-                assert_type(name, str)  # ok
-                assert_type(name, int)  # type checker error
-
-        At runtime this returns the first argument unchanged and otherwise
-        does nothing.
-        """
-        return val
-
-
-if hasattr(typing, "ReadOnly"):  # 3.13+
-    get_type_hints = typing.get_type_hints
-else:  # <=3.13
-    # replaces _strip_annotations()
-    def _strip_extras(t):
-        """Strips Annotated, Required and NotRequired from a given type."""
-        if isinstance(t, _AnnotatedAlias):
-            return _strip_extras(t.__origin__)
-        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired, ReadOnly):
-            return _strip_extras(t.__args__[0])
-        if isinstance(t, typing._GenericAlias):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return t.copy_with(stripped_args)
-        if hasattr(_types, "GenericAlias") and isinstance(t, _types.GenericAlias):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return _types.GenericAlias(t.__origin__, stripped_args)
-        if hasattr(_types, "UnionType") and isinstance(t, _types.UnionType):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return functools.reduce(operator.or_, stripped_args)
-
-        return t
-
-    def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
-        """Return type hints for an object.
-
-        This is often the same as obj.__annotations__, but it handles
-        forward references encoded as string literals, adds Optional[t] if a
-        default value equal to None is set and recursively replaces all
-        'Annotated[T, ...]', 'Required[T]' or 'NotRequired[T]' with 'T'
-        (unless 'include_extras=True').
-
-        The argument may be a module, class, method, or function. The annotations
-        are returned as a dictionary. For classes, annotations include also
-        inherited members.
-
-        TypeError is raised if the argument is not of a type that can contain
-        annotations, and an empty dictionary is returned if no annotations are
-        present.
-
-        BEWARE -- the behavior of globalns and localns is counterintuitive
-        (unless you are familiar with how eval() and exec() work).  The
-        search order is locals first, then globals.
-
-        - If no dict arguments are passed, an attempt is made to use the
-          globals from obj (or the respective module's globals for classes),
-          and these are also used as the locals.  If the object does not appear
-          to have globals, an empty dictionary is used.
-
-        - If one dict argument is passed, it is used for both globals and
-          locals.
-
-        - If two dict arguments are passed, they specify globals and
-          locals, respectively.
-        """
-        if hasattr(typing, "Annotated"):  # 3.9+
-            hint = typing.get_type_hints(
-                obj, globalns=globalns, localns=localns, include_extras=True
-            )
-        else:  # 3.8
-            hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
-        if include_extras:
-            return hint
-        return {k: _strip_extras(t) for k, t in hint.items()}
-
-
-# Python 3.9+ has PEP 593 (Annotated)
+# Python 3.9+ has PEP 593 (Annotated and modified get_type_hints)
 if hasattr(typing, 'Annotated'):
     Annotated = typing.Annotated
+    get_type_hints = typing.get_type_hints
     # Not exported and not a public API, but needed for get_origin() and get_args()
     # to work.
     _AnnotatedAlias = typing._AnnotatedAlias
-# 3.8
-else:
+# 3.7-3.8
+elif PEP_560:
     class _AnnotatedAlias(typing._GenericAlias, _root=True):
         """Runtime representation of an annotated type.
 
@@ -1271,7 +1157,7 @@ else:
 
         def __reduce__(self):
             return operator.getitem, (
-                Annotated, (self.__origin__, *self.__metadata__)
+                Annotated, (self.__origin__,) + self.__metadata__
             )
 
         def __eq__(self, other):
@@ -1328,12 +1214,8 @@ else:
                 raise TypeError("Annotated[...] should be used "
                                 "with at least two arguments (a type and an "
                                 "annotation).")
-            allowed_special_forms = (ClassVar, Final)
-            if get_origin(params[0]) in allowed_special_forms:
-                origin = params[0]
-            else:
-                msg = "Annotated[t, ...]: t must be a type."
-                origin = typing._type_check(params[0], msg)
+            msg = "Annotated[t, ...]: t must be a type."
+            origin = typing._type_check(params[0], msg)
             metadata = tuple(params[1:])
             return _AnnotatedAlias(origin, metadata)
 
@@ -1342,14 +1224,204 @@ else:
                 f"Cannot subclass {cls.__module__}.Annotated"
             )
 
+    def _strip_annotations(t):
+        """Strips the annotations from a given type.
+        """
+        if isinstance(t, _AnnotatedAlias):
+            return _strip_annotations(t.__origin__)
+        if isinstance(t, typing._GenericAlias):
+            stripped_args = tuple(_strip_annotations(a) for a in t.__args__)
+            if stripped_args == t.__args__:
+                return t
+            res = t.copy_with(stripped_args)
+            res._special = t._special
+            return res
+        return t
+
+    def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
+        """Return type hints for an object.
+
+        This is often the same as obj.__annotations__, but it handles
+        forward references encoded as string literals, adds Optional[t] if a
+        default value equal to None is set and recursively replaces all
+        'Annotated[T, ...]' with 'T' (unless 'include_extras=True').
+
+        The argument may be a module, class, method, or function. The annotations
+        are returned as a dictionary. For classes, annotations include also
+        inherited members.
+
+        TypeError is raised if the argument is not of a type that can contain
+        annotations, and an empty dictionary is returned if no annotations are
+        present.
+
+        BEWARE -- the behavior of globalns and localns is counterintuitive
+        (unless you are familiar with how eval() and exec() work).  The
+        search order is locals first, then globals.
+
+        - If no dict arguments are passed, an attempt is made to use the
+          globals from obj (or the respective module's globals for classes),
+          and these are also used as the locals.  If the object does not appear
+          to have globals, an empty dictionary is used.
+
+        - If one dict argument is passed, it is used for both globals and
+          locals.
+
+        - If two dict arguments are passed, they specify globals and
+          locals, respectively.
+        """
+        hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
+        if include_extras:
+            return hint
+        return {k: _strip_annotations(t) for k, t in hint.items()}
+# 3.6
+else:
+
+    def _is_dunder(name):
+        """Returns True if name is a __dunder_variable_name__."""
+        return len(name) > 4 and name.startswith('__') and name.endswith('__')
+
+    # Prior to Python 3.7 types did not have `copy_with`. A lot of the equality
+    # checks, argument expansion etc. are done on the _subs_tre. As a result we
+    # can't provide a get_type_hints function that strips out annotations.
+
+    class AnnotatedMeta(typing.GenericMeta):
+        """Metaclass for Annotated"""
+
+        def __new__(cls, name, bases, namespace, **kwargs):
+            if any(b is not object for b in bases):
+                raise TypeError("Cannot subclass " + str(Annotated))
+            return super().__new__(cls, name, bases, namespace, **kwargs)
+
+        @property
+        def __metadata__(self):
+            return self._subs_tree()[2]
+
+        def _tree_repr(self, tree):
+            cls, origin, metadata = tree
+            if not isinstance(origin, tuple):
+                tp_repr = typing._type_repr(origin)
+            else:
+                tp_repr = origin[0]._tree_repr(origin)
+            metadata_reprs = ", ".join(repr(arg) for arg in metadata)
+            return f'{cls}[{tp_repr}, {metadata_reprs}]'
+
+        def _subs_tree(self, tvars=None, args=None):  # noqa
+            if self is Annotated:
+                return Annotated
+            res = super()._subs_tree(tvars=tvars, args=args)
+            # Flatten nested Annotated
+            if isinstance(res[1], tuple) and res[1][0] is Annotated:
+                sub_tp = res[1][1]
+                sub_annot = res[1][2]
+                return (Annotated, sub_tp, sub_annot + res[2])
+            return res
+
+        def _get_cons(self):
+            """Return the class used to create instance of this type."""
+            if self.__origin__ is None:
+                raise TypeError("Cannot get the underlying type of a "
+                                "non-specialized Annotated type.")
+            tree = self._subs_tree()
+            while isinstance(tree, tuple) and tree[0] is Annotated:
+                tree = tree[1]
+            if isinstance(tree, tuple):
+                return tree[0]
+            else:
+                return tree
+
+        @typing._tp_cache
+        def __getitem__(self, params):
+            if not isinstance(params, tuple):
+                params = (params,)
+            if self.__origin__ is not None:  # specializing an instantiated type
+                return super().__getitem__(params)
+            elif not isinstance(params, tuple) or len(params) < 2:
+                raise TypeError("Annotated[...] should be instantiated "
+                                "with at least two arguments (a type and an "
+                                "annotation).")
+            else:
+                msg = "Annotated[t, ...]: t must be a type."
+                tp = typing._type_check(params[0], msg)
+                metadata = tuple(params[1:])
+            return self.__class__(
+                self.__name__,
+                self.__bases__,
+                _no_slots_copy(self.__dict__),
+                tvars=_type_vars((tp,)),
+                # Metadata is a tuple so it won't be touched by _replace_args et al.
+                args=(tp, metadata),
+                origin=self,
+            )
+
+        def __call__(self, *args, **kwargs):
+            cons = self._get_cons()
+            result = cons(*args, **kwargs)
+            try:
+                result.__orig_class__ = self
+            except AttributeError:
+                pass
+            return result
+
+        def __getattr__(self, attr):
+            # For simplicity we just don't relay all dunder names
+            if self.__origin__ is not None and not _is_dunder(attr):
+                return getattr(self._get_cons(), attr)
+            raise AttributeError(attr)
+
+        def __setattr__(self, attr, value):
+            if _is_dunder(attr) or attr.startswith('_abc_'):
+                super().__setattr__(attr, value)
+            elif self.__origin__ is None:
+                raise AttributeError(attr)
+            else:
+                setattr(self._get_cons(), attr, value)
+
+        def __instancecheck__(self, obj):
+            raise TypeError("Annotated cannot be used with isinstance().")
+
+        def __subclasscheck__(self, cls):
+            raise TypeError("Annotated cannot be used with issubclass().")
+
+    class Annotated(metaclass=AnnotatedMeta):
+        """Add context specific metadata to a type.
+
+        Example: Annotated[int, runtime_check.Unsigned] indicates to the
+        hypothetical runtime_check module that this type is an unsigned int.
+        Every other consumer of this type can ignore this metadata and treat
+        this type as int.
+
+        The first argument to Annotated must be a valid type, the remaining
+        arguments are kept as a tuple in the __metadata__ field.
+
+        Details:
+
+        - It's an error to call `Annotated` with less than two arguments.
+        - Nested Annotated are flattened::
+
+            Annotated[Annotated[T, Ann1, Ann2], Ann3] == Annotated[T, Ann1, Ann2, Ann3]
+
+        - Instantiating an annotated type is equivalent to instantiating the
+        underlying type::
+
+            Annotated[C, Ann1](5) == C(5)
+
+        - Annotated can be used as a generic type alias::
+
+            Optimized = Annotated[T, runtime.Optimize()]
+            Optimized[int] == Annotated[int, runtime.Optimize()]
+
+            OptimizedList = Annotated[List[T], runtime.Optimize()]
+            OptimizedList[int] == Annotated[List[int], runtime.Optimize()]
+        """
+
 # Python 3.8 has get_origin() and get_args() but those implementations aren't
 # Annotated-aware, so we can't use those. Python 3.9's versions don't support
 # ParamSpecArgs and ParamSpecKwargs, so only Python 3.10's versions will do.
 if sys.version_info[:2] >= (3, 10):
     get_origin = typing.get_origin
     get_args = typing.get_args
-# 3.8-3.9
-else:
+# 3.7-3.9
+elif PEP_560:
     try:
         # 3.9+
         from typing import _BaseGenericAlias
@@ -1357,9 +1429,9 @@ else:
         _BaseGenericAlias = typing._GenericAlias
     try:
         # 3.9+
-        from typing import GenericAlias as _typing_GenericAlias
+        from typing import GenericAlias
     except ImportError:
-        _typing_GenericAlias = typing._GenericAlias
+        GenericAlias = typing._GenericAlias
 
     def get_origin(tp):
         """Get the unsubscripted version of a type.
@@ -1378,7 +1450,7 @@ else:
         """
         if isinstance(tp, _AnnotatedAlias):
             return Annotated
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias, _BaseGenericAlias,
+        if isinstance(tp, (typing._GenericAlias, GenericAlias, _BaseGenericAlias,
                            ParamSpecArgs, ParamSpecKwargs)):
             return tp.__origin__
         if tp is typing.Generic:
@@ -1397,8 +1469,8 @@ else:
             get_args(Callable[[], T][int]) == ([], int)
         """
         if isinstance(tp, _AnnotatedAlias):
-            return (tp.__origin__, *tp.__metadata__)
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias)):
+            return (tp.__origin__,) + tp.__metadata__
+        if isinstance(tp, (typing._GenericAlias, GenericAlias)):
             if getattr(tp, "_special", False):
                 return ()
             res = tp.__args__
@@ -1413,7 +1485,11 @@ if hasattr(typing, 'TypeAlias'):
     TypeAlias = typing.TypeAlias
 # 3.9
 elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
+    class _TypeAliasForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
+    @_TypeAliasForm
     def TypeAlias(self, parameters):
         """Special marker indicating that an assignment should
         be recognized as a proper type alias definition by type
@@ -1426,11 +1502,33 @@ elif sys.version_info[:2] >= (3, 9):
         It's invalid when used anywhere except as in the example above.
         """
         raise TypeError(f"{self} is not subscriptable")
-# 3.8
+# 3.7-3.8
+elif sys.version_info[:2] >= (3, 7):
+    class _TypeAliasForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
+    TypeAlias = _TypeAliasForm('TypeAlias',
+                               doc="""Special marker indicating that an assignment should
+                               be recognized as a proper type alias definition by type
+                               checkers.
+
+                               For example::
+
+                                   Predicate: TypeAlias = Callable[..., bool]
+
+                               It's invalid when used anywhere except as in the example
+                               above.""")
+# 3.6
 else:
-    TypeAlias = _ExtensionsSpecialForm(
-        'TypeAlias',
-        doc="""Special marker indicating that an assignment should
+    class _TypeAliasMeta(typing.TypingMeta):
+        """Metaclass for TypeAlias"""
+
+        def __repr__(self):
+            return 'typing_extensions.TypeAlias'
+
+    class _TypeAliasBase(typing._FinalTypingBase, metaclass=_TypeAliasMeta, _root=True):
+        """Special marker indicating that an assignment should
         be recognized as a proper type alias definition by type
         checkers.
 
@@ -1438,111 +1536,27 @@ else:
 
             Predicate: TypeAlias = Callable[..., bool]
 
-        It's invalid when used anywhere except as in the example
-        above."""
-    )
-
-
-if hasattr(typing, "NoDefault"):
-    NoDefault = typing.NoDefault
-else:
-    class NoDefaultTypeMeta(type):
-        def __setattr__(cls, attr, value):
-            # TypeError is consistent with the behavior of NoneType
-            raise TypeError(
-                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
-            )
-
-    class NoDefaultType(metaclass=NoDefaultTypeMeta):
-        """The type of the NoDefault singleton."""
-
+        It's invalid when used anywhere except as in the example above.
+        """
         __slots__ = ()
 
-        def __new__(cls):
-            return globals().get("NoDefault") or object.__new__(cls)
+        def __instancecheck__(self, obj):
+            raise TypeError("TypeAlias cannot be used with isinstance().")
+
+        def __subclasscheck__(self, cls):
+            raise TypeError("TypeAlias cannot be used with issubclass().")
 
         def __repr__(self):
-            return "typing_extensions.NoDefault"
+            return 'typing_extensions.TypeAlias'
 
-        def __reduce__(self):
-            return "NoDefault"
-
-    NoDefault = NoDefaultType()
-    del NoDefaultType, NoDefaultTypeMeta
-
-
-def _set_default(type_param, default):
-    type_param.has_default = lambda: default is not NoDefault
-    type_param.__default__ = default
-
-
-def _set_module(typevarlike):
-    # for pickling:
-    def_mod = _caller(depth=3)
-    if def_mod != 'typing_extensions':
-        typevarlike.__module__ = def_mod
-
-
-class _DefaultMixin:
-    """Mixin for TypeVarLike defaults."""
-
-    __slots__ = ()
-    __init__ = _set_default
-
-
-# Classes using this metaclass must provide a _backported_typevarlike ClassVar
-class _TypeVarLikeMeta(type):
-    def __instancecheck__(cls, __instance: Any) -> bool:
-        return isinstance(__instance, cls._backported_typevarlike)
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import TypeVar
-else:
-    # Add default and infer_variance parameters from PEP 696 and 695
-    class TypeVar(metaclass=_TypeVarLikeMeta):
-        """Type variable."""
-
-        _backported_typevarlike = typing.TypeVar
-
-        def __new__(cls, name, *constraints, bound=None,
-                    covariant=False, contravariant=False,
-                    default=NoDefault, infer_variance=False):
-            if hasattr(typing, "TypeAliasType"):
-                # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
-                typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                         covariant=covariant, contravariant=contravariant,
-                                         infer_variance=infer_variance)
-            else:
-                typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                         covariant=covariant, contravariant=contravariant)
-                if infer_variance and (covariant or contravariant):
-                    raise ValueError("Variance cannot be specified with infer_variance.")
-                typevar.__infer_variance__ = infer_variance
-
-            _set_default(typevar, default)
-            _set_module(typevar)
-
-            def _tvar_prepare_subst(alias, args):
-                if (
-                    typevar.has_default()
-                    and alias.__parameters__.index(typevar) == len(args)
-                ):
-                    args += (typevar.__default__,)
-                return args
-
-            typevar.__typing_prepare_subst__ = _tvar_prepare_subst
-            return typevar
-
-        def __init_subclass__(cls) -> None:
-            raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
+    TypeAlias = _TypeAliasBase(_root=True)
 
 
 # Python 3.10+ has PEP 612
 if hasattr(typing, 'ParamSpecArgs'):
     ParamSpecArgs = typing.ParamSpecArgs
     ParamSpecKwargs = typing.ParamSpecKwargs
-# 3.8-3.9
+# 3.6-3.9
 else:
     class _Immutable:
         """Mixin to indicate that object should not be copied."""
@@ -1572,11 +1586,6 @@ else:
         def __repr__(self):
             return f"{self.__origin__.__name__}.args"
 
-        def __eq__(self, other):
-            if not isinstance(other, ParamSpecArgs):
-                return NotImplemented
-            return self.__origin__ == other.__origin__
-
     class ParamSpecKwargs(_Immutable):
         """The kwargs for a ParamSpec object.
 
@@ -1595,69 +1604,14 @@ else:
         def __repr__(self):
             return f"{self.__origin__.__name__}.kwargs"
 
-        def __eq__(self, other):
-            if not isinstance(other, ParamSpecKwargs):
-                return NotImplemented
-            return self.__origin__ == other.__origin__
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import ParamSpec
-
 # 3.10+
-elif hasattr(typing, 'ParamSpec'):
-
-    # Add default parameter - PEP 696
-    class ParamSpec(metaclass=_TypeVarLikeMeta):
-        """Parameter specification."""
-
-        _backported_typevarlike = typing.ParamSpec
-
-        def __new__(cls, name, *, bound=None,
-                    covariant=False, contravariant=False,
-                    infer_variance=False, default=NoDefault):
-            if hasattr(typing, "TypeAliasType"):
-                # PEP 695 implemented, can pass infer_variance to typing.TypeVar
-                paramspec = typing.ParamSpec(name, bound=bound,
-                                             covariant=covariant,
-                                             contravariant=contravariant,
-                                             infer_variance=infer_variance)
-            else:
-                paramspec = typing.ParamSpec(name, bound=bound,
-                                             covariant=covariant,
-                                             contravariant=contravariant)
-                paramspec.__infer_variance__ = infer_variance
-
-            _set_default(paramspec, default)
-            _set_module(paramspec)
-
-            def _paramspec_prepare_subst(alias, args):
-                params = alias.__parameters__
-                i = params.index(paramspec)
-                if i == len(args) and paramspec.has_default():
-                    args = [*args, paramspec.__default__]
-                if i >= len(args):
-                    raise TypeError(f"Too few arguments for {alias}")
-                # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
-                if len(params) == 1 and not typing._is_param_expr(args[0]):
-                    assert i == 0
-                    args = (args,)
-                # Convert lists to tuples to help other libraries cache the results.
-                elif isinstance(args[i], list):
-                    args = (*args[:i], tuple(args[i]), *args[i + 1:])
-                return args
-
-            paramspec.__typing_prepare_subst__ = _paramspec_prepare_subst
-            return paramspec
-
-        def __init_subclass__(cls) -> None:
-            raise TypeError(f"type '{__name__}.ParamSpec' is not an acceptable base type")
-
-# 3.8-3.9
+if hasattr(typing, 'ParamSpec'):
+    ParamSpec = typing.ParamSpec
+# 3.6-3.9
 else:
 
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
-    class ParamSpec(list, _DefaultMixin):
+    class ParamSpec(list):
         """Parameter specification variable.
 
         Usage::
@@ -1715,28 +1669,26 @@ else:
         def kwargs(self):
             return ParamSpecKwargs(self)
 
-        def __init__(self, name, *, bound=None, covariant=False, contravariant=False,
-                     infer_variance=False, default=NoDefault):
-            list.__init__(self, [self])
+        def __init__(self, name, *, bound=None, covariant=False, contravariant=False):
+            super().__init__([self])
             self.__name__ = name
             self.__covariant__ = bool(covariant)
             self.__contravariant__ = bool(contravariant)
-            self.__infer_variance__ = bool(infer_variance)
             if bound:
                 self.__bound__ = typing._type_check(bound, 'Bound must be a type.')
             else:
                 self.__bound__ = None
-            _DefaultMixin.__init__(self, default)
 
             # for pickling:
-            def_mod = _caller()
+            try:
+                def_mod = sys._getframe(1).f_globals.get('__name__', '__main__')
+            except (AttributeError, ValueError):
+                def_mod = None
             if def_mod != 'typing_extensions':
                 self.__module__ = def_mod
 
         def __repr__(self):
-            if self.__infer_variance__:
-                prefix = ''
-            elif self.__covariant__:
+            if self.__covariant__:
                 prefix = '+'
             elif self.__contravariant__:
                 prefix = '-'
@@ -1757,17 +1709,28 @@ else:
         def __call__(self, *args, **kwargs):
             pass
 
+        if not PEP_560:
+            # Only needed in 3.6.
+            def _get_type_vars(self, tvars):
+                if self not in tvars:
+                    tvars.append(self)
 
-# 3.8-3.9
+
+# 3.6-3.9
 if not hasattr(typing, 'Concatenate'):
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
     class _ConcatenateGenericAlias(list):
 
         # Trick Generic into looking into this for __parameters__.
-        __class__ = typing._GenericAlias
+        if PEP_560:
+            __class__ = typing._GenericAlias
+        else:
+            __class__ = typing._TypingBase
 
         # Flag in 3.8.
         _special = False
+        # Attribute in 3.6 and earlier.
+        _gorg = typing.Generic
 
         def __init__(self, origin, args):
             super().__init__(args)
@@ -1792,8 +1755,14 @@ if not hasattr(typing, 'Concatenate'):
                 tp for tp in self.__args__ if isinstance(tp, (typing.TypeVar, ParamSpec))
             )
 
+        if not PEP_560:
+            # Only required in 3.6.
+            def _get_type_vars(self, tvars):
+                if self.__origin__ and self.__parameters__:
+                    typing._get_type_vars(self.__parameters__, tvars)
 
-# 3.8-3.9
+
+# 3.6-3.9
 @typing._tp_cache
 def _concatenate_getitem(self, parameters):
     if parameters == ():
@@ -1811,10 +1780,10 @@ def _concatenate_getitem(self, parameters):
 # 3.10+
 if hasattr(typing, 'Concatenate'):
     Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
+    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias # noqa
 # 3.9
 elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
+    @_TypeAliasForm
     def Concatenate(self, parameters):
         """Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
         higher order function which adds, removes or transforms parameters of a
@@ -1827,9 +1796,12 @@ elif sys.version_info[:2] >= (3, 9):
         See PEP 612 for detailed information.
         """
         return _concatenate_getitem(self, parameters)
-# 3.8
-else:
-    class _ConcatenateForm(_ExtensionsSpecialForm, _root=True):
+# 3.7-8
+elif sys.version_info[:2] >= (3, 7):
+    class _ConcatenateForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
         def __getitem__(self, parameters):
             return _concatenate_getitem(self, parameters)
 
@@ -1845,13 +1817,53 @@ else:
 
         See PEP 612 for detailed information.
         """)
+# 3.6
+else:
+    class _ConcatenateAliasMeta(typing.TypingMeta):
+        """Metaclass for Concatenate."""
+
+        def __repr__(self):
+            return 'typing_extensions.Concatenate'
+
+    class _ConcatenateAliasBase(typing._FinalTypingBase,
+                                metaclass=_ConcatenateAliasMeta,
+                                _root=True):
+        """Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
+        higher order function which adds, removes or transforms parameters of a
+        callable.
+
+        For example::
+
+           Callable[Concatenate[int, P], int]
+
+        See PEP 612 for detailed information.
+        """
+        __slots__ = ()
+
+        def __instancecheck__(self, obj):
+            raise TypeError("Concatenate cannot be used with isinstance().")
+
+        def __subclasscheck__(self, cls):
+            raise TypeError("Concatenate cannot be used with issubclass().")
+
+        def __repr__(self):
+            return 'typing_extensions.Concatenate'
+
+        def __getitem__(self, parameters):
+            return _concatenate_getitem(self, parameters)
+
+    Concatenate = _ConcatenateAliasBase(_root=True)
 
 # 3.10+
 if hasattr(typing, 'TypeGuard'):
     TypeGuard = typing.TypeGuard
 # 3.9
 elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
+    class _TypeGuardForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
+    @_TypeGuardForm
     def TypeGuard(self, parameters):
         """Special typing form used to annotate the return type of a user-defined
         type guard function.  ``TypeGuard`` only accepts a single type argument.
@@ -1895,11 +1907,15 @@ elif sys.version_info[:2] >= (3, 9):
         ``TypeGuard`` also works with type variables.  For more information, see
         PEP 647 (User-Defined Type Guards).
         """
-        item = typing._type_check(parameters, f'{self} accepts only a single type.')
+        item = typing._type_check(parameters, f'{self} accepts only single type.')
         return typing._GenericAlias(self, (item,))
-# 3.8
-else:
-    class _TypeGuardForm(_ExtensionsSpecialForm, _root=True):
+# 3.7-3.8
+elif sys.version_info[:2] >= (3, 7):
+    class _TypeGuardForm(typing._SpecialForm, _root=True):
+
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
         def __getitem__(self, parameters):
             item = typing._type_check(parameters,
                                       f'{self._name} accepts only a single type')
@@ -1949,170 +1965,135 @@ else:
         ``TypeGuard`` also works with type variables.  For more information, see
         PEP 647 (User-Defined Type Guards).
         """)
-
-# 3.13+
-if hasattr(typing, 'TypeIs'):
-    TypeIs = typing.TypeIs
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def TypeIs(self, parameters):
-        """Special typing form used to annotate the return type of a user-defined
-        type narrower function.  ``TypeIs`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeIs[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeIs`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
-        previously known type.
-
-        For example::
-
-            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
-                return hasattr(val, '__await__')
-
-            def f(val: Union[int, Awaitable[int]]) -> int:
-                if is_awaitable(val):
-                    assert_type(val, Awaitable[int])
-                else:
-                    assert_type(val, int)
-
-        ``TypeIs`` also works with type variables.  For more information, see
-        PEP 742 (Narrowing types with TypeIs).
-        """
-        item = typing._type_check(parameters, f'{self} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-# 3.8
+# 3.6
 else:
-    class _TypeIsForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type')
-            return typing._GenericAlias(self, (item,))
-
-    TypeIs = _TypeIsForm(
-        'TypeIs',
-        doc="""Special typing form used to annotate the return type of a user-defined
-        type narrower function.  ``TypeIs`` only accepts a single type argument.
+    class _TypeGuard(typing._FinalTypingBase, _root=True):
+        """Special typing form used to annotate the return type of a user-defined
+        type guard function.  ``TypeGuard`` only accepts a single type argument.
         At runtime, functions marked this way should return a boolean.
 
-        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
+        ``TypeGuard`` aims to benefit *type narrowing* -- a technique used by static
         type checkers to determine a more precise type of an expression within a
         program's code flow.  Usually type narrowing is done by analyzing
         conditional code flow and applying the narrowing to a block of code.  The
         conditional expression here is sometimes referred to as a "type guard".
 
         Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeIs[...]`` as its
+        as a type guard.  Such a function should use ``TypeGuard[...]`` as its
         return type to alert static type checkers to this intention.
 
-        Using  ``-> TypeIs`` tells the static type checker that for a given
+        Using  ``-> TypeGuard`` tells the static type checker that for a given
         function:
 
         1. The return value is a boolean.
         2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
-        previously known type.
+        is the type inside ``TypeGuard``.
 
         For example::
 
-            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
-                return hasattr(val, '__await__')
-
-            def f(val: Union[int, Awaitable[int]]) -> int:
-                if is_awaitable(val):
-                    assert_type(val, Awaitable[int])
+            def is_str(val: Union[str, float]):
+                # "isinstance" type guard
+                if isinstance(val, str):
+                    # Type of ``val`` is narrowed to ``str``
+                    ...
                 else:
-                    assert_type(val, int)
+                    # Else, type of ``val`` is narrowed to ``float``.
+                    ...
 
-        ``TypeIs`` also works with type variables.  For more information, see
-        PEP 742 (Narrowing types with TypeIs).
-        """)
+        Strict type narrowing is not enforced -- ``TypeB`` need not be a narrower
+        form of ``TypeA`` (it can even be a wider form) and this may lead to
+        type-unsafe results.  The main reason is to allow for things like
+        narrowing ``List[object]`` to ``List[str]`` even though the latter is not
+        a subtype of the former, since ``List`` is invariant.  The responsibility of
+        writing type-safe type guards is left to the user.
 
+        ``TypeGuard`` also works with type variables.  For more information, see
+        PEP 647 (User-Defined Type Guards).
+        """
 
-# Vendored from cpython typing._SpecialFrom
-class _SpecialForm(typing._Final, _root=True):
-    __slots__ = ('_name', '__doc__', '_getitem')
+        __slots__ = ('__type__',)
 
-    def __init__(self, getitem):
-        self._getitem = getitem
-        self._name = getitem.__name__
-        self.__doc__ = getitem.__doc__
+        def __init__(self, tp=None, **kwds):
+            self.__type__ = tp
 
-    def __getattr__(self, item):
-        if item in {'__name__', '__qualname__'}:
+        def __getitem__(self, item):
+            cls = type(self)
+            if self.__type__ is None:
+                return cls(typing._type_check(item,
+                           f'{cls.__name__[1:]} accepts only a single type.'),
+                           _root=True)
+            raise TypeError(f'{cls.__name__[1:]} cannot be further subscripted')
+
+        def _eval_type(self, globalns, localns):
+            new_tp = typing._eval_type(self.__type__, globalns, localns)
+            if new_tp == self.__type__:
+                return self
+            return type(self)(new_tp, _root=True)
+
+        def __repr__(self):
+            r = super().__repr__()
+            if self.__type__ is not None:
+                r += f'[{typing._type_repr(self.__type__)}]'
+            return r
+
+        def __hash__(self):
+            return hash((type(self).__name__, self.__type__))
+
+        def __eq__(self, other):
+            if not isinstance(other, _TypeGuard):
+                return NotImplemented
+            if self.__type__ is not None:
+                return self.__type__ == other.__type__
+            return self is other
+
+    TypeGuard = _TypeGuard(_root=True)
+
+if hasattr(typing, "Self"):
+    Self = typing.Self
+elif sys.version_info[:2] >= (3, 7):
+    # Vendored from cpython typing._SpecialFrom
+    class _SpecialForm(typing._Final, _root=True):
+        __slots__ = ('_name', '__doc__', '_getitem')
+
+        def __init__(self, getitem):
+            self._getitem = getitem
+            self._name = getitem.__name__
+            self.__doc__ = getitem.__doc__
+
+        def __getattr__(self, item):
+            if item in {'__name__', '__qualname__'}:
+                return self._name
+
+            raise AttributeError(item)
+
+        def __mro_entries__(self, bases):
+            raise TypeError(f"Cannot subclass {self!r}")
+
+        def __repr__(self):
+            return f'typing_extensions.{self._name}'
+
+        def __reduce__(self):
             return self._name
 
-        raise AttributeError(item)
+        def __call__(self, *args, **kwds):
+            raise TypeError(f"Cannot instantiate {self!r}")
 
-    def __mro_entries__(self, bases):
-        raise TypeError(f"Cannot subclass {self!r}")
+        def __or__(self, other):
+            return typing.Union[self, other]
 
-    def __repr__(self):
-        return f'typing_extensions.{self._name}'
+        def __ror__(self, other):
+            return typing.Union[other, self]
 
-    def __reduce__(self):
-        return self._name
+        def __instancecheck__(self, obj):
+            raise TypeError(f"{self} cannot be used with isinstance()")
 
-    def __call__(self, *args, **kwds):
-        raise TypeError(f"Cannot instantiate {self!r}")
+        def __subclasscheck__(self, cls):
+            raise TypeError(f"{self} cannot be used with issubclass()")
 
-    def __or__(self, other):
-        return typing.Union[self, other]
+        @typing._tp_cache
+        def __getitem__(self, parameters):
+            return self._getitem(self, parameters)
 
-    def __ror__(self, other):
-        return typing.Union[other, self]
-
-    def __instancecheck__(self, obj):
-        raise TypeError(f"{self} cannot be used with isinstance()")
-
-    def __subclasscheck__(self, cls):
-        raise TypeError(f"{self} cannot be used with issubclass()")
-
-    @typing._tp_cache
-    def __getitem__(self, parameters):
-        return self._getitem(self, parameters)
-
-
-if hasattr(typing, "LiteralString"):  # 3.11+
-    LiteralString = typing.LiteralString
-else:
-    @_SpecialForm
-    def LiteralString(self, params):
-        """Represents an arbitrary literal string.
-
-        Example::
-
-          from typing_extensions import LiteralString
-
-          def query(sql: LiteralString) -> ...:
-              ...
-
-          query("SELECT * FROM table")  # ok
-          query(f"SELECT * FROM {input()}")  # not ok
-
-        See PEP 675 for details.
-
-        """
-        raise TypeError(f"{self} is not subscriptable")
-
-
-if hasattr(typing, "Self"):  # 3.11+
-    Self = typing.Self
-else:
     @_SpecialForm
     def Self(self, params):
         """Used to spell the type of "self" in classes.
@@ -2129,42 +2110,40 @@ else:
         """
 
         raise TypeError(f"{self} is not subscriptable")
-
-
-if hasattr(typing, "Never"):  # 3.11+
-    Never = typing.Never
 else:
-    @_SpecialForm
-    def Never(self, params):
-        """The bottom type, a type that has no members.
+    class _Self(typing._FinalTypingBase, _root=True):
+        """Used to spell the type of "self" in classes.
 
-        This can be used to define a function that should never be
-        called, or a function that never returns::
+        Example::
 
-            from typing_extensions import Never
+          from typing import Self
 
-            def never_call_me(arg: Never) -> None:
-                pass
-
-            def int_or_str(arg: int | str) -> None:
-                never_call_me(arg)  # type checker error
-                match arg:
-                    case int():
-                        print("It's an int")
-                    case str():
-                        print("It's a str")
-                    case _:
-                        never_call_me(arg)  # ok, arg is of type Never
+          class ReturnsSelf:
+              def parse(self, data: bytes) -> Self:
+                  ...
+                  return self
 
         """
 
-        raise TypeError(f"{self} is not subscriptable")
+        __slots__ = ()
+
+        def __instancecheck__(self, obj):
+            raise TypeError(f"{self} cannot be used with isinstance().")
+
+        def __subclasscheck__(self, cls):
+            raise TypeError(f"{self} cannot be used with issubclass().")
+
+    Self = _Self(_root=True)
 
 
-if hasattr(typing, 'Required'):  # 3.11+
+if hasattr(typing, 'Required'):
     Required = typing.Required
     NotRequired = typing.NotRequired
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
+elif sys.version_info[:2] >= (3, 9):
+    class _ExtensionsSpecialForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
     @_ExtensionsSpecialForm
     def Required(self, parameters):
         """A special typing construct to mark a key of a total=False TypedDict
@@ -2182,7 +2161,7 @@ elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
         There is no runtime checking that a required key is actually provided
         when instantiating a related TypedDict.
         """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
+        item = typing._type_check(parameters, f'{self._name} accepts only single type')
         return typing._GenericAlias(self, (item,))
 
     @_ExtensionsSpecialForm
@@ -2199,14 +2178,17 @@ elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
                 year=1999,
             )
         """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
+        item = typing._type_check(parameters, f'{self._name} accepts only single type')
         return typing._GenericAlias(self, (item,))
 
-else:  # 3.8
-    class _RequiredForm(_ExtensionsSpecialForm, _root=True):
+elif sys.version_info[:2] >= (3, 7):
+    class _RequiredForm(typing._SpecialForm, _root=True):
+        def __repr__(self):
+            return 'typing_extensions.' + self._name
+
         def __getitem__(self, parameters):
             item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
+                                      '{} accepts only single type'.format(self._name))
             return typing._GenericAlias(self, (item,))
 
     Required = _RequiredForm(
@@ -2240,1402 +2222,75 @@ else:  # 3.8
                 year=1999,
             )
         """)
-
-
-if hasattr(typing, 'ReadOnly'):
-    ReadOnly = typing.ReadOnly
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.12
-    @_ExtensionsSpecialForm
-    def ReadOnly(self, parameters):
-        """A special typing construct to mark an item of a TypedDict as read-only.
-
-        For example:
-
-            class Movie(TypedDict):
-                title: ReadOnly[str]
-                year: int
-
-            def mutate_movie(m: Movie) -> None:
-                m["year"] = 1992  # allowed
-                m["title"] = "The Matrix"  # typechecker error
-
-        There is no runtime checking for this property.
-        """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-
-else:  # 3.8
-    class _ReadOnlyForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    ReadOnly = _ReadOnlyForm(
-        'ReadOnly',
-        doc="""A special typing construct to mark a key of a TypedDict as read-only.
-
-        For example:
-
-            class Movie(TypedDict):
-                title: ReadOnly[str]
-                year: int
-
-            def mutate_movie(m: Movie) -> None:
-                m["year"] = 1992  # allowed
-                m["title"] = "The Matrix"  # typechecker error
-
-        There is no runtime checking for this propery.
-        """)
-
-
-_UNPACK_DOC = """\
-Type unpack operator.
-
-The type unpack operator takes the child types from some container type,
-such as `tuple[int, str]` or a `TypeVarTuple`, and 'pulls them out'. For
-example:
-
-  # For some generic class `Foo`:
-  Foo[Unpack[tuple[int, str]]]  # Equivalent to Foo[int, str]
-
-  Ts = TypeVarTuple('Ts')
-  # Specifies that `Bar` is generic in an arbitrary number of types.
-  # (Think of `Ts` as a tuple of an arbitrary number of individual
-  #  `TypeVar`s, which the `Unpack` is 'pulling out' directly into the
-  #  `Generic[]`.)
-  class Bar(Generic[Unpack[Ts]]): ...
-  Bar[int]  # Valid
-  Bar[int, str]  # Also valid
-
-From Python 3.11, this can also be done using the `*` operator:
-
-    Foo[*tuple[int, str]]
-    class Bar(Generic[*Ts]): ...
-
-The operator can also be used along with a `TypedDict` to annotate
-`**kwargs` in a function signature. For instance:
-
-  class Movie(TypedDict):
-    name: str
-    year: int
-
-  # This function expects two keyword arguments - *name* of type `str` and
-  # *year* of type `int`.
-  def foo(**kwargs: Unpack[Movie]): ...
-
-Note that there is only some runtime checking of this operator. Not
-everything the runtime allows may be accepted by static type checkers.
-
-For more information, see PEP 646 and PEP 692.
-"""
-
-
-if sys.version_info >= (3, 12):  # PEP 692 changed the repr of Unpack[]
-    Unpack = typing.Unpack
-
-    def _is_unpack(obj):
-        return get_origin(obj) is Unpack
-
-elif sys.version_info[:2] >= (3, 9):  # 3.9+
-    class _UnpackSpecialForm(_ExtensionsSpecialForm, _root=True):
-        def __init__(self, getitem):
-            super().__init__(getitem)
-            self.__doc__ = _UNPACK_DOC
-
-    class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
-
-        @property
-        def __typing_unpacked_tuple_args__(self):
-            assert self.__origin__ is Unpack
-            assert len(self.__args__) == 1
-            arg, = self.__args__
-            if isinstance(arg, (typing._GenericAlias, _types.GenericAlias)):
-                if arg.__origin__ is not tuple:
-                    raise TypeError("Unpack[...] must be used with a tuple type")
-                return arg.__args__
-            return None
-
-    @_UnpackSpecialForm
-    def Unpack(self, parameters):
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return _UnpackAlias(self, (item,))
-
-    def _is_unpack(obj):
-        return isinstance(obj, _UnpackAlias)
-
-else:  # 3.8
-    class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
-
-    class _UnpackForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return _UnpackAlias(self, (item,))
-
-    Unpack = _UnpackForm('Unpack', doc=_UNPACK_DOC)
-
-    def _is_unpack(obj):
-        return isinstance(obj, _UnpackAlias)
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import TypeVarTuple
-
-elif hasattr(typing, "TypeVarTuple"):  # 3.11+
-
-    def _unpack_args(*args):
-        newargs = []
-        for arg in args:
-            subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-            if subargs is not None and not (subargs and subargs[-1] is ...):
-                newargs.extend(subargs)
-            else:
-                newargs.append(arg)
-        return newargs
-
-    # Add default parameter - PEP 696
-    class TypeVarTuple(metaclass=_TypeVarLikeMeta):
-        """Type variable tuple."""
-
-        _backported_typevarlike = typing.TypeVarTuple
-
-        def __new__(cls, name, *, default=NoDefault):
-            tvt = typing.TypeVarTuple(name)
-            _set_default(tvt, default)
-            _set_module(tvt)
-
-            def _typevartuple_prepare_subst(alias, args):
-                params = alias.__parameters__
-                typevartuple_index = params.index(tvt)
-                for param in params[typevartuple_index + 1:]:
-                    if isinstance(param, TypeVarTuple):
-                        raise TypeError(
-                            f"More than one TypeVarTuple parameter in {alias}"
-                        )
-
-                alen = len(args)
-                plen = len(params)
-                left = typevartuple_index
-                right = plen - typevartuple_index - 1
-                var_tuple_index = None
-                fillarg = None
-                for k, arg in enumerate(args):
-                    if not isinstance(arg, type):
-                        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-                        if subargs and len(subargs) == 2 and subargs[-1] is ...:
-                            if var_tuple_index is not None:
-                                raise TypeError(
-                                    "More than one unpacked "
-                                    "arbitrary-length tuple argument"
-                                )
-                            var_tuple_index = k
-                            fillarg = subargs[0]
-                if var_tuple_index is not None:
-                    left = min(left, var_tuple_index)
-                    right = min(right, alen - var_tuple_index - 1)
-                elif left + right > alen:
-                    raise TypeError(f"Too few arguments for {alias};"
-                                    f" actual {alen}, expected at least {plen - 1}")
-                if left == alen - right and tvt.has_default():
-                    replacement = _unpack_args(tvt.__default__)
-                else:
-                    replacement = args[left: alen - right]
-
-                return (
-                    *args[:left],
-                    *([fillarg] * (typevartuple_index - left)),
-                    replacement,
-                    *([fillarg] * (plen - right - left - typevartuple_index - 1)),
-                    *args[alen - right:],
-                )
-
-            tvt.__typing_prepare_subst__ = _typevartuple_prepare_subst
-            return tvt
-
-        def __init_subclass__(self, *args, **kwds):
-            raise TypeError("Cannot subclass special typing classes")
-
-else:  # <=3.10
-    class TypeVarTuple(_DefaultMixin):
-        """Type variable tuple.
-
-        Usage::
-
-            Ts = TypeVarTuple('Ts')
-
-        In the same way that a normal type variable is a stand-in for a single
-        type such as ``int``, a type variable *tuple* is a stand-in for a *tuple*
-        type such as ``Tuple[int, str]``.
-
-        Type variable tuples can be used in ``Generic`` declarations.
-        Consider the following example::
-
-            class Array(Generic[*Ts]): ...
-
-        The ``Ts`` type variable tuple here behaves like ``tuple[T1, T2]``,
-        where ``T1`` and ``T2`` are type variables. To use these type variables
-        as type parameters of ``Array``, we must *unpack* the type variable tuple using
-        the star operator: ``*Ts``. The signature of ``Array`` then behaves
-        as if we had simply written ``class Array(Generic[T1, T2]): ...``.
-        In contrast to ``Generic[T1, T2]``, however, ``Generic[*Shape]`` allows
-        us to parameterise the class with an *arbitrary* number of type parameters.
-
-        Type variable tuples can be used anywhere a normal ``TypeVar`` can.
-        This includes class definitions, as shown above, as well as function
-        signatures and variable annotations::
-
-            class Array(Generic[*Ts]):
-
-                def __init__(self, shape: Tuple[*Ts]):
-                    self._shape: Tuple[*Ts] = shape
-
-                def get_shape(self) -> Tuple[*Ts]:
-                    return self._shape
-
-            shape = (Height(480), Width(640))
-            x: Array[Height, Width] = Array(shape)
-            y = abs(x)  # Inferred type is Array[Height, Width]
-            z = x + x   #        ...    is Array[Height, Width]
-            x.get_shape()  #     ...    is tuple[Height, Width]
-
-        """
-
-        # Trick Generic __parameters__.
-        __class__ = typing.TypeVar
-
-        def __iter__(self):
-            yield self.__unpacked__
-
-        def __init__(self, name, *, default=NoDefault):
-            self.__name__ = name
-            _DefaultMixin.__init__(self, default)
-
-            # for pickling:
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-
-            self.__unpacked__ = Unpack[self]
+else:
+    # NOTE: Modeled after _Final's implementation when _FinalTypingBase available
+    class _MaybeRequired(typing._FinalTypingBase, _root=True):
+        __slots__ = ('__type__',)
+
+        def __init__(self, tp=None, **kwds):
+            self.__type__ = tp
+
+        def __getitem__(self, item):
+            cls = type(self)
+            if self.__type__ is None:
+                return cls(typing._type_check(item,
+                           '{} accepts only single type.'.format(cls.__name__[1:])),
+                           _root=True)
+            raise TypeError('{} cannot be further subscripted'
+                            .format(cls.__name__[1:]))
+
+        def _eval_type(self, globalns, localns):
+            new_tp = typing._eval_type(self.__type__, globalns, localns)
+            if new_tp == self.__type__:
+                return self
+            return type(self)(new_tp, _root=True)
 
         def __repr__(self):
-            return self.__name__
+            r = super().__repr__()
+            if self.__type__ is not None:
+                r += '[{}]'.format(typing._type_repr(self.__type__))
+            return r
 
         def __hash__(self):
-            return object.__hash__(self)
+            return hash((type(self).__name__, self.__type__))
 
         def __eq__(self, other):
+            if not isinstance(other, type(self)):
+                return NotImplemented
+            if self.__type__ is not None:
+                return self.__type__ == other.__type__
             return self is other
 
-        def __reduce__(self):
-            return self.__name__
+    class _Required(_MaybeRequired, _root=True):
+        """A special typing construct to mark a key of a total=False TypedDict
+        as required. For example:
 
-        def __init_subclass__(self, *args, **kwds):
-            if '_root' not in kwds:
-                raise TypeError("Cannot subclass special typing classes")
+            class Movie(TypedDict, total=False):
+                title: Required[str]
+                year: int
 
-
-if hasattr(typing, "reveal_type"):  # 3.11+
-    reveal_type = typing.reveal_type
-else:  # <=3.10
-    def reveal_type(obj: T, /) -> T:
-        """Reveal the inferred type of a variable.
-
-        When a static type checker encounters a call to ``reveal_type()``,
-        it will emit the inferred type of the argument::
-
-            x: int = 1
-            reveal_type(x)
-
-        Running a static type checker (e.g., ``mypy``) on this example
-        will produce output similar to 'Revealed type is "builtins.int"'.
-
-        At runtime, the function prints the runtime type of the
-        argument and returns it unchanged.
-
-        """
-        print(f"Runtime type is {type(obj).__name__!r}", file=sys.stderr)
-        return obj
-
-
-if hasattr(typing, "_ASSERT_NEVER_REPR_MAX_LENGTH"):  # 3.11+
-    _ASSERT_NEVER_REPR_MAX_LENGTH = typing._ASSERT_NEVER_REPR_MAX_LENGTH
-else:  # <=3.10
-    _ASSERT_NEVER_REPR_MAX_LENGTH = 100
-
-
-if hasattr(typing, "assert_never"):  # 3.11+
-    assert_never = typing.assert_never
-else:  # <=3.10
-    def assert_never(arg: Never, /) -> Never:
-        """Assert to the type checker that a line of code is unreachable.
-
-        Example::
-
-            def int_or_str(arg: int | str) -> None:
-                match arg:
-                    case int():
-                        print("It's an int")
-                    case str():
-                        print("It's a str")
-                    case _:
-                        assert_never(arg)
-
-        If a type checker finds that a call to assert_never() is
-        reachable, it will emit an error.
-
-        At runtime, this throws an exception when called.
-
-        """
-        value = repr(arg)
-        if len(value) > _ASSERT_NEVER_REPR_MAX_LENGTH:
-            value = value[:_ASSERT_NEVER_REPR_MAX_LENGTH] + '...'
-        raise AssertionError(f"Expected code to be unreachable, but got: {value}")
-
-
-if sys.version_info >= (3, 12):  # 3.12+
-    # dataclass_transform exists in 3.11 but lacks the frozen_default parameter
-    dataclass_transform = typing.dataclass_transform
-else:  # <=3.11
-    def dataclass_transform(
-        *,
-        eq_default: bool = True,
-        order_default: bool = False,
-        kw_only_default: bool = False,
-        frozen_default: bool = False,
-        field_specifiers: typing.Tuple[
-            typing.Union[typing.Type[typing.Any], typing.Callable[..., typing.Any]],
-            ...
-        ] = (),
-        **kwargs: typing.Any,
-    ) -> typing.Callable[[T], T]:
-        """Decorator that marks a function, class, or metaclass as providing
-        dataclass-like behavior.
-
-        Example:
-
-            from typing_extensions import dataclass_transform
-
-            _T = TypeVar("_T")
-
-            # Used on a decorator function
-            @dataclass_transform()
-            def create_model(cls: type[_T]) -> type[_T]:
-                ...
-                return cls
-
-            @create_model
-            class CustomerModel:
-                id: int
-                name: str
-
-            # Used on a base class
-            @dataclass_transform()
-            class ModelBase: ...
-
-            class CustomerModel(ModelBase):
-                id: int
-                name: str
-
-            # Used on a metaclass
-            @dataclass_transform()
-            class ModelMeta(type): ...
-
-            class ModelBase(metaclass=ModelMeta): ...
-
-            class CustomerModel(ModelBase):
-                id: int
-                name: str
-
-        Each of the ``CustomerModel`` classes defined in this example will now
-        behave similarly to a dataclass created with the ``@dataclasses.dataclass``
-        decorator. For example, the type checker will synthesize an ``__init__``
-        method.
-
-        The arguments to this decorator can be used to customize this behavior:
-        - ``eq_default`` indicates whether the ``eq`` parameter is assumed to be
-          True or False if it is omitted by the caller.
-        - ``order_default`` indicates whether the ``order`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``kw_only_default`` indicates whether the ``kw_only`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``frozen_default`` indicates whether the ``frozen`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``field_specifiers`` specifies a static list of supported classes
-          or functions that describe fields, similar to ``dataclasses.field()``.
-
-        At runtime, this decorator records its arguments in the
-        ``__dataclass_transform__`` attribute on the decorated object.
-
-        See PEP 681 for details.
-
-        """
-        def decorator(cls_or_fn):
-            cls_or_fn.__dataclass_transform__ = {
-                "eq_default": eq_default,
-                "order_default": order_default,
-                "kw_only_default": kw_only_default,
-                "frozen_default": frozen_default,
-                "field_specifiers": field_specifiers,
-                "kwargs": kwargs,
-            }
-            return cls_or_fn
-        return decorator
-
-
-if hasattr(typing, "override"):  # 3.12+
-    override = typing.override
-else:  # <=3.11
-    _F = typing.TypeVar("_F", bound=typing.Callable[..., typing.Any])
-
-    def override(arg: _F, /) -> _F:
-        """Indicate that a method is intended to override a method in a base class.
-
-        Usage:
-
-            class Base:
-                def method(self) -> None:
-                    pass
-
-            class Child(Base):
-                @override
-                def method(self) -> None:
-                    super().method()
-
-        When this decorator is applied to a method, the type checker will
-        validate that it overrides a method with the same name on a base class.
-        This helps prevent bugs that may occur when a base class is changed
-        without an equivalent change to a child class.
-
-        There is no runtime checking of these properties. The decorator
-        sets the ``__override__`` attribute to ``True`` on the decorated object
-        to allow runtime introspection.
-
-        See PEP 698 for details.
-
-        """
-        try:
-            arg.__override__ = True
-        except (AttributeError, TypeError):
-            # Skip the attribute silently if it is not writable.
-            # AttributeError happens if the object has __slots__ or a
-            # read-only property, TypeError if it's a builtin class.
-            pass
-        return arg
-
-
-if hasattr(warnings, "deprecated"):
-    deprecated = warnings.deprecated
-else:
-    _T = typing.TypeVar("_T")
-
-    class deprecated:
-        """Indicate that a class, function or overload is deprecated.
-
-        When this decorator is applied to an object, the type checker
-        will generate a diagnostic on usage of the deprecated object.
-
-        Usage:
-
-            @deprecated("Use B instead")
-            class A:
-                pass
-
-            @deprecated("Use g instead")
-            def f():
-                pass
-
-            @overload
-            @deprecated("int support is deprecated")
-            def g(x: int) -> int: ...
-            @overload
-            def g(x: str) -> int: ...
-
-        The warning specified by *category* will be emitted at runtime
-        on use of deprecated objects. For functions, that happens on calls;
-        for classes, on instantiation and on creation of subclasses.
-        If the *category* is ``None``, no warning is emitted at runtime.
-        The *stacklevel* determines where the
-        warning is emitted. If it is ``1`` (the default), the warning
-        is emitted at the direct caller of the deprecated object; if it
-        is higher, it is emitted further up the stack.
-        Static type checker behavior is not affected by the *category*
-        and *stacklevel* arguments.
-
-        The deprecation message passed to the decorator is saved in the
-        ``__deprecated__`` attribute on the decorated object.
-        If applied to an overload, the decorator
-        must be after the ``@overload`` decorator for the attribute to
-        exist on the overload as returned by ``get_overloads()``.
-
-        See PEP 702 for details.
-
-        """
-        def __init__(
-            self,
-            message: str,
-            /,
-            *,
-            category: typing.Optional[typing.Type[Warning]] = DeprecationWarning,
-            stacklevel: int = 1,
-        ) -> None:
-            if not isinstance(message, str):
-                raise TypeError(
-                    "Expected an object of type str for 'message', not "
-                    f"{type(message).__name__!r}"
-                )
-            self.message = message
-            self.category = category
-            self.stacklevel = stacklevel
-
-        def __call__(self, arg: _T, /) -> _T:
-            # Make sure the inner functions created below don't
-            # retain a reference to self.
-            msg = self.message
-            category = self.category
-            stacklevel = self.stacklevel
-            if category is None:
-                arg.__deprecated__ = msg
-                return arg
-            elif isinstance(arg, type):
-                import functools
-                from types import MethodType
-
-                original_new = arg.__new__
-
-                @functools.wraps(original_new)
-                def __new__(cls, *args, **kwargs):
-                    if cls is arg:
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                    if original_new is not object.__new__:
-                        return original_new(cls, *args, **kwargs)
-                    # Mirrors a similar check in object.__new__.
-                    elif cls.__init__ is object.__init__ and (args or kwargs):
-                        raise TypeError(f"{cls.__name__}() takes no arguments")
-                    else:
-                        return original_new(cls)
-
-                arg.__new__ = staticmethod(__new__)
-
-                original_init_subclass = arg.__init_subclass__
-                # We need slightly different behavior if __init_subclass__
-                # is a bound method (likely if it was implemented in Python)
-                if isinstance(original_init_subclass, MethodType):
-                    original_init_subclass = original_init_subclass.__func__
-
-                    @functools.wraps(original_init_subclass)
-                    def __init_subclass__(*args, **kwargs):
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                        return original_init_subclass(*args, **kwargs)
-
-                    arg.__init_subclass__ = classmethod(__init_subclass__)
-                # Or otherwise, which likely means it's a builtin such as
-                # object's implementation of __init_subclass__.
-                else:
-                    @functools.wraps(original_init_subclass)
-                    def __init_subclass__(*args, **kwargs):
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                        return original_init_subclass(*args, **kwargs)
-
-                    arg.__init_subclass__ = __init_subclass__
-
-                arg.__deprecated__ = __new__.__deprecated__ = msg
-                __init_subclass__.__deprecated__ = msg
-                return arg
-            elif callable(arg):
-                import functools
-
-                @functools.wraps(arg)
-                def wrapper(*args, **kwargs):
-                    warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                    return arg(*args, **kwargs)
-
-                arg.__deprecated__ = wrapper.__deprecated__ = msg
-                return wrapper
-            else:
-                raise TypeError(
-                    "@deprecated decorator with non-None category must be applied to "
-                    f"a class or callable, not {arg!r}"
-                )
-
-
-# We have to do some monkey patching to deal with the dual nature of
-# Unpack/TypeVarTuple:
-# - We want Unpack to be a kind of TypeVar so it gets accepted in
-#   Generic[Unpack[Ts]]
-# - We want it to *not* be treated as a TypeVar for the purposes of
-#   counting generic parameters, so that when we subscript a generic,
-#   the runtime doesn't try to substitute the Unpack with the subscripted type.
-if not hasattr(typing, "TypeVarTuple"):
-    def _check_generic(cls, parameters, elen=_marker):
-        """Check correct count for parameters of a generic cls (internal helper).
-
-        This gives a nice error message in case of count mismatch.
-        """
-        if not elen:
-            raise TypeError(f"{cls} is not a generic class")
-        if elen is _marker:
-            if not hasattr(cls, "__parameters__") or not cls.__parameters__:
-                raise TypeError(f"{cls} is not a generic class")
-            elen = len(cls.__parameters__)
-        alen = len(parameters)
-        if alen != elen:
-            expect_val = elen
-            if hasattr(cls, "__parameters__"):
-                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-                num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
-                if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
-                    return
-
-                # deal with TypeVarLike defaults
-                # required TypeVarLikes cannot appear after a defaulted one.
-                if alen < elen:
-                    # since we validate TypeVarLike default in _collect_type_vars
-                    # or _collect_parameters we can safely check parameters[alen]
-                    if (
-                        getattr(parameters[alen], '__default__', NoDefault)
-                        is not NoDefault
-                    ):
-                        return
-
-                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
-                                         is not NoDefault for p in parameters)
-
-                    elen -= num_default_tv
-
-                    expect_val = f"at least {elen}"
-
-            things = "arguments" if sys.version_info >= (3, 10) else "parameters"
-            raise TypeError(f"Too {'many' if alen > elen else 'few'} {things}"
-                            f" for {cls}; actual {alen}, expected {expect_val}")
-else:
-    # Python 3.11+
-
-    def _check_generic(cls, parameters, elen):
-        """Check correct count for parameters of a generic cls (internal helper).
-
-        This gives a nice error message in case of count mismatch.
-        """
-        if not elen:
-            raise TypeError(f"{cls} is not a generic class")
-        alen = len(parameters)
-        if alen != elen:
-            expect_val = elen
-            if hasattr(cls, "__parameters__"):
-                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-
-                # deal with TypeVarLike defaults
-                # required TypeVarLikes cannot appear after a defaulted one.
-                if alen < elen:
-                    # since we validate TypeVarLike default in _collect_type_vars
-                    # or _collect_parameters we can safely check parameters[alen]
-                    if (
-                        getattr(parameters[alen], '__default__', NoDefault)
-                        is not NoDefault
-                    ):
-                        return
-
-                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
-                                         is not NoDefault for p in parameters)
-
-                    elen -= num_default_tv
-
-                    expect_val = f"at least {elen}"
-
-            raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments"
-                            f" for {cls}; actual {alen}, expected {expect_val}")
-
-if not _PEP_696_IMPLEMENTED:
-    typing._check_generic = _check_generic
-
-
-def _has_generic_or_protocol_as_origin() -> bool:
-    try:
-        frame = sys._getframe(2)
-    # - Catch AttributeError: not all Python implementations have sys._getframe()
-    # - Catch ValueError: maybe we're called from an unexpected module
-    #   and the call stack isn't deep enough
-    except (AttributeError, ValueError):
-        return False  # err on the side of leniency
-    else:
-        # If we somehow get invoked from outside typing.py,
-        # also err on the side of leniency
-        if frame.f_globals.get("__name__") != "typing":
-            return False
-        origin = frame.f_locals.get("origin")
-        # Cannot use "in" because origin may be an object with a buggy __eq__ that
-        # throws an error.
-        return origin is typing.Generic or origin is Protocol or origin is typing.Protocol
-
-
-_TYPEVARTUPLE_TYPES = {TypeVarTuple, getattr(typing, "TypeVarTuple", None)}
-
-
-def _is_unpacked_typevartuple(x) -> bool:
-    if get_origin(x) is not Unpack:
-        return False
-    args = get_args(x)
-    return (
-        bool(args)
-        and len(args) == 1
-        and type(args[0]) in _TYPEVARTUPLE_TYPES
-    )
-
-
-# Python 3.11+ _collect_type_vars was renamed to _collect_parameters
-if hasattr(typing, '_collect_type_vars'):
-    def _collect_type_vars(types, typevar_types=None):
-        """Collect all type variable contained in types in order of
-        first appearance (lexicographic order). For example::
-
-            _collect_type_vars((T, List[S, T])) == (T, S)
-        """
-        if typevar_types is None:
-            typevar_types = typing.TypeVar
-        tvars = []
-
-        # A required TypeVarLike cannot appear after a TypeVarLike with a default
-        # if it was a direct call to `Generic[]` or `Protocol[]`
-        enforce_default_ordering = _has_generic_or_protocol_as_origin()
-        default_encountered = False
-
-        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
-        type_var_tuple_encountered = False
-
-        for t in types:
-            if _is_unpacked_typevartuple(t):
-                type_var_tuple_encountered = True
-            elif isinstance(t, typevar_types) and t not in tvars:
-                if enforce_default_ordering:
-                    has_default = getattr(t, '__default__', NoDefault) is not NoDefault
-                    if has_default:
-                        if type_var_tuple_encountered:
-                            raise TypeError('Type parameter with a default'
-                                            ' follows TypeVarTuple')
-                        default_encountered = True
-                    elif default_encountered:
-                        raise TypeError(f'Type parameter {t!r} without a default'
-                                        ' follows type parameter with a default')
-
-                tvars.append(t)
-            if _should_collect_from_parameters(t):
-                tvars.extend([t for t in t.__parameters__ if t not in tvars])
-        return tuple(tvars)
-
-    typing._collect_type_vars = _collect_type_vars
-else:
-    def _collect_parameters(args):
-        """Collect all type variables and parameter specifications in args
-        in order of first appearance (lexicographic order).
-
-        For example::
-
-            assert _collect_parameters((T, Callable[P, T])) == (T, P)
-        """
-        parameters = []
-
-        # A required TypeVarLike cannot appear after a TypeVarLike with default
-        # if it was a direct call to `Generic[]` or `Protocol[]`
-        enforce_default_ordering = _has_generic_or_protocol_as_origin()
-        default_encountered = False
-
-        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
-        type_var_tuple_encountered = False
-
-        for t in args:
-            if isinstance(t, type):
-                # We don't want __parameters__ descriptor of a bare Python class.
-                pass
-            elif isinstance(t, tuple):
-                # `t` might be a tuple, when `ParamSpec` is substituted with
-                # `[T, int]`, or `[int, *Ts]`, etc.
-                for x in t:
-                    for collected in _collect_parameters([x]):
-                        if collected not in parameters:
-                            parameters.append(collected)
-            elif hasattr(t, '__typing_subst__'):
-                if t not in parameters:
-                    if enforce_default_ordering:
-                        has_default = (
-                            getattr(t, '__default__', NoDefault) is not NoDefault
-                        )
-
-                        if type_var_tuple_encountered and has_default:
-                            raise TypeError('Type parameter with a default'
-                                            ' follows TypeVarTuple')
-
-                        if has_default:
-                            default_encountered = True
-                        elif default_encountered:
-                            raise TypeError(f'Type parameter {t!r} without a default'
-                                            ' follows type parameter with a default')
-
-                    parameters.append(t)
-            else:
-                if _is_unpacked_typevartuple(t):
-                    type_var_tuple_encountered = True
-                for x in getattr(t, '__parameters__', ()):
-                    if x not in parameters:
-                        parameters.append(x)
-
-        return tuple(parameters)
-
-    if not _PEP_696_IMPLEMENTED:
-        typing._collect_parameters = _collect_parameters
-
-# Backport typing.NamedTuple as it exists in Python 3.13.
-# In 3.11, the ability to define generic `NamedTuple`s was supported.
-# This was explicitly disallowed in 3.9-3.10, and only half-worked in <=3.8.
-# On 3.12, we added __orig_bases__ to call-based NamedTuples
-# On 3.13, we deprecated kwargs-based NamedTuples
-if sys.version_info >= (3, 13):
-    NamedTuple = typing.NamedTuple
-else:
-    def _make_nmtuple(name, types, module, defaults=()):
-        fields = [n for n, t in types]
-        annotations = {n: typing._type_check(t, f"field {n} annotation must be a type")
-                       for n, t in types}
-        nm_tpl = collections.namedtuple(name, fields,
-                                        defaults=defaults, module=module)
-        nm_tpl.__annotations__ = nm_tpl.__new__.__annotations__ = annotations
-        # The `_field_types` attribute was removed in 3.9;
-        # in earlier versions, it is the same as the `__annotations__` attribute
-        if sys.version_info < (3, 9):
-            nm_tpl._field_types = annotations
-        return nm_tpl
-
-    _prohibited_namedtuple_fields = typing._prohibited
-    _special_namedtuple_fields = frozenset({'__module__', '__name__', '__annotations__'})
-
-    class _NamedTupleMeta(type):
-        def __new__(cls, typename, bases, ns):
-            assert _NamedTuple in bases
-            for base in bases:
-                if base is not _NamedTuple and base is not typing.Generic:
-                    raise TypeError(
-                        'can only inherit from a NamedTuple type and Generic')
-            bases = tuple(tuple if base is _NamedTuple else base for base in bases)
-            if "__annotations__" in ns:
-                types = ns["__annotations__"]
-            elif "__annotate__" in ns:
-                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
-                types = ns["__annotate__"](1)
-            else:
-                types = {}
-            default_names = []
-            for field_name in types:
-                if field_name in ns:
-                    default_names.append(field_name)
-                elif default_names:
-                    raise TypeError(f"Non-default namedtuple field {field_name} "
-                                    f"cannot follow default field"
-                                    f"{'s' if len(default_names) > 1 else ''} "
-                                    f"{', '.join(default_names)}")
-            nm_tpl = _make_nmtuple(
-                typename, types.items(),
-                defaults=[ns[n] for n in default_names],
-                module=ns['__module__']
-            )
-            nm_tpl.__bases__ = bases
-            if typing.Generic in bases:
-                if hasattr(typing, '_generic_class_getitem'):  # 3.12+
-                    nm_tpl.__class_getitem__ = classmethod(typing._generic_class_getitem)
-                else:
-                    class_getitem = typing.Generic.__class_getitem__.__func__
-                    nm_tpl.__class_getitem__ = classmethod(class_getitem)
-            # update from user namespace without overriding special namedtuple attributes
-            for key, val in ns.items():
-                if key in _prohibited_namedtuple_fields:
-                    raise AttributeError("Cannot overwrite NamedTuple attribute " + key)
-                elif key not in _special_namedtuple_fields:
-                    if key not in nm_tpl._fields:
-                        setattr(nm_tpl, key, ns[key])
-                    try:
-                        set_name = type(val).__set_name__
-                    except AttributeError:
-                        pass
-                    else:
-                        try:
-                            set_name(val, nm_tpl, key)
-                        except BaseException as e:
-                            msg = (
-                                f"Error calling __set_name__ on {type(val).__name__!r} "
-                                f"instance {key!r} in {typename!r}"
-                            )
-                            # BaseException.add_note() existed on py311,
-                            # but the __set_name__ machinery didn't start
-                            # using add_note() until py312.
-                            # Making sure exceptions are raised in the same way
-                            # as in "normal" classes seems most important here.
-                            if sys.version_info >= (3, 12):
-                                e.add_note(msg)
-                                raise
-                            else:
-                                raise RuntimeError(msg) from e
-
-            if typing.Generic in bases:
-                nm_tpl.__init_subclass__()
-            return nm_tpl
-
-    _NamedTuple = type.__new__(_NamedTupleMeta, 'NamedTuple', (), {})
-
-    def _namedtuple_mro_entries(bases):
-        assert NamedTuple in bases
-        return (_NamedTuple,)
-
-    @_ensure_subclassable(_namedtuple_mro_entries)
-    def NamedTuple(typename, fields=_marker, /, **kwargs):
-        """Typed version of namedtuple.
-
-        Usage::
-
-            class Employee(NamedTuple):
-                name: str
-                id: int
-
-        This is equivalent to::
-
-            Employee = collections.namedtuple('Employee', ['name', 'id'])
-
-        The resulting class has an extra __annotations__ attribute, giving a
-        dict that maps field names to types.  (The field names are also in
-        the _fields attribute, which is part of the namedtuple API.)
-        An alternative equivalent functional syntax is also accepted::
-
-            Employee = NamedTuple('Employee', [('name', str), ('id', int)])
-        """
-        if fields is _marker:
-            if kwargs:
-                deprecated_thing = "Creating NamedTuple classes using keyword arguments"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "Use the class-based or functional syntax instead."
-                )
-            else:
-                deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-                example = f"`{typename} = NamedTuple({typename!r}, [])`"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "To create a NamedTuple class with 0 fields "
-                    "using the functional syntax, "
-                    "pass an empty list, e.g. "
-                ) + example + "."
-        elif fields is None:
-            if kwargs:
-                raise TypeError(
-                    "Cannot pass `None` as the 'fields' parameter "
-                    "and also specify fields using keyword arguments"
-                )
-            else:
-                deprecated_thing = "Passing `None` as the 'fields' parameter"
-                example = f"`{typename} = NamedTuple({typename!r}, [])`"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "To create a NamedTuple class with 0 fields "
-                    "using the functional syntax, "
-                    "pass an empty list, e.g. "
-                ) + example + "."
-        elif kwargs:
-            raise TypeError("Either list of fields or keywords"
-                            " can be provided to NamedTuple, not both")
-        if fields is _marker or fields is None:
-            warnings.warn(
-                deprecation_msg.format(name=deprecated_thing, remove="3.15"),
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            fields = kwargs.items()
-        nt = _make_nmtuple(typename, fields, module=_caller())
-        nt.__orig_bases__ = (NamedTuple,)
-        return nt
-
-
-if hasattr(collections.abc, "Buffer"):
-    Buffer = collections.abc.Buffer
-else:
-    class Buffer(abc.ABC):  # noqa: B024
-        """Base class for classes that implement the buffer protocol.
-
-        The buffer protocol allows Python objects to expose a low-level
-        memory buffer interface. Before Python 3.12, it is not possible
-        to implement the buffer protocol in pure Python code, or even
-        to check whether a class implements the buffer protocol. In
-        Python 3.12 and higher, the ``__buffer__`` method allows access
-        to the buffer protocol from Python code, and the
-        ``collections.abc.Buffer`` ABC allows checking whether a class
-        implements the buffer protocol.
-
-        To indicate support for the buffer protocol in earlier versions,
-        inherit from this ABC, either in a stub file or at runtime,
-        or use ABC registration. This ABC provides no methods, because
-        there is no Python-accessible methods shared by pre-3.12 buffer
-        classes. It is useful primarily for static checks.
-
-        """
-
-    # As a courtesy, register the most common stdlib buffer classes.
-    Buffer.register(memoryview)
-    Buffer.register(bytearray)
-    Buffer.register(bytes)
-
-
-# Backport of types.get_original_bases, available on 3.12+ in CPython
-if hasattr(_types, "get_original_bases"):
-    get_original_bases = _types.get_original_bases
-else:
-    def get_original_bases(cls, /):
-        """Return the class's "original" bases prior to modification by `__mro_entries__`.
-
-        Examples::
-
-            from typing import TypeVar, Generic
-            from typing_extensions import NamedTuple, TypedDict
-
-            T = TypeVar("T")
-            class Foo(Generic[T]): ...
-            class Bar(Foo[int], float): ...
-            class Baz(list[str]): ...
-            Eggs = NamedTuple("Eggs", [("a", int), ("b", str)])
-            Spam = TypedDict("Spam", {"a": int, "b": str})
-
-            assert get_original_bases(Bar) == (Foo[int], float)
-            assert get_original_bases(Baz) == (list[str],)
-            assert get_original_bases(Eggs) == (NamedTuple,)
-            assert get_original_bases(Spam) == (TypedDict,)
-            assert get_original_bases(int) == (object,)
-        """
-        try:
-            return cls.__dict__.get("__orig_bases__", cls.__bases__)
-        except AttributeError:
-            raise TypeError(
-                f'Expected an instance of type, not {type(cls).__name__!r}'
-            ) from None
-
-
-# NewType is a class on Python 3.10+, making it pickleable
-# The error message for subclassing instances of NewType was improved on 3.11+
-if sys.version_info >= (3, 11):
-    NewType = typing.NewType
-else:
-    class NewType:
-        """NewType creates simple unique types with almost zero
-        runtime overhead. NewType(name, tp) is considered a subtype of tp
-        by static type checkers. At runtime, NewType(name, tp) returns
-        a dummy callable that simply returns its argument. Usage::
-            UserId = NewType('UserId', int)
-            def name_by_id(user_id: UserId) -> str:
-                ...
-            UserId('user')          # Fails type check
-            name_by_id(42)          # Fails type check
-            name_by_id(UserId(42))  # OK
-            num = UserId(5) + 1     # type: int
-        """
-
-        def __call__(self, obj, /):
-            return obj
-
-        def __init__(self, name, tp):
-            self.__qualname__ = name
-            if '.' in name:
-                name = name.rpartition('.')[-1]
-            self.__name__ = name
-            self.__supertype__ = tp
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-
-        def __mro_entries__(self, bases):
-            # We defined __mro_entries__ to get a better error message
-            # if a user attempts to subclass a NewType instance. bpo-46170
-            supercls_name = self.__name__
-
-            class Dummy:
-                def __init_subclass__(cls):
-                    subcls_name = cls.__name__
-                    raise TypeError(
-                        f"Cannot subclass an instance of NewType. "
-                        f"Perhaps you were looking for: "
-                        f"`{subcls_name} = NewType({subcls_name!r}, {supercls_name})`"
-                    )
-
-            return (Dummy,)
-
-        def __repr__(self):
-            return f'{self.__module__}.{self.__qualname__}'
-
-        def __reduce__(self):
-            return self.__qualname__
-
-        if sys.version_info >= (3, 10):
-            # PEP 604 methods
-            # It doesn't make sense to have these methods on Python <3.10
-
-            def __or__(self, other):
-                return typing.Union[self, other]
-
-            def __ror__(self, other):
-                return typing.Union[other, self]
-
-
-if hasattr(typing, "TypeAliasType"):
-    TypeAliasType = typing.TypeAliasType
-else:
-    def _is_unionable(obj):
-        """Corresponds to is_unionable() in unionobject.c in CPython."""
-        return obj is None or isinstance(obj, (
-            type,
-            _types.GenericAlias,
-            _types.UnionType,
-            TypeAliasType,
-        ))
-
-    class TypeAliasType:
-        """Create named, parameterized type aliases.
-
-        This provides a backport of the new `type` statement in Python 3.12:
-
-            type ListOrSet[T] = list[T] | set[T]
-
-        is equivalent to:
-
-            T = TypeVar("T")
-            ListOrSet = TypeAliasType("ListOrSet", list[T] | set[T], type_params=(T,))
-
-        The name ListOrSet can then be used as an alias for the type it refers to.
-
-        The type_params argument should contain all the type parameters used
-        in the value of the type alias. If the alias is not generic, this
-        argument is omitted.
-
-        Static type checkers should only support type aliases declared using
-        TypeAliasType that follow these rules:
-
-        - The first argument (the name) must be a string literal.
-        - The TypeAliasType instance must be immediately assigned to a variable
-          of the same name. (For example, 'X = TypeAliasType("Y", int)' is invalid,
-          as is 'X, Y = TypeAliasType("X", int), TypeAliasType("Y", int)').
-
-        """
-
-        def __init__(self, name: str, value, *, type_params=()):
-            if not isinstance(name, str):
-                raise TypeError("TypeAliasType name must be a string")
-            self.__value__ = value
-            self.__type_params__ = type_params
-
-            parameters = []
-            for type_param in type_params:
-                if isinstance(type_param, TypeVarTuple):
-                    parameters.extend(type_param)
-                else:
-                    parameters.append(type_param)
-            self.__parameters__ = tuple(parameters)
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-            # Setting this attribute closes the TypeAliasType from further modification
-            self.__name__ = name
-
-        def __setattr__(self, name: str, value: object, /) -> None:
-            if hasattr(self, "__name__"):
-                self._raise_attribute_error(name)
-            super().__setattr__(name, value)
-
-        def __delattr__(self, name: str, /) -> Never:
-            self._raise_attribute_error(name)
-
-        def _raise_attribute_error(self, name: str) -> Never:
-            # Match the Python 3.12 error messages exactly
-            if name == "__name__":
-                raise AttributeError("readonly attribute")
-            elif name in {"__value__", "__type_params__", "__parameters__", "__module__"}:
-                raise AttributeError(
-                    f"attribute '{name}' of 'typing.TypeAliasType' objects "
-                    "is not writable"
-                )
-            else:
-                raise AttributeError(
-                    f"'typing.TypeAliasType' object has no attribute '{name}'"
-                )
-
-        def __repr__(self) -> str:
-            return self.__name__
-
-        def __getitem__(self, parameters):
-            if not isinstance(parameters, tuple):
-                parameters = (parameters,)
-            parameters = [
-                typing._type_check(
-                    item, f'Subscripting {self.__name__} requires a type.'
-                )
-                for item in parameters
-            ]
-            return typing._GenericAlias(self, tuple(parameters))
-
-        def __reduce__(self):
-            return self.__name__
-
-        def __init_subclass__(cls, *args, **kwargs):
-            raise TypeError(
-                "type 'typing_extensions.TypeAliasType' is not an acceptable base type"
+            m = Movie(
+                title='The Matrix',  # typechecker error if key is omitted
+                year=1999,
             )
 
-        # The presence of this method convinces typing._type_check
-        # that TypeAliasTypes are types.
-        def __call__(self):
-            raise TypeError("Type alias is not callable")
-
-        if sys.version_info >= (3, 10):
-            def __or__(self, right):
-                # For forward compatibility with 3.12, reject Unions
-                # that are not accepted by the built-in Union.
-                if not _is_unionable(right):
-                    return NotImplemented
-                return typing.Union[self, right]
-
-            def __ror__(self, left):
-                if not _is_unionable(left):
-                    return NotImplemented
-                return typing.Union[left, self]
-
-
-if hasattr(typing, "is_protocol"):
-    is_protocol = typing.is_protocol
-    get_protocol_members = typing.get_protocol_members
-else:
-    def is_protocol(tp: type, /) -> bool:
-        """Return True if the given type is a Protocol.
-
-        Example::
-
-            >>> from typing_extensions import Protocol, is_protocol
-            >>> class P(Protocol):
-            ...     def a(self) -> str: ...
-            ...     b: int
-            >>> is_protocol(P)
-            True
-            >>> is_protocol(int)
-            False
+        There is no runtime checking that a required key is actually provided
+        when instantiating a related TypedDict.
         """
-        return (
-            isinstance(tp, type)
-            and getattr(tp, '_is_protocol', False)
-            and tp is not Protocol
-            and tp is not typing.Protocol
-        )
 
-    def get_protocol_members(tp: type, /) -> typing.FrozenSet[str]:
-        """Return the set of members defined in a Protocol.
+    class _NotRequired(_MaybeRequired, _root=True):
+        """A special typing construct to mark a key of a TypedDict as
+        potentially missing. For example:
 
-        Example::
+            class Movie(TypedDict):
+                title: str
+                year: NotRequired[int]
 
-            >>> from typing_extensions import Protocol, get_protocol_members
-            >>> class P(Protocol):
-            ...     def a(self) -> str: ...
-            ...     b: int
-            >>> get_protocol_members(P)
-            frozenset({'a', 'b'})
-
-        Raise a TypeError for arguments that are not Protocols.
+            m = Movie(
+                title='The Matrix',  # typechecker error if key is omitted
+                year=1999,
+            )
         """
-        if not is_protocol(tp):
-            raise TypeError(f'{tp!r} is not a Protocol')
-        if hasattr(tp, '__protocol_attrs__'):
-            return frozenset(tp.__protocol_attrs__)
-        return frozenset(_get_protocol_attrs(tp))
 
-
-if hasattr(typing, "Doc"):
-    Doc = typing.Doc
-else:
-    class Doc:
-        """Define the documentation of a type annotation using ``Annotated``, to be
-         used in class attributes, function and method parameters, return values,
-         and variables.
-
-        The value should be a positional-only string literal to allow static tools
-        like editors and documentation generators to use it.
-
-        This complements docstrings.
-
-        The string value passed is available in the attribute ``documentation``.
-
-        Example::
-
-            >>> from typing_extensions import Annotated, Doc
-            >>> def hi(to: Annotated[str, Doc("Who to say hi to")]) -> None: ...
-        """
-        def __init__(self, documentation: str, /) -> None:
-            self.documentation = documentation
-
-        def __repr__(self) -> str:
-            return f"Doc({self.documentation!r})"
-
-        def __hash__(self) -> int:
-            return hash(self.documentation)
-
-        def __eq__(self, other: object) -> bool:
-            if not isinstance(other, Doc):
-                return NotImplemented
-            return self.documentation == other.documentation
-
-
-_CapsuleType = getattr(_types, "CapsuleType", None)
-
-if _CapsuleType is None:
-    try:
-        import _socket
-    except ImportError:
-        pass
-    else:
-        _CAPI = getattr(_socket, "CAPI", None)
-        if _CAPI is not None:
-            _CapsuleType = type(_CAPI)
-
-if _CapsuleType is not None:
-    CapsuleType = _CapsuleType
-    __all__.append("CapsuleType")
-
-
-# Aliases for items that have always been in typing.
-# Explicitly assign these (rather than using `from typing import *` at the top),
-# so that we get a CI error if one of these is deleted from typing.py
-# in a future version of Python
-AbstractSet = typing.AbstractSet
-AnyStr = typing.AnyStr
-BinaryIO = typing.BinaryIO
-Callable = typing.Callable
-Collection = typing.Collection
-Container = typing.Container
-Dict = typing.Dict
-ForwardRef = typing.ForwardRef
-FrozenSet = typing.FrozenSet
-Generic = typing.Generic
-Hashable = typing.Hashable
-IO = typing.IO
-ItemsView = typing.ItemsView
-Iterable = typing.Iterable
-Iterator = typing.Iterator
-KeysView = typing.KeysView
-List = typing.List
-Mapping = typing.Mapping
-MappingView = typing.MappingView
-Match = typing.Match
-MutableMapping = typing.MutableMapping
-MutableSequence = typing.MutableSequence
-MutableSet = typing.MutableSet
-Optional = typing.Optional
-Pattern = typing.Pattern
-Reversible = typing.Reversible
-Sequence = typing.Sequence
-Set = typing.Set
-Sized = typing.Sized
-TextIO = typing.TextIO
-Tuple = typing.Tuple
-Union = typing.Union
-ValuesView = typing.ValuesView
-cast = typing.cast
-no_type_check = typing.no_type_check
-no_type_check_decorator = typing.no_type_check_decorator
+    Required = _Required(_root=True)
+    NotRequired = _NotRequired(_root=True)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/LICENSE.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/LICENSE.txt
deleted file mode 100644
index a31470f..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2012 Daniel Holth  and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/METADATA
deleted file mode 100644
index f645dcb..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/METADATA
+++ /dev/null
@@ -1,66 +0,0 @@
-Metadata-Version: 2.3
-Name: wheel
-Version: 0.45.1
-Summary: A built-package format for Python
-Keywords: wheel,packaging
-Author-email: Daniel Holth 
-Maintainer-email: Alex Grönholm 
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: System :: Archiving :: Packaging
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: pytest >= 6.0.0 ; extra == "test"
-Requires-Dist: setuptools >= 65 ; extra == "test"
-Project-URL: Changelog, https://wheel.readthedocs.io/en/stable/news.html
-Project-URL: Documentation, https://wheel.readthedocs.io/
-Project-URL: Issue Tracker, https://github.com/pypa/wheel/issues
-Project-URL: Source, https://github.com/pypa/wheel
-Provides-Extra: test
-
-wheel
-=====
-
-This is a command line tool for manipulating Python wheel files, as defined in
-`PEP 427`_. It contains the following functionality:
-
-* Convert ``.egg`` archives into ``.whl``
-* Unpack wheel archives
-* Repack wheel archives
-* Add or remove tags in existing wheel archives
-
-.. _PEP 427: https://www.python.org/dev/peps/pep-0427/
-
-Historical note
----------------
-
-This project used to contain the implementation of the setuptools_ ``bdist_wheel``
-command, but as of setuptools v70.1, it no longer needs ``wheel`` installed for that to
-work. Thus, you should install this **only** if you intend to use the ``wheel`` command
-line tool!
-
-.. _setuptools: https://pypi.org/project/setuptools/
-
-Documentation
--------------
-
-The documentation_ can be found on Read The Docs.
-
-.. _documentation: https://wheel.readthedocs.io/
-
-Code of Conduct
----------------
-
-Everyone interacting in the wheel project's codebases, issue trackers, chat
-rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
-
-.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/RECORD
deleted file mode 100644
index c1535b6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/RECORD
+++ /dev/null
@@ -1,68 +0,0 @@
-../../bin/wheel,sha256=pBhV19bQIgjS-r541fG3kLU6QtcyKaKdQ2RE9YIzeiU,249
-wheel-0.45.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-wheel-0.45.1.dist-info/LICENSE.txt,sha256=MMI2GGeRCPPo6h0qZYx8pBe9_IkcmO8aifpP8MmChlQ,1107
-wheel-0.45.1.dist-info/METADATA,sha256=mKz84H7m7jsxJyzeIcTVORiTb0NPMV39KvOIYhGgmjA,2313
-wheel-0.45.1.dist-info/RECORD,,
-wheel-0.45.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wheel-0.45.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-wheel-0.45.1.dist-info/entry_points.txt,sha256=rTY1BbkPHhkGMm4Q3F0pIzJBzW2kMxoG1oriffvGdA0,104
-wheel/__init__.py,sha256=mrxMnvdXACur_LWegbUfh5g5ysWZrd63UJn890wvGNk,59
-wheel/__main__.py,sha256=NkMUnuTCGcOkgY0IBLgBCVC_BGGcWORx2K8jYGS12UE,455
-wheel/__pycache__/__init__.cpython-311.pyc,,
-wheel/__pycache__/__main__.cpython-311.pyc,,
-wheel/__pycache__/_bdist_wheel.cpython-311.pyc,,
-wheel/__pycache__/_setuptools_logging.cpython-311.pyc,,
-wheel/__pycache__/bdist_wheel.cpython-311.pyc,,
-wheel/__pycache__/macosx_libfile.cpython-311.pyc,,
-wheel/__pycache__/metadata.cpython-311.pyc,,
-wheel/__pycache__/util.cpython-311.pyc,,
-wheel/__pycache__/wheelfile.cpython-311.pyc,,
-wheel/_bdist_wheel.py,sha256=UghCQjSH_pVfcZh6oRjzSw_TQhcf3anSx1OkiLSL82M,21694
-wheel/_setuptools_logging.py,sha256=-5KC-lne0ilOUWIDfOkqapUWGMFZhuKYDIavIZiB5kM,781
-wheel/bdist_wheel.py,sha256=tpf9WufiSO1RuEMg5oPhIfSG8DMziCZ_4muCKF69Cqo,1107
-wheel/cli/__init__.py,sha256=Npq6_jKi03dhIcRnmbuFhwviVJxwO0tYEnEhWMv9cJo,4402
-wheel/cli/__pycache__/__init__.cpython-311.pyc,,
-wheel/cli/__pycache__/convert.cpython-311.pyc,,
-wheel/cli/__pycache__/pack.cpython-311.pyc,,
-wheel/cli/__pycache__/tags.cpython-311.pyc,,
-wheel/cli/__pycache__/unpack.cpython-311.pyc,,
-wheel/cli/convert.py,sha256=Bi0ntEXb9nTllCxWeTRQ4j-nPs3szWSEKipG_GgnMkQ,12634
-wheel/cli/pack.py,sha256=CAFcHdBVulvsHYJlndKVO7KMI9JqBTZz5ii0PKxxCOs,3103
-wheel/cli/tags.py,sha256=lHw-LaWrkS5Jy_qWcw-6pSjeNM6yAjDnqKI3E5JTTCU,4760
-wheel/cli/unpack.py,sha256=Y_J7ynxPSoFFTT7H0fMgbBlVErwyDGcObgme5MBuz58,1021
-wheel/macosx_libfile.py,sha256=k1x7CE3LPtOVGqj6NXQ1nTGYVPaeRrhVzUG_KPq3zDs,16572
-wheel/metadata.py,sha256=JC4p7jlQZu2bUTAQ2fevkqLjg_X6gnNyRhLn6OUO1tc,6171
-wheel/util.py,sha256=aL7aibHwYUgfc8WlolL5tXdkV4DatbJxZHb1kwHFJAU,423
-wheel/vendored/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wheel/vendored/__pycache__/__init__.cpython-311.pyc,,
-wheel/vendored/packaging/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
-wheel/vendored/packaging/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
-wheel/vendored/packaging/LICENSE.BSD,sha256=tw5-m3QvHMb5SLNMFqo5_-zpQZY2S8iP8NIYDwAo-sU,1344
-wheel/vendored/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wheel/vendored/packaging/__pycache__/__init__.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_elffile.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_manylinux.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_musllinux.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_parser.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_structures.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/_tokenizer.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/markers.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/requirements.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/specifiers.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/tags.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/utils.cpython-311.pyc,,
-wheel/vendored/packaging/__pycache__/version.cpython-311.pyc,,
-wheel/vendored/packaging/_elffile.py,sha256=hbmK8OD6Z7fY6hwinHEUcD1by7czkGiNYu7ShnFEk2k,3266
-wheel/vendored/packaging/_manylinux.py,sha256=P7sdR5_7XBY09LVYYPhHmydMJIIwPXWsh4olk74Uuj4,9588
-wheel/vendored/packaging/_musllinux.py,sha256=z1s8To2hQ0vpn_d-O2i5qxGwEK8WmGlLt3d_26V7NeY,2674
-wheel/vendored/packaging/_parser.py,sha256=4tT4emSl2qTaU7VTQE1Xa9o1jMPCsBezsYBxyNMUN-s,10347
-wheel/vendored/packaging/_structures.py,sha256=q3eVNmbWJGG_S0Dit_S3Ao8qQqz_5PYTXFAKBZe5yr4,1431
-wheel/vendored/packaging/_tokenizer.py,sha256=alCtbwXhOFAmFGZ6BQ-wCTSFoRAJ2z-ysIf7__MTJ_k,5292
-wheel/vendored/packaging/markers.py,sha256=_TSPI1BhJYO7Bp9AzTmHQxIqHEVXaTjmDh9G-w8qzPA,8232
-wheel/vendored/packaging/requirements.py,sha256=dgoBeVprPu2YE6Q8nGfwOPTjATHbRa_ZGLyXhFEln6Q,2933
-wheel/vendored/packaging/specifiers.py,sha256=IWSt0SrLSP72heWhAC8UL0eGvas7XIQHjqiViVfmPKE,39778
-wheel/vendored/packaging/tags.py,sha256=fedHXiOHkBxNZTXotXv8uXPmMFU9ae-TKBujgYHigcA,18950
-wheel/vendored/packaging/utils.py,sha256=XgdmP3yx9-wQEFjO7OvMj9RjEf5JlR5HFFR69v7SQ9E,5268
-wheel/vendored/packaging/version.py,sha256=PFJaYZDxBgyxkfYhH3SQw4qfE9ICCWrTmitvq14y3bs,16234
-wheel/vendored/vendor.txt,sha256=Z2ENjB1i5prfez8CdM1Sdr3c6Zxv2rRRolMpLmBncAE,16
-wheel/wheelfile.py,sha256=USCttNlJwafxt51YYFFKG7jnxz8dfhbyqAZL6jMTA9s,8411
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/REQUESTED
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/WHEEL
deleted file mode 100644
index e3c6fee..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/entry_points.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/entry_points.txt
deleted file mode 100644
index 06c9f69..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel-0.45.1.dist-info/entry_points.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-[console_scripts]
-wheel=wheel.cli:main
-
-[distutils.commands]
-bdist_wheel=wheel.bdist_wheel:bdist_wheel
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__init__.py
deleted file mode 100644
index 3ab8f72..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import annotations
-
-__version__ = "0.45.1"
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__main__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__main__.py
deleted file mode 100644
index 0be7453..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__main__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-Wheel command line tool (enable python -m wheel syntax)
-"""
-
-from __future__ import annotations
-
-import sys
-
-
-def main():  # needed for console script
-    if __package__ == "":
-        # To be able to run 'python wheel-0.9.whl/wheel':
-        import os.path
-
-        path = os.path.dirname(os.path.dirname(__file__))
-        sys.path[0:0] = [path]
-    import wheel.cli
-
-    sys.exit(wheel.cli.main())
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 858e192..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__main__.cpython-311.pyc
deleted file mode 100644
index c25a8cb..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/__main__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_bdist_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_bdist_wheel.cpython-311.pyc
deleted file mode 100644
index 4f9c33b..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_bdist_wheel.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_setuptools_logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_setuptools_logging.cpython-311.pyc
deleted file mode 100644
index c0a9864..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/_setuptools_logging.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/bdist_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/bdist_wheel.cpython-311.pyc
deleted file mode 100644
index 4991cf2..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/bdist_wheel.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/macosx_libfile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/macosx_libfile.cpython-311.pyc
deleted file mode 100644
index 4e93f4d..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/macosx_libfile.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/metadata.cpython-311.pyc
deleted file mode 100644
index 24c540c..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/metadata.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/util.cpython-311.pyc
deleted file mode 100644
index 9c87942..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/util.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/wheelfile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/wheelfile.cpython-311.pyc
deleted file mode 100644
index 7856294..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/__pycache__/wheelfile.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_bdist_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_bdist_wheel.py
deleted file mode 100644
index 88973eb..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_bdist_wheel.py
+++ /dev/null
@@ -1,613 +0,0 @@
-"""
-Create a wheel (.whl) distribution.
-
-A wheel is a built archive format.
-"""
-
-from __future__ import annotations
-
-import os
-import re
-import shutil
-import stat
-import struct
-import sys
-import sysconfig
-import warnings
-from email.generator import BytesGenerator, Generator
-from email.policy import EmailPolicy
-from glob import iglob
-from shutil import rmtree
-from typing import TYPE_CHECKING, Callable, Iterable, Literal, Sequence, cast
-from zipfile import ZIP_DEFLATED, ZIP_STORED
-
-import setuptools
-from setuptools import Command
-
-from . import __version__ as wheel_version
-from .metadata import pkginfo_to_metadata
-from .util import log
-from .vendored.packaging import tags
-from .vendored.packaging import version as _packaging_version
-from .wheelfile import WheelFile
-
-if TYPE_CHECKING:
-    import types
-
-# ensure Python logging is configured
-try:
-    __import__("setuptools.logging")
-except ImportError:
-    # setuptools < ??
-    from . import _setuptools_logging
-
-    _setuptools_logging.configure()
-
-
-def safe_name(name: str) -> str:
-    """Convert an arbitrary string to a standard distribution name
-    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
-    """
-    return re.sub("[^A-Za-z0-9.]+", "-", name)
-
-
-def safe_version(version: str) -> str:
-    """
-    Convert an arbitrary string to a standard version string
-    """
-    try:
-        # normalize the version
-        return str(_packaging_version.Version(version))
-    except _packaging_version.InvalidVersion:
-        version = version.replace(" ", ".")
-        return re.sub("[^A-Za-z0-9.]+", "-", version)
-
-
-setuptools_major_version = int(setuptools.__version__.split(".")[0])
-
-PY_LIMITED_API_PATTERN = r"cp3\d"
-
-
-def _is_32bit_interpreter() -> bool:
-    return struct.calcsize("P") == 4
-
-
-def python_tag() -> str:
-    return f"py{sys.version_info[0]}"
-
-
-def get_platform(archive_root: str | None) -> str:
-    """Return our platform name 'win32', 'linux_x86_64'"""
-    result = sysconfig.get_platform()
-    if result.startswith("macosx") and archive_root is not None:
-        from .macosx_libfile import calculate_macosx_platform_tag
-
-        result = calculate_macosx_platform_tag(archive_root, result)
-    elif _is_32bit_interpreter():
-        if result == "linux-x86_64":
-            # pip pull request #3497
-            result = "linux-i686"
-        elif result == "linux-aarch64":
-            # packaging pull request #234
-            # TODO armv8l, packaging pull request #690 => this did not land
-            # in pip/packaging yet
-            result = "linux-armv7l"
-
-    return result.replace("-", "_")
-
-
-def get_flag(
-    var: str, fallback: bool, expected: bool = True, warn: bool = True
-) -> bool:
-    """Use a fallback value for determining SOABI flags if the needed config
-    var is unset or unavailable."""
-    val = sysconfig.get_config_var(var)
-    if val is None:
-        if warn:
-            warnings.warn(
-                f"Config variable '{var}' is unset, Python ABI tag may be incorrect",
-                RuntimeWarning,
-                stacklevel=2,
-            )
-        return fallback
-    return val == expected
-
-
-def get_abi_tag() -> str | None:
-    """Return the ABI tag based on SOABI (if available) or emulate SOABI (PyPy2)."""
-    soabi: str = sysconfig.get_config_var("SOABI")
-    impl = tags.interpreter_name()
-    if not soabi and impl in ("cp", "pp") and hasattr(sys, "maxunicode"):
-        d = ""
-        m = ""
-        u = ""
-        if get_flag("Py_DEBUG", hasattr(sys, "gettotalrefcount"), warn=(impl == "cp")):
-            d = "d"
-
-        if get_flag(
-            "WITH_PYMALLOC",
-            impl == "cp",
-            warn=(impl == "cp" and sys.version_info < (3, 8)),
-        ) and sys.version_info < (3, 8):
-            m = "m"
-
-        abi = f"{impl}{tags.interpreter_version()}{d}{m}{u}"
-    elif soabi and impl == "cp" and soabi.startswith("cpython"):
-        # non-Windows
-        abi = "cp" + soabi.split("-")[1]
-    elif soabi and impl == "cp" and soabi.startswith("cp"):
-        # Windows
-        abi = soabi.split("-")[0]
-    elif soabi and impl == "pp":
-        # we want something like pypy36-pp73
-        abi = "-".join(soabi.split("-")[:2])
-        abi = abi.replace(".", "_").replace("-", "_")
-    elif soabi and impl == "graalpy":
-        abi = "-".join(soabi.split("-")[:3])
-        abi = abi.replace(".", "_").replace("-", "_")
-    elif soabi:
-        abi = soabi.replace(".", "_").replace("-", "_")
-    else:
-        abi = None
-
-    return abi
-
-
-def safer_name(name: str) -> str:
-    return safe_name(name).replace("-", "_")
-
-
-def safer_version(version: str) -> str:
-    return safe_version(version).replace("-", "_")
-
-
-def remove_readonly(
-    func: Callable[..., object],
-    path: str,
-    excinfo: tuple[type[Exception], Exception, types.TracebackType],
-) -> None:
-    remove_readonly_exc(func, path, excinfo[1])
-
-
-def remove_readonly_exc(func: Callable[..., object], path: str, exc: Exception) -> None:
-    os.chmod(path, stat.S_IWRITE)
-    func(path)
-
-
-class bdist_wheel(Command):
-    description = "create a wheel distribution"
-
-    supported_compressions = {
-        "stored": ZIP_STORED,
-        "deflated": ZIP_DEFLATED,
-    }
-
-    user_options = [
-        ("bdist-dir=", "b", "temporary directory for creating the distribution"),
-        (
-            "plat-name=",
-            "p",
-            "platform name to embed in generated filenames "
-            f"(default: {get_platform(None)})",
-        ),
-        (
-            "keep-temp",
-            "k",
-            "keep the pseudo-installation tree around after "
-            "creating the distribution archive",
-        ),
-        ("dist-dir=", "d", "directory to put final built distributions in"),
-        ("skip-build", None, "skip rebuilding everything (for testing/debugging)"),
-        (
-            "relative",
-            None,
-            "build the archive using relative paths (default: false)",
-        ),
-        (
-            "owner=",
-            "u",
-            "Owner name used when creating a tar file [default: current user]",
-        ),
-        (
-            "group=",
-            "g",
-            "Group name used when creating a tar file [default: current group]",
-        ),
-        ("universal", None, "make a universal wheel (default: false)"),
-        (
-            "compression=",
-            None,
-            "zipfile compression (one of: {}) (default: 'deflated')".format(
-                ", ".join(supported_compressions)
-            ),
-        ),
-        (
-            "python-tag=",
-            None,
-            f"Python implementation compatibility tag (default: '{python_tag()}')",
-        ),
-        (
-            "build-number=",
-            None,
-            "Build number for this particular version. "
-            "As specified in PEP-0427, this must start with a digit. "
-            "[default: None]",
-        ),
-        (
-            "py-limited-api=",
-            None,
-            "Python tag (cp32|cp33|cpNN) for abi3 wheel tag (default: false)",
-        ),
-    ]
-
-    boolean_options = ["keep-temp", "skip-build", "relative", "universal"]
-
-    def initialize_options(self):
-        self.bdist_dir: str = None
-        self.data_dir = None
-        self.plat_name: str | None = None
-        self.plat_tag = None
-        self.format = "zip"
-        self.keep_temp = False
-        self.dist_dir: str | None = None
-        self.egginfo_dir = None
-        self.root_is_pure: bool | None = None
-        self.skip_build = None
-        self.relative = False
-        self.owner = None
-        self.group = None
-        self.universal: bool = False
-        self.compression: str | int = "deflated"
-        self.python_tag: str = python_tag()
-        self.build_number: str | None = None
-        self.py_limited_api: str | Literal[False] = False
-        self.plat_name_supplied = False
-
-    def finalize_options(self):
-        if self.bdist_dir is None:
-            bdist_base = self.get_finalized_command("bdist").bdist_base
-            self.bdist_dir = os.path.join(bdist_base, "wheel")
-
-        egg_info = self.distribution.get_command_obj("egg_info")
-        egg_info.ensure_finalized()  # needed for correct `wheel_dist_name`
-
-        self.data_dir = self.wheel_dist_name + ".data"
-        self.plat_name_supplied = self.plat_name is not None
-
-        try:
-            self.compression = self.supported_compressions[self.compression]
-        except KeyError:
-            raise ValueError(f"Unsupported compression: {self.compression}") from None
-
-        need_options = ("dist_dir", "plat_name", "skip_build")
-
-        self.set_undefined_options("bdist", *zip(need_options, need_options))
-
-        self.root_is_pure = not (
-            self.distribution.has_ext_modules() or self.distribution.has_c_libraries()
-        )
-
-        if self.py_limited_api and not re.match(
-            PY_LIMITED_API_PATTERN, self.py_limited_api
-        ):
-            raise ValueError(f"py-limited-api must match '{PY_LIMITED_API_PATTERN}'")
-
-        # Support legacy [wheel] section for setting universal
-        wheel = self.distribution.get_option_dict("wheel")
-        if "universal" in wheel:
-            # please don't define this in your global configs
-            log.warning(
-                "The [wheel] section is deprecated. Use [bdist_wheel] instead.",
-            )
-            val = wheel["universal"][1].strip()
-            if val.lower() in ("1", "true", "yes"):
-                self.universal = True
-
-        if self.build_number is not None and not self.build_number[:1].isdigit():
-            raise ValueError("Build tag (build-number) must start with a digit.")
-
-    @property
-    def wheel_dist_name(self):
-        """Return distribution full name with - replaced with _"""
-        components = (
-            safer_name(self.distribution.get_name()),
-            safer_version(self.distribution.get_version()),
-        )
-        if self.build_number:
-            components += (self.build_number,)
-        return "-".join(components)
-
-    def get_tag(self) -> tuple[str, str, str]:
-        # bdist sets self.plat_name if unset, we should only use it for purepy
-        # wheels if the user supplied it.
-        if self.plat_name_supplied:
-            plat_name = cast(str, self.plat_name)
-        elif self.root_is_pure:
-            plat_name = "any"
-        else:
-            # macosx contains system version in platform name so need special handle
-            if self.plat_name and not self.plat_name.startswith("macosx"):
-                plat_name = self.plat_name
-            else:
-                # on macosx always limit the platform name to comply with any
-                # c-extension modules in bdist_dir, since the user can specify
-                # a higher MACOSX_DEPLOYMENT_TARGET via tools like CMake
-
-                # on other platforms, and on macosx if there are no c-extension
-                # modules, use the default platform name.
-                plat_name = get_platform(self.bdist_dir)
-
-            if _is_32bit_interpreter():
-                if plat_name in ("linux-x86_64", "linux_x86_64"):
-                    plat_name = "linux_i686"
-                if plat_name in ("linux-aarch64", "linux_aarch64"):
-                    # TODO armv8l, packaging pull request #690 => this did not land
-                    # in pip/packaging yet
-                    plat_name = "linux_armv7l"
-
-        plat_name = (
-            plat_name.lower().replace("-", "_").replace(".", "_").replace(" ", "_")
-        )
-
-        if self.root_is_pure:
-            if self.universal:
-                impl = "py2.py3"
-            else:
-                impl = self.python_tag
-            tag = (impl, "none", plat_name)
-        else:
-            impl_name = tags.interpreter_name()
-            impl_ver = tags.interpreter_version()
-            impl = impl_name + impl_ver
-            # We don't work on CPython 3.1, 3.0.
-            if self.py_limited_api and (impl_name + impl_ver).startswith("cp3"):
-                impl = self.py_limited_api
-                abi_tag = "abi3"
-            else:
-                abi_tag = str(get_abi_tag()).lower()
-            tag = (impl, abi_tag, plat_name)
-            # issue gh-374: allow overriding plat_name
-            supported_tags = [
-                (t.interpreter, t.abi, plat_name) for t in tags.sys_tags()
-            ]
-            assert (
-                tag in supported_tags
-            ), f"would build wheel with unsupported tag {tag}"
-        return tag
-
-    def run(self):
-        build_scripts = self.reinitialize_command("build_scripts")
-        build_scripts.executable = "python"
-        build_scripts.force = True
-
-        build_ext = self.reinitialize_command("build_ext")
-        build_ext.inplace = False
-
-        if not self.skip_build:
-            self.run_command("build")
-
-        install = self.reinitialize_command("install", reinit_subcommands=True)
-        install.root = self.bdist_dir
-        install.compile = False
-        install.skip_build = self.skip_build
-        install.warn_dir = False
-
-        # A wheel without setuptools scripts is more cross-platform.
-        # Use the (undocumented) `no_ep` option to setuptools'
-        # install_scripts command to avoid creating entry point scripts.
-        install_scripts = self.reinitialize_command("install_scripts")
-        install_scripts.no_ep = True
-
-        # Use a custom scheme for the archive, because we have to decide
-        # at installation time which scheme to use.
-        for key in ("headers", "scripts", "data", "purelib", "platlib"):
-            setattr(install, "install_" + key, os.path.join(self.data_dir, key))
-
-        basedir_observed = ""
-
-        if os.name == "nt":
-            # win32 barfs if any of these are ''; could be '.'?
-            # (distutils.command.install:change_roots bug)
-            basedir_observed = os.path.normpath(os.path.join(self.data_dir, ".."))
-            self.install_libbase = self.install_lib = basedir_observed
-
-        setattr(
-            install,
-            "install_purelib" if self.root_is_pure else "install_platlib",
-            basedir_observed,
-        )
-
-        log.info(f"installing to {self.bdist_dir}")
-
-        self.run_command("install")
-
-        impl_tag, abi_tag, plat_tag = self.get_tag()
-        archive_basename = f"{self.wheel_dist_name}-{impl_tag}-{abi_tag}-{plat_tag}"
-        if not self.relative:
-            archive_root = self.bdist_dir
-        else:
-            archive_root = os.path.join(
-                self.bdist_dir, self._ensure_relative(install.install_base)
-            )
-
-        self.set_undefined_options("install_egg_info", ("target", "egginfo_dir"))
-        distinfo_dirname = (
-            f"{safer_name(self.distribution.get_name())}-"
-            f"{safer_version(self.distribution.get_version())}.dist-info"
-        )
-        distinfo_dir = os.path.join(self.bdist_dir, distinfo_dirname)
-        self.egg2dist(self.egginfo_dir, distinfo_dir)
-
-        self.write_wheelfile(distinfo_dir)
-
-        # Make the archive
-        if not os.path.exists(self.dist_dir):
-            os.makedirs(self.dist_dir)
-
-        wheel_path = os.path.join(self.dist_dir, archive_basename + ".whl")
-        with WheelFile(wheel_path, "w", self.compression) as wf:
-            wf.write_files(archive_root)
-
-        # Add to 'Distribution.dist_files' so that the "upload" command works
-        getattr(self.distribution, "dist_files", []).append(
-            (
-                "bdist_wheel",
-                "{}.{}".format(*sys.version_info[:2]),  # like 3.7
-                wheel_path,
-            )
-        )
-
-        if not self.keep_temp:
-            log.info(f"removing {self.bdist_dir}")
-            if not self.dry_run:
-                if sys.version_info < (3, 12):
-                    rmtree(self.bdist_dir, onerror=remove_readonly)
-                else:
-                    rmtree(self.bdist_dir, onexc=remove_readonly_exc)
-
-    def write_wheelfile(
-        self, wheelfile_base: str, generator: str = f"bdist_wheel ({wheel_version})"
-    ):
-        from email.message import Message
-
-        msg = Message()
-        msg["Wheel-Version"] = "1.0"  # of the spec
-        msg["Generator"] = generator
-        msg["Root-Is-Purelib"] = str(self.root_is_pure).lower()
-        if self.build_number is not None:
-            msg["Build"] = self.build_number
-
-        # Doesn't work for bdist_wininst
-        impl_tag, abi_tag, plat_tag = self.get_tag()
-        for impl in impl_tag.split("."):
-            for abi in abi_tag.split("."):
-                for plat in plat_tag.split("."):
-                    msg["Tag"] = "-".join((impl, abi, plat))
-
-        wheelfile_path = os.path.join(wheelfile_base, "WHEEL")
-        log.info(f"creating {wheelfile_path}")
-        with open(wheelfile_path, "wb") as f:
-            BytesGenerator(f, maxheaderlen=0).flatten(msg)
-
-    def _ensure_relative(self, path: str) -> str:
-        # copied from dir_util, deleted
-        drive, path = os.path.splitdrive(path)
-        if path[0:1] == os.sep:
-            path = drive + path[1:]
-        return path
-
-    @property
-    def license_paths(self) -> Iterable[str]:
-        if setuptools_major_version >= 57:
-            # Setuptools has resolved any patterns to actual file names
-            return self.distribution.metadata.license_files or ()
-
-        files: set[str] = set()
-        metadata = self.distribution.get_option_dict("metadata")
-        if setuptools_major_version >= 42:
-            # Setuptools recognizes the license_files option but does not do globbing
-            patterns = cast(Sequence[str], self.distribution.metadata.license_files)
-        else:
-            # Prior to those, wheel is entirely responsible for handling license files
-            if "license_files" in metadata:
-                patterns = metadata["license_files"][1].split()
-            else:
-                patterns = ()
-
-        if "license_file" in metadata:
-            warnings.warn(
-                'The "license_file" option is deprecated. Use "license_files" instead.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            files.add(metadata["license_file"][1])
-
-        if not files and not patterns and not isinstance(patterns, list):
-            patterns = ("LICEN[CS]E*", "COPYING*", "NOTICE*", "AUTHORS*")
-
-        for pattern in patterns:
-            for path in iglob(pattern):
-                if path.endswith("~"):
-                    log.debug(
-                        f'ignoring license file "{path}" as it looks like a backup'
-                    )
-                    continue
-
-                if path not in files and os.path.isfile(path):
-                    log.info(
-                        f'adding license file "{path}" (matched pattern "{pattern}")'
-                    )
-                    files.add(path)
-
-        return files
-
-    def egg2dist(self, egginfo_path: str, distinfo_path: str):
-        """Convert an .egg-info directory into a .dist-info directory"""
-
-        def adios(p: str) -> None:
-            """Appropriately delete directory, file or link."""
-            if os.path.exists(p) and not os.path.islink(p) and os.path.isdir(p):
-                shutil.rmtree(p)
-            elif os.path.exists(p):
-                os.unlink(p)
-
-        adios(distinfo_path)
-
-        if not os.path.exists(egginfo_path):
-            # There is no egg-info. This is probably because the egg-info
-            # file/directory is not named matching the distribution name used
-            # to name the archive file. Check for this case and report
-            # accordingly.
-            import glob
-
-            pat = os.path.join(os.path.dirname(egginfo_path), "*.egg-info")
-            possible = glob.glob(pat)
-            err = f"Egg metadata expected at {egginfo_path} but not found"
-            if possible:
-                alt = os.path.basename(possible[0])
-                err += f" ({alt} found - possible misnamed archive file?)"
-
-            raise ValueError(err)
-
-        if os.path.isfile(egginfo_path):
-            # .egg-info is a single file
-            pkg_info = pkginfo_to_metadata(egginfo_path, egginfo_path)
-            os.mkdir(distinfo_path)
-        else:
-            # .egg-info is a directory
-            pkginfo_path = os.path.join(egginfo_path, "PKG-INFO")
-            pkg_info = pkginfo_to_metadata(egginfo_path, pkginfo_path)
-
-            # ignore common egg metadata that is useless to wheel
-            shutil.copytree(
-                egginfo_path,
-                distinfo_path,
-                ignore=lambda x, y: {
-                    "PKG-INFO",
-                    "requires.txt",
-                    "SOURCES.txt",
-                    "not-zip-safe",
-                },
-            )
-
-            # delete dependency_links if it is only whitespace
-            dependency_links_path = os.path.join(distinfo_path, "dependency_links.txt")
-            with open(dependency_links_path, encoding="utf-8") as dependency_links_file:
-                dependency_links = dependency_links_file.read().strip()
-            if not dependency_links:
-                adios(dependency_links_path)
-
-        pkg_info_path = os.path.join(distinfo_path, "METADATA")
-        serialization_policy = EmailPolicy(
-            utf8=True,
-            mangle_from_=False,
-            max_line_length=0,
-        )
-        with open(pkg_info_path, "w", encoding="utf-8") as out:
-            Generator(out, policy=serialization_policy).flatten(pkg_info)
-
-        for license_path in self.license_paths:
-            filename = os.path.basename(license_path)
-            shutil.copy(license_path, os.path.join(distinfo_path, filename))
-
-        adios(egginfo_path)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_setuptools_logging.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_setuptools_logging.py
deleted file mode 100644
index a1a2482..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/_setuptools_logging.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# copied from setuptools.logging, omitting monkeypatching
-from __future__ import annotations
-
-import logging
-import sys
-
-
-def _not_warning(record: logging.LogRecord) -> bool:
-    return record.levelno < logging.WARNING
-
-
-def configure() -> None:
-    """
-    Configure logging to emit warning and above to stderr
-    and everything else to stdout. This behavior is provided
-    for compatibility with distutils.log but may change in
-    the future.
-    """
-    err_handler = logging.StreamHandler()
-    err_handler.setLevel(logging.WARNING)
-    out_handler = logging.StreamHandler(sys.stdout)
-    out_handler.addFilter(_not_warning)
-    handlers = err_handler, out_handler
-    logging.basicConfig(
-        format="{message}", style="{", handlers=handlers, level=logging.DEBUG
-    )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/bdist_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/bdist_wheel.py
deleted file mode 100644
index dd7b862..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/bdist_wheel.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from typing import TYPE_CHECKING
-from warnings import warn
-
-warn(
-    "The 'wheel' package is no longer the canonical location of the 'bdist_wheel' "
-    "command, and will be removed in a future release. Please update to setuptools "
-    "v70.1 or later which contains an integrated version of this command.",
-    DeprecationWarning,
-    stacklevel=1,
-)
-
-if TYPE_CHECKING:
-    from ._bdist_wheel import bdist_wheel as bdist_wheel
-else:
-    try:
-        # Better integration/compatibility with setuptools:
-        # in the case new fixes or PEPs are implemented in setuptools
-        # there is no need to backport them to the deprecated code base.
-        # This is useful in the case of old packages in the ecosystem
-        # that are still used but have low maintenance.
-        from setuptools.command.bdist_wheel import bdist_wheel
-    except ImportError:
-        # Only used in the case of old setuptools versions.
-        # If the user wants to get the latest fixes/PEPs,
-        # they are encouraged to address the deprecation warning.
-        from ._bdist_wheel import bdist_wheel as bdist_wheel
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__init__.py
deleted file mode 100644
index 6ba1217..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__init__.py
+++ /dev/null
@@ -1,155 +0,0 @@
-"""
-Wheel command-line utility.
-"""
-
-from __future__ import annotations
-
-import argparse
-import os
-import sys
-from argparse import ArgumentTypeError
-
-
-class WheelError(Exception):
-    pass
-
-
-def unpack_f(args: argparse.Namespace) -> None:
-    from .unpack import unpack
-
-    unpack(args.wheelfile, args.dest)
-
-
-def pack_f(args: argparse.Namespace) -> None:
-    from .pack import pack
-
-    pack(args.directory, args.dest_dir, args.build_number)
-
-
-def convert_f(args: argparse.Namespace) -> None:
-    from .convert import convert
-
-    convert(args.files, args.dest_dir, args.verbose)
-
-
-def tags_f(args: argparse.Namespace) -> None:
-    from .tags import tags
-
-    names = (
-        tags(
-            wheel,
-            args.python_tag,
-            args.abi_tag,
-            args.platform_tag,
-            args.build,
-            args.remove,
-        )
-        for wheel in args.wheel
-    )
-
-    for name in names:
-        print(name)
-
-
-def version_f(args: argparse.Namespace) -> None:
-    from .. import __version__
-
-    print(f"wheel {__version__}")
-
-
-def parse_build_tag(build_tag: str) -> str:
-    if build_tag and not build_tag[0].isdigit():
-        raise ArgumentTypeError("build tag must begin with a digit")
-    elif "-" in build_tag:
-        raise ArgumentTypeError("invalid character ('-') in build tag")
-
-    return build_tag
-
-
-TAGS_HELP = """\
-Make a new wheel with given tags. Any tags unspecified will remain the same.
-Starting the tags with a "+" will append to the existing tags. Starting with a
-"-" will remove a tag (use --option=-TAG syntax). Multiple tags can be
-separated by ".". The original file will remain unless --remove is given.  The
-output filename(s) will be displayed on stdout for further processing.
-"""
-
-
-def parser():
-    p = argparse.ArgumentParser()
-    s = p.add_subparsers(help="commands")
-
-    unpack_parser = s.add_parser("unpack", help="Unpack wheel")
-    unpack_parser.add_argument(
-        "--dest", "-d", help="Destination directory", default="."
-    )
-    unpack_parser.add_argument("wheelfile", help="Wheel file")
-    unpack_parser.set_defaults(func=unpack_f)
-
-    repack_parser = s.add_parser("pack", help="Repack wheel")
-    repack_parser.add_argument("directory", help="Root directory of the unpacked wheel")
-    repack_parser.add_argument(
-        "--dest-dir",
-        "-d",
-        default=os.path.curdir,
-        help="Directory to store the wheel (default %(default)s)",
-    )
-    repack_parser.add_argument(
-        "--build-number", help="Build tag to use in the wheel name"
-    )
-    repack_parser.set_defaults(func=pack_f)
-
-    convert_parser = s.add_parser("convert", help="Convert egg or wininst to wheel")
-    convert_parser.add_argument("files", nargs="*", help="Files to convert")
-    convert_parser.add_argument(
-        "--dest-dir",
-        "-d",
-        default=os.path.curdir,
-        help="Directory to store wheels (default %(default)s)",
-    )
-    convert_parser.add_argument("--verbose", "-v", action="store_true")
-    convert_parser.set_defaults(func=convert_f)
-
-    tags_parser = s.add_parser(
-        "tags", help="Add or replace the tags on a wheel", description=TAGS_HELP
-    )
-    tags_parser.add_argument("wheel", nargs="*", help="Existing wheel(s) to retag")
-    tags_parser.add_argument(
-        "--remove",
-        action="store_true",
-        help="Remove the original files, keeping only the renamed ones",
-    )
-    tags_parser.add_argument(
-        "--python-tag", metavar="TAG", help="Specify an interpreter tag(s)"
-    )
-    tags_parser.add_argument("--abi-tag", metavar="TAG", help="Specify an ABI tag(s)")
-    tags_parser.add_argument(
-        "--platform-tag", metavar="TAG", help="Specify a platform tag(s)"
-    )
-    tags_parser.add_argument(
-        "--build", type=parse_build_tag, metavar="BUILD", help="Specify a build tag"
-    )
-    tags_parser.set_defaults(func=tags_f)
-
-    version_parser = s.add_parser("version", help="Print version and exit")
-    version_parser.set_defaults(func=version_f)
-
-    help_parser = s.add_parser("help", help="Show this help")
-    help_parser.set_defaults(func=lambda args: p.print_help())
-
-    return p
-
-
-def main():
-    p = parser()
-    args = p.parse_args()
-    if not hasattr(args, "func"):
-        p.print_help()
-    else:
-        try:
-            args.func(args)
-            return 0
-        except WheelError as e:
-            print(e, file=sys.stderr)
-
-    return 1
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 51e9e2f..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/convert.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/convert.cpython-311.pyc
deleted file mode 100644
index 372d88c..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/convert.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/pack.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/pack.cpython-311.pyc
deleted file mode 100644
index 1967d6c..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/pack.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/tags.cpython-311.pyc
deleted file mode 100644
index 05205a1..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/tags.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/unpack.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/unpack.cpython-311.pyc
deleted file mode 100644
index e860105..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/__pycache__/unpack.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/convert.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/convert.py
deleted file mode 100644
index 61d4775..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/convert.py
+++ /dev/null
@@ -1,332 +0,0 @@
-from __future__ import annotations
-
-import os.path
-import re
-from abc import ABCMeta, abstractmethod
-from collections import defaultdict
-from collections.abc import Iterator
-from email.message import Message
-from email.parser import Parser
-from email.policy import EmailPolicy
-from glob import iglob
-from pathlib import Path
-from textwrap import dedent
-from zipfile import ZipFile
-
-from .. import __version__
-from ..metadata import generate_requirements
-from ..vendored.packaging.tags import parse_tag
-from ..wheelfile import WheelFile
-
-egg_filename_re = re.compile(
-    r"""
-    (?P.+?)-(?P.+?)
-    (-(?Ppy\d\.\d+)
-     (-(?P.+?))?
-    )?.egg$""",
-    re.VERBOSE,
-)
-egg_info_re = re.compile(
-    r"""
-    ^(?P.+?)-(?P.+?)
-    (-(?Ppy\d\.\d+)
-    )?.egg-info/""",
-    re.VERBOSE,
-)
-wininst_re = re.compile(
-    r"\.(?Pwin32|win-amd64)(?:-(?Ppy\d\.\d))?\.exe$"
-)
-pyd_re = re.compile(r"\.(?P[a-z0-9]+)-(?Pwin32|win_amd64)\.pyd$")
-serialization_policy = EmailPolicy(
-    utf8=True,
-    mangle_from_=False,
-    max_line_length=0,
-)
-GENERATOR = f"wheel {__version__}"
-
-
-def convert_requires(requires: str, metadata: Message) -> None:
-    extra: str | None = None
-    requirements: dict[str | None, list[str]] = defaultdict(list)
-    for line in requires.splitlines():
-        line = line.strip()
-        if not line:
-            continue
-
-        if line.startswith("[") and line.endswith("]"):
-            extra = line[1:-1]
-            continue
-
-        requirements[extra].append(line)
-
-    for key, value in generate_requirements(requirements):
-        metadata.add_header(key, value)
-
-
-def convert_pkg_info(pkginfo: str, metadata: Message):
-    parsed_message = Parser().parsestr(pkginfo)
-    for key, value in parsed_message.items():
-        key_lower = key.lower()
-        if value == "UNKNOWN":
-            continue
-
-        if key_lower == "description":
-            description_lines = value.splitlines()
-            value = "\n".join(
-                (
-                    description_lines[0].lstrip(),
-                    dedent("\n".join(description_lines[1:])),
-                    "\n",
-                )
-            )
-            metadata.set_payload(value)
-        elif key_lower == "home-page":
-            metadata.add_header("Project-URL", f"Homepage, {value}")
-        elif key_lower == "download-url":
-            metadata.add_header("Project-URL", f"Download, {value}")
-        else:
-            metadata.add_header(key, value)
-
-    metadata.replace_header("Metadata-Version", "2.4")
-
-
-def normalize(name: str) -> str:
-    return re.sub(r"[-_.]+", "-", name).lower().replace("-", "_")
-
-
-class ConvertSource(metaclass=ABCMeta):
-    name: str
-    version: str
-    pyver: str = "py2.py3"
-    abi: str = "none"
-    platform: str = "any"
-    metadata: Message
-
-    @property
-    def dist_info_dir(self) -> str:
-        return f"{self.name}-{self.version}.dist-info"
-
-    @abstractmethod
-    def generate_contents(self) -> Iterator[tuple[str, bytes]]:
-        pass
-
-
-class EggFileSource(ConvertSource):
-    def __init__(self, path: Path):
-        if not (match := egg_filename_re.match(path.name)):
-            raise ValueError(f"Invalid egg file name: {path.name}")
-
-        # Binary wheels are assumed to be for CPython
-        self.path = path
-        self.name = normalize(match.group("name"))
-        self.version = match.group("ver")
-        if pyver := match.group("pyver"):
-            self.pyver = pyver.replace(".", "")
-            if arch := match.group("arch"):
-                self.abi = self.pyver.replace("py", "cp")
-                self.platform = normalize(arch)
-
-        self.metadata = Message()
-
-    def generate_contents(self) -> Iterator[tuple[str, bytes]]:
-        with ZipFile(self.path, "r") as zip_file:
-            for filename in sorted(zip_file.namelist()):
-                # Skip pure directory entries
-                if filename.endswith("/"):
-                    continue
-
-                # Handle files in the egg-info directory specially, selectively moving
-                # them to the dist-info directory while converting as needed
-                if filename.startswith("EGG-INFO/"):
-                    if filename == "EGG-INFO/requires.txt":
-                        requires = zip_file.read(filename).decode("utf-8")
-                        convert_requires(requires, self.metadata)
-                    elif filename == "EGG-INFO/PKG-INFO":
-                        pkginfo = zip_file.read(filename).decode("utf-8")
-                        convert_pkg_info(pkginfo, self.metadata)
-                    elif filename == "EGG-INFO/entry_points.txt":
-                        yield (
-                            f"{self.dist_info_dir}/entry_points.txt",
-                            zip_file.read(filename),
-                        )
-
-                    continue
-
-                # For any other file, just pass it through
-                yield filename, zip_file.read(filename)
-
-
-class EggDirectorySource(EggFileSource):
-    def generate_contents(self) -> Iterator[tuple[str, bytes]]:
-        for dirpath, _, filenames in os.walk(self.path):
-            for filename in sorted(filenames):
-                path = Path(dirpath, filename)
-                if path.parent.name == "EGG-INFO":
-                    if path.name == "requires.txt":
-                        requires = path.read_text("utf-8")
-                        convert_requires(requires, self.metadata)
-                    elif path.name == "PKG-INFO":
-                        pkginfo = path.read_text("utf-8")
-                        convert_pkg_info(pkginfo, self.metadata)
-                        if name := self.metadata.get("Name"):
-                            self.name = normalize(name)
-
-                        if version := self.metadata.get("Version"):
-                            self.version = version
-                    elif path.name == "entry_points.txt":
-                        yield (
-                            f"{self.dist_info_dir}/entry_points.txt",
-                            path.read_bytes(),
-                        )
-
-                    continue
-
-                # For any other file, just pass it through
-                yield str(path.relative_to(self.path)), path.read_bytes()
-
-
-class WininstFileSource(ConvertSource):
-    """
-    Handles distributions created with ``bdist_wininst``.
-
-    The egginfo filename has the format::
-
-        name-ver(-pyver)(-arch).egg-info
-
-    The installer filename has the format::
-
-        name-ver.arch(-pyver).exe
-
-    Some things to note:
-
-    1. The installer filename is not definitive. An installer can be renamed
-       and work perfectly well as an installer. So more reliable data should
-       be used whenever possible.
-    2. The egg-info data should be preferred for the name and version, because
-       these come straight from the distutils metadata, and are mandatory.
-    3. The pyver from the egg-info data should be ignored, as it is
-       constructed from the version of Python used to build the installer,
-       which is irrelevant - the installer filename is correct here (even to
-       the point that when it's not there, any version is implied).
-    4. The architecture must be taken from the installer filename, as it is
-       not included in the egg-info data.
-    5. Architecture-neutral installers still have an architecture because the
-       installer format itself (being executable) is architecture-specific. We
-       should therefore ignore the architecture if the content is pure-python.
-    """
-
-    def __init__(self, path: Path):
-        self.path = path
-        self.metadata = Message()
-
-        # Determine the initial architecture and Python version from the file name
-        # (if possible)
-        if match := wininst_re.search(path.name):
-            self.platform = normalize(match.group("platform"))
-            if pyver := match.group("pyver"):
-                self.pyver = pyver.replace(".", "")
-
-        # Look for an .egg-info directory and any .pyd files for more precise info
-        egg_info_found = pyd_found = False
-        with ZipFile(self.path) as zip_file:
-            for filename in zip_file.namelist():
-                prefix, filename = filename.split("/", 1)
-                if not egg_info_found and (match := egg_info_re.match(filename)):
-                    egg_info_found = True
-                    self.name = normalize(match.group("name"))
-                    self.version = match.group("ver")
-                    if pyver := match.group("pyver"):
-                        self.pyver = pyver.replace(".", "")
-                elif not pyd_found and (match := pyd_re.search(filename)):
-                    pyd_found = True
-                    self.abi = match.group("abi")
-                    self.platform = match.group("platform")
-
-                if egg_info_found and pyd_found:
-                    break
-
-    def generate_contents(self) -> Iterator[tuple[str, bytes]]:
-        dist_info_dir = f"{self.name}-{self.version}.dist-info"
-        data_dir = f"{self.name}-{self.version}.data"
-        with ZipFile(self.path, "r") as zip_file:
-            for filename in sorted(zip_file.namelist()):
-                # Skip pure directory entries
-                if filename.endswith("/"):
-                    continue
-
-                # Handle files in the egg-info directory specially, selectively moving
-                # them to the dist-info directory while converting as needed
-                prefix, target_filename = filename.split("/", 1)
-                if egg_info_re.search(target_filename):
-                    basename = target_filename.rsplit("/", 1)[-1]
-                    if basename == "requires.txt":
-                        requires = zip_file.read(filename).decode("utf-8")
-                        convert_requires(requires, self.metadata)
-                    elif basename == "PKG-INFO":
-                        pkginfo = zip_file.read(filename).decode("utf-8")
-                        convert_pkg_info(pkginfo, self.metadata)
-                    elif basename == "entry_points.txt":
-                        yield (
-                            f"{dist_info_dir}/entry_points.txt",
-                            zip_file.read(filename),
-                        )
-
-                    continue
-                elif prefix == "SCRIPTS":
-                    target_filename = f"{data_dir}/scripts/{target_filename}"
-
-                # For any other file, just pass it through
-                yield target_filename, zip_file.read(filename)
-
-
-def convert(files: list[str], dest_dir: str, verbose: bool) -> None:
-    for pat in files:
-        for archive in iglob(pat):
-            path = Path(archive)
-            if path.suffix == ".egg":
-                if path.is_dir():
-                    source: ConvertSource = EggDirectorySource(path)
-                else:
-                    source = EggFileSource(path)
-            else:
-                source = WininstFileSource(path)
-
-            if verbose:
-                print(f"{archive}...", flush=True, end="")
-
-            dest_path = Path(dest_dir) / (
-                f"{source.name}-{source.version}-{source.pyver}-{source.abi}"
-                f"-{source.platform}.whl"
-            )
-            with WheelFile(dest_path, "w") as wheelfile:
-                for name_or_zinfo, contents in source.generate_contents():
-                    wheelfile.writestr(name_or_zinfo, contents)
-
-                # Write the METADATA file
-                wheelfile.writestr(
-                    f"{source.dist_info_dir}/METADATA",
-                    source.metadata.as_string(policy=serialization_policy).encode(
-                        "utf-8"
-                    ),
-                )
-
-                # Write the WHEEL file
-                wheel_message = Message()
-                wheel_message.add_header("Wheel-Version", "1.0")
-                wheel_message.add_header("Generator", GENERATOR)
-                wheel_message.add_header(
-                    "Root-Is-Purelib", str(source.platform == "any").lower()
-                )
-                tags = parse_tag(f"{source.pyver}-{source.abi}-{source.platform}")
-                for tag in sorted(tags, key=lambda tag: tag.interpreter):
-                    wheel_message.add_header("Tag", str(tag))
-
-                wheelfile.writestr(
-                    f"{source.dist_info_dir}/WHEEL",
-                    wheel_message.as_string(policy=serialization_policy).encode(
-                        "utf-8"
-                    ),
-                )
-
-            if verbose:
-                print("OK")
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/pack.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/pack.py
deleted file mode 100644
index 64469c0..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/pack.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from __future__ import annotations
-
-import email.policy
-import os.path
-import re
-from email.generator import BytesGenerator
-from email.parser import BytesParser
-
-from wheel.cli import WheelError
-from wheel.wheelfile import WheelFile
-
-DIST_INFO_RE = re.compile(r"^(?P(?P.+?)-(?P\d.*?))\.dist-info$")
-
-
-def pack(directory: str, dest_dir: str, build_number: str | None) -> None:
-    """Repack a previously unpacked wheel directory into a new wheel file.
-
-    The .dist-info/WHEEL file must contain one or more tags so that the target
-    wheel file name can be determined.
-
-    :param directory: The unpacked wheel directory
-    :param dest_dir: Destination directory (defaults to the current directory)
-    """
-    # Find the .dist-info directory
-    dist_info_dirs = [
-        fn
-        for fn in os.listdir(directory)
-        if os.path.isdir(os.path.join(directory, fn)) and DIST_INFO_RE.match(fn)
-    ]
-    if len(dist_info_dirs) > 1:
-        raise WheelError(f"Multiple .dist-info directories found in {directory}")
-    elif not dist_info_dirs:
-        raise WheelError(f"No .dist-info directories found in {directory}")
-
-    # Determine the target wheel filename
-    dist_info_dir = dist_info_dirs[0]
-    name_version = DIST_INFO_RE.match(dist_info_dir).group("namever")
-
-    # Read the tags and the existing build number from .dist-info/WHEEL
-    wheel_file_path = os.path.join(directory, dist_info_dir, "WHEEL")
-    with open(wheel_file_path, "rb") as f:
-        info = BytesParser(policy=email.policy.compat32).parse(f)
-        tags: list[str] = info.get_all("Tag", [])
-        existing_build_number = info.get("Build")
-
-        if not tags:
-            raise WheelError(
-                f"No tags present in {dist_info_dir}/WHEEL; cannot determine target "
-                f"wheel filename"
-            )
-
-    # Set the wheel file name and add/replace/remove the Build tag in .dist-info/WHEEL
-    build_number = build_number if build_number is not None else existing_build_number
-    if build_number is not None:
-        del info["Build"]
-        if build_number:
-            info["Build"] = build_number
-            name_version += "-" + build_number
-
-        if build_number != existing_build_number:
-            with open(wheel_file_path, "wb") as f:
-                BytesGenerator(f, maxheaderlen=0).flatten(info)
-
-    # Reassemble the tags for the wheel file
-    tagline = compute_tagline(tags)
-
-    # Repack the wheel
-    wheel_path = os.path.join(dest_dir, f"{name_version}-{tagline}.whl")
-    with WheelFile(wheel_path, "w") as wf:
-        print(f"Repacking wheel as {wheel_path}...", end="", flush=True)
-        wf.write_files(directory)
-
-    print("OK")
-
-
-def compute_tagline(tags: list[str]) -> str:
-    """Compute a tagline from a list of tags.
-
-    :param tags: A list of tags
-    :return: A tagline
-    """
-    impls = sorted({tag.split("-")[0] for tag in tags})
-    abivers = sorted({tag.split("-")[1] for tag in tags})
-    platforms = sorted({tag.split("-")[2] for tag in tags})
-    return "-".join([".".join(impls), ".".join(abivers), ".".join(platforms)])
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/tags.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/tags.py
deleted file mode 100644
index 88da72e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/tags.py
+++ /dev/null
@@ -1,139 +0,0 @@
-from __future__ import annotations
-
-import email.policy
-import itertools
-import os
-from collections.abc import Iterable
-from email.parser import BytesParser
-
-from ..wheelfile import WheelFile
-
-
-def _compute_tags(original_tags: Iterable[str], new_tags: str | None) -> set[str]:
-    """Add or replace tags. Supports dot-separated tags"""
-    if new_tags is None:
-        return set(original_tags)
-
-    if new_tags.startswith("+"):
-        return {*original_tags, *new_tags[1:].split(".")}
-
-    if new_tags.startswith("-"):
-        return set(original_tags) - set(new_tags[1:].split("."))
-
-    return set(new_tags.split("."))
-
-
-def tags(
-    wheel: str,
-    python_tags: str | None = None,
-    abi_tags: str | None = None,
-    platform_tags: str | None = None,
-    build_tag: str | None = None,
-    remove: bool = False,
-) -> str:
-    """Change the tags on a wheel file.
-
-    The tags are left unchanged if they are not specified. To specify "none",
-    use ["none"]. To append to the previous tags, a tag should start with a
-    "+".  If a tag starts with "-", it will be removed from existing tags.
-    Processing is done left to right.
-
-    :param wheel: The paths to the wheels
-    :param python_tags: The Python tags to set
-    :param abi_tags: The ABI tags to set
-    :param platform_tags: The platform tags to set
-    :param build_tag: The build tag to set
-    :param remove: Remove the original wheel
-    """
-    with WheelFile(wheel, "r") as f:
-        assert f.filename, f"{f.filename} must be available"
-
-        wheel_info = f.read(f.dist_info_path + "/WHEEL")
-        info = BytesParser(policy=email.policy.compat32).parsebytes(wheel_info)
-
-        original_wheel_name = os.path.basename(f.filename)
-        namever = f.parsed_filename.group("namever")
-        build = f.parsed_filename.group("build")
-        original_python_tags = f.parsed_filename.group("pyver").split(".")
-        original_abi_tags = f.parsed_filename.group("abi").split(".")
-        original_plat_tags = f.parsed_filename.group("plat").split(".")
-
-    tags: list[str] = info.get_all("Tag", [])
-    existing_build_tag = info.get("Build")
-
-    impls = {tag.split("-")[0] for tag in tags}
-    abivers = {tag.split("-")[1] for tag in tags}
-    platforms = {tag.split("-")[2] for tag in tags}
-
-    if impls != set(original_python_tags):
-        msg = f"Wheel internal tags {impls!r} != filename tags {original_python_tags!r}"
-        raise AssertionError(msg)
-
-    if abivers != set(original_abi_tags):
-        msg = f"Wheel internal tags {abivers!r} != filename tags {original_abi_tags!r}"
-        raise AssertionError(msg)
-
-    if platforms != set(original_plat_tags):
-        msg = (
-            f"Wheel internal tags {platforms!r} != filename tags {original_plat_tags!r}"
-        )
-        raise AssertionError(msg)
-
-    if existing_build_tag != build:
-        msg = (
-            f"Incorrect filename '{build}' "
-            f"& *.dist-info/WHEEL '{existing_build_tag}' build numbers"
-        )
-        raise AssertionError(msg)
-
-    # Start changing as needed
-    if build_tag is not None:
-        build = build_tag
-
-    final_python_tags = sorted(_compute_tags(original_python_tags, python_tags))
-    final_abi_tags = sorted(_compute_tags(original_abi_tags, abi_tags))
-    final_plat_tags = sorted(_compute_tags(original_plat_tags, platform_tags))
-
-    final_tags = [
-        namever,
-        ".".join(final_python_tags),
-        ".".join(final_abi_tags),
-        ".".join(final_plat_tags),
-    ]
-    if build:
-        final_tags.insert(1, build)
-
-    final_wheel_name = "-".join(final_tags) + ".whl"
-
-    if original_wheel_name != final_wheel_name:
-        del info["Tag"], info["Build"]
-        for a, b, c in itertools.product(
-            final_python_tags, final_abi_tags, final_plat_tags
-        ):
-            info["Tag"] = f"{a}-{b}-{c}"
-        if build:
-            info["Build"] = build
-
-        original_wheel_path = os.path.join(
-            os.path.dirname(f.filename), original_wheel_name
-        )
-        final_wheel_path = os.path.join(os.path.dirname(f.filename), final_wheel_name)
-
-        with WheelFile(original_wheel_path, "r") as fin, WheelFile(
-            final_wheel_path, "w"
-        ) as fout:
-            fout.comment = fin.comment  # preserve the comment
-            for item in fin.infolist():
-                if item.is_dir():
-                    continue
-                if item.filename == f.dist_info_path + "/RECORD":
-                    continue
-                if item.filename == f.dist_info_path + "/WHEEL":
-                    fout.writestr(item, info.as_bytes())
-                else:
-                    fout.writestr(item, fin.read(item))
-
-        if remove:
-            os.remove(original_wheel_path)
-
-    return final_wheel_name
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/unpack.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/unpack.py
deleted file mode 100644
index d48840e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/cli/unpack.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from pathlib import Path
-
-from ..wheelfile import WheelFile
-
-
-def unpack(path: str, dest: str = ".") -> None:
-    """Unpack a wheel.
-
-    Wheel content will be unpacked to {dest}/{name}-{ver}, where {name}
-    is the package name and {ver} its version.
-
-    :param path: The path to the wheel.
-    :param dest: Destination directory (default to current directory).
-    """
-    with WheelFile(path) as wf:
-        namever = wf.parsed_filename.group("namever")
-        destination = Path(dest) / namever
-        print(f"Unpacking to: {destination}...", end="", flush=True)
-        for zinfo in wf.filelist:
-            wf.extract(zinfo, destination)
-
-            # Set permissions to the same values as they were set in the archive
-            # We have to do this manually due to
-            # https://github.com/python/cpython/issues/59999
-            permissions = zinfo.external_attr >> 16 & 0o777
-            destination.joinpath(zinfo.filename).chmod(permissions)
-
-    print("OK")
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/macosx_libfile.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/macosx_libfile.py
deleted file mode 100644
index abdfc9e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/macosx_libfile.py
+++ /dev/null
@@ -1,482 +0,0 @@
-"""
-This module contains function to analyse dynamic library
-headers to extract system information
-
-Currently only for MacOSX
-
-Library file on macosx system starts with Mach-O or Fat field.
-This can be distinguish by first 32 bites and it is called magic number.
-Proper value of magic number is with suffix _MAGIC. Suffix _CIGAM means
-reversed bytes order.
-Both fields can occur in two types: 32 and 64 bytes.
-
-FAT field inform that this library contains few version of library
-(typically for different types version). It contains
-information where Mach-O headers starts.
-
-Each section started with Mach-O header contains one library
-(So if file starts with this field it contains only one version).
-
-After filed Mach-O there are section fields.
-Each of them starts with two fields:
-cmd - magic number for this command
-cmdsize - total size occupied by this section information.
-
-In this case only sections LC_VERSION_MIN_MACOSX (for macosx 10.13 and earlier)
-and LC_BUILD_VERSION (for macosx 10.14 and newer) are interesting,
-because them contains information about minimal system version.
-
-Important remarks:
-- For fat files this implementation looks for maximum number version.
-  It not check if it is 32 or 64 and do not compare it with currently built package.
-  So it is possible to false report higher version that needed.
-- All structures signatures are taken form macosx header files.
-- I think that binary format will be more stable than `otool` output.
-  and if apple introduce some changes both implementation will need to be updated.
-- The system compile will set the deployment target no lower than
-  11.0 for arm64 builds. For "Universal 2" builds use the x86_64 deployment
-  target when the arm64 target is 11.0.
-"""
-
-from __future__ import annotations
-
-import ctypes
-import os
-import sys
-from io import BufferedIOBase
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Union
-
-    StrPath = Union[str, os.PathLike[str]]
-
-"""here the needed const and struct from mach-o header files"""
-
-FAT_MAGIC = 0xCAFEBABE
-FAT_CIGAM = 0xBEBAFECA
-FAT_MAGIC_64 = 0xCAFEBABF
-FAT_CIGAM_64 = 0xBFBAFECA
-MH_MAGIC = 0xFEEDFACE
-MH_CIGAM = 0xCEFAEDFE
-MH_MAGIC_64 = 0xFEEDFACF
-MH_CIGAM_64 = 0xCFFAEDFE
-
-LC_VERSION_MIN_MACOSX = 0x24
-LC_BUILD_VERSION = 0x32
-
-CPU_TYPE_ARM64 = 0x0100000C
-
-mach_header_fields = [
-    ("magic", ctypes.c_uint32),
-    ("cputype", ctypes.c_int),
-    ("cpusubtype", ctypes.c_int),
-    ("filetype", ctypes.c_uint32),
-    ("ncmds", ctypes.c_uint32),
-    ("sizeofcmds", ctypes.c_uint32),
-    ("flags", ctypes.c_uint32),
-]
-"""
-struct mach_header {
-    uint32_t	magic;		/* mach magic number identifier */
-    cpu_type_t	cputype;	/* cpu specifier */
-    cpu_subtype_t	cpusubtype;	/* machine specifier */
-    uint32_t	filetype;	/* type of file */
-    uint32_t	ncmds;		/* number of load commands */
-    uint32_t	sizeofcmds;	/* the size of all the load commands */
-    uint32_t	flags;		/* flags */
-};
-typedef integer_t cpu_type_t;
-typedef integer_t cpu_subtype_t;
-"""
-
-mach_header_fields_64 = mach_header_fields + [("reserved", ctypes.c_uint32)]
-"""
-struct mach_header_64 {
-    uint32_t	magic;		/* mach magic number identifier */
-    cpu_type_t	cputype;	/* cpu specifier */
-    cpu_subtype_t	cpusubtype;	/* machine specifier */
-    uint32_t	filetype;	/* type of file */
-    uint32_t	ncmds;		/* number of load commands */
-    uint32_t	sizeofcmds;	/* the size of all the load commands */
-    uint32_t	flags;		/* flags */
-    uint32_t	reserved;	/* reserved */
-};
-"""
-
-fat_header_fields = [("magic", ctypes.c_uint32), ("nfat_arch", ctypes.c_uint32)]
-"""
-struct fat_header {
-    uint32_t	magic;		/* FAT_MAGIC or FAT_MAGIC_64 */
-    uint32_t	nfat_arch;	/* number of structs that follow */
-};
-"""
-
-fat_arch_fields = [
-    ("cputype", ctypes.c_int),
-    ("cpusubtype", ctypes.c_int),
-    ("offset", ctypes.c_uint32),
-    ("size", ctypes.c_uint32),
-    ("align", ctypes.c_uint32),
-]
-"""
-struct fat_arch {
-    cpu_type_t	cputype;	/* cpu specifier (int) */
-    cpu_subtype_t	cpusubtype;	/* machine specifier (int) */
-    uint32_t	offset;		/* file offset to this object file */
-    uint32_t	size;		/* size of this object file */
-    uint32_t	align;		/* alignment as a power of 2 */
-};
-"""
-
-fat_arch_64_fields = [
-    ("cputype", ctypes.c_int),
-    ("cpusubtype", ctypes.c_int),
-    ("offset", ctypes.c_uint64),
-    ("size", ctypes.c_uint64),
-    ("align", ctypes.c_uint32),
-    ("reserved", ctypes.c_uint32),
-]
-"""
-struct fat_arch_64 {
-    cpu_type_t	cputype;	/* cpu specifier (int) */
-    cpu_subtype_t	cpusubtype;	/* machine specifier (int) */
-    uint64_t	offset;		/* file offset to this object file */
-    uint64_t	size;		/* size of this object file */
-    uint32_t	align;		/* alignment as a power of 2 */
-    uint32_t	reserved;	/* reserved */
-};
-"""
-
-segment_base_fields = [("cmd", ctypes.c_uint32), ("cmdsize", ctypes.c_uint32)]
-"""base for reading segment info"""
-
-segment_command_fields = [
-    ("cmd", ctypes.c_uint32),
-    ("cmdsize", ctypes.c_uint32),
-    ("segname", ctypes.c_char * 16),
-    ("vmaddr", ctypes.c_uint32),
-    ("vmsize", ctypes.c_uint32),
-    ("fileoff", ctypes.c_uint32),
-    ("filesize", ctypes.c_uint32),
-    ("maxprot", ctypes.c_int),
-    ("initprot", ctypes.c_int),
-    ("nsects", ctypes.c_uint32),
-    ("flags", ctypes.c_uint32),
-]
-"""
-struct segment_command { /* for 32-bit architectures */
-    uint32_t	cmd;		/* LC_SEGMENT */
-    uint32_t	cmdsize;	/* includes sizeof section structs */
-    char		segname[16];	/* segment name */
-    uint32_t	vmaddr;		/* memory address of this segment */
-    uint32_t	vmsize;		/* memory size of this segment */
-    uint32_t	fileoff;	/* file offset of this segment */
-    uint32_t	filesize;	/* amount to map from the file */
-    vm_prot_t	maxprot;	/* maximum VM protection */
-    vm_prot_t	initprot;	/* initial VM protection */
-    uint32_t	nsects;		/* number of sections in segment */
-    uint32_t	flags;		/* flags */
-};
-typedef int vm_prot_t;
-"""
-
-segment_command_fields_64 = [
-    ("cmd", ctypes.c_uint32),
-    ("cmdsize", ctypes.c_uint32),
-    ("segname", ctypes.c_char * 16),
-    ("vmaddr", ctypes.c_uint64),
-    ("vmsize", ctypes.c_uint64),
-    ("fileoff", ctypes.c_uint64),
-    ("filesize", ctypes.c_uint64),
-    ("maxprot", ctypes.c_int),
-    ("initprot", ctypes.c_int),
-    ("nsects", ctypes.c_uint32),
-    ("flags", ctypes.c_uint32),
-]
-"""
-struct segment_command_64 { /* for 64-bit architectures */
-    uint32_t	cmd;		/* LC_SEGMENT_64 */
-    uint32_t	cmdsize;	/* includes sizeof section_64 structs */
-    char		segname[16];	/* segment name */
-    uint64_t	vmaddr;		/* memory address of this segment */
-    uint64_t	vmsize;		/* memory size of this segment */
-    uint64_t	fileoff;	/* file offset of this segment */
-    uint64_t	filesize;	/* amount to map from the file */
-    vm_prot_t	maxprot;	/* maximum VM protection */
-    vm_prot_t	initprot;	/* initial VM protection */
-    uint32_t	nsects;		/* number of sections in segment */
-    uint32_t	flags;		/* flags */
-};
-"""
-
-version_min_command_fields = segment_base_fields + [
-    ("version", ctypes.c_uint32),
-    ("sdk", ctypes.c_uint32),
-]
-"""
-struct version_min_command {
-    uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
-                               LC_VERSION_MIN_IPHONEOS or
-                               LC_VERSION_MIN_WATCHOS or
-                               LC_VERSION_MIN_TVOS */
-    uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
-    uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-    uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-};
-"""
-
-build_version_command_fields = segment_base_fields + [
-    ("platform", ctypes.c_uint32),
-    ("minos", ctypes.c_uint32),
-    ("sdk", ctypes.c_uint32),
-    ("ntools", ctypes.c_uint32),
-]
-"""
-struct build_version_command {
-    uint32_t	cmd;		/* LC_BUILD_VERSION */
-    uint32_t	cmdsize;	/* sizeof(struct build_version_command) plus */
-                                /* ntools * sizeof(struct build_tool_version) */
-    uint32_t	platform;	/* platform */
-    uint32_t	minos;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-    uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-    uint32_t	ntools;		/* number of tool entries following this */
-};
-"""
-
-
-def swap32(x: int) -> int:
-    return (
-        ((x << 24) & 0xFF000000)
-        | ((x << 8) & 0x00FF0000)
-        | ((x >> 8) & 0x0000FF00)
-        | ((x >> 24) & 0x000000FF)
-    )
-
-
-def get_base_class_and_magic_number(
-    lib_file: BufferedIOBase,
-    seek: int | None = None,
-) -> tuple[type[ctypes.Structure], int]:
-    if seek is None:
-        seek = lib_file.tell()
-    else:
-        lib_file.seek(seek)
-    magic_number = ctypes.c_uint32.from_buffer_copy(
-        lib_file.read(ctypes.sizeof(ctypes.c_uint32))
-    ).value
-
-    # Handle wrong byte order
-    if magic_number in [FAT_CIGAM, FAT_CIGAM_64, MH_CIGAM, MH_CIGAM_64]:
-        if sys.byteorder == "little":
-            BaseClass = ctypes.BigEndianStructure
-        else:
-            BaseClass = ctypes.LittleEndianStructure
-
-        magic_number = swap32(magic_number)
-    else:
-        BaseClass = ctypes.Structure
-
-    lib_file.seek(seek)
-    return BaseClass, magic_number
-
-
-def read_data(struct_class: type[ctypes.Structure], lib_file: BufferedIOBase):
-    return struct_class.from_buffer_copy(lib_file.read(ctypes.sizeof(struct_class)))
-
-
-def extract_macosx_min_system_version(path_to_lib: str):
-    with open(path_to_lib, "rb") as lib_file:
-        BaseClass, magic_number = get_base_class_and_magic_number(lib_file, 0)
-        if magic_number not in [FAT_MAGIC, FAT_MAGIC_64, MH_MAGIC, MH_MAGIC_64]:
-            return
-
-        if magic_number in [FAT_MAGIC, FAT_CIGAM_64]:
-
-            class FatHeader(BaseClass):
-                _fields_ = fat_header_fields
-
-            fat_header = read_data(FatHeader, lib_file)
-            if magic_number == FAT_MAGIC:
-
-                class FatArch(BaseClass):
-                    _fields_ = fat_arch_fields
-
-            else:
-
-                class FatArch(BaseClass):
-                    _fields_ = fat_arch_64_fields
-
-            fat_arch_list = [
-                read_data(FatArch, lib_file) for _ in range(fat_header.nfat_arch)
-            ]
-
-            versions_list: list[tuple[int, int, int]] = []
-            for el in fat_arch_list:
-                try:
-                    version = read_mach_header(lib_file, el.offset)
-                    if version is not None:
-                        if el.cputype == CPU_TYPE_ARM64 and len(fat_arch_list) != 1:
-                            # Xcode will not set the deployment target below 11.0.0
-                            # for the arm64 architecture. Ignore the arm64 deployment
-                            # in fat binaries when the target is 11.0.0, that way
-                            # the other architectures can select a lower deployment
-                            # target.
-                            # This is safe because there is no arm64 variant for
-                            # macOS 10.15 or earlier.
-                            if version == (11, 0, 0):
-                                continue
-                        versions_list.append(version)
-                except ValueError:
-                    pass
-
-            if len(versions_list) > 0:
-                return max(versions_list)
-            else:
-                return None
-
-        else:
-            try:
-                return read_mach_header(lib_file, 0)
-            except ValueError:
-                """when some error during read library files"""
-                return None
-
-
-def read_mach_header(
-    lib_file: BufferedIOBase,
-    seek: int | None = None,
-) -> tuple[int, int, int] | None:
-    """
-    This function parses a Mach-O header and extracts
-    information about the minimal macOS version.
-
-    :param lib_file: reference to opened library file with pointer
-    """
-    base_class, magic_number = get_base_class_and_magic_number(lib_file, seek)
-    arch = "32" if magic_number == MH_MAGIC else "64"
-
-    class SegmentBase(base_class):
-        _fields_ = segment_base_fields
-
-    if arch == "32":
-
-        class MachHeader(base_class):
-            _fields_ = mach_header_fields
-
-    else:
-
-        class MachHeader(base_class):
-            _fields_ = mach_header_fields_64
-
-    mach_header = read_data(MachHeader, lib_file)
-    for _i in range(mach_header.ncmds):
-        pos = lib_file.tell()
-        segment_base = read_data(SegmentBase, lib_file)
-        lib_file.seek(pos)
-        if segment_base.cmd == LC_VERSION_MIN_MACOSX:
-
-            class VersionMinCommand(base_class):
-                _fields_ = version_min_command_fields
-
-            version_info = read_data(VersionMinCommand, lib_file)
-            return parse_version(version_info.version)
-        elif segment_base.cmd == LC_BUILD_VERSION:
-
-            class VersionBuild(base_class):
-                _fields_ = build_version_command_fields
-
-            version_info = read_data(VersionBuild, lib_file)
-            return parse_version(version_info.minos)
-        else:
-            lib_file.seek(pos + segment_base.cmdsize)
-            continue
-
-
-def parse_version(version: int) -> tuple[int, int, int]:
-    x = (version & 0xFFFF0000) >> 16
-    y = (version & 0x0000FF00) >> 8
-    z = version & 0x000000FF
-    return x, y, z
-
-
-def calculate_macosx_platform_tag(archive_root: StrPath, platform_tag: str) -> str:
-    """
-    Calculate proper macosx platform tag basing on files which are included to wheel
-
-    Example platform tag `macosx-10.14-x86_64`
-    """
-    prefix, base_version, suffix = platform_tag.split("-")
-    base_version = tuple(int(x) for x in base_version.split("."))
-    base_version = base_version[:2]
-    if base_version[0] > 10:
-        base_version = (base_version[0], 0)
-    assert len(base_version) == 2
-    if "MACOSX_DEPLOYMENT_TARGET" in os.environ:
-        deploy_target = tuple(
-            int(x) for x in os.environ["MACOSX_DEPLOYMENT_TARGET"].split(".")
-        )
-        deploy_target = deploy_target[:2]
-        if deploy_target[0] > 10:
-            deploy_target = (deploy_target[0], 0)
-        if deploy_target < base_version:
-            sys.stderr.write(
-                "[WARNING] MACOSX_DEPLOYMENT_TARGET is set to a lower value ({}) than "
-                "the version on which the Python interpreter was compiled ({}), and "
-                "will be ignored.\n".format(
-                    ".".join(str(x) for x in deploy_target),
-                    ".".join(str(x) for x in base_version),
-                )
-            )
-        else:
-            base_version = deploy_target
-
-    assert len(base_version) == 2
-    start_version = base_version
-    versions_dict: dict[str, tuple[int, int]] = {}
-    for dirpath, _dirnames, filenames in os.walk(archive_root):
-        for filename in filenames:
-            if filename.endswith(".dylib") or filename.endswith(".so"):
-                lib_path = os.path.join(dirpath, filename)
-                min_ver = extract_macosx_min_system_version(lib_path)
-                if min_ver is not None:
-                    min_ver = min_ver[0:2]
-                    if min_ver[0] > 10:
-                        min_ver = (min_ver[0], 0)
-                    versions_dict[lib_path] = min_ver
-
-    if len(versions_dict) > 0:
-        base_version = max(base_version, max(versions_dict.values()))
-
-    # macosx platform tag do not support minor bugfix release
-    fin_base_version = "_".join([str(x) for x in base_version])
-    if start_version < base_version:
-        problematic_files = [k for k, v in versions_dict.items() if v > start_version]
-        problematic_files = "\n".join(problematic_files)
-        if len(problematic_files) == 1:
-            files_form = "this file"
-        else:
-            files_form = "these files"
-        error_message = (
-            "[WARNING] This wheel needs a higher macOS version than {}  "
-            "To silence this warning, set MACOSX_DEPLOYMENT_TARGET to at least "
-            + fin_base_version
-            + " or recreate "
-            + files_form
-            + " with lower "
-            "MACOSX_DEPLOYMENT_TARGET:  \n" + problematic_files
-        )
-
-        if "MACOSX_DEPLOYMENT_TARGET" in os.environ:
-            error_message = error_message.format(
-                "is set in MACOSX_DEPLOYMENT_TARGET variable."
-            )
-        else:
-            error_message = error_message.format(
-                "the version your Python interpreter is compiled against."
-            )
-
-        sys.stderr.write(error_message)
-
-    platform_tag = prefix + "_" + fin_base_version + "_" + suffix
-    return platform_tag
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/metadata.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/metadata.py
deleted file mode 100644
index b8098fa..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/metadata.py
+++ /dev/null
@@ -1,183 +0,0 @@
-"""
-Tools for converting old- to new-style metadata.
-"""
-
-from __future__ import annotations
-
-import functools
-import itertools
-import os.path
-import re
-import textwrap
-from email.message import Message
-from email.parser import Parser
-from typing import Generator, Iterable, Iterator, Literal
-
-from .vendored.packaging.requirements import Requirement
-
-
-def _nonblank(str: str) -> bool | Literal[""]:
-    return str and not str.startswith("#")
-
-
-@functools.singledispatch
-def yield_lines(iterable: Iterable[str]) -> Iterator[str]:
-    r"""
-    Yield valid lines of a string or iterable.
-    >>> list(yield_lines(''))
-    []
-    >>> list(yield_lines(['foo', 'bar']))
-    ['foo', 'bar']
-    >>> list(yield_lines('foo\nbar'))
-    ['foo', 'bar']
-    >>> list(yield_lines('\nfoo\n#bar\nbaz #comment'))
-    ['foo', 'baz #comment']
-    >>> list(yield_lines(['foo\nbar', 'baz', 'bing\n\n\n']))
-    ['foo', 'bar', 'baz', 'bing']
-    """
-    return itertools.chain.from_iterable(map(yield_lines, iterable))
-
-
-@yield_lines.register(str)
-def _(text: str) -> Iterator[str]:
-    return filter(_nonblank, map(str.strip, text.splitlines()))
-
-
-def split_sections(
-    s: str | Iterator[str],
-) -> Generator[tuple[str | None, list[str]], None, None]:
-    """Split a string or iterable thereof into (section, content) pairs
-    Each ``section`` is a stripped version of the section header ("[section]")
-    and each ``content`` is a list of stripped lines excluding blank lines and
-    comment-only lines.  If there are any such lines before the first section
-    header, they're returned in a first ``section`` of ``None``.
-    """
-    section = None
-    content: list[str] = []
-    for line in yield_lines(s):
-        if line.startswith("["):
-            if line.endswith("]"):
-                if section or content:
-                    yield section, content
-                section = line[1:-1].strip()
-                content = []
-            else:
-                raise ValueError("Invalid section heading", line)
-        else:
-            content.append(line)
-
-    # wrap up last segment
-    yield section, content
-
-
-def safe_extra(extra: str) -> str:
-    """Convert an arbitrary string to a standard 'extra' name
-    Any runs of non-alphanumeric characters are replaced with a single '_',
-    and the result is always lowercased.
-    """
-    return re.sub("[^A-Za-z0-9.-]+", "_", extra).lower()
-
-
-def safe_name(name: str) -> str:
-    """Convert an arbitrary string to a standard distribution name
-    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
-    """
-    return re.sub("[^A-Za-z0-9.]+", "-", name)
-
-
-def requires_to_requires_dist(requirement: Requirement) -> str:
-    """Return the version specifier for a requirement in PEP 345/566 fashion."""
-    if requirement.url:
-        return " @ " + requirement.url
-
-    requires_dist: list[str] = []
-    for spec in requirement.specifier:
-        requires_dist.append(spec.operator + spec.version)
-
-    if requires_dist:
-        return " " + ",".join(sorted(requires_dist))
-    else:
-        return ""
-
-
-def convert_requirements(requirements: list[str]) -> Iterator[str]:
-    """Yield Requires-Dist: strings for parsed requirements strings."""
-    for req in requirements:
-        parsed_requirement = Requirement(req)
-        spec = requires_to_requires_dist(parsed_requirement)
-        extras = ",".join(sorted(safe_extra(e) for e in parsed_requirement.extras))
-        if extras:
-            extras = f"[{extras}]"
-
-        yield safe_name(parsed_requirement.name) + extras + spec
-
-
-def generate_requirements(
-    extras_require: dict[str | None, list[str]],
-) -> Iterator[tuple[str, str]]:
-    """
-    Convert requirements from a setup()-style dictionary to
-    ('Requires-Dist', 'requirement') and ('Provides-Extra', 'extra') tuples.
-
-    extras_require is a dictionary of {extra: [requirements]} as passed to setup(),
-    using the empty extra {'': [requirements]} to hold install_requires.
-    """
-    for extra, depends in extras_require.items():
-        condition = ""
-        extra = extra or ""
-        if ":" in extra:  # setuptools extra:condition syntax
-            extra, condition = extra.split(":", 1)
-
-        extra = safe_extra(extra)
-        if extra:
-            yield "Provides-Extra", extra
-            if condition:
-                condition = "(" + condition + ") and "
-            condition += f"extra == '{extra}'"
-
-        if condition:
-            condition = " ; " + condition
-
-        for new_req in convert_requirements(depends):
-            canonical_req = str(Requirement(new_req + condition))
-            yield "Requires-Dist", canonical_req
-
-
-def pkginfo_to_metadata(egg_info_path: str, pkginfo_path: str) -> Message:
-    """
-    Convert .egg-info directory with PKG-INFO to the Metadata 2.1 format
-    """
-    with open(pkginfo_path, encoding="utf-8") as headers:
-        pkg_info = Parser().parse(headers)
-
-    pkg_info.replace_header("Metadata-Version", "2.1")
-    # Those will be regenerated from `requires.txt`.
-    del pkg_info["Provides-Extra"]
-    del pkg_info["Requires-Dist"]
-    requires_path = os.path.join(egg_info_path, "requires.txt")
-    if os.path.exists(requires_path):
-        with open(requires_path, encoding="utf-8") as requires_file:
-            requires = requires_file.read()
-
-        parsed_requirements = sorted(split_sections(requires), key=lambda x: x[0] or "")
-        for extra, reqs in parsed_requirements:
-            for key, value in generate_requirements({extra: reqs}):
-                if (key, value) not in pkg_info.items():
-                    pkg_info[key] = value
-
-    description = pkg_info["Description"]
-    if description:
-        description_lines = pkg_info["Description"].splitlines()
-        dedented_description = "\n".join(
-            # if the first line of long_description is blank,
-            # the first line here will be indented.
-            (
-                description_lines[0].lstrip(),
-                textwrap.dedent("\n".join(description_lines[1:])),
-                "\n",
-            )
-        )
-        pkg_info.set_payload(dedented_description)
-        del pkg_info["Description"]
-
-    return pkg_info
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/util.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/util.py
deleted file mode 100644
index c928aa4..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/util.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import annotations
-
-import base64
-import logging
-
-log = logging.getLogger("wheel")
-
-
-def urlsafe_b64encode(data: bytes) -> bytes:
-    """urlsafe_b64encode without padding"""
-    return base64.urlsafe_b64encode(data).rstrip(b"=")
-
-
-def urlsafe_b64decode(data: bytes) -> bytes:
-    """urlsafe_b64decode without padding"""
-    pad = b"=" * (4 - (len(data) & 3))
-    return base64.urlsafe_b64decode(data + pad)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 160b265..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE
deleted file mode 100644
index 6f62d44..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-This software is made available under the terms of *either* of the licenses
-found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
-under the terms of *both* these licenses.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.APACHE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.APACHE
deleted file mode 100644
index f433b1a..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.APACHE
+++ /dev/null
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.BSD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.BSD
deleted file mode 100644
index 42ce7b7..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/LICENSE.BSD
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) Donald Stufft and individual contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index f2d1fd7..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_elffile.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_elffile.cpython-311.pyc
deleted file mode 100644
index e6bbbd6..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_elffile.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_manylinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_manylinux.cpython-311.pyc
deleted file mode 100644
index a224c73..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_manylinux.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_musllinux.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_musllinux.cpython-311.pyc
deleted file mode 100644
index 94bb35a..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_musllinux.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_parser.cpython-311.pyc
deleted file mode 100644
index 8a82a82..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_parser.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_structures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_structures.cpython-311.pyc
deleted file mode 100644
index c51fcdd..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_structures.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_tokenizer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_tokenizer.cpython-311.pyc
deleted file mode 100644
index 8d697ac..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/_tokenizer.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/markers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/markers.cpython-311.pyc
deleted file mode 100644
index b4c246b..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/markers.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/requirements.cpython-311.pyc
deleted file mode 100644
index e68fa86..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/requirements.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/specifiers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/specifiers.cpython-311.pyc
deleted file mode 100644
index 05928e5..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/specifiers.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/tags.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/tags.cpython-311.pyc
deleted file mode 100644
index faaf712..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/tags.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/utils.cpython-311.pyc
deleted file mode 100644
index 9423abe..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/utils.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/version.cpython-311.pyc
deleted file mode 100644
index a97bae1..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/__pycache__/version.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_elffile.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_elffile.py
deleted file mode 100644
index 6fb19b3..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_elffile.py
+++ /dev/null
@@ -1,108 +0,0 @@
-"""
-ELF file parser.
-
-This provides a class ``ELFFile`` that parses an ELF executable in a similar
-interface to ``ZipFile``. Only the read interface is implemented.
-
-Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca
-ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html
-"""
-
-import enum
-import os
-import struct
-from typing import IO, Optional, Tuple
-
-
-class ELFInvalid(ValueError):
-    pass
-
-
-class EIClass(enum.IntEnum):
-    C32 = 1
-    C64 = 2
-
-
-class EIData(enum.IntEnum):
-    Lsb = 1
-    Msb = 2
-
-
-class EMachine(enum.IntEnum):
-    I386 = 3
-    S390 = 22
-    Arm = 40
-    X8664 = 62
-    AArc64 = 183
-
-
-class ELFFile:
-    """
-    Representation of an ELF executable.
-    """
-
-    def __init__(self, f: IO[bytes]) -> None:
-        self._f = f
-
-        try:
-            ident = self._read("16B")
-        except struct.error:
-            raise ELFInvalid("unable to parse identification")
-        magic = bytes(ident[:4])
-        if magic != b"\x7fELF":
-            raise ELFInvalid(f"invalid magic: {magic!r}")
-
-        self.capacity = ident[4]  # Format for program header (bitness).
-        self.encoding = ident[5]  # Data structure encoding (endianness).
-
-        try:
-            # e_fmt: Format for program header.
-            # p_fmt: Format for section header.
-            # p_idx: Indexes to find p_type, p_offset, and p_filesz.
-            e_fmt, self._p_fmt, self._p_idx = {
-                (1, 1): ("HHIIIIIHHH", ">IIIIIIII", (0, 1, 4)),  # 32-bit MSB.
-                (2, 1): ("HHIQQQIHHH", ">IIQQQQQQ", (0, 2, 5)),  # 64-bit MSB.
-            }[(self.capacity, self.encoding)]
-        except KeyError:
-            raise ELFInvalid(
-                f"unrecognized capacity ({self.capacity}) or "
-                f"encoding ({self.encoding})"
-            )
-
-        try:
-            (
-                _,
-                self.machine,  # Architecture type.
-                _,
-                _,
-                self._e_phoff,  # Offset of program header.
-                _,
-                self.flags,  # Processor-specific flags.
-                _,
-                self._e_phentsize,  # Size of section.
-                self._e_phnum,  # Number of sections.
-            ) = self._read(e_fmt)
-        except struct.error as e:
-            raise ELFInvalid("unable to parse machine and section information") from e
-
-    def _read(self, fmt: str) -> Tuple[int, ...]:
-        return struct.unpack(fmt, self._f.read(struct.calcsize(fmt)))
-
-    @property
-    def interpreter(self) -> Optional[str]:
-        """
-        The path recorded in the ``PT_INTERP`` section header.
-        """
-        for index in range(self._e_phnum):
-            self._f.seek(self._e_phoff + self._e_phentsize * index)
-            try:
-                data = self._read(self._p_fmt)
-            except struct.error:
-                continue
-            if data[self._p_idx[0]] != 3:  # Not PT_INTERP.
-                continue
-            self._f.seek(data[self._p_idx[1]])
-            return os.fsdecode(self._f.read(data[self._p_idx[2]])).strip("\0")
-        return None
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_manylinux.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_manylinux.py
deleted file mode 100644
index 1f5f4ab..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_manylinux.py
+++ /dev/null
@@ -1,260 +0,0 @@
-import collections
-import contextlib
-import functools
-import os
-import re
-import sys
-import warnings
-from typing import Dict, Generator, Iterator, NamedTuple, Optional, Sequence, Tuple
-
-from ._elffile import EIClass, EIData, ELFFile, EMachine
-
-EF_ARM_ABIMASK = 0xFF000000
-EF_ARM_ABI_VER5 = 0x05000000
-EF_ARM_ABI_FLOAT_HARD = 0x00000400
-
-
-# `os.PathLike` not a generic type until Python 3.9, so sticking with `str`
-# as the type for `path` until then.
-@contextlib.contextmanager
-def _parse_elf(path: str) -> Generator[Optional[ELFFile], None, None]:
-    try:
-        with open(path, "rb") as f:
-            yield ELFFile(f)
-    except (OSError, TypeError, ValueError):
-        yield None
-
-
-def _is_linux_armhf(executable: str) -> bool:
-    # hard-float ABI can be detected from the ELF header of the running
-    # process
-    # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
-    with _parse_elf(executable) as f:
-        return (
-            f is not None
-            and f.capacity == EIClass.C32
-            and f.encoding == EIData.Lsb
-            and f.machine == EMachine.Arm
-            and f.flags & EF_ARM_ABIMASK == EF_ARM_ABI_VER5
-            and f.flags & EF_ARM_ABI_FLOAT_HARD == EF_ARM_ABI_FLOAT_HARD
-        )
-
-
-def _is_linux_i686(executable: str) -> bool:
-    with _parse_elf(executable) as f:
-        return (
-            f is not None
-            and f.capacity == EIClass.C32
-            and f.encoding == EIData.Lsb
-            and f.machine == EMachine.I386
-        )
-
-
-def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
-    if "armv7l" in archs:
-        return _is_linux_armhf(executable)
-    if "i686" in archs:
-        return _is_linux_i686(executable)
-    allowed_archs = {
-        "x86_64",
-        "aarch64",
-        "ppc64",
-        "ppc64le",
-        "s390x",
-        "loongarch64",
-        "riscv64",
-    }
-    return any(arch in allowed_archs for arch in archs)
-
-
-# If glibc ever changes its major version, we need to know what the last
-# minor version was, so we can build the complete list of all versions.
-# For now, guess what the highest minor version might be, assume it will
-# be 50 for testing. Once this actually happens, update the dictionary
-# with the actual value.
-_LAST_GLIBC_MINOR: Dict[int, int] = collections.defaultdict(lambda: 50)
-
-
-class _GLibCVersion(NamedTuple):
-    major: int
-    minor: int
-
-
-def _glibc_version_string_confstr() -> Optional[str]:
-    """
-    Primary implementation of glibc_version_string using os.confstr.
-    """
-    # os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
-    # to be broken or missing. This strategy is used in the standard library
-    # platform module.
-    # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183
-    try:
-        # Should be a string like "glibc 2.17".
-        version_string: Optional[str] = os.confstr("CS_GNU_LIBC_VERSION")
-        assert version_string is not None
-        _, version = version_string.rsplit()
-    except (AssertionError, AttributeError, OSError, ValueError):
-        # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
-        return None
-    return version
-
-
-def _glibc_version_string_ctypes() -> Optional[str]:
-    """
-    Fallback implementation of glibc_version_string using ctypes.
-    """
-    try:
-        import ctypes
-    except ImportError:
-        return None
-
-    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
-    # manpage says, "If filename is NULL, then the returned handle is for the
-    # main program". This way we can let the linker do the work to figure out
-    # which libc our process is actually using.
-    #
-    # We must also handle the special case where the executable is not a
-    # dynamically linked executable. This can occur when using musl libc,
-    # for example. In this situation, dlopen() will error, leading to an
-    # OSError. Interestingly, at least in the case of musl, there is no
-    # errno set on the OSError. The single string argument used to construct
-    # OSError comes from libc itself and is therefore not portable to
-    # hard code here. In any case, failure to call dlopen() means we
-    # can proceed, so we bail on our attempt.
-    try:
-        process_namespace = ctypes.CDLL(None)
-    except OSError:
-        return None
-
-    try:
-        gnu_get_libc_version = process_namespace.gnu_get_libc_version
-    except AttributeError:
-        # Symbol doesn't exist -> therefore, we are not linked to
-        # glibc.
-        return None
-
-    # Call gnu_get_libc_version, which returns a string like "2.5"
-    gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str: str = gnu_get_libc_version()
-    # py2 / py3 compatibility:
-    if not isinstance(version_str, str):
-        version_str = version_str.decode("ascii")
-
-    return version_str
-
-
-def _glibc_version_string() -> Optional[str]:
-    """Returns glibc version string, or None if not using glibc."""
-    return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
-
-
-def _parse_glibc_version(version_str: str) -> Tuple[int, int]:
-    """Parse glibc version.
-
-    We use a regexp instead of str.split because we want to discard any
-    random junk that might come after the minor version -- this might happen
-    in patched/forked versions of glibc (e.g. Linaro's version of glibc
-    uses version strings like "2.20-2014.11"). See gh-3588.
-    """
-    m = re.match(r"(?P[0-9]+)\.(?P[0-9]+)", version_str)
-    if not m:
-        warnings.warn(
-            f"Expected glibc version with 2 components major.minor,"
-            f" got: {version_str}",
-            RuntimeWarning,
-        )
-        return -1, -1
-    return int(m.group("major")), int(m.group("minor"))
-
-
-@functools.lru_cache
-def _get_glibc_version() -> Tuple[int, int]:
-    version_str = _glibc_version_string()
-    if version_str is None:
-        return (-1, -1)
-    return _parse_glibc_version(version_str)
-
-
-# From PEP 513, PEP 600
-def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
-    sys_glibc = _get_glibc_version()
-    if sys_glibc < version:
-        return False
-    # Check for presence of _manylinux module.
-    try:
-        import _manylinux
-    except ImportError:
-        return True
-    if hasattr(_manylinux, "manylinux_compatible"):
-        result = _manylinux.manylinux_compatible(version[0], version[1], arch)
-        if result is not None:
-            return bool(result)
-        return True
-    if version == _GLibCVersion(2, 5):
-        if hasattr(_manylinux, "manylinux1_compatible"):
-            return bool(_manylinux.manylinux1_compatible)
-    if version == _GLibCVersion(2, 12):
-        if hasattr(_manylinux, "manylinux2010_compatible"):
-            return bool(_manylinux.manylinux2010_compatible)
-    if version == _GLibCVersion(2, 17):
-        if hasattr(_manylinux, "manylinux2014_compatible"):
-            return bool(_manylinux.manylinux2014_compatible)
-    return True
-
-
-_LEGACY_MANYLINUX_MAP = {
-    # CentOS 7 w/ glibc 2.17 (PEP 599)
-    (2, 17): "manylinux2014",
-    # CentOS 6 w/ glibc 2.12 (PEP 571)
-    (2, 12): "manylinux2010",
-    # CentOS 5 w/ glibc 2.5 (PEP 513)
-    (2, 5): "manylinux1",
-}
-
-
-def platform_tags(archs: Sequence[str]) -> Iterator[str]:
-    """Generate manylinux tags compatible to the current platform.
-
-    :param archs: Sequence of compatible architectures.
-        The first one shall be the closest to the actual architecture and be the part of
-        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
-        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
-        be manylinux-compatible.
-
-    :returns: An iterator of compatible manylinux tags.
-    """
-    if not _have_compatible_abi(sys.executable, archs):
-        return
-    # Oldest glibc to be supported regardless of architecture is (2, 17).
-    too_old_glibc2 = _GLibCVersion(2, 16)
-    if set(archs) & {"x86_64", "i686"}:
-        # On x86/i686 also oldest glibc to be supported is (2, 5).
-        too_old_glibc2 = _GLibCVersion(2, 4)
-    current_glibc = _GLibCVersion(*_get_glibc_version())
-    glibc_max_list = [current_glibc]
-    # We can assume compatibility across glibc major versions.
-    # https://sourceware.org/bugzilla/show_bug.cgi?id=24636
-    #
-    # Build a list of maximum glibc versions so that we can
-    # output the canonical list of all glibc from current_glibc
-    # down to too_old_glibc2, including all intermediary versions.
-    for glibc_major in range(current_glibc.major - 1, 1, -1):
-        glibc_minor = _LAST_GLIBC_MINOR[glibc_major]
-        glibc_max_list.append(_GLibCVersion(glibc_major, glibc_minor))
-    for arch in archs:
-        for glibc_max in glibc_max_list:
-            if glibc_max.major == too_old_glibc2.major:
-                min_minor = too_old_glibc2.minor
-            else:
-                # For other glibc major versions oldest supported is (x, 0).
-                min_minor = -1
-            for glibc_minor in range(glibc_max.minor, min_minor, -1):
-                glibc_version = _GLibCVersion(glibc_max.major, glibc_minor)
-                tag = "manylinux_{}_{}".format(*glibc_version)
-                if _is_compatible(arch, glibc_version):
-                    yield f"{tag}_{arch}"
-                # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
-                if glibc_version in _LEGACY_MANYLINUX_MAP:
-                    legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version]
-                    if _is_compatible(arch, glibc_version):
-                        yield f"{legacy_tag}_{arch}"
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_musllinux.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_musllinux.py
deleted file mode 100644
index eb4251b..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_musllinux.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""PEP 656 support.
-
-This module implements logic to detect if the currently running Python is
-linked against musl, and what musl version is used.
-"""
-
-import functools
-import re
-import subprocess
-import sys
-from typing import Iterator, NamedTuple, Optional, Sequence
-
-from ._elffile import ELFFile
-
-
-class _MuslVersion(NamedTuple):
-    major: int
-    minor: int
-
-
-def _parse_musl_version(output: str) -> Optional[_MuslVersion]:
-    lines = [n for n in (n.strip() for n in output.splitlines()) if n]
-    if len(lines) < 2 or lines[0][:4] != "musl":
-        return None
-    m = re.match(r"Version (\d+)\.(\d+)", lines[1])
-    if not m:
-        return None
-    return _MuslVersion(major=int(m.group(1)), minor=int(m.group(2)))
-
-
-@functools.lru_cache
-def _get_musl_version(executable: str) -> Optional[_MuslVersion]:
-    """Detect currently-running musl runtime version.
-
-    This is done by checking the specified executable's dynamic linking
-    information, and invoking the loader to parse its output for a version
-    string. If the loader is musl, the output would be something like::
-
-        musl libc (x86_64)
-        Version 1.2.2
-        Dynamic Program Loader
-    """
-    try:
-        with open(executable, "rb") as f:
-            ld = ELFFile(f).interpreter
-    except (OSError, TypeError, ValueError):
-        return None
-    if ld is None or "musl" not in ld:
-        return None
-    proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True)
-    return _parse_musl_version(proc.stderr)
-
-
-def platform_tags(archs: Sequence[str]) -> Iterator[str]:
-    """Generate musllinux tags compatible to the current platform.
-
-    :param archs: Sequence of compatible architectures.
-        The first one shall be the closest to the actual architecture and be the part of
-        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
-        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
-        be musllinux-compatible.
-
-    :returns: An iterator of compatible musllinux tags.
-    """
-    sys_musl = _get_musl_version(sys.executable)
-    if sys_musl is None:  # Python not dynamically linked against musl.
-        return
-    for arch in archs:
-        for minor in range(sys_musl.minor, -1, -1):
-            yield f"musllinux_{sys_musl.major}_{minor}_{arch}"
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sysconfig
-
-    plat = sysconfig.get_platform()
-    assert plat.startswith("linux-"), "not linux"
-
-    print("plat:", plat)
-    print("musl:", _get_musl_version(sys.executable))
-    print("tags:", end=" ")
-    for t in platform_tags(re.sub(r"[.-]", "_", plat.split("-", 1)[-1])):
-        print(t, end="\n      ")
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_parser.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_parser.py
deleted file mode 100644
index 513686a..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_parser.py
+++ /dev/null
@@ -1,356 +0,0 @@
-"""Handwritten parser of dependency specifiers.
-
-The docstring for each __parse_* function contains EBNF-inspired grammar representing
-the implementation.
-"""
-
-import ast
-from typing import Any, List, NamedTuple, Optional, Tuple, Union
-
-from ._tokenizer import DEFAULT_RULES, Tokenizer
-
-
-class Node:
-    def __init__(self, value: str) -> None:
-        self.value = value
-
-    def __str__(self) -> str:
-        return self.value
-
-    def __repr__(self) -> str:
-        return f"<{self.__class__.__name__}('{self}')>"
-
-    def serialize(self) -> str:
-        raise NotImplementedError
-
-
-class Variable(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-class Value(Node):
-    def serialize(self) -> str:
-        return f'"{self}"'
-
-
-class Op(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-MarkerVar = Union[Variable, Value]
-MarkerItem = Tuple[MarkerVar, Op, MarkerVar]
-# MarkerAtom = Union[MarkerItem, List["MarkerAtom"]]
-# MarkerList = List[Union["MarkerList", MarkerAtom, str]]
-# mypy does not support recursive type definition
-# https://github.com/python/mypy/issues/731
-MarkerAtom = Any
-MarkerList = List[Any]
-
-
-class ParsedRequirement(NamedTuple):
-    name: str
-    url: str
-    extras: List[str]
-    specifier: str
-    marker: Optional[MarkerList]
-
-
-# --------------------------------------------------------------------------------------
-# Recursive descent parser for dependency specifier
-# --------------------------------------------------------------------------------------
-def parse_requirement(source: str) -> ParsedRequirement:
-    return _parse_requirement(Tokenizer(source, rules=DEFAULT_RULES))
-
-
-def _parse_requirement(tokenizer: Tokenizer) -> ParsedRequirement:
-    """
-    requirement = WS? IDENTIFIER WS? extras WS? requirement_details
-    """
-    tokenizer.consume("WS")
-
-    name_token = tokenizer.expect(
-        "IDENTIFIER", expected="package name at the start of dependency specifier"
-    )
-    name = name_token.text
-    tokenizer.consume("WS")
-
-    extras = _parse_extras(tokenizer)
-    tokenizer.consume("WS")
-
-    url, specifier, marker = _parse_requirement_details(tokenizer)
-    tokenizer.expect("END", expected="end of dependency specifier")
-
-    return ParsedRequirement(name, url, extras, specifier, marker)
-
-
-def _parse_requirement_details(
-    tokenizer: Tokenizer,
-) -> Tuple[str, str, Optional[MarkerList]]:
-    """
-    requirement_details = AT URL (WS requirement_marker?)?
-                        | specifier WS? (requirement_marker)?
-    """
-
-    specifier = ""
-    url = ""
-    marker = None
-
-    if tokenizer.check("AT"):
-        tokenizer.read()
-        tokenizer.consume("WS")
-
-        url_start = tokenizer.position
-        url = tokenizer.expect("URL", expected="URL after @").text
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        tokenizer.expect("WS", expected="whitespace after URL")
-
-        # The input might end after whitespace.
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        marker = _parse_requirement_marker(
-            tokenizer, span_start=url_start, after="URL and whitespace"
-        )
-    else:
-        specifier_start = tokenizer.position
-        specifier = _parse_specifier(tokenizer)
-        tokenizer.consume("WS")
-
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        marker = _parse_requirement_marker(
-            tokenizer,
-            span_start=specifier_start,
-            after=(
-                "version specifier"
-                if specifier
-                else "name and no valid version specifier"
-            ),
-        )
-
-    return (url, specifier, marker)
-
-
-def _parse_requirement_marker(
-    tokenizer: Tokenizer, *, span_start: int, after: str
-) -> MarkerList:
-    """
-    requirement_marker = SEMICOLON marker WS?
-    """
-
-    if not tokenizer.check("SEMICOLON"):
-        tokenizer.raise_syntax_error(
-            f"Expected end or semicolon (after {after})",
-            span_start=span_start,
-        )
-    tokenizer.read()
-
-    marker = _parse_marker(tokenizer)
-    tokenizer.consume("WS")
-
-    return marker
-
-
-def _parse_extras(tokenizer: Tokenizer) -> List[str]:
-    """
-    extras = (LEFT_BRACKET wsp* extras_list? wsp* RIGHT_BRACKET)?
-    """
-    if not tokenizer.check("LEFT_BRACKET", peek=True):
-        return []
-
-    with tokenizer.enclosing_tokens(
-        "LEFT_BRACKET",
-        "RIGHT_BRACKET",
-        around="extras",
-    ):
-        tokenizer.consume("WS")
-        extras = _parse_extras_list(tokenizer)
-        tokenizer.consume("WS")
-
-    return extras
-
-
-def _parse_extras_list(tokenizer: Tokenizer) -> List[str]:
-    """
-    extras_list = identifier (wsp* ',' wsp* identifier)*
-    """
-    extras: List[str] = []
-
-    if not tokenizer.check("IDENTIFIER"):
-        return extras
-
-    extras.append(tokenizer.read().text)
-
-    while True:
-        tokenizer.consume("WS")
-        if tokenizer.check("IDENTIFIER", peek=True):
-            tokenizer.raise_syntax_error("Expected comma between extra names")
-        elif not tokenizer.check("COMMA"):
-            break
-
-        tokenizer.read()
-        tokenizer.consume("WS")
-
-        extra_token = tokenizer.expect("IDENTIFIER", expected="extra name after comma")
-        extras.append(extra_token.text)
-
-    return extras
-
-
-def _parse_specifier(tokenizer: Tokenizer) -> str:
-    """
-    specifier = LEFT_PARENTHESIS WS? version_many WS? RIGHT_PARENTHESIS
-              | WS? version_many WS?
-    """
-    with tokenizer.enclosing_tokens(
-        "LEFT_PARENTHESIS",
-        "RIGHT_PARENTHESIS",
-        around="version specifier",
-    ):
-        tokenizer.consume("WS")
-        parsed_specifiers = _parse_version_many(tokenizer)
-        tokenizer.consume("WS")
-
-    return parsed_specifiers
-
-
-def _parse_version_many(tokenizer: Tokenizer) -> str:
-    """
-    version_many = (SPECIFIER (WS? COMMA WS? SPECIFIER)*)?
-    """
-    parsed_specifiers = ""
-    while tokenizer.check("SPECIFIER"):
-        span_start = tokenizer.position
-        parsed_specifiers += tokenizer.read().text
-        if tokenizer.check("VERSION_PREFIX_TRAIL", peek=True):
-            tokenizer.raise_syntax_error(
-                ".* suffix can only be used with `==` or `!=` operators",
-                span_start=span_start,
-                span_end=tokenizer.position + 1,
-            )
-        if tokenizer.check("VERSION_LOCAL_LABEL_TRAIL", peek=True):
-            tokenizer.raise_syntax_error(
-                "Local version label can only be used with `==` or `!=` operators",
-                span_start=span_start,
-                span_end=tokenizer.position,
-            )
-        tokenizer.consume("WS")
-        if not tokenizer.check("COMMA"):
-            break
-        parsed_specifiers += tokenizer.read().text
-        tokenizer.consume("WS")
-
-    return parsed_specifiers
-
-
-# --------------------------------------------------------------------------------------
-# Recursive descent parser for marker expression
-# --------------------------------------------------------------------------------------
-def parse_marker(source: str) -> MarkerList:
-    return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES))
-
-
-def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList:
-    retval = _parse_marker(tokenizer)
-    tokenizer.expect("END", expected="end of marker expression")
-    return retval
-
-
-def _parse_marker(tokenizer: Tokenizer) -> MarkerList:
-    """
-    marker = marker_atom (BOOLOP marker_atom)+
-    """
-    expression = [_parse_marker_atom(tokenizer)]
-    while tokenizer.check("BOOLOP"):
-        token = tokenizer.read()
-        expr_right = _parse_marker_atom(tokenizer)
-        expression.extend((token.text, expr_right))
-    return expression
-
-
-def _parse_marker_atom(tokenizer: Tokenizer) -> MarkerAtom:
-    """
-    marker_atom = WS? LEFT_PARENTHESIS WS? marker WS? RIGHT_PARENTHESIS WS?
-                | WS? marker_item WS?
-    """
-
-    tokenizer.consume("WS")
-    if tokenizer.check("LEFT_PARENTHESIS", peek=True):
-        with tokenizer.enclosing_tokens(
-            "LEFT_PARENTHESIS",
-            "RIGHT_PARENTHESIS",
-            around="marker expression",
-        ):
-            tokenizer.consume("WS")
-            marker: MarkerAtom = _parse_marker(tokenizer)
-            tokenizer.consume("WS")
-    else:
-        marker = _parse_marker_item(tokenizer)
-    tokenizer.consume("WS")
-    return marker
-
-
-def _parse_marker_item(tokenizer: Tokenizer) -> MarkerItem:
-    """
-    marker_item = WS? marker_var WS? marker_op WS? marker_var WS?
-    """
-    tokenizer.consume("WS")
-    marker_var_left = _parse_marker_var(tokenizer)
-    tokenizer.consume("WS")
-    marker_op = _parse_marker_op(tokenizer)
-    tokenizer.consume("WS")
-    marker_var_right = _parse_marker_var(tokenizer)
-    tokenizer.consume("WS")
-    return (marker_var_left, marker_op, marker_var_right)
-
-
-def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:
-    """
-    marker_var = VARIABLE | QUOTED_STRING
-    """
-    if tokenizer.check("VARIABLE"):
-        return process_env_var(tokenizer.read().text.replace(".", "_"))
-    elif tokenizer.check("QUOTED_STRING"):
-        return process_python_str(tokenizer.read().text)
-    else:
-        tokenizer.raise_syntax_error(
-            message="Expected a marker variable or quoted string"
-        )
-
-
-def process_env_var(env_var: str) -> Variable:
-    if env_var in ("platform_python_implementation", "python_implementation"):
-        return Variable("platform_python_implementation")
-    else:
-        return Variable(env_var)
-
-
-def process_python_str(python_str: str) -> Value:
-    value = ast.literal_eval(python_str)
-    return Value(str(value))
-
-
-def _parse_marker_op(tokenizer: Tokenizer) -> Op:
-    """
-    marker_op = IN | NOT IN | OP
-    """
-    if tokenizer.check("IN"):
-        tokenizer.read()
-        return Op("in")
-    elif tokenizer.check("NOT"):
-        tokenizer.read()
-        tokenizer.expect("WS", expected="whitespace after 'not'")
-        tokenizer.expect("IN", expected="'in' after 'not'")
-        return Op("not in")
-    elif tokenizer.check("OP"):
-        return Op(tokenizer.read().text)
-    else:
-        return tokenizer.raise_syntax_error(
-            "Expected marker operator, one of "
-            "<=, <, !=, ==, >=, >, ~=, ===, in, not in"
-        )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_structures.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_structures.py
deleted file mode 100644
index 90a6465..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_structures.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-
-class InfinityType:
-    def __repr__(self) -> str:
-        return "Infinity"
-
-    def __hash__(self) -> int:
-        return hash(repr(self))
-
-    def __lt__(self, other: object) -> bool:
-        return False
-
-    def __le__(self, other: object) -> bool:
-        return False
-
-    def __eq__(self, other: object) -> bool:
-        return isinstance(other, self.__class__)
-
-    def __gt__(self, other: object) -> bool:
-        return True
-
-    def __ge__(self, other: object) -> bool:
-        return True
-
-    def __neg__(self: object) -> "NegativeInfinityType":
-        return NegativeInfinity
-
-
-Infinity = InfinityType()
-
-
-class NegativeInfinityType:
-    def __repr__(self) -> str:
-        return "-Infinity"
-
-    def __hash__(self) -> int:
-        return hash(repr(self))
-
-    def __lt__(self, other: object) -> bool:
-        return True
-
-    def __le__(self, other: object) -> bool:
-        return True
-
-    def __eq__(self, other: object) -> bool:
-        return isinstance(other, self.__class__)
-
-    def __gt__(self, other: object) -> bool:
-        return False
-
-    def __ge__(self, other: object) -> bool:
-        return False
-
-    def __neg__(self: object) -> InfinityType:
-        return Infinity
-
-
-NegativeInfinity = NegativeInfinityType()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_tokenizer.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_tokenizer.py
deleted file mode 100644
index dd0d648..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/_tokenizer.py
+++ /dev/null
@@ -1,192 +0,0 @@
-import contextlib
-import re
-from dataclasses import dataclass
-from typing import Dict, Iterator, NoReturn, Optional, Tuple, Union
-
-from .specifiers import Specifier
-
-
-@dataclass
-class Token:
-    name: str
-    text: str
-    position: int
-
-
-class ParserSyntaxError(Exception):
-    """The provided source text could not be parsed correctly."""
-
-    def __init__(
-        self,
-        message: str,
-        *,
-        source: str,
-        span: Tuple[int, int],
-    ) -> None:
-        self.span = span
-        self.message = message
-        self.source = source
-
-        super().__init__()
-
-    def __str__(self) -> str:
-        marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^"
-        return "\n    ".join([self.message, self.source, marker])
-
-
-DEFAULT_RULES: "Dict[str, Union[str, re.Pattern[str]]]" = {
-    "LEFT_PARENTHESIS": r"\(",
-    "RIGHT_PARENTHESIS": r"\)",
-    "LEFT_BRACKET": r"\[",
-    "RIGHT_BRACKET": r"\]",
-    "SEMICOLON": r";",
-    "COMMA": r",",
-    "QUOTED_STRING": re.compile(
-        r"""
-            (
-                ('[^']*')
-                |
-                ("[^"]*")
-            )
-        """,
-        re.VERBOSE,
-    ),
-    "OP": r"(===|==|~=|!=|<=|>=|<|>)",
-    "BOOLOP": r"\b(or|and)\b",
-    "IN": r"\bin\b",
-    "NOT": r"\bnot\b",
-    "VARIABLE": re.compile(
-        r"""
-            \b(
-                python_version
-                |python_full_version
-                |os[._]name
-                |sys[._]platform
-                |platform_(release|system)
-                |platform[._](version|machine|python_implementation)
-                |python_implementation
-                |implementation_(name|version)
-                |extra
-            )\b
-        """,
-        re.VERBOSE,
-    ),
-    "SPECIFIER": re.compile(
-        Specifier._operator_regex_str + Specifier._version_regex_str,
-        re.VERBOSE | re.IGNORECASE,
-    ),
-    "AT": r"\@",
-    "URL": r"[^ \t]+",
-    "IDENTIFIER": r"\b[a-zA-Z0-9][a-zA-Z0-9._-]*\b",
-    "VERSION_PREFIX_TRAIL": r"\.\*",
-    "VERSION_LOCAL_LABEL_TRAIL": r"\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*",
-    "WS": r"[ \t]+",
-    "END": r"$",
-}
-
-
-class Tokenizer:
-    """Context-sensitive token parsing.
-
-    Provides methods to examine the input stream to check whether the next token
-    matches.
-    """
-
-    def __init__(
-        self,
-        source: str,
-        *,
-        rules: "Dict[str, Union[str, re.Pattern[str]]]",
-    ) -> None:
-        self.source = source
-        self.rules: Dict[str, re.Pattern[str]] = {
-            name: re.compile(pattern) for name, pattern in rules.items()
-        }
-        self.next_token: Optional[Token] = None
-        self.position = 0
-
-    def consume(self, name: str) -> None:
-        """Move beyond provided token name, if at current position."""
-        if self.check(name):
-            self.read()
-
-    def check(self, name: str, *, peek: bool = False) -> bool:
-        """Check whether the next token has the provided name.
-
-        By default, if the check succeeds, the token *must* be read before
-        another check. If `peek` is set to `True`, the token is not loaded and
-        would need to be checked again.
-        """
-        assert (
-            self.next_token is None
-        ), f"Cannot check for {name!r}, already have {self.next_token!r}"
-        assert name in self.rules, f"Unknown token name: {name!r}"
-
-        expression = self.rules[name]
-
-        match = expression.match(self.source, self.position)
-        if match is None:
-            return False
-        if not peek:
-            self.next_token = Token(name, match[0], self.position)
-        return True
-
-    def expect(self, name: str, *, expected: str) -> Token:
-        """Expect a certain token name next, failing with a syntax error otherwise.
-
-        The token is *not* read.
-        """
-        if not self.check(name):
-            raise self.raise_syntax_error(f"Expected {expected}")
-        return self.read()
-
-    def read(self) -> Token:
-        """Consume the next token and return it."""
-        token = self.next_token
-        assert token is not None
-
-        self.position += len(token.text)
-        self.next_token = None
-
-        return token
-
-    def raise_syntax_error(
-        self,
-        message: str,
-        *,
-        span_start: Optional[int] = None,
-        span_end: Optional[int] = None,
-    ) -> NoReturn:
-        """Raise ParserSyntaxError at the given position."""
-        span = (
-            self.position if span_start is None else span_start,
-            self.position if span_end is None else span_end,
-        )
-        raise ParserSyntaxError(
-            message,
-            source=self.source,
-            span=span,
-        )
-
-    @contextlib.contextmanager
-    def enclosing_tokens(
-        self, open_token: str, close_token: str, *, around: str
-    ) -> Iterator[None]:
-        if self.check(open_token):
-            open_position = self.position
-            self.read()
-        else:
-            open_position = None
-
-        yield
-
-        if open_position is None:
-            return
-
-        if not self.check(close_token):
-            self.raise_syntax_error(
-                f"Expected matching {close_token} for {open_token}, after {around}",
-                span_start=open_position,
-            )
-
-        self.read()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/markers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/markers.py
deleted file mode 100644
index c96d22a..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/markers.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-import operator
-import os
-import platform
-import sys
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
-
-from ._parser import (
-    MarkerAtom,
-    MarkerList,
-    Op,
-    Value,
-    Variable,
-)
-from ._parser import (
-    parse_marker as _parse_marker,
-)
-from ._tokenizer import ParserSyntaxError
-from .specifiers import InvalidSpecifier, Specifier
-from .utils import canonicalize_name
-
-__all__ = [
-    "InvalidMarker",
-    "UndefinedComparison",
-    "UndefinedEnvironmentName",
-    "Marker",
-    "default_environment",
-]
-
-Operator = Callable[[str, str], bool]
-
-
-class InvalidMarker(ValueError):
-    """
-    An invalid marker was found, users should refer to PEP 508.
-    """
-
-
-class UndefinedComparison(ValueError):
-    """
-    An invalid operation was attempted on a value that doesn't support it.
-    """
-
-
-class UndefinedEnvironmentName(ValueError):
-    """
-    A name was attempted to be used that does not exist inside of the
-    environment.
-    """
-
-
-def _normalize_extra_values(results: Any) -> Any:
-    """
-    Normalize extra values.
-    """
-    if isinstance(results[0], tuple):
-        lhs, op, rhs = results[0]
-        if isinstance(lhs, Variable) and lhs.value == "extra":
-            normalized_extra = canonicalize_name(rhs.value)
-            rhs = Value(normalized_extra)
-        elif isinstance(rhs, Variable) and rhs.value == "extra":
-            normalized_extra = canonicalize_name(lhs.value)
-            lhs = Value(normalized_extra)
-        results[0] = lhs, op, rhs
-    return results
-
-
-def _format_marker(
-    marker: Union[List[str], MarkerAtom, str], first: Optional[bool] = True
-) -> str:
-    assert isinstance(marker, (list, tuple, str))
-
-    # Sometimes we have a structure like [[...]] which is a single item list
-    # where the single item is itself it's own list. In that case we want skip
-    # the rest of this function so that we don't get extraneous () on the
-    # outside.
-    if (
-        isinstance(marker, list)
-        and len(marker) == 1
-        and isinstance(marker[0], (list, tuple))
-    ):
-        return _format_marker(marker[0])
-
-    if isinstance(marker, list):
-        inner = (_format_marker(m, first=False) for m in marker)
-        if first:
-            return " ".join(inner)
-        else:
-            return "(" + " ".join(inner) + ")"
-    elif isinstance(marker, tuple):
-        return " ".join([m.serialize() for m in marker])
-    else:
-        return marker
-
-
-_operators: Dict[str, Operator] = {
-    "in": lambda lhs, rhs: lhs in rhs,
-    "not in": lambda lhs, rhs: lhs not in rhs,
-    "<": operator.lt,
-    "<=": operator.le,
-    "==": operator.eq,
-    "!=": operator.ne,
-    ">=": operator.ge,
-    ">": operator.gt,
-}
-
-
-def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
-    try:
-        spec = Specifier("".join([op.serialize(), rhs]))
-    except InvalidSpecifier:
-        pass
-    else:
-        return spec.contains(lhs, prereleases=True)
-
-    oper: Optional[Operator] = _operators.get(op.serialize())
-    if oper is None:
-        raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.")
-
-    return oper(lhs, rhs)
-
-
-def _normalize(*values: str, key: str) -> Tuple[str, ...]:
-    # PEP 685 – Comparison of extra names for optional distribution dependencies
-    # https://peps.python.org/pep-0685/
-    # > When comparing extra names, tools MUST normalize the names being
-    # > compared using the semantics outlined in PEP 503 for names
-    if key == "extra":
-        return tuple(canonicalize_name(v) for v in values)
-
-    # other environment markers don't have such standards
-    return values
-
-
-def _evaluate_markers(markers: MarkerList, environment: Dict[str, str]) -> bool:
-    groups: List[List[bool]] = [[]]
-
-    for marker in markers:
-        assert isinstance(marker, (list, tuple, str))
-
-        if isinstance(marker, list):
-            groups[-1].append(_evaluate_markers(marker, environment))
-        elif isinstance(marker, tuple):
-            lhs, op, rhs = marker
-
-            if isinstance(lhs, Variable):
-                environment_key = lhs.value
-                lhs_value = environment[environment_key]
-                rhs_value = rhs.value
-            else:
-                lhs_value = lhs.value
-                environment_key = rhs.value
-                rhs_value = environment[environment_key]
-
-            lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key)
-            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
-        else:
-            assert marker in ["and", "or"]
-            if marker == "or":
-                groups.append([])
-
-    return any(all(item) for item in groups)
-
-
-def format_full_version(info: "sys._version_info") -> str:
-    version = "{0.major}.{0.minor}.{0.micro}".format(info)
-    kind = info.releaselevel
-    if kind != "final":
-        version += kind[0] + str(info.serial)
-    return version
-
-
-def default_environment() -> Dict[str, str]:
-    iver = format_full_version(sys.implementation.version)
-    implementation_name = sys.implementation.name
-    return {
-        "implementation_name": implementation_name,
-        "implementation_version": iver,
-        "os_name": os.name,
-        "platform_machine": platform.machine(),
-        "platform_release": platform.release(),
-        "platform_system": platform.system(),
-        "platform_version": platform.version(),
-        "python_full_version": platform.python_version(),
-        "platform_python_implementation": platform.python_implementation(),
-        "python_version": ".".join(platform.python_version_tuple()[:2]),
-        "sys_platform": sys.platform,
-    }
-
-
-class Marker:
-    def __init__(self, marker: str) -> None:
-        # Note: We create a Marker object without calling this constructor in
-        #       packaging.requirements.Requirement. If any additional logic is
-        #       added here, make sure to mirror/adapt Requirement.
-        try:
-            self._markers = _normalize_extra_values(_parse_marker(marker))
-            # The attribute `_markers` can be described in terms of a recursive type:
-            # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]]
-            #
-            # For example, the following expression:
-            # python_version > "3.6" or (python_version == "3.6" and os_name == "unix")
-            #
-            # is parsed into:
-            # [
-            #     (, ')>, ),
-            #     'and',
-            #     [
-            #         (, , ),
-            #         'or',
-            #         (, , )
-            #     ]
-            # ]
-        except ParserSyntaxError as e:
-            raise InvalidMarker(str(e)) from e
-
-    def __str__(self) -> str:
-        return _format_marker(self._markers)
-
-    def __repr__(self) -> str:
-        return f""
-
-    def __hash__(self) -> int:
-        return hash((self.__class__.__name__, str(self)))
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Marker):
-            return NotImplemented
-
-        return str(self) == str(other)
-
-    def evaluate(self, environment: Optional[Dict[str, str]] = None) -> bool:
-        """Evaluate a marker.
-
-        Return the boolean from evaluating the given marker against the
-        environment. environment is an optional argument to override all or
-        part of the determined environment.
-
-        The environment is determined from the current Python process.
-        """
-        current_environment = default_environment()
-        current_environment["extra"] = ""
-        if environment is not None:
-            current_environment.update(environment)
-            # The API used to allow setting extra to None. We need to handle this
-            # case for backwards compatibility.
-            if current_environment["extra"] is None:
-                current_environment["extra"] = ""
-
-        return _evaluate_markers(self._markers, current_environment)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/requirements.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/requirements.py
deleted file mode 100644
index bdc43a7..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/requirements.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-from typing import Any, Iterator, Optional, Set
-
-from ._parser import parse_requirement as _parse_requirement
-from ._tokenizer import ParserSyntaxError
-from .markers import Marker, _normalize_extra_values
-from .specifiers import SpecifierSet
-from .utils import canonicalize_name
-
-
-class InvalidRequirement(ValueError):
-    """
-    An invalid requirement was found, users should refer to PEP 508.
-    """
-
-
-class Requirement:
-    """Parse a requirement.
-
-    Parse a given requirement string into its parts, such as name, specifier,
-    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
-    string.
-    """
-
-    # TODO: Can we test whether something is contained within a requirement?
-    #       If so how do we do that? Do we need to test against the _name_ of
-    #       the thing as well as the version? What about the markers?
-    # TODO: Can we normalize the name and extra name?
-
-    def __init__(self, requirement_string: str) -> None:
-        try:
-            parsed = _parse_requirement(requirement_string)
-        except ParserSyntaxError as e:
-            raise InvalidRequirement(str(e)) from e
-
-        self.name: str = parsed.name
-        self.url: Optional[str] = parsed.url or None
-        self.extras: Set[str] = set(parsed.extras or [])
-        self.specifier: SpecifierSet = SpecifierSet(parsed.specifier)
-        self.marker: Optional[Marker] = None
-        if parsed.marker is not None:
-            self.marker = Marker.__new__(Marker)
-            self.marker._markers = _normalize_extra_values(parsed.marker)
-
-    def _iter_parts(self, name: str) -> Iterator[str]:
-        yield name
-
-        if self.extras:
-            formatted_extras = ",".join(sorted(self.extras))
-            yield f"[{formatted_extras}]"
-
-        if self.specifier:
-            yield str(self.specifier)
-
-        if self.url:
-            yield f"@ {self.url}"
-            if self.marker:
-                yield " "
-
-        if self.marker:
-            yield f"; {self.marker}"
-
-    def __str__(self) -> str:
-        return "".join(self._iter_parts(self.name))
-
-    def __repr__(self) -> str:
-        return f""
-
-    def __hash__(self) -> int:
-        return hash(
-            (
-                self.__class__.__name__,
-                *self._iter_parts(canonicalize_name(self.name)),
-            )
-        )
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Requirement):
-            return NotImplemented
-
-        return (
-            canonicalize_name(self.name) == canonicalize_name(other.name)
-            and self.extras == other.extras
-            and self.specifier == other.specifier
-            and self.url == other.url
-            and self.marker == other.marker
-        )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/specifiers.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/specifiers.py
deleted file mode 100644
index 6d4066a..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/specifiers.py
+++ /dev/null
@@ -1,1011 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-"""
-.. testsetup::
-
-    from packaging.specifiers import Specifier, SpecifierSet, InvalidSpecifier
-    from packaging.version import Version
-"""
-
-import abc
-import itertools
-import re
-from typing import Callable, Iterable, Iterator, List, Optional, Tuple, TypeVar, Union
-
-from .utils import canonicalize_version
-from .version import Version
-
-UnparsedVersion = Union[Version, str]
-UnparsedVersionVar = TypeVar("UnparsedVersionVar", bound=UnparsedVersion)
-CallableOperator = Callable[[Version, str], bool]
-
-
-def _coerce_version(version: UnparsedVersion) -> Version:
-    if not isinstance(version, Version):
-        version = Version(version)
-    return version
-
-
-class InvalidSpecifier(ValueError):
-    """
-    Raised when attempting to create a :class:`Specifier` with a specifier
-    string that is invalid.
-
-    >>> Specifier("lolwat")
-    Traceback (most recent call last):
-        ...
-    packaging.specifiers.InvalidSpecifier: Invalid specifier: 'lolwat'
-    """
-
-
-class BaseSpecifier(metaclass=abc.ABCMeta):
-    @abc.abstractmethod
-    def __str__(self) -> str:
-        """
-        Returns the str representation of this Specifier-like object. This
-        should be representative of the Specifier itself.
-        """
-
-    @abc.abstractmethod
-    def __hash__(self) -> int:
-        """
-        Returns a hash value for this Specifier-like object.
-        """
-
-    @abc.abstractmethod
-    def __eq__(self, other: object) -> bool:
-        """
-        Returns a boolean representing whether or not the two Specifier-like
-        objects are equal.
-
-        :param other: The other object to check against.
-        """
-
-    @property
-    @abc.abstractmethod
-    def prereleases(self) -> Optional[bool]:
-        """Whether or not pre-releases as a whole are allowed.
-
-        This can be set to either ``True`` or ``False`` to explicitly enable or disable
-        prereleases or it can be set to ``None`` (the default) to use default semantics.
-        """
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        """Setter for :attr:`prereleases`.
-
-        :param value: The value to set.
-        """
-
-    @abc.abstractmethod
-    def contains(self, item: str, prereleases: Optional[bool] = None) -> bool:
-        """
-        Determines if the given item is contained within this specifier.
-        """
-
-    @abc.abstractmethod
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """
-        Takes an iterable of items and filters them so that only items which
-        are contained within this specifier are allowed in it.
-        """
-
-
-class Specifier(BaseSpecifier):
-    """This class abstracts handling of version specifiers.
-
-    .. tip::
-
-        It is generally not required to instantiate this manually. You should instead
-        prefer to work with :class:`SpecifierSet` instead, which can parse
-        comma-separated version specifiers (which is what package metadata contains).
-    """
-
-    _operator_regex_str = r"""
-        (?P(~=|==|!=|<=|>=|<|>|===))
-        """
-    _version_regex_str = r"""
-        (?P
-            (?:
-                # The identity operators allow for an escape hatch that will
-                # do an exact string match of the version you wish to install.
-                # This will not be parsed by PEP 440 and we cannot determine
-                # any semantic meaning from it. This operator is discouraged
-                # but included entirely as an escape hatch.
-                (?<====)  # Only match for the identity operator
-                \s*
-                [^\s;)]*  # The arbitrary version can be just about anything,
-                          # we match everything except for whitespace, a
-                          # semi-colon for marker support, and a closing paren
-                          # since versions can be enclosed in them.
-            )
-            |
-            (?:
-                # The (non)equality operators allow for wild card and local
-                # versions to be specified so we have to define these two
-                # operators separately to enable that.
-                (?<===|!=)            # Only match for equals and not equals
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-
-                # You cannot use a wild card and a pre-release, post-release, a dev or
-                # local version together so group them with a | and make them optional.
-                (?:
-                    \.\*  # Wild card syntax of .*
-                    |
-                    (?:                                  # pre release
-                        [-_\.]?
-                        (alpha|beta|preview|pre|a|b|c|rc)
-                        [-_\.]?
-                        [0-9]*
-                    )?
-                    (?:                                  # post release
-                        (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                    )?
-                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
-                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
-                )?
-            )
-            |
-            (?:
-                # The compatible operator requires at least two digits in the
-                # release segment.
-                (?<=~=)               # Only match for the compatible operator
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
-                (?:                   # pre release
-                    [-_\.]?
-                    (alpha|beta|preview|pre|a|b|c|rc)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-            |
-            (?:
-                # All other operators only allow a sub set of what the
-                # (non)equality operators do. Specifically they do not allow
-                # local versions to be specified nor do they allow the prefix
-                # matching wild cards.
-                (?=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-        "===": "arbitrary",
-    }
-
-    def __init__(self, spec: str = "", prereleases: Optional[bool] = None) -> None:
-        """Initialize a Specifier instance.
-
-        :param spec:
-            The string representation of a specifier which will be parsed and
-            normalized before use.
-        :param prereleases:
-            This tells the specifier if it should accept prerelease versions if
-            applicable or not. The default of ``None`` will autodetect it from the
-            given specifiers.
-        :raises InvalidSpecifier:
-            If the given specifier is invalid (i.e. bad syntax).
-        """
-        match = self._regex.search(spec)
-        if not match:
-            raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
-
-        self._spec: Tuple[str, str] = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
-
-        # Store whether or not this Specifier should accept prereleases
-        self._prereleases = prereleases
-
-    # https://github.com/python/mypy/pull/13475#pullrequestreview-1079784515
-    @property  # type: ignore[override]
-    def prereleases(self) -> bool:
-        # If there is an explicit prereleases set for this, then we'll just
-        # blindly use that.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # Look at all of our specifiers and determine if they are inclusive
-        # operators, and if they are if they are including an explicit
-        # prerelease.
-        operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~=", "==="]:
-            # The == specifier can include a trailing .*, if it does we
-            # want to remove before parsing.
-            if operator == "==" and version.endswith(".*"):
-                version = version[:-2]
-
-            # Parse the version, and if it is a pre-release than this
-            # specifier allows pre-releases.
-            if Version(version).is_prerelease:
-                return True
-
-        return False
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
-
-    @property
-    def operator(self) -> str:
-        """The operator of this specifier.
-
-        >>> Specifier("==1.2.3").operator
-        '=='
-        """
-        return self._spec[0]
-
-    @property
-    def version(self) -> str:
-        """The version of this specifier.
-
-        >>> Specifier("==1.2.3").version
-        '1.2.3'
-        """
-        return self._spec[1]
-
-    def __repr__(self) -> str:
-        """A representation of the Specifier that shows all internal state.
-
-        >>> Specifier('>=1.0.0')
-        =1.0.0')>
-        >>> Specifier('>=1.0.0', prereleases=False)
-        =1.0.0', prereleases=False)>
-        >>> Specifier('>=1.0.0', prereleases=True)
-        =1.0.0', prereleases=True)>
-        """
-        pre = (
-            f", prereleases={self.prereleases!r}"
-            if self._prereleases is not None
-            else ""
-        )
-
-        return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
-
-    def __str__(self) -> str:
-        """A string representation of the Specifier that can be round-tripped.
-
-        >>> str(Specifier('>=1.0.0'))
-        '>=1.0.0'
-        >>> str(Specifier('>=1.0.0', prereleases=False))
-        '>=1.0.0'
-        """
-        return "{}{}".format(*self._spec)
-
-    @property
-    def _canonical_spec(self) -> Tuple[str, str]:
-        canonical_version = canonicalize_version(
-            self._spec[1],
-            strip_trailing_zero=(self._spec[0] != "~="),
-        )
-        return self._spec[0], canonical_version
-
-    def __hash__(self) -> int:
-        return hash(self._canonical_spec)
-
-    def __eq__(self, other: object) -> bool:
-        """Whether or not the two Specifier-like objects are equal.
-
-        :param other: The other object to check against.
-
-        The value of :attr:`prereleases` is ignored.
-
-        >>> Specifier("==1.2.3") == Specifier("== 1.2.3.0")
-        True
-        >>> (Specifier("==1.2.3", prereleases=False) ==
-        ...  Specifier("==1.2.3", prereleases=True))
-        True
-        >>> Specifier("==1.2.3") == "==1.2.3"
-        True
-        >>> Specifier("==1.2.3") == Specifier("==1.2.4")
-        False
-        >>> Specifier("==1.2.3") == Specifier("~=1.2.3")
-        False
-        """
-        if isinstance(other, str):
-            try:
-                other = self.__class__(str(other))
-            except InvalidSpecifier:
-                return NotImplemented
-        elif not isinstance(other, self.__class__):
-            return NotImplemented
-
-        return self._canonical_spec == other._canonical_spec
-
-    def _get_operator(self, op: str) -> CallableOperator:
-        operator_callable: CallableOperator = getattr(
-            self, f"_compare_{self._operators[op]}"
-        )
-        return operator_callable
-
-    def _compare_compatible(self, prospective: Version, spec: str) -> bool:
-        # Compatible releases have an equivalent combination of >= and ==. That
-        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
-        # implement this in terms of the other specifiers instead of
-        # implementing it ourselves. The only thing we need to do is construct
-        # the other specifiers.
-
-        # We want everything but the last item in the version, but we want to
-        # ignore suffix segments.
-        prefix = _version_join(
-            list(itertools.takewhile(_is_not_suffix, _version_split(spec)))[:-1]
-        )
-
-        # Add the prefix notation to the end of our string
-        prefix += ".*"
-
-        return self._get_operator(">=")(prospective, spec) and self._get_operator("==")(
-            prospective, prefix
-        )
-
-    def _compare_equal(self, prospective: Version, spec: str) -> bool:
-        # We need special logic to handle prefix matching
-        if spec.endswith(".*"):
-            # In the case of prefix matching we want to ignore local segment.
-            normalized_prospective = canonicalize_version(
-                prospective.public, strip_trailing_zero=False
-            )
-            # Get the normalized version string ignoring the trailing .*
-            normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False)
-            # Split the spec out by bangs and dots, and pretend that there is
-            # an implicit dot in between a release segment and a pre-release segment.
-            split_spec = _version_split(normalized_spec)
-
-            # Split the prospective version out by bangs and dots, and pretend
-            # that there is an implicit dot in between a release segment and
-            # a pre-release segment.
-            split_prospective = _version_split(normalized_prospective)
-
-            # 0-pad the prospective version before shortening it to get the correct
-            # shortened version.
-            padded_prospective, _ = _pad_version(split_prospective, split_spec)
-
-            # Shorten the prospective version to be the same length as the spec
-            # so that we can determine if the specifier is a prefix of the
-            # prospective version or not.
-            shortened_prospective = padded_prospective[: len(split_spec)]
-
-            return shortened_prospective == split_spec
-        else:
-            # Convert our spec string into a Version
-            spec_version = Version(spec)
-
-            # If the specifier does not have a local segment, then we want to
-            # act as if the prospective version also does not have a local
-            # segment.
-            if not spec_version.local:
-                prospective = Version(prospective.public)
-
-            return prospective == spec_version
-
-    def _compare_not_equal(self, prospective: Version, spec: str) -> bool:
-        return not self._compare_equal(prospective, spec)
-
-    def _compare_less_than_equal(self, prospective: Version, spec: str) -> bool:
-        # NB: Local version identifiers are NOT permitted in the version
-        # specifier, so local version labels can be universally removed from
-        # the prospective version.
-        return Version(prospective.public) <= Version(spec)
-
-    def _compare_greater_than_equal(self, prospective: Version, spec: str) -> bool:
-        # NB: Local version identifiers are NOT permitted in the version
-        # specifier, so local version labels can be universally removed from
-        # the prospective version.
-        return Version(prospective.public) >= Version(spec)
-
-    def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec_str)
-
-        # Check to see if the prospective version is less than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective < spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a pre-release version, that we do not accept pre-release
-        # versions for the version mentioned in the specifier (e.g. <3.1 should
-        # not match 3.1.dev0, but should match 3.0.dev0).
-        if not spec.is_prerelease and prospective.is_prerelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # less than the spec version *and* it's not a pre-release of the same
-        # version in the spec.
-        return True
-
-    def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec_str)
-
-        # Check to see if the prospective version is greater than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective > spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a post-release version, that we do not accept
-        # post-release versions for the version mentioned in the specifier
-        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
-        if not spec.is_postrelease and prospective.is_postrelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is technically greater than, to match.
-        if prospective.local is not None:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # greater than the spec version *and* it's not a pre-release of the
-        # same version in the spec.
-        return True
-
-    def _compare_arbitrary(self, prospective: Version, spec: str) -> bool:
-        return str(prospective).lower() == str(spec).lower()
-
-    def __contains__(self, item: Union[str, Version]) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item: The item to check for.
-
-        This is used for the ``in`` operator and behaves the same as
-        :meth:`contains` with no ``prereleases`` argument passed.
-
-        >>> "1.2.3" in Specifier(">=1.2.3")
-        True
-        >>> Version("1.2.3") in Specifier(">=1.2.3")
-        True
-        >>> "1.0.0" in Specifier(">=1.2.3")
-        False
-        >>> "1.3.0a1" in Specifier(">=1.2.3")
-        False
-        >>> "1.3.0a1" in Specifier(">=1.2.3", prereleases=True)
-        True
-        """
-        return self.contains(item)
-
-    def contains(
-        self, item: UnparsedVersion, prereleases: Optional[bool] = None
-    ) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item:
-            The item to check for, which can be a version string or a
-            :class:`Version` instance.
-        :param prereleases:
-            Whether or not to match prereleases with this Specifier. If set to
-            ``None`` (the default), it uses :attr:`prereleases` to determine
-            whether or not prereleases are allowed.
-
-        >>> Specifier(">=1.2.3").contains("1.2.3")
-        True
-        >>> Specifier(">=1.2.3").contains(Version("1.2.3"))
-        True
-        >>> Specifier(">=1.2.3").contains("1.0.0")
-        False
-        >>> Specifier(">=1.2.3").contains("1.3.0a1")
-        False
-        >>> Specifier(">=1.2.3", prereleases=True).contains("1.3.0a1")
-        True
-        >>> Specifier(">=1.2.3").contains("1.3.0a1", prereleases=True)
-        True
-        """
-
-        # Determine if prereleases are to be allowed or not.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # Normalize item to a Version, this allows us to have a shortcut for
-        # "2.0" in Specifier(">=2")
-        normalized_item = _coerce_version(item)
-
-        # Determine if we should be supporting prereleases in this specifier
-        # or not, if we do not support prereleases than we can short circuit
-        # logic if this version is a prereleases.
-        if normalized_item.is_prerelease and not prereleases:
-            return False
-
-        # Actually do the comparison to determine if this item is contained
-        # within this Specifier or not.
-        operator_callable: CallableOperator = self._get_operator(self.operator)
-        return operator_callable(normalized_item, self.version)
-
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """Filter items in the given iterable, that match the specifier.
-
-        :param iterable:
-            An iterable that can contain version strings and :class:`Version` instances.
-            The items in the iterable will be filtered according to the specifier.
-        :param prereleases:
-            Whether or not to allow prereleases in the returned iterator. If set to
-            ``None`` (the default), it will be intelligently decide whether to allow
-            prereleases or not (based on the :attr:`prereleases` attribute, and
-            whether the only versions matching are prereleases).
-
-        This method is smarter than just ``filter(Specifier().contains, [...])``
-        because it implements the rule from :pep:`440` that a prerelease item
-        SHOULD be accepted if no other versions match the given specifier.
-
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.2.3", "1.3", Version("1.4")]))
-        ['1.2.3', '1.3', ]
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.5a1"]))
-        ['1.5a1']
-        >>> list(Specifier(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        >>> list(Specifier(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-        """
-
-        yielded = False
-        found_prereleases = []
-
-        kw = {"prereleases": prereleases if prereleases is not None else True}
-
-        # Attempt to iterate over all the values in the iterable and if any of
-        # them match, yield them.
-        for version in iterable:
-            parsed_version = _coerce_version(version)
-
-            if self.contains(parsed_version, **kw):
-                # If our version is a prerelease, and we were not set to allow
-                # prereleases, then we'll store it for later in case nothing
-                # else matches this specifier.
-                if parsed_version.is_prerelease and not (
-                    prereleases or self.prereleases
-                ):
-                    found_prereleases.append(version)
-                # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning.
-                else:
-                    yielded = True
-                    yield version
-
-        # Now that we've iterated over everything, determine if we've yielded
-        # any values, and if we have not and we have any prereleases stored up
-        # then we will go ahead and yield the prereleases.
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
-
-
-_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
-
-
-def _version_split(version: str) -> List[str]:
-    """Split version into components.
-
-    The split components are intended for version comparison. The logic does
-    not attempt to retain the original version string, so joining the
-    components back with :func:`_version_join` may not produce the original
-    version string.
-    """
-    result: List[str] = []
-
-    epoch, _, rest = version.rpartition("!")
-    result.append(epoch or "0")
-
-    for item in rest.split("."):
-        match = _prefix_regex.search(item)
-        if match:
-            result.extend(match.groups())
-        else:
-            result.append(item)
-    return result
-
-
-def _version_join(components: List[str]) -> str:
-    """Join split version components into a version string.
-
-    This function assumes the input came from :func:`_version_split`, where the
-    first component must be the epoch (either empty or numeric), and all other
-    components numeric.
-    """
-    epoch, *rest = components
-    return f"{epoch}!{'.'.join(rest)}"
-
-
-def _is_not_suffix(segment: str) -> bool:
-    return not any(
-        segment.startswith(prefix) for prefix in ("dev", "a", "b", "rc", "post")
-    )
-
-
-def _pad_version(left: List[str], right: List[str]) -> Tuple[List[str], List[str]]:
-    left_split, right_split = [], []
-
-    # Get the release segment of our versions
-    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
-    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
-
-    # Get the rest of our versions
-    left_split.append(left[len(left_split[0]) :])
-    right_split.append(right[len(right_split[0]) :])
-
-    # Insert our padding
-    left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
-    right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
-
-    return (
-        list(itertools.chain.from_iterable(left_split)),
-        list(itertools.chain.from_iterable(right_split)),
-    )
-
-
-class SpecifierSet(BaseSpecifier):
-    """This class abstracts handling of a set of version specifiers.
-
-    It can be passed a single specifier (``>=3.0``), a comma-separated list of
-    specifiers (``>=3.0,!=3.1``), or no specifier at all.
-    """
-
-    def __init__(
-        self, specifiers: str = "", prereleases: Optional[bool] = None
-    ) -> None:
-        """Initialize a SpecifierSet instance.
-
-        :param specifiers:
-            The string representation of a specifier or a comma-separated list of
-            specifiers which will be parsed and normalized before use.
-        :param prereleases:
-            This tells the SpecifierSet if it should accept prerelease versions if
-            applicable or not. The default of ``None`` will autodetect it from the
-            given specifiers.
-
-        :raises InvalidSpecifier:
-            If the given ``specifiers`` are not parseable than this exception will be
-            raised.
-        """
-
-        # Split on `,` to break each individual specifier into it's own item, and
-        # strip each item to remove leading/trailing whitespace.
-        split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
-
-        # Make each individual specifier a Specifier and save in a frozen set for later.
-        self._specs = frozenset(map(Specifier, split_specifiers))
-
-        # Store our prereleases value so we can use it later to determine if
-        # we accept prereleases or not.
-        self._prereleases = prereleases
-
-    @property
-    def prereleases(self) -> Optional[bool]:
-        # If we have been given an explicit prerelease modifier, then we'll
-        # pass that through here.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # If we don't have any specifiers, and we don't have a forced value,
-        # then we'll just return None since we don't know if this should have
-        # pre-releases or not.
-        if not self._specs:
-            return None
-
-        # Otherwise we'll see if any of the given specifiers accept
-        # prereleases, if any of them do we'll return True, otherwise False.
-        return any(s.prereleases for s in self._specs)
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
-
-    def __repr__(self) -> str:
-        """A representation of the specifier set that shows all internal state.
-
-        Note that the ordering of the individual specifiers within the set may not
-        match the input string.
-
-        >>> SpecifierSet('>=1.0.0,!=2.0.0')
-        =1.0.0')>
-        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=False)
-        =1.0.0', prereleases=False)>
-        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=True)
-        =1.0.0', prereleases=True)>
-        """
-        pre = (
-            f", prereleases={self.prereleases!r}"
-            if self._prereleases is not None
-            else ""
-        )
-
-        return f""
-
-    def __str__(self) -> str:
-        """A string representation of the specifier set that can be round-tripped.
-
-        Note that the ordering of the individual specifiers within the set may not
-        match the input string.
-
-        >>> str(SpecifierSet(">=1.0.0,!=1.0.1"))
-        '!=1.0.1,>=1.0.0'
-        >>> str(SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False))
-        '!=1.0.1,>=1.0.0'
-        """
-        return ",".join(sorted(str(s) for s in self._specs))
-
-    def __hash__(self) -> int:
-        return hash(self._specs)
-
-    def __and__(self, other: Union["SpecifierSet", str]) -> "SpecifierSet":
-        """Return a SpecifierSet which is a combination of the two sets.
-
-        :param other: The other object to combine with.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") & '<=2.0.0,!=2.0.1'
-        =1.0.0')>
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") & SpecifierSet('<=2.0.0,!=2.0.1')
-        =1.0.0')>
-        """
-        if isinstance(other, str):
-            other = SpecifierSet(other)
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        specifier = SpecifierSet()
-        specifier._specs = frozenset(self._specs | other._specs)
-
-        if self._prereleases is None and other._prereleases is not None:
-            specifier._prereleases = other._prereleases
-        elif self._prereleases is not None and other._prereleases is None:
-            specifier._prereleases = self._prereleases
-        elif self._prereleases == other._prereleases:
-            specifier._prereleases = self._prereleases
-        else:
-            raise ValueError(
-                "Cannot combine SpecifierSets with True and False prerelease "
-                "overrides."
-            )
-
-        return specifier
-
-    def __eq__(self, other: object) -> bool:
-        """Whether or not the two SpecifierSet-like objects are equal.
-
-        :param other: The other object to check against.
-
-        The value of :attr:`prereleases` is ignored.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> (SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False) ==
-        ...  SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True))
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == ">=1.0.0,!=1.0.1"
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.2")
-        False
-        """
-        if isinstance(other, (str, Specifier)):
-            other = SpecifierSet(str(other))
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        return self._specs == other._specs
-
-    def __len__(self) -> int:
-        """Returns the number of specifiers in this specifier set."""
-        return len(self._specs)
-
-    def __iter__(self) -> Iterator[Specifier]:
-        """
-        Returns an iterator over all the underlying :class:`Specifier` instances
-        in this specifier set.
-
-        >>> sorted(SpecifierSet(">=1.0.0,!=1.0.1"), key=str)
-        [, =1.0.0')>]
-        """
-        return iter(self._specs)
-
-    def __contains__(self, item: UnparsedVersion) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item: The item to check for.
-
-        This is used for the ``in`` operator and behaves the same as
-        :meth:`contains` with no ``prereleases`` argument passed.
-
-        >>> "1.2.3" in SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> Version("1.2.3") in SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> "1.0.1" in SpecifierSet(">=1.0.0,!=1.0.1")
-        False
-        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1")
-        False
-        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True)
-        True
-        """
-        return self.contains(item)
-
-    def contains(
-        self,
-        item: UnparsedVersion,
-        prereleases: Optional[bool] = None,
-        installed: Optional[bool] = None,
-    ) -> bool:
-        """Return whether or not the item is contained in this SpecifierSet.
-
-        :param item:
-            The item to check for, which can be a version string or a
-            :class:`Version` instance.
-        :param prereleases:
-            Whether or not to match prereleases with this SpecifierSet. If set to
-            ``None`` (the default), it uses :attr:`prereleases` to determine
-            whether or not prereleases are allowed.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.2.3")
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains(Version("1.2.3"))
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.0.1")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True).contains("1.3.0a1")
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1", prereleases=True)
-        True
-        """
-        # Ensure that our item is a Version instance.
-        if not isinstance(item, Version):
-            item = Version(item)
-
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # We can determine if we're going to allow pre-releases by looking to
-        # see if any of the underlying items supports them. If none of them do
-        # and this item is a pre-release then we do not allow it and we can
-        # short circuit that here.
-        # Note: This means that 1.0.dev1 would not be contained in something
-        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
-        if not prereleases and item.is_prerelease:
-            return False
-
-        if installed and item.is_prerelease:
-            item = Version(item.base_version)
-
-        # We simply dispatch to the underlying specs here to make sure that the
-        # given version is contained within all of them.
-        # Note: This use of all() here means that an empty set of specifiers
-        #       will always return True, this is an explicit design decision.
-        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
-
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: Optional[bool] = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """Filter items in the given iterable, that match the specifiers in this set.
-
-        :param iterable:
-            An iterable that can contain version strings and :class:`Version` instances.
-            The items in the iterable will be filtered according to the specifier.
-        :param prereleases:
-            Whether or not to allow prereleases in the returned iterator. If set to
-            ``None`` (the default), it will be intelligently decide whether to allow
-            prereleases or not (based on the :attr:`prereleases` attribute, and
-            whether the only versions matching are prereleases).
-
-        This method is smarter than just ``filter(SpecifierSet(...).contains, [...])``
-        because it implements the rule from :pep:`440` that a prerelease item
-        SHOULD be accepted if no other versions match the given specifier.
-
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", Version("1.4")]))
-        ['1.3', ]
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.5a1"]))
-        []
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        >>> list(SpecifierSet(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-
-        An "empty" SpecifierSet will filter items based on the presence of prerelease
-        versions in the set.
-
-        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(SpecifierSet("").filter(["1.5a1"]))
-        ['1.5a1']
-        >>> list(SpecifierSet("", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        """
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # If we have any specifiers, then we want to wrap our iterable in the
-        # filter method for each one, this will act as a logical AND amongst
-        # each specifier.
-        if self._specs:
-            for spec in self._specs:
-                iterable = spec.filter(iterable, prereleases=bool(prereleases))
-            return iter(iterable)
-        # If we do not have any specifiers, then we need to have a rough filter
-        # which will filter out any pre-releases, unless there are no final
-        # releases.
-        else:
-            filtered: List[UnparsedVersionVar] = []
-            found_prereleases: List[UnparsedVersionVar] = []
-
-            for item in iterable:
-                parsed_version = _coerce_version(item)
-
-                # Store any item which is a pre-release for later unless we've
-                # already found a final version or we are accepting prereleases
-                if parsed_version.is_prerelease and not prereleases:
-                    if not filtered:
-                        found_prereleases.append(item)
-                else:
-                    filtered.append(item)
-
-            # If we've found no items except for pre-releases, then we'll go
-            # ahead and use the pre-releases
-            if not filtered and found_prereleases and prereleases is None:
-                return iter(found_prereleases)
-
-            return iter(filtered)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/tags.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/tags.py
deleted file mode 100644
index 89f1926..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/tags.py
+++ /dev/null
@@ -1,571 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-import logging
-import platform
-import re
-import struct
-import subprocess
-import sys
-import sysconfig
-from importlib.machinery import EXTENSION_SUFFIXES
-from typing import (
-    Dict,
-    FrozenSet,
-    Iterable,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Tuple,
-    Union,
-    cast,
-)
-
-from . import _manylinux, _musllinux
-
-logger = logging.getLogger(__name__)
-
-PythonVersion = Sequence[int]
-MacVersion = Tuple[int, int]
-
-INTERPRETER_SHORT_NAMES: Dict[str, str] = {
-    "python": "py",  # Generic.
-    "cpython": "cp",
-    "pypy": "pp",
-    "ironpython": "ip",
-    "jython": "jy",
-}
-
-
-_32_BIT_INTERPRETER = struct.calcsize("P") == 4
-
-
-class Tag:
-    """
-    A representation of the tag triple for a wheel.
-
-    Instances are considered immutable and thus are hashable. Equality checking
-    is also supported.
-    """
-
-    __slots__ = ["_interpreter", "_abi", "_platform", "_hash"]
-
-    def __init__(self, interpreter: str, abi: str, platform: str) -> None:
-        self._interpreter = interpreter.lower()
-        self._abi = abi.lower()
-        self._platform = platform.lower()
-        # The __hash__ of every single element in a Set[Tag] will be evaluated each time
-        # that a set calls its `.disjoint()` method, which may be called hundreds of
-        # times when scanning a page of links for packages with tags matching that
-        # Set[Tag]. Pre-computing the value here produces significant speedups for
-        # downstream consumers.
-        self._hash = hash((self._interpreter, self._abi, self._platform))
-
-    @property
-    def interpreter(self) -> str:
-        return self._interpreter
-
-    @property
-    def abi(self) -> str:
-        return self._abi
-
-    @property
-    def platform(self) -> str:
-        return self._platform
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, Tag):
-            return NotImplemented
-
-        return (
-            (self._hash == other._hash)  # Short-circuit ASAP for perf reasons.
-            and (self._platform == other._platform)
-            and (self._abi == other._abi)
-            and (self._interpreter == other._interpreter)
-        )
-
-    def __hash__(self) -> int:
-        return self._hash
-
-    def __str__(self) -> str:
-        return f"{self._interpreter}-{self._abi}-{self._platform}"
-
-    def __repr__(self) -> str:
-        return f"<{self} @ {id(self)}>"
-
-
-def parse_tag(tag: str) -> FrozenSet[Tag]:
-    """
-    Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
-
-    Returning a set is required due to the possibility that the tag is a
-    compressed tag set.
-    """
-    tags = set()
-    interpreters, abis, platforms = tag.split("-")
-    for interpreter in interpreters.split("."):
-        for abi in abis.split("."):
-            for platform_ in platforms.split("."):
-                tags.add(Tag(interpreter, abi, platform_))
-    return frozenset(tags)
-
-
-def _get_config_var(name: str, warn: bool = False) -> Union[int, str, None]:
-    value: Union[int, str, None] = sysconfig.get_config_var(name)
-    if value is None and warn:
-        logger.debug(
-            "Config variable '%s' is unset, Python ABI tag may be incorrect", name
-        )
-    return value
-
-
-def _normalize_string(string: str) -> str:
-    return string.replace(".", "_").replace("-", "_").replace(" ", "_")
-
-
-def _is_threaded_cpython(abis: List[str]) -> bool:
-    """
-    Determine if the ABI corresponds to a threaded (`--disable-gil`) build.
-
-    The threaded builds are indicated by a "t" in the abiflags.
-    """
-    if len(abis) == 0:
-        return False
-    # expect e.g., cp313
-    m = re.match(r"cp\d+(.*)", abis[0])
-    if not m:
-        return False
-    abiflags = m.group(1)
-    return "t" in abiflags
-
-
-def _abi3_applies(python_version: PythonVersion, threading: bool) -> bool:
-    """
-    Determine if the Python version supports abi3.
-
-    PEP 384 was first implemented in Python 3.2. The threaded (`--disable-gil`)
-    builds do not support abi3.
-    """
-    return len(python_version) > 1 and tuple(python_version) >= (3, 2) and not threading
-
-
-def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> List[str]:
-    py_version = tuple(py_version)  # To allow for version comparison.
-    abis = []
-    version = _version_nodot(py_version[:2])
-    threading = debug = pymalloc = ucs4 = ""
-    with_debug = _get_config_var("Py_DEBUG", warn)
-    has_refcount = hasattr(sys, "gettotalrefcount")
-    # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
-    # extension modules is the best option.
-    # https://github.com/pypa/pip/issues/3383#issuecomment-173267692
-    has_ext = "_d.pyd" in EXTENSION_SUFFIXES
-    if with_debug or (with_debug is None and (has_refcount or has_ext)):
-        debug = "d"
-    if py_version >= (3, 13) and _get_config_var("Py_GIL_DISABLED", warn):
-        threading = "t"
-    if py_version < (3, 8):
-        with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
-        if with_pymalloc or with_pymalloc is None:
-            pymalloc = "m"
-        if py_version < (3, 3):
-            unicode_size = _get_config_var("Py_UNICODE_SIZE", warn)
-            if unicode_size == 4 or (
-                unicode_size is None and sys.maxunicode == 0x10FFFF
-            ):
-                ucs4 = "u"
-    elif debug:
-        # Debug builds can also load "normal" extension modules.
-        # We can also assume no UCS-4 or pymalloc requirement.
-        abis.append(f"cp{version}{threading}")
-    abis.insert(0, f"cp{version}{threading}{debug}{pymalloc}{ucs4}")
-    return abis
-
-
-def cpython_tags(
-    python_version: Optional[PythonVersion] = None,
-    abis: Optional[Iterable[str]] = None,
-    platforms: Optional[Iterable[str]] = None,
-    *,
-    warn: bool = False,
-) -> Iterator[Tag]:
-    """
-    Yields the tags for a CPython interpreter.
-
-    The tags consist of:
-    - cp--
-    - cp-abi3-
-    - cp-none-
-    - cp-abi3-  # Older Python versions down to 3.2.
-
-    If python_version only specifies a major version then user-provided ABIs and
-    the 'none' ABItag will be used.
-
-    If 'abi3' or 'none' are specified in 'abis' then they will be yielded at
-    their normal position and not at the beginning.
-    """
-    if not python_version:
-        python_version = sys.version_info[:2]
-
-    interpreter = f"cp{_version_nodot(python_version[:2])}"
-
-    if abis is None:
-        if len(python_version) > 1:
-            abis = _cpython_abis(python_version, warn)
-        else:
-            abis = []
-    abis = list(abis)
-    # 'abi3' and 'none' are explicitly handled later.
-    for explicit_abi in ("abi3", "none"):
-        try:
-            abis.remove(explicit_abi)
-        except ValueError:
-            pass
-
-    platforms = list(platforms or platform_tags())
-    for abi in abis:
-        for platform_ in platforms:
-            yield Tag(interpreter, abi, platform_)
-
-    threading = _is_threaded_cpython(abis)
-    use_abi3 = _abi3_applies(python_version, threading)
-    if use_abi3:
-        yield from (Tag(interpreter, "abi3", platform_) for platform_ in platforms)
-    yield from (Tag(interpreter, "none", platform_) for platform_ in platforms)
-
-    if use_abi3:
-        for minor_version in range(python_version[1] - 1, 1, -1):
-            for platform_ in platforms:
-                interpreter = "cp{version}".format(
-                    version=_version_nodot((python_version[0], minor_version))
-                )
-                yield Tag(interpreter, "abi3", platform_)
-
-
-def _generic_abi() -> List[str]:
-    """
-    Return the ABI tag based on EXT_SUFFIX.
-    """
-    # The following are examples of `EXT_SUFFIX`.
-    # We want to keep the parts which are related to the ABI and remove the
-    # parts which are related to the platform:
-    # - linux:   '.cpython-310-x86_64-linux-gnu.so' => cp310
-    # - mac:     '.cpython-310-darwin.so'           => cp310
-    # - win:     '.cp310-win_amd64.pyd'             => cp310
-    # - win:     '.pyd'                             => cp37 (uses _cpython_abis())
-    # - pypy:    '.pypy38-pp73-x86_64-linux-gnu.so' => pypy38_pp73
-    # - graalpy: '.graalpy-38-native-x86_64-darwin.dylib'
-    #                                               => graalpy_38_native
-
-    ext_suffix = _get_config_var("EXT_SUFFIX", warn=True)
-    if not isinstance(ext_suffix, str) or ext_suffix[0] != ".":
-        raise SystemError("invalid sysconfig.get_config_var('EXT_SUFFIX')")
-    parts = ext_suffix.split(".")
-    if len(parts) < 3:
-        # CPython3.7 and earlier uses ".pyd" on Windows.
-        return _cpython_abis(sys.version_info[:2])
-    soabi = parts[1]
-    if soabi.startswith("cpython"):
-        # non-windows
-        abi = "cp" + soabi.split("-")[1]
-    elif soabi.startswith("cp"):
-        # windows
-        abi = soabi.split("-")[0]
-    elif soabi.startswith("pypy"):
-        abi = "-".join(soabi.split("-")[:2])
-    elif soabi.startswith("graalpy"):
-        abi = "-".join(soabi.split("-")[:3])
-    elif soabi:
-        # pyston, ironpython, others?
-        abi = soabi
-    else:
-        return []
-    return [_normalize_string(abi)]
-
-
-def generic_tags(
-    interpreter: Optional[str] = None,
-    abis: Optional[Iterable[str]] = None,
-    platforms: Optional[Iterable[str]] = None,
-    *,
-    warn: bool = False,
-) -> Iterator[Tag]:
-    """
-    Yields the tags for a generic interpreter.
-
-    The tags consist of:
-    - --
-
-    The "none" ABI will be added if it was not explicitly provided.
-    """
-    if not interpreter:
-        interp_name = interpreter_name()
-        interp_version = interpreter_version(warn=warn)
-        interpreter = "".join([interp_name, interp_version])
-    if abis is None:
-        abis = _generic_abi()
-    else:
-        abis = list(abis)
-    platforms = list(platforms or platform_tags())
-    if "none" not in abis:
-        abis.append("none")
-    for abi in abis:
-        for platform_ in platforms:
-            yield Tag(interpreter, abi, platform_)
-
-
-def _py_interpreter_range(py_version: PythonVersion) -> Iterator[str]:
-    """
-    Yields Python versions in descending order.
-
-    After the latest version, the major-only version will be yielded, and then
-    all previous versions of that major version.
-    """
-    if len(py_version) > 1:
-        yield f"py{_version_nodot(py_version[:2])}"
-    yield f"py{py_version[0]}"
-    if len(py_version) > 1:
-        for minor in range(py_version[1] - 1, -1, -1):
-            yield f"py{_version_nodot((py_version[0], minor))}"
-
-
-def compatible_tags(
-    python_version: Optional[PythonVersion] = None,
-    interpreter: Optional[str] = None,
-    platforms: Optional[Iterable[str]] = None,
-) -> Iterator[Tag]:
-    """
-    Yields the sequence of tags that are compatible with a specific version of Python.
-
-    The tags consist of:
-    - py*-none-
-    - -none-any  # ... if `interpreter` is provided.
-    - py*-none-any
-    """
-    if not python_version:
-        python_version = sys.version_info[:2]
-    platforms = list(platforms or platform_tags())
-    for version in _py_interpreter_range(python_version):
-        for platform_ in platforms:
-            yield Tag(version, "none", platform_)
-    if interpreter:
-        yield Tag(interpreter, "none", "any")
-    for version in _py_interpreter_range(python_version):
-        yield Tag(version, "none", "any")
-
-
-def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
-    if not is_32bit:
-        return arch
-
-    if arch.startswith("ppc"):
-        return "ppc"
-
-    return "i386"
-
-
-def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> List[str]:
-    formats = [cpu_arch]
-    if cpu_arch == "x86_64":
-        if version < (10, 4):
-            return []
-        formats.extend(["intel", "fat64", "fat32"])
-
-    elif cpu_arch == "i386":
-        if version < (10, 4):
-            return []
-        formats.extend(["intel", "fat32", "fat"])
-
-    elif cpu_arch == "ppc64":
-        # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
-        if version > (10, 5) or version < (10, 4):
-            return []
-        formats.append("fat64")
-
-    elif cpu_arch == "ppc":
-        if version > (10, 6):
-            return []
-        formats.extend(["fat32", "fat"])
-
-    if cpu_arch in {"arm64", "x86_64"}:
-        formats.append("universal2")
-
-    if cpu_arch in {"x86_64", "i386", "ppc64", "ppc", "intel"}:
-        formats.append("universal")
-
-    return formats
-
-
-def mac_platforms(
-    version: Optional[MacVersion] = None, arch: Optional[str] = None
-) -> Iterator[str]:
-    """
-    Yields the platform tags for a macOS system.
-
-    The `version` parameter is a two-item tuple specifying the macOS version to
-    generate platform tags for. The `arch` parameter is the CPU architecture to
-    generate platform tags for. Both parameters default to the appropriate value
-    for the current system.
-    """
-    version_str, _, cpu_arch = platform.mac_ver()
-    if version is None:
-        version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
-        if version == (10, 16):
-            # When built against an older macOS SDK, Python will report macOS 10.16
-            # instead of the real version.
-            version_str = subprocess.run(
-                [
-                    sys.executable,
-                    "-sS",
-                    "-c",
-                    "import platform; print(platform.mac_ver()[0])",
-                ],
-                check=True,
-                env={"SYSTEM_VERSION_COMPAT": "0"},
-                stdout=subprocess.PIPE,
-                text=True,
-            ).stdout
-            version = cast("MacVersion", tuple(map(int, version_str.split(".")[:2])))
-    else:
-        version = version
-    if arch is None:
-        arch = _mac_arch(cpu_arch)
-    else:
-        arch = arch
-
-    if (10, 0) <= version and version < (11, 0):
-        # Prior to Mac OS 11, each yearly release of Mac OS bumped the
-        # "minor" version number.  The major version was always 10.
-        for minor_version in range(version[1], -1, -1):
-            compat_version = 10, minor_version
-            binary_formats = _mac_binary_formats(compat_version, arch)
-            for binary_format in binary_formats:
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=10, minor=minor_version, binary_format=binary_format
-                )
-
-    if version >= (11, 0):
-        # Starting with Mac OS 11, each yearly release bumps the major version
-        # number.   The minor versions are now the midyear updates.
-        for major_version in range(version[0], 10, -1):
-            compat_version = major_version, 0
-            binary_formats = _mac_binary_formats(compat_version, arch)
-            for binary_format in binary_formats:
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=major_version, minor=0, binary_format=binary_format
-                )
-
-    if version >= (11, 0):
-        # Mac OS 11 on x86_64 is compatible with binaries from previous releases.
-        # Arm64 support was introduced in 11.0, so no Arm binaries from previous
-        # releases exist.
-        #
-        # However, the "universal2" binary format can have a
-        # macOS version earlier than 11.0 when the x86_64 part of the binary supports
-        # that version of macOS.
-        if arch == "x86_64":
-            for minor_version in range(16, 3, -1):
-                compat_version = 10, minor_version
-                binary_formats = _mac_binary_formats(compat_version, arch)
-                for binary_format in binary_formats:
-                    yield "macosx_{major}_{minor}_{binary_format}".format(
-                        major=compat_version[0],
-                        minor=compat_version[1],
-                        binary_format=binary_format,
-                    )
-        else:
-            for minor_version in range(16, 3, -1):
-                compat_version = 10, minor_version
-                binary_format = "universal2"
-                yield "macosx_{major}_{minor}_{binary_format}".format(
-                    major=compat_version[0],
-                    minor=compat_version[1],
-                    binary_format=binary_format,
-                )
-
-
-def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
-    linux = _normalize_string(sysconfig.get_platform())
-    if not linux.startswith("linux_"):
-        # we should never be here, just yield the sysconfig one and return
-        yield linux
-        return
-    if is_32bit:
-        if linux == "linux_x86_64":
-            linux = "linux_i686"
-        elif linux == "linux_aarch64":
-            linux = "linux_armv8l"
-    _, arch = linux.split("_", 1)
-    archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
-    yield from _manylinux.platform_tags(archs)
-    yield from _musllinux.platform_tags(archs)
-    for arch in archs:
-        yield f"linux_{arch}"
-
-
-def _generic_platforms() -> Iterator[str]:
-    yield _normalize_string(sysconfig.get_platform())
-
-
-def platform_tags() -> Iterator[str]:
-    """
-    Provides the platform tags for this installation.
-    """
-    if platform.system() == "Darwin":
-        return mac_platforms()
-    elif platform.system() == "Linux":
-        return _linux_platforms()
-    else:
-        return _generic_platforms()
-
-
-def interpreter_name() -> str:
-    """
-    Returns the name of the running interpreter.
-
-    Some implementations have a reserved, two-letter abbreviation which will
-    be returned when appropriate.
-    """
-    name = sys.implementation.name
-    return INTERPRETER_SHORT_NAMES.get(name) or name
-
-
-def interpreter_version(*, warn: bool = False) -> str:
-    """
-    Returns the version of the running interpreter.
-    """
-    version = _get_config_var("py_version_nodot", warn=warn)
-    if version:
-        version = str(version)
-    else:
-        version = _version_nodot(sys.version_info[:2])
-    return version
-
-
-def _version_nodot(version: PythonVersion) -> str:
-    return "".join(map(str, version))
-
-
-def sys_tags(*, warn: bool = False) -> Iterator[Tag]:
-    """
-    Returns the sequence of tag triples for the running interpreter.
-
-    The order of the sequence corresponds to priority order for the
-    interpreter, from most to least important.
-    """
-
-    interp_name = interpreter_name()
-    if interp_name == "cp":
-        yield from cpython_tags(warn=warn)
-    else:
-        yield from generic_tags()
-
-    if interp_name == "pp":
-        interp = "pp3"
-    elif interp_name == "cp":
-        interp = "cp" + interpreter_version(warn=warn)
-    else:
-        interp = None
-    yield from compatible_tags(interpreter=interp)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/utils.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/utils.py
deleted file mode 100644
index c2c2f75..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/utils.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-import re
-from typing import FrozenSet, NewType, Tuple, Union, cast
-
-from .tags import Tag, parse_tag
-from .version import InvalidVersion, Version
-
-BuildTag = Union[Tuple[()], Tuple[int, str]]
-NormalizedName = NewType("NormalizedName", str)
-
-
-class InvalidName(ValueError):
-    """
-    An invalid distribution name; users should refer to the packaging user guide.
-    """
-
-
-class InvalidWheelFilename(ValueError):
-    """
-    An invalid wheel filename was found, users should refer to PEP 427.
-    """
-
-
-class InvalidSdistFilename(ValueError):
-    """
-    An invalid sdist filename was found, users should refer to the packaging user guide.
-    """
-
-
-# Core metadata spec for `Name`
-_validate_regex = re.compile(
-    r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE
-)
-_canonicalize_regex = re.compile(r"[-_.]+")
-_normalized_regex = re.compile(r"^([a-z0-9]|[a-z0-9]([a-z0-9-](?!--))*[a-z0-9])$")
-# PEP 427: The build number must start with a digit.
-_build_tag_regex = re.compile(r"(\d+)(.*)")
-
-
-def canonicalize_name(name: str, *, validate: bool = False) -> NormalizedName:
-    if validate and not _validate_regex.match(name):
-        raise InvalidName(f"name is invalid: {name!r}")
-    # This is taken from PEP 503.
-    value = _canonicalize_regex.sub("-", name).lower()
-    return cast(NormalizedName, value)
-
-
-def is_normalized_name(name: str) -> bool:
-    return _normalized_regex.match(name) is not None
-
-
-def canonicalize_version(
-    version: Union[Version, str], *, strip_trailing_zero: bool = True
-) -> str:
-    """
-    This is very similar to Version.__str__, but has one subtle difference
-    with the way it handles the release segment.
-    """
-    if isinstance(version, str):
-        try:
-            parsed = Version(version)
-        except InvalidVersion:
-            # Legacy versions cannot be normalized
-            return version
-    else:
-        parsed = version
-
-    parts = []
-
-    # Epoch
-    if parsed.epoch != 0:
-        parts.append(f"{parsed.epoch}!")
-
-    # Release segment
-    release_segment = ".".join(str(x) for x in parsed.release)
-    if strip_trailing_zero:
-        # NB: This strips trailing '.0's to normalize
-        release_segment = re.sub(r"(\.0)+$", "", release_segment)
-    parts.append(release_segment)
-
-    # Pre-release
-    if parsed.pre is not None:
-        parts.append("".join(str(x) for x in parsed.pre))
-
-    # Post-release
-    if parsed.post is not None:
-        parts.append(f".post{parsed.post}")
-
-    # Development release
-    if parsed.dev is not None:
-        parts.append(f".dev{parsed.dev}")
-
-    # Local version segment
-    if parsed.local is not None:
-        parts.append(f"+{parsed.local}")
-
-    return "".join(parts)
-
-
-def parse_wheel_filename(
-    filename: str,
-) -> Tuple[NormalizedName, Version, BuildTag, FrozenSet[Tag]]:
-    if not filename.endswith(".whl"):
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (extension must be '.whl'): {filename}"
-        )
-
-    filename = filename[:-4]
-    dashes = filename.count("-")
-    if dashes not in (4, 5):
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (wrong number of parts): {filename}"
-        )
-
-    parts = filename.split("-", dashes - 2)
-    name_part = parts[0]
-    # See PEP 427 for the rules on escaping the project name.
-    if "__" in name_part or re.match(r"^[\w\d._]*$", name_part, re.UNICODE) is None:
-        raise InvalidWheelFilename(f"Invalid project name: {filename}")
-    name = canonicalize_name(name_part)
-
-    try:
-        version = Version(parts[1])
-    except InvalidVersion as e:
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (invalid version): {filename}"
-        ) from e
-
-    if dashes == 5:
-        build_part = parts[2]
-        build_match = _build_tag_regex.match(build_part)
-        if build_match is None:
-            raise InvalidWheelFilename(
-                f"Invalid build number: {build_part} in '{filename}'"
-            )
-        build = cast(BuildTag, (int(build_match.group(1)), build_match.group(2)))
-    else:
-        build = ()
-    tags = parse_tag(parts[-1])
-    return (name, version, build, tags)
-
-
-def parse_sdist_filename(filename: str) -> Tuple[NormalizedName, Version]:
-    if filename.endswith(".tar.gz"):
-        file_stem = filename[: -len(".tar.gz")]
-    elif filename.endswith(".zip"):
-        file_stem = filename[: -len(".zip")]
-    else:
-        raise InvalidSdistFilename(
-            f"Invalid sdist filename (extension must be '.tar.gz' or '.zip'):"
-            f" {filename}"
-        )
-
-    # We are requiring a PEP 440 version, which cannot contain dashes,
-    # so we split on the last dash.
-    name_part, sep, version_part = file_stem.rpartition("-")
-    if not sep:
-        raise InvalidSdistFilename(f"Invalid sdist filename: {filename}")
-
-    name = canonicalize_name(name_part)
-
-    try:
-        version = Version(version_part)
-    except InvalidVersion as e:
-        raise InvalidSdistFilename(
-            f"Invalid sdist filename (invalid version): {filename}"
-        ) from e
-
-    return (name, version)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/version.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/version.py
deleted file mode 100644
index cda8e99..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/packaging/version.py
+++ /dev/null
@@ -1,561 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-"""
-.. testsetup::
-
-    from packaging.version import parse, Version
-"""
-
-import itertools
-import re
-from typing import Any, Callable, NamedTuple, Optional, SupportsInt, Tuple, Union
-
-from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
-
-__all__ = ["VERSION_PATTERN", "parse", "Version", "InvalidVersion"]
-
-LocalType = Tuple[Union[int, str], ...]
-
-CmpPrePostDevType = Union[InfinityType, NegativeInfinityType, Tuple[str, int]]
-CmpLocalType = Union[
-    NegativeInfinityType,
-    Tuple[Union[Tuple[int, str], Tuple[NegativeInfinityType, Union[int, str]]], ...],
-]
-CmpKey = Tuple[
-    int,
-    Tuple[int, ...],
-    CmpPrePostDevType,
-    CmpPrePostDevType,
-    CmpPrePostDevType,
-    CmpLocalType,
-]
-VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
-
-
-class _Version(NamedTuple):
-    epoch: int
-    release: Tuple[int, ...]
-    dev: Optional[Tuple[str, int]]
-    pre: Optional[Tuple[str, int]]
-    post: Optional[Tuple[str, int]]
-    local: Optional[LocalType]
-
-
-def parse(version: str) -> "Version":
-    """Parse the given version string.
-
-    >>> parse('1.0.dev1')
-    
-
-    :param version: The version string to parse.
-    :raises InvalidVersion: When the version string is not a valid version.
-    """
-    return Version(version)
-
-
-class InvalidVersion(ValueError):
-    """Raised when a version string is not a valid version.
-
-    >>> Version("invalid")
-    Traceback (most recent call last):
-        ...
-    packaging.version.InvalidVersion: Invalid version: 'invalid'
-    """
-
-
-class _BaseVersion:
-    _key: Tuple[Any, ...]
-
-    def __hash__(self) -> int:
-        return hash(self._key)
-
-    # Please keep the duplicated `isinstance` check
-    # in the six comparisons hereunder
-    # unless you find a way to avoid adding overhead function calls.
-    def __lt__(self, other: "_BaseVersion") -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key < other._key
-
-    def __le__(self, other: "_BaseVersion") -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key <= other._key
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key == other._key
-
-    def __ge__(self, other: "_BaseVersion") -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key >= other._key
-
-    def __gt__(self, other: "_BaseVersion") -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key > other._key
-
-    def __ne__(self, other: object) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key != other._key
-
-
-# Deliberately not anchored to the start and end of the string, to make it
-# easier for 3rd party code to reuse
-_VERSION_PATTERN = r"""
-    v?
-    (?:
-        (?:(?P[0-9]+)!)?                           # epoch
-        (?P[0-9]+(?:\.[0-9]+)*)                  # release segment
-        (?P
                                          # pre-release
-            [-_\.]?
-            (?Palpha|a|beta|b|preview|pre|c|rc)
-            [-_\.]?
-            (?P[0-9]+)?
-        )?
-        (?P                                         # post release
-            (?:-(?P[0-9]+))
-            |
-            (?:
-                [-_\.]?
-                (?Ppost|rev|r)
-                [-_\.]?
-                (?P[0-9]+)?
-            )
-        )?
-        (?P                                          # dev release
-            [-_\.]?
-            (?Pdev)
-            [-_\.]?
-            (?P[0-9]+)?
-        )?
-    )
-    (?:\+(?P[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-"""
-
-VERSION_PATTERN = _VERSION_PATTERN
-"""
-A string containing the regular expression used to match a valid version.
-
-The pattern is not anchored at either end, and is intended for embedding in larger
-expressions (for example, matching a version number as part of a file name). The
-regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
-flags set.
-
-:meta hide-value:
-"""
-
-
-class Version(_BaseVersion):
-    """This class abstracts handling of a project's versions.
-
-    A :class:`Version` instance is comparison aware and can be compared and
-    sorted using the standard Python interfaces.
-
-    >>> v1 = Version("1.0a5")
-    >>> v2 = Version("1.0")
-    >>> v1
-    
-    >>> v2
-    
-    >>> v1 < v2
-    True
-    >>> v1 == v2
-    False
-    >>> v1 > v2
-    False
-    >>> v1 >= v2
-    False
-    >>> v1 <= v2
-    True
-    """
-
-    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
-    _key: CmpKey
-
-    def __init__(self, version: str) -> None:
-        """Initialize a Version object.
-
-        :param version:
-            The string representation of a version which will be parsed and normalized
-            before use.
-        :raises InvalidVersion:
-            If the ``version`` does not conform to PEP 440 in any way then this
-            exception will be raised.
-        """
-
-        # Validate the version and parse it into pieces
-        match = self._regex.search(version)
-        if not match:
-            raise InvalidVersion(f"Invalid version: '{version}'")
-
-        # Store the parsed out pieces of the version
-        self._version = _Version(
-            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
-            release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
-            post=_parse_letter_version(
-                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
-            ),
-            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
-            local=_parse_local_version(match.group("local")),
-        )
-
-        # Generate a key which will be used for sorting
-        self._key = _cmpkey(
-            self._version.epoch,
-            self._version.release,
-            self._version.pre,
-            self._version.post,
-            self._version.dev,
-            self._version.local,
-        )
-
-    def __repr__(self) -> str:
-        """A representation of the Version that shows all internal state.
-
-        >>> Version('1.0.0')
-        
-        """
-        return f""
-
-    def __str__(self) -> str:
-        """A string representation of the version that can be rounded-tripped.
-
-        >>> str(Version("1.0a5"))
-        '1.0a5'
-        """
-        parts = []
-
-        # Epoch
-        if self.epoch != 0:
-            parts.append(f"{self.epoch}!")
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self.release))
-
-        # Pre-release
-        if self.pre is not None:
-            parts.append("".join(str(x) for x in self.pre))
-
-        # Post-release
-        if self.post is not None:
-            parts.append(f".post{self.post}")
-
-        # Development release
-        if self.dev is not None:
-            parts.append(f".dev{self.dev}")
-
-        # Local version segment
-        if self.local is not None:
-            parts.append(f"+{self.local}")
-
-        return "".join(parts)
-
-    @property
-    def epoch(self) -> int:
-        """The epoch of the version.
-
-        >>> Version("2.0.0").epoch
-        0
-        >>> Version("1!2.0.0").epoch
-        1
-        """
-        return self._version.epoch
-
-    @property
-    def release(self) -> Tuple[int, ...]:
-        """The components of the "release" segment of the version.
-
-        >>> Version("1.2.3").release
-        (1, 2, 3)
-        >>> Version("2.0.0").release
-        (2, 0, 0)
-        >>> Version("1!2.0.0.post0").release
-        (2, 0, 0)
-
-        Includes trailing zeroes but not the epoch or any pre-release / development /
-        post-release suffixes.
-        """
-        return self._version.release
-
-    @property
-    def pre(self) -> Optional[Tuple[str, int]]:
-        """The pre-release segment of the version.
-
-        >>> print(Version("1.2.3").pre)
-        None
-        >>> Version("1.2.3a1").pre
-        ('a', 1)
-        >>> Version("1.2.3b1").pre
-        ('b', 1)
-        >>> Version("1.2.3rc1").pre
-        ('rc', 1)
-        """
-        return self._version.pre
-
-    @property
-    def post(self) -> Optional[int]:
-        """The post-release number of the version.
-
-        >>> print(Version("1.2.3").post)
-        None
-        >>> Version("1.2.3.post1").post
-        1
-        """
-        return self._version.post[1] if self._version.post else None
-
-    @property
-    def dev(self) -> Optional[int]:
-        """The development number of the version.
-
-        >>> print(Version("1.2.3").dev)
-        None
-        >>> Version("1.2.3.dev1").dev
-        1
-        """
-        return self._version.dev[1] if self._version.dev else None
-
-    @property
-    def local(self) -> Optional[str]:
-        """The local version segment of the version.
-
-        >>> print(Version("1.2.3").local)
-        None
-        >>> Version("1.2.3+abc").local
-        'abc'
-        """
-        if self._version.local:
-            return ".".join(str(x) for x in self._version.local)
-        else:
-            return None
-
-    @property
-    def public(self) -> str:
-        """The public portion of the version.
-
-        >>> Version("1.2.3").public
-        '1.2.3'
-        >>> Version("1.2.3+abc").public
-        '1.2.3'
-        >>> Version("1.2.3+abc.dev1").public
-        '1.2.3'
-        """
-        return str(self).split("+", 1)[0]
-
-    @property
-    def base_version(self) -> str:
-        """The "base version" of the version.
-
-        >>> Version("1.2.3").base_version
-        '1.2.3'
-        >>> Version("1.2.3+abc").base_version
-        '1.2.3'
-        >>> Version("1!1.2.3+abc.dev1").base_version
-        '1!1.2.3'
-
-        The "base version" is the public version of the project without any pre or post
-        release markers.
-        """
-        parts = []
-
-        # Epoch
-        if self.epoch != 0:
-            parts.append(f"{self.epoch}!")
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self.release))
-
-        return "".join(parts)
-
-    @property
-    def is_prerelease(self) -> bool:
-        """Whether this version is a pre-release.
-
-        >>> Version("1.2.3").is_prerelease
-        False
-        >>> Version("1.2.3a1").is_prerelease
-        True
-        >>> Version("1.2.3b1").is_prerelease
-        True
-        >>> Version("1.2.3rc1").is_prerelease
-        True
-        >>> Version("1.2.3dev1").is_prerelease
-        True
-        """
-        return self.dev is not None or self.pre is not None
-
-    @property
-    def is_postrelease(self) -> bool:
-        """Whether this version is a post-release.
-
-        >>> Version("1.2.3").is_postrelease
-        False
-        >>> Version("1.2.3.post1").is_postrelease
-        True
-        """
-        return self.post is not None
-
-    @property
-    def is_devrelease(self) -> bool:
-        """Whether this version is a development release.
-
-        >>> Version("1.2.3").is_devrelease
-        False
-        >>> Version("1.2.3.dev1").is_devrelease
-        True
-        """
-        return self.dev is not None
-
-    @property
-    def major(self) -> int:
-        """The first item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").major
-        1
-        """
-        return self.release[0] if len(self.release) >= 1 else 0
-
-    @property
-    def minor(self) -> int:
-        """The second item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").minor
-        2
-        >>> Version("1").minor
-        0
-        """
-        return self.release[1] if len(self.release) >= 2 else 0
-
-    @property
-    def micro(self) -> int:
-        """The third item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").micro
-        3
-        >>> Version("1").micro
-        0
-        """
-        return self.release[2] if len(self.release) >= 3 else 0
-
-
-def _parse_letter_version(
-    letter: Optional[str], number: Union[str, bytes, SupportsInt, None]
-) -> Optional[Tuple[str, int]]:
-    if letter:
-        # We consider there to be an implicit 0 in a pre-release if there is
-        # not a numeral associated with it.
-        if number is None:
-            number = 0
-
-        # We normalize any letters to their lower case form
-        letter = letter.lower()
-
-        # We consider some words to be alternate spellings of other words and
-        # in those cases we want to normalize the spellings to our preferred
-        # spelling.
-        if letter == "alpha":
-            letter = "a"
-        elif letter == "beta":
-            letter = "b"
-        elif letter in ["c", "pre", "preview"]:
-            letter = "rc"
-        elif letter in ["rev", "r"]:
-            letter = "post"
-
-        return letter, int(number)
-    if not letter and number:
-        # We assume if we are given a number, but we are not given a letter
-        # then this is using the implicit post release syntax (e.g. 1.0-1)
-        letter = "post"
-
-        return letter, int(number)
-
-    return None
-
-
-_local_version_separators = re.compile(r"[\._-]")
-
-
-def _parse_local_version(local: Optional[str]) -> Optional[LocalType]:
-    """
-    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
-    """
-    if local is not None:
-        return tuple(
-            part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_separators.split(local)
-        )
-    return None
-
-
-def _cmpkey(
-    epoch: int,
-    release: Tuple[int, ...],
-    pre: Optional[Tuple[str, int]],
-    post: Optional[Tuple[str, int]],
-    dev: Optional[Tuple[str, int]],
-    local: Optional[LocalType],
-) -> CmpKey:
-    # When we compare a release version, we want to compare it with all of the
-    # trailing zeros removed. So we'll use a reverse the list, drop all the now
-    # leading zeros until we come to something non zero, then take the rest
-    # re-reverse it back into the correct order and make it a tuple and use
-    # that for our sorting key.
-    _release = tuple(
-        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
-    )
-
-    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
-    # We'll do this by abusing the pre segment, but we _only_ want to do this
-    # if there is not a pre or a post segment. If we have one of those then
-    # the normal sorting rules will handle this case correctly.
-    if pre is None and post is None and dev is not None:
-        _pre: CmpPrePostDevType = NegativeInfinity
-    # Versions without a pre-release (except as noted above) should sort after
-    # those with one.
-    elif pre is None:
-        _pre = Infinity
-    else:
-        _pre = pre
-
-    # Versions without a post segment should sort before those with one.
-    if post is None:
-        _post: CmpPrePostDevType = NegativeInfinity
-
-    else:
-        _post = post
-
-    # Versions without a development segment should sort after those with one.
-    if dev is None:
-        _dev: CmpPrePostDevType = Infinity
-
-    else:
-        _dev = dev
-
-    if local is None:
-        # Versions without a local segment should sort before those with one.
-        _local: CmpLocalType = NegativeInfinity
-    else:
-        # Versions with a local segment need that segment parsed to implement
-        # the sorting rules in PEP440.
-        # - Alpha numeric segments sort before numeric segments
-        # - Alpha numeric segments sort lexicographically
-        # - Numeric segments sort numerically
-        # - Shorter versions sort before longer versions when the prefixes
-        #   match exactly
-        _local = tuple(
-            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
-        )
-
-    return epoch, _release, _pre, _post, _dev, _local
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/vendor.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/vendor.txt
deleted file mode 100644
index 1466610..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/vendored/vendor.txt
+++ /dev/null
@@ -1 +0,0 @@
-packaging==24.0
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/wheelfile.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/wheelfile.py
deleted file mode 100644
index 0a0f459..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/wheel/wheelfile.py
+++ /dev/null
@@ -1,227 +0,0 @@
-from __future__ import annotations
-
-import csv
-import hashlib
-import os.path
-import re
-import stat
-import time
-from io import StringIO, TextIOWrapper
-from typing import IO, TYPE_CHECKING, Literal
-from zipfile import ZIP_DEFLATED, ZipFile, ZipInfo
-
-from wheel.cli import WheelError
-from wheel.util import log, urlsafe_b64decode, urlsafe_b64encode
-
-if TYPE_CHECKING:
-    from typing import Protocol, Sized, Union
-
-    from typing_extensions import Buffer
-
-    StrPath = Union[str, os.PathLike[str]]
-
-    class SizedBuffer(Sized, Buffer, Protocol): ...
-
-
-# Non-greedy matching of an optional build number may be too clever (more
-# invalid wheel filenames will match). Separate regex for .dist-info?
-WHEEL_INFO_RE = re.compile(
-    r"""^(?P(?P[^\s-]+?)-(?P[^\s-]+?))(-(?P\d[^\s-]*))?
-     -(?P[^\s-]+?)-(?P[^\s-]+?)-(?P\S+)\.whl$""",
-    re.VERBOSE,
-)
-MINIMUM_TIMESTAMP = 315532800  # 1980-01-01 00:00:00 UTC
-
-
-def get_zipinfo_datetime(timestamp: float | None = None):
-    # Some applications need reproducible .whl files, but they can't do this without
-    # forcing the timestamp of the individual ZipInfo objects. See issue #143.
-    timestamp = int(os.environ.get("SOURCE_DATE_EPOCH", timestamp or time.time()))
-    timestamp = max(timestamp, MINIMUM_TIMESTAMP)
-    return time.gmtime(timestamp)[0:6]
-
-
-class WheelFile(ZipFile):
-    """A ZipFile derivative class that also reads SHA-256 hashes from
-    .dist-info/RECORD and checks any read files against those.
-    """
-
-    _default_algorithm = hashlib.sha256
-
-    def __init__(
-        self,
-        file: StrPath,
-        mode: Literal["r", "w", "x", "a"] = "r",
-        compression: int = ZIP_DEFLATED,
-    ):
-        basename = os.path.basename(file)
-        self.parsed_filename = WHEEL_INFO_RE.match(basename)
-        if not basename.endswith(".whl") or self.parsed_filename is None:
-            raise WheelError(f"Bad wheel filename {basename!r}")
-
-        ZipFile.__init__(self, file, mode, compression=compression, allowZip64=True)
-
-        self.dist_info_path = "{}.dist-info".format(
-            self.parsed_filename.group("namever")
-        )
-        self.record_path = self.dist_info_path + "/RECORD"
-        self._file_hashes: dict[str, tuple[None, None] | tuple[int, bytes]] = {}
-        self._file_sizes = {}
-        if mode == "r":
-            # Ignore RECORD and any embedded wheel signatures
-            self._file_hashes[self.record_path] = None, None
-            self._file_hashes[self.record_path + ".jws"] = None, None
-            self._file_hashes[self.record_path + ".p7s"] = None, None
-
-            # Fill in the expected hashes by reading them from RECORD
-            try:
-                record = self.open(self.record_path)
-            except KeyError:
-                raise WheelError(f"Missing {self.record_path} file") from None
-
-            with record:
-                for line in csv.reader(
-                    TextIOWrapper(record, newline="", encoding="utf-8")
-                ):
-                    path, hash_sum, size = line
-                    if not hash_sum:
-                        continue
-
-                    algorithm, hash_sum = hash_sum.split("=")
-                    try:
-                        hashlib.new(algorithm)
-                    except ValueError:
-                        raise WheelError(
-                            f"Unsupported hash algorithm: {algorithm}"
-                        ) from None
-
-                    if algorithm.lower() in {"md5", "sha1"}:
-                        raise WheelError(
-                            f"Weak hash algorithm ({algorithm}) is not permitted by "
-                            f"PEP 427"
-                        )
-
-                    self._file_hashes[path] = (
-                        algorithm,
-                        urlsafe_b64decode(hash_sum.encode("ascii")),
-                    )
-
-    def open(
-        self,
-        name_or_info: str | ZipInfo,
-        mode: Literal["r", "w"] = "r",
-        pwd: bytes | None = None,
-    ) -> IO[bytes]:
-        def _update_crc(newdata: bytes) -> None:
-            eof = ef._eof
-            update_crc_orig(newdata)
-            running_hash.update(newdata)
-            if eof and running_hash.digest() != expected_hash:
-                raise WheelError(f"Hash mismatch for file '{ef_name}'")
-
-        ef_name = (
-            name_or_info.filename if isinstance(name_or_info, ZipInfo) else name_or_info
-        )
-        if (
-            mode == "r"
-            and not ef_name.endswith("/")
-            and ef_name not in self._file_hashes
-        ):
-            raise WheelError(f"No hash found for file '{ef_name}'")
-
-        ef = ZipFile.open(self, name_or_info, mode, pwd)
-        if mode == "r" and not ef_name.endswith("/"):
-            algorithm, expected_hash = self._file_hashes[ef_name]
-            if expected_hash is not None:
-                # Monkey patch the _update_crc method to also check for the hash from
-                # RECORD
-                running_hash = hashlib.new(algorithm)
-                update_crc_orig, ef._update_crc = ef._update_crc, _update_crc
-
-        return ef
-
-    def write_files(self, base_dir: str):
-        log.info(f"creating '{self.filename}' and adding '{base_dir}' to it")
-        deferred: list[tuple[str, str]] = []
-        for root, dirnames, filenames in os.walk(base_dir):
-            # Sort the directory names so that `os.walk` will walk them in a
-            # defined order on the next iteration.
-            dirnames.sort()
-            for name in sorted(filenames):
-                path = os.path.normpath(os.path.join(root, name))
-                if os.path.isfile(path):
-                    arcname = os.path.relpath(path, base_dir).replace(os.path.sep, "/")
-                    if arcname == self.record_path:
-                        pass
-                    elif root.endswith(".dist-info"):
-                        deferred.append((path, arcname))
-                    else:
-                        self.write(path, arcname)
-
-        deferred.sort()
-        for path, arcname in deferred:
-            self.write(path, arcname)
-
-    def write(
-        self,
-        filename: str,
-        arcname: str | None = None,
-        compress_type: int | None = None,
-    ) -> None:
-        with open(filename, "rb") as f:
-            st = os.fstat(f.fileno())
-            data = f.read()
-
-        zinfo = ZipInfo(
-            arcname or filename, date_time=get_zipinfo_datetime(st.st_mtime)
-        )
-        zinfo.external_attr = (stat.S_IMODE(st.st_mode) | stat.S_IFMT(st.st_mode)) << 16
-        zinfo.compress_type = compress_type or self.compression
-        self.writestr(zinfo, data, compress_type)
-
-    def writestr(
-        self,
-        zinfo_or_arcname: str | ZipInfo,
-        data: SizedBuffer | str,
-        compress_type: int | None = None,
-    ):
-        if isinstance(zinfo_or_arcname, str):
-            zinfo_or_arcname = ZipInfo(
-                zinfo_or_arcname, date_time=get_zipinfo_datetime()
-            )
-            zinfo_or_arcname.compress_type = self.compression
-            zinfo_or_arcname.external_attr = (0o664 | stat.S_IFREG) << 16
-
-        if isinstance(data, str):
-            data = data.encode("utf-8")
-
-        ZipFile.writestr(self, zinfo_or_arcname, data, compress_type)
-        fname = (
-            zinfo_or_arcname.filename
-            if isinstance(zinfo_or_arcname, ZipInfo)
-            else zinfo_or_arcname
-        )
-        log.info(f"adding '{fname}'")
-        if fname != self.record_path:
-            hash_ = self._default_algorithm(data)
-            self._file_hashes[fname] = (
-                hash_.name,
-                urlsafe_b64encode(hash_.digest()).decode("ascii"),
-            )
-            self._file_sizes[fname] = len(data)
-
-    def close(self):
-        # Write RECORD
-        if self.fp is not None and self.mode == "w" and self._file_hashes:
-            data = StringIO()
-            writer = csv.writer(data, delimiter=",", quotechar='"', lineterminator="\n")
-            writer.writerows(
-                (
-                    (fname, algorithm + "=" + hash_, self._file_sizes[fname])
-                    for fname, (algorithm, hash_) in self._file_hashes.items()
-                )
-            )
-            writer.writerow((format(self.record_path), "", ""))
-            self.writestr(self.record_path, data.getvalue())
-
-        ZipFile.close(self)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/INSTALLER b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/INSTALLER
deleted file mode 100644
index a1b589e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/LICENSE b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/LICENSE
deleted file mode 100644
index 1bb5a44..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/METADATA b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/METADATA
deleted file mode 100644
index 1399281..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/METADATA
+++ /dev/null
@@ -1,102 +0,0 @@
-Metadata-Version: 2.1
-Name: zipp
-Version: 3.19.2
-Summary: Backport of pathlib-compatible object wrapper for zip files
-Author-email: "Jason R. Coombs" 
-Project-URL: Homepage, https://github.com/jaraco/zipp
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Provides-Extra: doc
-Requires-Dist: sphinx >=3.5 ; extra == 'doc'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
-Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
-Requires-Dist: furo ; extra == 'doc'
-Requires-Dist: sphinx-lint ; extra == 'doc'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
-Provides-Extra: test
-Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: pytest-mypy ; extra == 'test'
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'test'
-Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test'
-Requires-Dist: jaraco.itertools ; extra == 'test'
-Requires-Dist: jaraco.functools ; extra == 'test'
-Requires-Dist: more-itertools ; extra == 'test'
-Requires-Dist: big-O ; extra == 'test'
-Requires-Dist: pytest-ignore-flaky ; extra == 'test'
-Requires-Dist: jaraco.test ; extra == 'test'
-Requires-Dist: importlib-resources ; (python_version < "3.9") and extra == 'test'
-
-.. image:: https://img.shields.io/pypi/v/zipp.svg
-   :target: https://pypi.org/project/zipp
-
-.. image:: https://img.shields.io/pypi/pyversions/zipp.svg
-
-.. image:: https://github.com/jaraco/zipp/actions/workflows/main.yml/badge.svg
-   :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22tests%22
-   :alt: tests
-
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
-    :alt: Ruff
-
-.. .. image:: https://readthedocs.org/projects/PROJECT_RTD/badge/?version=latest
-..    :target: https://PROJECT_RTD.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2024-informational
-   :target: https://blog.jaraco.com/skeleton
-
-.. image:: https://tidelift.com/badges/package/pypi/zipp
-   :target: https://tidelift.com/subscription/pkg/pypi-zipp?utm_source=pypi-zipp&utm_medium=readme
-
-
-A pathlib-compatible Zipfile object wrapper. Official backport of the standard library
-`Path object `_.
-
-
-Compatibility
-=============
-
-New features are introduced in this third-party library and later merged
-into CPython. The following table indicates which versions of this library
-were contributed to different versions in the standard library:
-
-.. list-table::
-   :header-rows: 1
-
-   * - zipp
-     - stdlib
-   * - 3.18
-     - 3.13
-   * - 3.16
-     - 3.12
-   * - 3.5
-     - 3.11
-   * - 3.2
-     - 3.10
-   * - 3.3 ??
-     - 3.9
-   * - 1.0
-     - 3.8
-
-
-Usage
-=====
-
-Use ``zipp.Path`` in place of ``zipfile.Path`` on any Python.
-
-For Enterprise
-==============
-
-Available as part of the Tidelift Subscription.
-
-This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
-
-`Learn more `_.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/RECORD
deleted file mode 100644
index 77c0283..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-zipp-3.19.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-zipp-3.19.2.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-zipp-3.19.2.dist-info/METADATA,sha256=UIrk_kMIHGSwsKKChYizqMw0MMZpPRZ2ZiVpQAsN_bE,3575
-zipp-3.19.2.dist-info/RECORD,,
-zipp-3.19.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zipp-3.19.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-zipp-3.19.2.dist-info/top_level.txt,sha256=iAbdoSHfaGqBfVb2XuR9JqSQHCoOsOtG6y9C_LSpqFw,5
-zipp/__init__.py,sha256=QuI1g00G4fRAcGt-HqbV0oWIkmSgedCGGYsHHYzNa8A,13412
-zipp/__pycache__/__init__.cpython-312.pyc,,
-zipp/__pycache__/glob.cpython-312.pyc,,
-zipp/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zipp/compat/__pycache__/__init__.cpython-312.pyc,,
-zipp/compat/__pycache__/py310.cpython-312.pyc,,
-zipp/compat/py310.py,sha256=eZpkW0zRtunkhEh8jjX3gCGe22emoKCBJw72Zt4RkhA,219
-zipp/glob.py,sha256=etWpnfEoRyfUvrUsi6sTiGmErvPwe6HzY6pT8jg_lUI,3082
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/REQUESTED b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/REQUESTED
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/WHEEL b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/WHEEL
deleted file mode 100644
index bab98d6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/top_level.txt b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/top_level.txt
deleted file mode 100644
index e82f676..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp-3.19.2.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-zipp
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__init__.py
deleted file mode 100644
index d65297b..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__init__.py
+++ /dev/null
@@ -1,501 +0,0 @@
-import io
-import posixpath
-import zipfile
-import itertools
-import contextlib
-import pathlib
-import re
-import stat
-import sys
-
-from .compat.py310 import text_encoding
-from .glob import Translator
-
-
-__all__ = ['Path']
-
-
-def _parents(path):
-    """
-    Given a path with elements separated by
-    posixpath.sep, generate all parents of that path.
-
-    >>> list(_parents('b/d'))
-    ['b']
-    >>> list(_parents('/b/d/'))
-    ['/b']
-    >>> list(_parents('b/d/f/'))
-    ['b/d', 'b']
-    >>> list(_parents('b'))
-    []
-    >>> list(_parents(''))
-    []
-    """
-    return itertools.islice(_ancestry(path), 1, None)
-
-
-def _ancestry(path):
-    """
-    Given a path with elements separated by
-    posixpath.sep, generate all elements of that path
-
-    >>> list(_ancestry('b/d'))
-    ['b/d', 'b']
-    >>> list(_ancestry('/b/d/'))
-    ['/b/d', '/b']
-    >>> list(_ancestry('b/d/f/'))
-    ['b/d/f', 'b/d', 'b']
-    >>> list(_ancestry('b'))
-    ['b']
-    >>> list(_ancestry(''))
-    []
-    """
-    path = path.rstrip(posixpath.sep)
-    while path and path != posixpath.sep:
-        yield path
-        path, tail = posixpath.split(path)
-
-
-_dedupe = dict.fromkeys
-"""Deduplicate an iterable in original order"""
-
-
-def _difference(minuend, subtrahend):
-    """
-    Return items in minuend not in subtrahend, retaining order
-    with O(1) lookup.
-    """
-    return itertools.filterfalse(set(subtrahend).__contains__, minuend)
-
-
-class InitializedState:
-    """
-    Mix-in to save the initialization state for pickling.
-    """
-
-    def __init__(self, *args, **kwargs):
-        self.__args = args
-        self.__kwargs = kwargs
-        super().__init__(*args, **kwargs)
-
-    def __getstate__(self):
-        return self.__args, self.__kwargs
-
-    def __setstate__(self, state):
-        args, kwargs = state
-        super().__init__(*args, **kwargs)
-
-
-class SanitizedNames:
-    """
-    ZipFile mix-in to ensure names are sanitized.
-    """
-
-    def namelist(self):
-        return list(map(self._sanitize, super().namelist()))
-
-    @staticmethod
-    def _sanitize(name):
-        r"""
-        Ensure a relative path with posix separators and no dot names.
-
-        Modeled after
-        https://github.com/python/cpython/blob/bcc1be39cb1d04ad9fc0bd1b9193d3972835a57c/Lib/zipfile/__init__.py#L1799-L1813
-        but provides consistent cross-platform behavior.
-
-        >>> san = SanitizedNames._sanitize
-        >>> san('/foo/bar')
-        'foo/bar'
-        >>> san('//foo.txt')
-        'foo.txt'
-        >>> san('foo/.././bar.txt')
-        'foo/bar.txt'
-        >>> san('foo../.bar.txt')
-        'foo../.bar.txt'
-        >>> san('\\foo\\bar.txt')
-        'foo/bar.txt'
-        >>> san('D:\\foo.txt')
-        'D/foo.txt'
-        >>> san('\\\\server\\share\\file.txt')
-        'server/share/file.txt'
-        >>> san('\\\\?\\GLOBALROOT\\Volume3')
-        '?/GLOBALROOT/Volume3'
-        >>> san('\\\\.\\PhysicalDrive1\\root')
-        'PhysicalDrive1/root'
-
-        Retain any trailing slash.
-        >>> san('abc/')
-        'abc/'
-
-        Raises a ValueError if the result is empty.
-        >>> san('../..')
-        Traceback (most recent call last):
-        ...
-        ValueError: Empty filename
-        """
-
-        def allowed(part):
-            return part and part not in {'..', '.'}
-
-        # Remove the drive letter.
-        # Don't use ntpath.splitdrive, because that also strips UNC paths
-        bare = re.sub('^([A-Z]):', r'\1', name, flags=re.IGNORECASE)
-        clean = bare.replace('\\', '/')
-        parts = clean.split('/')
-        joined = '/'.join(filter(allowed, parts))
-        if not joined:
-            raise ValueError("Empty filename")
-        return joined + '/' * name.endswith('/')
-
-
-class CompleteDirs(InitializedState, SanitizedNames, zipfile.ZipFile):
-    """
-    A ZipFile subclass that ensures that implied directories
-    are always included in the namelist.
-
-    >>> list(CompleteDirs._implied_dirs(['foo/bar.txt', 'foo/bar/baz.txt']))
-    ['foo/', 'foo/bar/']
-    >>> list(CompleteDirs._implied_dirs(['foo/bar.txt', 'foo/bar/baz.txt', 'foo/bar/']))
-    ['foo/']
-    """
-
-    @staticmethod
-    def _implied_dirs(names):
-        parents = itertools.chain.from_iterable(map(_parents, names))
-        as_dirs = (p + posixpath.sep for p in parents)
-        return _dedupe(_difference(as_dirs, names))
-
-    def namelist(self):
-        names = super().namelist()
-        return names + list(self._implied_dirs(names))
-
-    def _name_set(self):
-        return set(self.namelist())
-
-    def resolve_dir(self, name):
-        """
-        If the name represents a directory, return that name
-        as a directory (with the trailing slash).
-        """
-        names = self._name_set()
-        dirname = name + '/'
-        dir_match = name not in names and dirname in names
-        return dirname if dir_match else name
-
-    def getinfo(self, name):
-        """
-        Supplement getinfo for implied dirs.
-        """
-        try:
-            return super().getinfo(name)
-        except KeyError:
-            if not name.endswith('/') or name not in self._name_set():
-                raise
-            return zipfile.ZipInfo(filename=name)
-
-    @classmethod
-    def make(cls, source):
-        """
-        Given a source (filename or zipfile), return an
-        appropriate CompleteDirs subclass.
-        """
-        if isinstance(source, CompleteDirs):
-            return source
-
-        if not isinstance(source, zipfile.ZipFile):
-            return cls(source)
-
-        # Only allow for FastLookup when supplied zipfile is read-only
-        if 'r' not in source.mode:
-            cls = CompleteDirs
-
-        source.__class__ = cls
-        return source
-
-    @classmethod
-    def inject(cls, zf: zipfile.ZipFile) -> zipfile.ZipFile:
-        """
-        Given a writable zip file zf, inject directory entries for
-        any directories implied by the presence of children.
-        """
-        for name in cls._implied_dirs(zf.namelist()):
-            zf.writestr(name, b"")
-        return zf
-
-
-class FastLookup(CompleteDirs):
-    """
-    ZipFile subclass to ensure implicit
-    dirs exist and are resolved rapidly.
-    """
-
-    def namelist(self):
-        with contextlib.suppress(AttributeError):
-            return self.__names
-        self.__names = super().namelist()
-        return self.__names
-
-    def _name_set(self):
-        with contextlib.suppress(AttributeError):
-            return self.__lookup
-        self.__lookup = super()._name_set()
-        return self.__lookup
-
-
-def _extract_text_encoding(encoding=None, *args, **kwargs):
-    # compute stack level so that the caller of the caller sees any warning.
-    is_pypy = sys.implementation.name == 'pypy'
-    stack_level = 3 + is_pypy
-    return text_encoding(encoding, stack_level), args, kwargs
-
-
-class Path:
-    """
-    A :class:`importlib.resources.abc.Traversable` interface for zip files.
-
-    Implements many of the features users enjoy from
-    :class:`pathlib.Path`.
-
-    Consider a zip file with this structure::
-
-        .
-        ├── a.txt
-        └── b
-            ├── c.txt
-            └── d
-                └── e.txt
-
-    >>> data = io.BytesIO()
-    >>> zf = zipfile.ZipFile(data, 'w')
-    >>> zf.writestr('a.txt', 'content of a')
-    >>> zf.writestr('b/c.txt', 'content of c')
-    >>> zf.writestr('b/d/e.txt', 'content of e')
-    >>> zf.filename = 'mem/abcde.zip'
-
-    Path accepts the zipfile object itself or a filename
-
-    >>> path = Path(zf)
-
-    From there, several path operations are available.
-
-    Directory iteration (including the zip file itself):
-
-    >>> a, b = path.iterdir()
-    >>> a
-    Path('mem/abcde.zip', 'a.txt')
-    >>> b
-    Path('mem/abcde.zip', 'b/')
-
-    name property:
-
-    >>> b.name
-    'b'
-
-    join with divide operator:
-
-    >>> c = b / 'c.txt'
-    >>> c
-    Path('mem/abcde.zip', 'b/c.txt')
-    >>> c.name
-    'c.txt'
-
-    Read text:
-
-    >>> c.read_text(encoding='utf-8')
-    'content of c'
-
-    existence:
-
-    >>> c.exists()
-    True
-    >>> (b / 'missing.txt').exists()
-    False
-
-    Coercion to string:
-
-    >>> import os
-    >>> str(c).replace(os.sep, posixpath.sep)
-    'mem/abcde.zip/b/c.txt'
-
-    At the root, ``name``, ``filename``, and ``parent``
-    resolve to the zipfile.
-
-    >>> str(path)
-    'mem/abcde.zip/'
-    >>> path.name
-    'abcde.zip'
-    >>> path.filename == pathlib.Path('mem/abcde.zip')
-    True
-    >>> str(path.parent)
-    'mem'
-
-    If the zipfile has no filename, such attributes are not
-    valid and accessing them will raise an Exception.
-
-    >>> zf.filename = None
-    >>> path.name
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    >>> path.filename
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    >>> path.parent
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    # workaround python/cpython#106763
-    >>> pass
-    """
-
-    __repr = "{self.__class__.__name__}({self.root.filename!r}, {self.at!r})"
-
-    def __init__(self, root, at=""):
-        """
-        Construct a Path from a ZipFile or filename.
-
-        Note: When the source is an existing ZipFile object,
-        its type (__class__) will be mutated to a
-        specialized type. If the caller wishes to retain the
-        original type, the caller should either create a
-        separate ZipFile object or pass a filename.
-        """
-        self.root = FastLookup.make(root)
-        self.at = at
-
-    def __eq__(self, other):
-        """
-        >>> Path(zipfile.ZipFile(io.BytesIO(), 'w')) == 'foo'
-        False
-        """
-        if self.__class__ is not other.__class__:
-            return NotImplemented
-        return (self.root, self.at) == (other.root, other.at)
-
-    def __hash__(self):
-        return hash((self.root, self.at))
-
-    def open(self, mode='r', *args, pwd=None, **kwargs):
-        """
-        Open this entry as text or binary following the semantics
-        of ``pathlib.Path.open()`` by passing arguments through
-        to io.TextIOWrapper().
-        """
-        if self.is_dir():
-            raise IsADirectoryError(self)
-        zip_mode = mode[0]
-        if not self.exists() and zip_mode == 'r':
-            raise FileNotFoundError(self)
-        stream = self.root.open(self.at, zip_mode, pwd=pwd)
-        if 'b' in mode:
-            if args or kwargs:
-                raise ValueError("encoding args invalid for binary operation")
-            return stream
-        # Text mode:
-        encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
-        return io.TextIOWrapper(stream, encoding, *args, **kwargs)
-
-    def _base(self):
-        return pathlib.PurePosixPath(self.at or self.root.filename)
-
-    @property
-    def name(self):
-        return self._base().name
-
-    @property
-    def suffix(self):
-        return self._base().suffix
-
-    @property
-    def suffixes(self):
-        return self._base().suffixes
-
-    @property
-    def stem(self):
-        return self._base().stem
-
-    @property
-    def filename(self):
-        return pathlib.Path(self.root.filename).joinpath(self.at)
-
-    def read_text(self, *args, **kwargs):
-        encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
-        with self.open('r', encoding, *args, **kwargs) as strm:
-            return strm.read()
-
-    def read_bytes(self):
-        with self.open('rb') as strm:
-            return strm.read()
-
-    def _is_child(self, path):
-        return posixpath.dirname(path.at.rstrip("/")) == self.at.rstrip("/")
-
-    def _next(self, at):
-        return self.__class__(self.root, at)
-
-    def is_dir(self):
-        return not self.at or self.at.endswith("/")
-
-    def is_file(self):
-        return self.exists() and not self.is_dir()
-
-    def exists(self):
-        return self.at in self.root._name_set()
-
-    def iterdir(self):
-        if not self.is_dir():
-            raise ValueError("Can't listdir a file")
-        subs = map(self._next, self.root.namelist())
-        return filter(self._is_child, subs)
-
-    def match(self, path_pattern):
-        return pathlib.PurePosixPath(self.at).match(path_pattern)
-
-    def is_symlink(self):
-        """
-        Return whether this path is a symlink.
-        """
-        info = self.root.getinfo(self.at)
-        mode = info.external_attr >> 16
-        return stat.S_ISLNK(mode)
-
-    def glob(self, pattern):
-        if not pattern:
-            raise ValueError(f"Unacceptable pattern: {pattern!r}")
-
-        prefix = re.escape(self.at)
-        tr = Translator(seps='/')
-        matches = re.compile(prefix + tr.translate(pattern)).fullmatch
-        names = (data.filename for data in self.root.filelist)
-        return map(self._next, filter(matches, names))
-
-    def rglob(self, pattern):
-        return self.glob(f'**/{pattern}')
-
-    def relative_to(self, other, *extra):
-        return posixpath.relpath(str(self), str(other.joinpath(*extra)))
-
-    def __str__(self):
-        return posixpath.join(self.root.filename, self.at)
-
-    def __repr__(self):
-        return self.__repr.format(self=self)
-
-    def joinpath(self, *other):
-        next = posixpath.join(self.at, *other)
-        return self._next(self.root.resolve_dir(next))
-
-    __truediv__ = joinpath
-
-    @property
-    def parent(self):
-        if not self.at:
-            return self.filename.parent
-        parent_at = posixpath.dirname(self.at.rstrip('/'))
-        if parent_at:
-            parent_at += '/'
-        return self._next(parent_at)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 80a8085..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/glob.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/glob.cpython-311.pyc
deleted file mode 100644
index f0bfab9..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/__pycache__/glob.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 47157de..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/py310.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/py310.cpython-311.pyc
deleted file mode 100644
index e45aa7f..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/__pycache__/py310.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/py310.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/py310.py
deleted file mode 100644
index d5ca53e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/compat/py310.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import sys
-import io
-
-
-def _text_encoding(encoding, stacklevel=2, /):  # pragma: no cover
-    return encoding
-
-
-text_encoding = (
-    io.text_encoding if sys.version_info > (3, 10) else _text_encoding  # type: ignore
-)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/glob.py b/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/glob.py
deleted file mode 100644
index 69c41d7..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/_vendor/zipp/glob.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import os
-import re
-
-
-_default_seps = os.sep + str(os.altsep) * bool(os.altsep)
-
-
-class Translator:
-    """
-    >>> Translator('xyz')
-    Traceback (most recent call last):
-    ...
-    AssertionError: Invalid separators
-
-    >>> Translator('')
-    Traceback (most recent call last):
-    ...
-    AssertionError: Invalid separators
-    """
-
-    seps: str
-
-    def __init__(self, seps: str = _default_seps):
-        assert seps and set(seps) <= set(_default_seps), "Invalid separators"
-        self.seps = seps
-
-    def translate(self, pattern):
-        """
-        Given a glob pattern, produce a regex that matches it.
-        """
-        return self.extend(self.translate_core(pattern))
-
-    def extend(self, pattern):
-        r"""
-        Extend regex for pattern-wide concerns.
-
-        Apply '(?s:)' to create a non-matching group that
-        matches newlines (valid on Unix).
-
-        Append '\Z' to imply fullmatch even when match is used.
-        """
-        return rf'(?s:{pattern})\Z'
-
-    def translate_core(self, pattern):
-        r"""
-        Given a glob pattern, produce a regex that matches it.
-
-        >>> t = Translator()
-        >>> t.translate_core('*.txt').replace('\\\\', '')
-        '[^/]*\\.txt'
-        >>> t.translate_core('a?txt')
-        'a[^/]txt'
-        >>> t.translate_core('**/*').replace('\\\\', '')
-        '.*/[^/][^/]*'
-        """
-        self.restrict_rglob(pattern)
-        return ''.join(map(self.replace, separate(self.star_not_empty(pattern))))
-
-    def replace(self, match):
-        """
-        Perform the replacements for a match from :func:`separate`.
-        """
-        return match.group('set') or (
-            re.escape(match.group(0))
-            .replace('\\*\\*', r'.*')
-            .replace('\\*', rf'[^{re.escape(self.seps)}]*')
-            .replace('\\?', r'[^/]')
-        )
-
-    def restrict_rglob(self, pattern):
-        """
-        Raise ValueError if ** appears in anything but a full path segment.
-
-        >>> Translator().translate('**foo')
-        Traceback (most recent call last):
-        ...
-        ValueError: ** must appear alone in a path segment
-        """
-        seps_pattern = rf'[{re.escape(self.seps)}]+'
-        segments = re.split(seps_pattern, pattern)
-        if any('**' in segment and segment != '**' for segment in segments):
-            raise ValueError("** must appear alone in a path segment")
-
-    def star_not_empty(self, pattern):
-        """
-        Ensure that * will not match an empty segment.
-        """
-
-        def handle_segment(match):
-            segment = match.group(0)
-            return '?*' if segment == '*' else segment
-
-        not_seps_pattern = rf'[^{re.escape(self.seps)}]+'
-        return re.sub(not_seps_pattern, handle_segment, pattern)
-
-
-def separate(pattern):
-    """
-    Separate out character sets to avoid translating their contents.
-
-    >>> [m.group(0) for m in separate('*.txt')]
-    ['*.txt']
-    >>> [m.group(0) for m in separate('a[?]txt')]
-    ['a', '[?]', 'txt']
-    """
-    return re.finditer(r'([^\[]+)|(?P[\[].*?[\]])|([\[][^\]]*$)', pattern)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/archive_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/archive_util.py
index 1a02010..d8e10c1 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/archive_util.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/archive_util.py
@@ -1,24 +1,18 @@
 """Utilities for extracting common archive formats"""
 
-import contextlib
-import os
-import posixpath
-import shutil
-import tarfile
 import zipfile
+import tarfile
+import os
+import shutil
+import posixpath
+import contextlib
+from distutils.errors import DistutilsError
 
 from ._path import ensure_directory
 
-from distutils.errors import DistutilsError
-
 __all__ = [
-    "unpack_archive",
-    "unpack_zipfile",
-    "unpack_tarfile",
-    "default_filter",
-    "UnrecognizedFormat",
-    "extraction_drivers",
-    "unpack_directory",
+    "unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
+    "UnrecognizedFormat", "extraction_drivers", "unpack_directory",
 ]
 
 
@@ -32,8 +26,8 @@ def default_filter(src, dst):
 
 
 def unpack_archive(
-    filename, extract_dir, progress_filter=default_filter, drivers=None
-) -> None:
+        filename, extract_dir, progress_filter=default_filter,
+        drivers=None):
     """Unpack `filename` to `extract_dir`, or raise ``UnrecognizedFormat``
 
     `progress_filter` is a function taking two arguments: a source path
@@ -62,16 +56,18 @@ def unpack_archive(
         else:
             return
     else:
-        raise UnrecognizedFormat(f"Not a recognized archive type: {filename}")
+        raise UnrecognizedFormat(
+            "Not a recognized archive type: %s" % filename
+        )
 
 
-def unpack_directory(filename, extract_dir, progress_filter=default_filter) -> None:
-    """ "Unpack" a directory, using the same interface as for archives
+def unpack_directory(filename, extract_dir, progress_filter=default_filter):
+    """"Unpack" a directory, using the same interface as for archives
 
     Raises ``UnrecognizedFormat`` if `filename` is not a directory
     """
     if not os.path.isdir(filename):
-        raise UnrecognizedFormat(f"{filename} is not a directory")
+        raise UnrecognizedFormat("%s is not a directory" % filename)
 
     paths = {
         filename: ('', extract_dir),
@@ -92,7 +88,7 @@ def unpack_directory(filename, extract_dir, progress_filter=default_filter) -> N
             shutil.copystat(f, target)
 
 
-def unpack_zipfile(filename, extract_dir, progress_filter=default_filter) -> None:
+def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
     """Unpack zip `filename` to `extract_dir`
 
     Raises ``UnrecognizedFormat`` if `filename` is not a zipfile (as determined
@@ -101,7 +97,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter) -> Non
     """
 
     if not zipfile.is_zipfile(filename):
-        raise UnrecognizedFormat(f"{filename} is not a zip file")
+        raise UnrecognizedFormat("%s is not a zip file" % (filename,))
 
     with zipfile.ZipFile(filename) as z:
         _unpack_zipfile_obj(z, extract_dir, progress_filter)
@@ -140,8 +136,7 @@ def _unpack_zipfile_obj(zipfile_obj, extract_dir, progress_filter=default_filter
 def _resolve_tar_file_or_dir(tar_obj, tar_member_obj):
     """Resolve any links and extract link targets as normal files."""
     while tar_member_obj is not None and (
-        tar_member_obj.islnk() or tar_member_obj.issym()
-    ):
+            tar_member_obj.islnk() or tar_member_obj.issym()):
         linkpath = tar_member_obj.linkname
         if tar_member_obj.issym():
             base = posixpath.dirname(tar_member_obj.name)
@@ -149,8 +144,9 @@ def _resolve_tar_file_or_dir(tar_obj, tar_member_obj):
             linkpath = posixpath.normpath(linkpath)
         tar_member_obj = tar_obj._getmember(linkpath)
 
-    is_file_or_dir = tar_member_obj is not None and (
-        tar_member_obj.isfile() or tar_member_obj.isdir()
+    is_file_or_dir = (
+        tar_member_obj is not None and
+        (tar_member_obj.isfile() or tar_member_obj.isdir())
     )
     if is_file_or_dir:
         return tar_member_obj
@@ -187,7 +183,7 @@ def _iter_open_tar(tar_obj, extract_dir, progress_filter):
             yield member, final_dst
 
 
-def unpack_tarfile(filename, extract_dir, progress_filter=default_filter) -> bool:
+def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
     """Unpack tar/tar.gz/tar.bz2 `filename` to `extract_dir`
 
     Raises ``UnrecognizedFormat`` if `filename` is not a tarfile (as determined
@@ -198,13 +194,11 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter) -> boo
         tarobj = tarfile.open(filename)
     except tarfile.TarError as e:
         raise UnrecognizedFormat(
-            f"{filename} is not a compressed or uncompressed tar file"
+            "%s is not a compressed or uncompressed tar file" % (filename,)
         ) from e
 
     for member, final_dst in _iter_open_tar(
-        tarobj,
-        extract_dir,
-        progress_filter,
+            tarobj, extract_dir, progress_filter,
     ):
         try:
             # XXX Ugh
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/build_meta.py b/server/.venv/lib/python3.11/site-packages/setuptools/build_meta.py
index 8f2e930..e8f1c72 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/build_meta.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/build_meta.py
@@ -2,7 +2,7 @@
 
 Previously, when a user or a command line tool (let's call it a "frontend")
 needed to make a request of setuptools to take a certain action, for
-example, generating a list of installation requirements, the frontend
+example, generating a list of installation requirements, the frontend would
 would call "setup.py egg_info" or "setup.py bdist_wheel" on the command line.
 
 PEP 517 defines a different method of interfacing with setuptools. Rather
@@ -26,50 +26,44 @@ bug reports or API stability):
 Again, this is not a formal definition! Just a "taste" of the module.
 """
 
-from __future__ import annotations
-
-import contextlib
 import io
 import os
 import shlex
-import shutil
 import sys
-import tempfile
 import tokenize
+import shutil
+import contextlib
+import tempfile
 import warnings
-from collections.abc import Iterable, Iterator, Mapping
 from pathlib import Path
-from typing import TYPE_CHECKING, Union
+from typing import Dict, Iterator, List, Optional, Union
 
 import setuptools
-
-from . import errors
-from ._path import StrPath, same_path
-from ._reqs import parse_strings
-from .warnings import SetuptoolsDeprecationWarning
-
 import distutils
+from . import errors
+from ._path import same_path
+from ._reqs import parse_strings
+from ._deprecation_warning import SetuptoolsDeprecationWarning
 from distutils.util import strtobool
 
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
 
-__all__ = [
-    'get_requires_for_build_sdist',
-    'get_requires_for_build_wheel',
-    'prepare_metadata_for_build_wheel',
-    'build_wheel',
-    'build_sdist',
-    'get_requires_for_build_editable',
-    'prepare_metadata_for_build_editable',
-    'build_editable',
-    '__legacy__',
-    'SetupRequirementsError',
-]
+__all__ = ['get_requires_for_build_sdist',
+           'get_requires_for_build_wheel',
+           'prepare_metadata_for_build_wheel',
+           'build_wheel',
+           'build_sdist',
+           'get_requires_for_build_editable',
+           'prepare_metadata_for_build_editable',
+           'build_editable',
+           '__legacy__',
+           'SetupRequirementsError']
+
+SETUPTOOLS_ENABLE_FEATURES = os.getenv("SETUPTOOLS_ENABLE_FEATURES", "").lower()
+LEGACY_EDITABLE = "legacy-editable" in SETUPTOOLS_ENABLE_FEATURES.replace("_", "-")
 
 
 class SetupRequirementsError(BaseException):
-    def __init__(self, specifiers) -> None:
+    def __init__(self, specifiers):
         self.specifiers = specifiers
 
 
@@ -88,11 +82,11 @@ class Distribution(setuptools.dist.Distribution):
         for the duration of this context.
         """
         orig = distutils.core.Distribution
-        distutils.core.Distribution = cls  # type: ignore[misc] # monkeypatching
+        distutils.core.Distribution = cls
         try:
             yield
         finally:
-            distutils.core.Distribution = orig  # type: ignore[misc] # monkeypatching
+            distutils.core.Distribution = orig
 
 
 @contextlib.contextmanager
@@ -112,29 +106,30 @@ def no_install_setup_requires():
 
 
 def _get_immediate_subdirectories(a_dir):
-    return [
-        name for name in os.listdir(a_dir) if os.path.isdir(os.path.join(a_dir, name))
-    ]
+    return [name for name in os.listdir(a_dir)
+            if os.path.isdir(os.path.join(a_dir, name))]
 
 
-def _file_with_extension(directory: StrPath, extension: str | tuple[str, ...]):
-    matching = (f for f in os.listdir(directory) if f.endswith(extension))
+def _file_with_extension(directory, extension):
+    matching = (
+        f for f in os.listdir(directory)
+        if f.endswith(extension)
+    )
     try:
-        (file,) = matching
+        file, = matching
     except ValueError:
         raise ValueError(
             'No distribution was found. Ensure that `setup.py` '
-            'is not empty and that it calls `setup()`.'
-        ) from None
+            'is not empty and that it calls `setup()`.')
     return file
 
 
 def _open_setup_script(setup_script):
     if not os.path.exists(setup_script):
         # Supply a default setup.py
-        return io.StringIO("from setuptools import setup; setup()")
+        return io.StringIO(u"from setuptools import setup; setup()")
 
-    return tokenize.open(setup_script)
+    return getattr(tokenize, 'open', open)(setup_script)
 
 
 @contextlib.contextmanager
@@ -144,7 +139,7 @@ def suppress_known_deprecation():
         yield
 
 
-_ConfigSettings: TypeAlias = Union[Mapping[str, Union[str, list[str], None]], None]
+_ConfigSettings = Optional[Dict[str, Union[str, List[str], None]]]
 """
 Currently the user can run::
 
@@ -164,10 +159,9 @@ class _ConfigSettingsTranslator:
     """Translate ``config_settings`` into distutils-style command arguments.
     Only a limited number of options is currently supported.
     """
-
     # See pypa/setuptools#1928 pypa/setuptools#2491
 
-    def _get_config(self, key: str, config_settings: _ConfigSettings) -> list[str]:
+    def _get_config(self, key: str, config_settings: _ConfigSettings) -> List[str]:
         """
         Get the value of a specific key in ``config_settings`` as a list of strings.
 
@@ -189,6 +183,11 @@ class _ConfigSettingsTranslator:
         opts = cfg.get(key) or []
         return shlex.split(opts) if isinstance(opts, str) else opts
 
+    def _valid_global_options(self):
+        """Global options accepted by setuptools (e.g. quiet or verbose)."""
+        options = (opt[:2] for opt in setuptools.dist.Distribution.global_options)
+        return {flag for long_and_short in options for flag in long_and_short if flag}
+
     def _global_args(self, config_settings: _ConfigSettings) -> Iterator[str]:
         """
         Let the user specify ``verbose`` or ``quiet`` + escape hatch via
@@ -219,7 +218,9 @@ class _ConfigSettingsTranslator:
             level = str(cfg.get("quiet") or cfg.get("--quiet") or "1")
             yield ("-v" if level.lower() in falsey else "-q")
 
-        yield from self._get_config("--global-option", config_settings)
+        valid = self._valid_global_options()
+        args = self._get_config("--global-option", config_settings)
+        yield from (arg for arg in args if arg.strip("-") in valid)
 
     def __dist_info_args(self, config_settings: _ConfigSettings) -> Iterator[str]:
         """
@@ -227,7 +228,7 @@ class _ConfigSettingsTranslator:
 
         .. warning::
            We cannot use this yet as it requires the ``sdist`` and ``bdist_wheel``
-           commands run in ``build_sdist`` and ``build_wheel`` to reuse the egg-info
+           commands run in ``build_sdist`` and ``build_wheel`` to re-use the egg-info
            directory created in ``prepare_metadata_for_build_wheel``.
 
         >>> fn = _ConfigSettingsTranslator()._ConfigSettingsTranslator__dist_info_args
@@ -281,20 +282,38 @@ class _ConfigSettingsTranslator:
         ['foo']
         >>> list(fn({'--build-option': 'foo bar'}))
         ['foo', 'bar']
-        >>> list(fn({'--global-option': 'foo'}))
-        []
+        >>> warnings.simplefilter('error', SetuptoolsDeprecationWarning)
+        >>> list(fn({'--global-option': 'foo'}))  # doctest: +IGNORE_EXCEPTION_DETAIL
+        Traceback (most recent call last):
+        SetuptoolsDeprecationWarning: ...arguments given via `--global-option`...
         """
+        args = self._get_config("--global-option", config_settings)
+        global_opts = self._valid_global_options()
+        bad_args = []
+
+        for arg in args:
+            if arg.strip("-") not in global_opts:
+                bad_args.append(arg)
+                yield arg
+
         yield from self._get_config("--build-option", config_settings)
 
+        if bad_args:
+            msg = f"""
+            The arguments {bad_args!r} were given via `--global-option`.
+            Please use `--build-option` instead,
+            `--global-option` is reserved to flags like `--verbose` or `--quiet`.
+            """
+            warnings.warn(msg, SetuptoolsDeprecationWarning)
+
 
 class _BuildMetaBackend(_ConfigSettingsTranslator):
-    def _get_build_requires(
-        self, config_settings: _ConfigSettings, requirements: list[str]
-    ):
+    def _get_build_requires(self, config_settings, requirements):
         sys.argv = [
             *sys.argv[:1],
             *self._global_args(config_settings),
             "egg_info",
+            *self._arbitrary_args(config_settings),
         ]
         try:
             with Distribution.patch():
@@ -304,38 +323,24 @@ class _BuildMetaBackend(_ConfigSettingsTranslator):
 
         return requirements
 
-    def run_setup(self, setup_script: str = 'setup.py'):
+    def run_setup(self, setup_script='setup.py'):
         # Note that we can reuse our build directory between calls
         # Correctness comes first, then optimization later
-        __file__ = os.path.abspath(setup_script)
+        __file__ = setup_script
         __name__ = '__main__'
 
         with _open_setup_script(__file__) as f:
             code = f.read().replace(r'\r\n', r'\n')
 
-        try:
-            exec(code, locals())
-        except SystemExit as e:
-            if e.code:
-                raise
-            # We ignore exit code indicating success
-            SetuptoolsDeprecationWarning.emit(
-                "Running `setup.py` directly as CLI tool is deprecated.",
-                "Please avoid using `sys.exit(0)` or similar statements "
-                "that don't fit in the paradigm of a configuration file.",
-                see_url="https://blog.ganssle.io/articles/2021/10/"
-                "setup-py-deprecated.html",
-            )
+        exec(code, locals())
 
-    def get_requires_for_build_wheel(self, config_settings: _ConfigSettings = None):
+    def get_requires_for_build_wheel(self, config_settings=None):
+        return self._get_build_requires(config_settings, requirements=['wheel'])
+
+    def get_requires_for_build_sdist(self, config_settings=None):
         return self._get_build_requires(config_settings, requirements=[])
 
-    def get_requires_for_build_sdist(self, config_settings: _ConfigSettings = None):
-        return self._get_build_requires(config_settings, requirements=[])
-
-    def _bubble_up_info_directory(
-        self, metadata_directory: StrPath, suffix: str
-    ) -> str:
+    def _bubble_up_info_directory(self, metadata_directory: str, suffix: str) -> str:
         """
         PEP 517 requires that the .dist-info directory be placed in the
         metadata_directory. To comply, we MUST copy the directory to the root.
@@ -348,7 +353,7 @@ class _BuildMetaBackend(_ConfigSettingsTranslator):
             # PEP 517 allow other files and dirs to exist in metadata_directory
         return info_dir.name
 
-    def _find_info_directory(self, metadata_directory: StrPath, suffix: str) -> Path:
+    def _find_info_directory(self, metadata_directory: str, suffix: str) -> Path:
         for parent, dirs, _ in os.walk(metadata_directory):
             candidates = [f for f in dirs if f.endswith(suffix)]
 
@@ -359,15 +364,13 @@ class _BuildMetaBackend(_ConfigSettingsTranslator):
         msg = f"No {suffix} directory found in {metadata_directory}"
         raise errors.InternalError(msg)
 
-    def prepare_metadata_for_build_wheel(
-        self, metadata_directory: StrPath, config_settings: _ConfigSettings = None
-    ):
+    def prepare_metadata_for_build_wheel(self, metadata_directory,
+                                         config_settings=None):
         sys.argv = [
             *sys.argv[:1],
             *self._global_args(config_settings),
             "dist_info",
-            "--output-dir",
-            str(metadata_directory),
+            "--output-dir", metadata_directory,
             "--keep-egg-info",
         ]
         with no_install_setup_requires():
@@ -376,34 +379,25 @@ class _BuildMetaBackend(_ConfigSettingsTranslator):
         self._bubble_up_info_directory(metadata_directory, ".egg-info")
         return self._bubble_up_info_directory(metadata_directory, ".dist-info")
 
-    def _build_with_temp_dir(
-        self,
-        setup_command: Iterable[str],
-        result_extension: str | tuple[str, ...],
-        result_directory: StrPath,
-        config_settings: _ConfigSettings,
-        arbitrary_args: Iterable[str] = (),
-    ):
+    def _build_with_temp_dir(self, setup_command, result_extension,
+                             result_directory, config_settings):
         result_directory = os.path.abspath(result_directory)
 
         # Build in a temporary directory, then copy to the target.
         os.makedirs(result_directory, exist_ok=True)
-
-        with tempfile.TemporaryDirectory(
-            prefix=".tmp-", dir=result_directory
-        ) as tmp_dist_dir:
+        with tempfile.TemporaryDirectory(dir=result_directory) as tmp_dist_dir:
             sys.argv = [
                 *sys.argv[:1],
                 *self._global_args(config_settings),
                 *setup_command,
-                "--dist-dir",
-                tmp_dist_dir,
-                *arbitrary_args,
+                "--dist-dir", tmp_dist_dir,
+                *self._arbitrary_args(config_settings),
             ]
             with no_install_setup_requires():
                 self.run_setup()
 
-            result_basename = _file_with_extension(tmp_dist_dir, result_extension)
+            result_basename = _file_with_extension(
+                tmp_dist_dir, result_extension)
             result_path = os.path.join(result_directory, result_basename)
             if os.path.exists(result_path):
                 # os.rename will fail overwriting on non-Unix.
@@ -412,73 +406,51 @@ class _BuildMetaBackend(_ConfigSettingsTranslator):
 
         return result_basename
 
-    def build_wheel(
-        self,
-        wheel_directory: StrPath,
-        config_settings: _ConfigSettings = None,
-        metadata_directory: StrPath | None = None,
-    ):
-        def _build(cmd: list[str]):
-            with suppress_known_deprecation():
-                return self._build_with_temp_dir(
-                    cmd,
-                    '.whl',
-                    wheel_directory,
-                    config_settings,
-                    self._arbitrary_args(config_settings),
-                )
+    def build_wheel(self, wheel_directory, config_settings=None,
+                    metadata_directory=None):
+        with suppress_known_deprecation():
+            return self._build_with_temp_dir(['bdist_wheel'], '.whl',
+                                             wheel_directory, config_settings)
 
-        if metadata_directory is None:
-            return _build(['bdist_wheel'])
+    def build_sdist(self, sdist_directory, config_settings=None):
+        return self._build_with_temp_dir(['sdist', '--formats', 'gztar'],
+                                         '.tar.gz', sdist_directory,
+                                         config_settings)
 
-        try:
-            return _build(['bdist_wheel', '--dist-info-dir', str(metadata_directory)])
-        except SystemExit as ex:  # pragma: nocover
-            # pypa/setuptools#4683
-            if "--dist-info-dir not recognized" not in str(ex):
-                raise
-            _IncompatibleBdistWheel.emit()
-            return _build(['bdist_wheel'])
-
-    def build_sdist(
-        self, sdist_directory: StrPath, config_settings: _ConfigSettings = None
-    ):
-        return self._build_with_temp_dir(
-            ['sdist', '--formats', 'gztar'], '.tar.gz', sdist_directory, config_settings
-        )
-
-    def _get_dist_info_dir(self, metadata_directory: StrPath | None) -> str | None:
+    def _get_dist_info_dir(self, metadata_directory: Optional[str]) -> Optional[str]:
         if not metadata_directory:
             return None
         dist_info_candidates = list(Path(metadata_directory).glob("*.dist-info"))
         assert len(dist_info_candidates) <= 1
         return str(dist_info_candidates[0]) if dist_info_candidates else None
 
-    def build_editable(
-        self,
-        wheel_directory: StrPath,
-        config_settings: _ConfigSettings = None,
-        metadata_directory: StrPath | None = None,
-    ):
-        # XXX can or should we hide our editable_wheel command normally?
-        info_dir = self._get_dist_info_dir(metadata_directory)
-        opts = ["--dist-info-dir", info_dir] if info_dir else []
-        cmd = ["editable_wheel", *opts, *self._editable_args(config_settings)]
-        with suppress_known_deprecation():
-            return self._build_with_temp_dir(
-                cmd, ".whl", wheel_directory, config_settings
+    if not LEGACY_EDITABLE:
+
+        # PEP660 hooks:
+        # build_editable
+        # get_requires_for_build_editable
+        # prepare_metadata_for_build_editable
+        def build_editable(
+            self, wheel_directory, config_settings=None, metadata_directory=None
+        ):
+            # XXX can or should we hide our editable_wheel command normally?
+            info_dir = self._get_dist_info_dir(metadata_directory)
+            opts = ["--dist-info-dir", info_dir] if info_dir else []
+            cmd = ["editable_wheel", *opts, *self._editable_args(config_settings)]
+            with suppress_known_deprecation():
+                return self._build_with_temp_dir(
+                    cmd, ".whl", wheel_directory, config_settings
+                )
+
+        def get_requires_for_build_editable(self, config_settings=None):
+            return self.get_requires_for_build_wheel(config_settings)
+
+        def prepare_metadata_for_build_editable(self, metadata_directory,
+                                                config_settings=None):
+            return self.prepare_metadata_for_build_wheel(
+                metadata_directory, config_settings
             )
 
-    def get_requires_for_build_editable(self, config_settings: _ConfigSettings = None):
-        return self.get_requires_for_build_wheel(config_settings)
-
-    def prepare_metadata_for_build_editable(
-        self, metadata_directory: StrPath, config_settings: _ConfigSettings = None
-    ):
-        return self.prepare_metadata_for_build_wheel(
-            metadata_directory, config_settings
-        )
-
 
 class _BuildMetaLegacyBackend(_BuildMetaBackend):
     """Compatibility backend for setuptools
@@ -491,12 +463,11 @@ class _BuildMetaLegacyBackend(_BuildMetaBackend):
     packaging mechanism,
     and will eventually be removed.
     """
-
-    def run_setup(self, setup_script: str = 'setup.py'):
+    def run_setup(self, setup_script='setup.py'):
         # In order to maintain compatibility with scripts assuming that
         # the setup.py script is in a directory on the PYTHONPATH, inject
         # '' into sys.path. (pypa/setuptools#1642)
-        sys_path = list(sys.path)  # Save the original path
+        sys_path = list(sys.path)           # Save the original path
 
         script_dir = os.path.dirname(os.path.abspath(setup_script))
         if script_dir not in sys.path:
@@ -509,7 +480,8 @@ class _BuildMetaLegacyBackend(_BuildMetaBackend):
         sys.argv[0] = setup_script
 
         try:
-            super().run_setup(setup_script=setup_script)
+            super(_BuildMetaLegacyBackend,
+                  self).run_setup(setup_script=setup_script)
         finally:
             # While PEP 517 frontends should be calling each hook in a fresh
             # subprocess according to the standard (and thus it should not be
@@ -520,17 +492,6 @@ class _BuildMetaLegacyBackend(_BuildMetaBackend):
             sys.argv[0] = sys_argv_0
 
 
-class _IncompatibleBdistWheel(SetuptoolsDeprecationWarning):
-    _SUMMARY = "wheel.bdist_wheel is deprecated, please import it from setuptools"
-    _DETAILS = """
-    Ensure that any custom bdist_wheel implementation is a subclass of
-    setuptools.command.bdist_wheel.bdist_wheel.
-    """
-    _DUE_DATE = (2025, 10, 15)
-    # Initially introduced in 2024/10/15, but maybe too disruptive to be enforced?
-    _SEE_URL = "https://github.com/pypa/wheel/pull/631"
-
-
 # The primary backend
 _BACKEND = _BuildMetaBackend()
 
@@ -539,9 +500,11 @@ get_requires_for_build_sdist = _BACKEND.get_requires_for_build_sdist
 prepare_metadata_for_build_wheel = _BACKEND.prepare_metadata_for_build_wheel
 build_wheel = _BACKEND.build_wheel
 build_sdist = _BACKEND.build_sdist
-get_requires_for_build_editable = _BACKEND.get_requires_for_build_editable
-prepare_metadata_for_build_editable = _BACKEND.prepare_metadata_for_build_editable
-build_editable = _BACKEND.build_editable
+
+if not LEGACY_EDITABLE:
+    get_requires_for_build_editable = _BACKEND.get_requires_for_build_editable
+    prepare_metadata_for_build_editable = _BACKEND.prepare_metadata_for_build_editable
+    build_editable = _BACKEND.build_editable
 
 
 # The legacy backend
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/cli-32.exe b/server/.venv/lib/python3.11/site-packages/setuptools/cli-32.exe
index 65c3cd9..b1487b7 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/cli-32.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/cli-32.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/cli-64.exe b/server/.venv/lib/python3.11/site-packages/setuptools/cli-64.exe
index 3ea50ee..675e6bf 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/cli-64.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/cli-64.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/cli-arm64.exe b/server/.venv/lib/python3.11/site-packages/setuptools/cli-arm64.exe
index da96455..7a87ce4 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/cli-arm64.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/cli-arm64.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/cli.exe b/server/.venv/lib/python3.11/site-packages/setuptools/cli.exe
index 65c3cd9..b1487b7 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/cli.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/cli.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/__init__.py
index 50e6c2f..5acd768 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/__init__.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/__init__.py
@@ -1,20 +1,11 @@
-# mypy: disable_error_code=call-overload
-# pyright: reportCallIssue=false, reportArgumentType=false
-# Can't disable on the exact line because distutils doesn't exists on Python 3.12
-# and type-checkers aren't aware of distutils_hack,
-# causing distutils.command.bdist.bdist.format_commands to be Any.
-
-import sys
-
 from distutils.command.bdist import bdist
+import sys
 
 if 'egg' not in bdist.format_commands:
     try:
-        # format_commands is a dict in vendored distutils
-        # It used to be a list in older (stdlib) distutils
-        # We support both for backwards compatibility
         bdist.format_commands['egg'] = ('bdist_egg', "Python .egg file")
     except TypeError:
+        # For backward compatibility with older distutils (stdlib)
         bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
         bdist.format_commands.append('egg')
 
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/__init__.cpython-311.pyc
index 6f5b6de..e5c97b8 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/__init__.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/_requirestxt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/_requirestxt.cpython-311.pyc
deleted file mode 100644
index f622a25..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/_requirestxt.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/alias.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/alias.cpython-311.pyc
index 69c22b3..c1ba37c 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/alias.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/alias.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-311.pyc
index f358aeb..6084450 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_egg.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-311.pyc
index 816f40a..6d13e25 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_rpm.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_wheel.cpython-311.pyc
deleted file mode 100644
index 580b075..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/bdist_wheel.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build.cpython-311.pyc
index 61cd792..00ff5b1 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_clib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_clib.cpython-311.pyc
index 30272b8..cbe5b1d 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_clib.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_clib.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_ext.cpython-311.pyc
index 6eaff06..744c884 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_ext.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_py.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_py.cpython-311.pyc
index e9562a5..1771cc2 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_py.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/build_py.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/develop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/develop.cpython-311.pyc
index 9094117..32a78eb 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/develop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/develop.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/dist_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/dist_info.cpython-311.pyc
index d9a37f1..5140594 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/dist_info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/dist_info.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/easy_install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/easy_install.cpython-311.pyc
index 761a23a..d5f79c1 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/easy_install.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/easy_install.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/editable_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/editable_wheel.cpython-311.pyc
index 4d6d923..63528d8 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/editable_wheel.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/editable_wheel.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/egg_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/egg_info.cpython-311.pyc
index 7b46ef1..7b7d5e1 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/egg_info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/egg_info.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install.cpython-311.pyc
index c4604d4..ebf90f8 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_egg_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_egg_info.cpython-311.pyc
index df5bfc3..3356805 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_egg_info.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_egg_info.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_lib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_lib.cpython-311.pyc
index 9a0489d..0a6f80b 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_lib.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_lib.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_scripts.cpython-311.pyc
index 4520b75..07b1215 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_scripts.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/install_scripts.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/rotate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/rotate.cpython-311.pyc
index 55ee4d5..8bf4bd5 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/rotate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/rotate.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/saveopts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/saveopts.cpython-311.pyc
index 0630c94..4719b26 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/saveopts.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/saveopts.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/sdist.cpython-311.pyc
index 08b8bbd..59a63d5 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/sdist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/sdist.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/setopt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/setopt.cpython-311.pyc
index 299a077..aa5b369 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/setopt.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/setopt.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/test.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/test.cpython-311.pyc
index ca861a0..3b527ab 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/test.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/command/__pycache__/test.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/_requirestxt.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/_requirestxt.py
deleted file mode 100644
index 9029b12..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/_requirestxt.py
+++ /dev/null
@@ -1,131 +0,0 @@
-"""Helper code used to generate ``requires.txt`` files in the egg-info directory.
-
-The ``requires.txt`` file has an specific format:
-    - Environment markers need to be part of the section headers and
-      should not be part of the requirement spec itself.
-
-See https://setuptools.pypa.io/en/latest/deprecated/python_eggs.html#requires-txt
-"""
-
-from __future__ import annotations
-
-import io
-from collections import defaultdict
-from collections.abc import Mapping
-from itertools import filterfalse
-from typing import TypeVar
-
-from jaraco.text import yield_lines
-from packaging.requirements import Requirement
-
-from .. import _reqs
-from .._reqs import _StrOrIter
-
-# dict can work as an ordered set
-_T = TypeVar("_T")
-_Ordered = dict[_T, None]
-
-
-def _prepare(
-    install_requires: _StrOrIter, extras_require: Mapping[str, _StrOrIter]
-) -> tuple[list[str], dict[str, list[str]]]:
-    """Given values for ``install_requires`` and ``extras_require``
-    create modified versions in a way that can be written in ``requires.txt``
-    """
-    extras = _convert_extras_requirements(extras_require)
-    return _move_install_requirements_markers(install_requires, extras)
-
-
-def _convert_extras_requirements(
-    extras_require: Mapping[str, _StrOrIter],
-) -> defaultdict[str, _Ordered[Requirement]]:
-    """
-    Convert requirements in `extras_require` of the form
-    `"extra": ["barbazquux; {marker}"]` to
-    `"extra:{marker}": ["barbazquux"]`.
-    """
-    output = defaultdict[str, _Ordered[Requirement]](dict)
-    for section, v in extras_require.items():
-        # Do not strip empty sections.
-        output[section]
-        for r in _reqs.parse(v):
-            output[section + _suffix_for(r)].setdefault(r)
-
-    return output
-
-
-def _move_install_requirements_markers(
-    install_requires: _StrOrIter, extras_require: Mapping[str, _Ordered[Requirement]]
-) -> tuple[list[str], dict[str, list[str]]]:
-    """
-    The ``requires.txt`` file has an specific format:
-        - Environment markers need to be part of the section headers and
-          should not be part of the requirement spec itself.
-
-    Move requirements in ``install_requires`` that are using environment
-    markers ``extras_require``.
-    """
-
-    # divide the install_requires into two sets, simple ones still
-    # handled by install_requires and more complex ones handled by extras_require.
-
-    inst_reqs = list(_reqs.parse(install_requires))
-    simple_reqs = filter(_no_marker, inst_reqs)
-    complex_reqs = filterfalse(_no_marker, inst_reqs)
-    simple_install_requires = list(map(str, simple_reqs))
-
-    for r in complex_reqs:
-        extras_require[':' + str(r.marker)].setdefault(r)
-
-    expanded_extras = dict(
-        # list(dict.fromkeys(...))  ensures a list of unique strings
-        (k, list(dict.fromkeys(str(r) for r in map(_clean_req, v))))
-        for k, v in extras_require.items()
-    )
-
-    return simple_install_requires, expanded_extras
-
-
-def _suffix_for(req):
-    """Return the 'extras_require' suffix for a given requirement."""
-    return ':' + str(req.marker) if req.marker else ''
-
-
-def _clean_req(req):
-    """Given a Requirement, remove environment markers and return it"""
-    r = Requirement(str(req))  # create a copy before modifying
-    r.marker = None
-    return r
-
-
-def _no_marker(req):
-    return not req.marker
-
-
-def _write_requirements(stream, reqs):
-    lines = yield_lines(reqs or ())
-
-    def append_cr(line):
-        return line + '\n'
-
-    lines = map(append_cr, lines)
-    stream.writelines(lines)
-
-
-def write_requirements(cmd, basename, filename):
-    dist = cmd.distribution
-    data = io.StringIO()
-    install_requires, extras_require = _prepare(
-        dist.install_requires or (), dist.extras_require or {}
-    )
-    _write_requirements(data, install_requires)
-    for extra in sorted(extras_require):
-        data.write('\n[{extra}]\n'.format(**vars()))
-        _write_requirements(data, extras_require[extra])
-    cmd.write_or_delete_file("requirements", filename, data.getvalue())
-
-
-def write_setup_requirements(cmd, basename, filename):
-    data = io.StringIO()
-    _write_requirements(data, cmd.distribution.setup_requires)
-    cmd.write_or_delete_file("setup-requirements", filename, data.getvalue())
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/alias.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/alias.py
index b8d74af..452a924 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/alias.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/alias.py
@@ -1,7 +1,7 @@
-from setuptools.command.setopt import config_file, edit_config, option_base
-
 from distutils.errors import DistutilsOptionError
 
+from setuptools.command.setopt import edit_config, option_base, config_file
+
 
 def shquote(arg):
     """Quote an argument for later parsing by shlex.split()"""
@@ -30,14 +30,15 @@ class alias(option_base):
         self.args = None
         self.remove = None
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         option_base.finalize_options(self)
         if self.remove and len(self.args) != 1:
             raise DistutilsOptionError(
-                "Must specify exactly one argument (the alias name) when using --remove"
+                "Must specify exactly one argument (the alias name) when "
+                "using --remove"
             )
 
-    def run(self) -> None:
+    def run(self):
         aliases = self.distribution.get_option_dict('aliases')
 
         if not self.args:
@@ -48,14 +49,14 @@ class alias(option_base):
             return
 
         elif len(self.args) == 1:
-            (alias,) = self.args
+            alias, = self.args
             if self.remove:
                 command = None
             elif alias in aliases:
                 print("setup.py alias", format_alias(alias, aliases))
                 return
             else:
-                print(f"No alias definition found for {alias!r}")
+                print("No alias definition found for %r" % alias)
                 return
         else:
             alias = self.args[0]
@@ -73,5 +74,5 @@ def format_alias(name, aliases):
     elif source == config_file('local'):
         source = ''
     else:
-        source = f'--filename={source!r}'
+        source = '--filename=%r' % source
     return source + name + ' ' + command
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_egg.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_egg.py
index 7f66c3b..11a1c6b 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_egg.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_egg.py
@@ -2,30 +2,21 @@
 
 Build .egg distributions"""
 
-from __future__ import annotations
-
-import marshal
+from distutils.dir_util import remove_tree, mkpath
+from distutils import log
+from types import CodeType
+import sys
 import os
 import re
-import sys
 import textwrap
-from sysconfig import get_path, get_python_version
-from types import CodeType
-from typing import TYPE_CHECKING, Literal
+import marshal
 
-from setuptools import Command
+from pkg_resources import get_build_platform, Distribution
 from setuptools.extension import Library
+from setuptools import Command
+from .._path import ensure_directory
 
-from .._path import StrPathT, ensure_directory
-
-from distutils import log
-from distutils.dir_util import mkpath, remove_tree
-
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-
-# Same as zipfile._ZipFileMode from typeshed
-_ZipFileMode: TypeAlias = Literal["r", "w", "x", "a"]
+from sysconfig import get_path, get_python_version
 
 
 def _get_purelib():
@@ -50,9 +41,8 @@ def sorted_walk(dir):
         yield base, dirs, files
 
 
-def write_stub(resource, pyfile) -> None:
-    _stub_template = textwrap.dedent(
-        """
+def write_stub(resource, pyfile):
+    _stub_template = textwrap.dedent("""
         def __bootstrap__():
             global __bootstrap__, __loader__, __file__
             import sys, pkg_resources, importlib.util
@@ -62,46 +52,44 @@ def write_stub(resource, pyfile) -> None:
             mod = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(mod)
         __bootstrap__()
-        """
-    ).lstrip()
-    with open(pyfile, 'w', encoding="utf-8") as f:
+        """).lstrip()
+    with open(pyfile, 'w') as f:
         f.write(_stub_template % resource)
 
 
 class bdist_egg(Command):
-    description = 'create an "egg" distribution'
+    description = "create an \"egg\" distribution"
 
     user_options = [
-        ('bdist-dir=', 'b', "temporary directory for creating the distribution"),
-        (
-            'plat-name=',
-            'p',
-            "platform name to embed in generated filenames "
-            "(by default uses `pkg_resources.get_build_platform()`)",
-        ),
-        ('exclude-source-files', None, "remove all .py files from the generated egg"),
-        (
-            'keep-temp',
-            'k',
-            "keep the pseudo-installation tree around after "
-            "creating the distribution archive",
-        ),
-        ('dist-dir=', 'd', "directory to put final built distributions in"),
-        ('skip-build', None, "skip rebuilding everything (for testing/debugging)"),
+        ('bdist-dir=', 'b',
+         "temporary directory for creating the distribution"),
+        ('plat-name=', 'p', "platform name to embed in generated filenames "
+                            "(default: %s)" % get_build_platform()),
+        ('exclude-source-files', None,
+         "remove all .py files from the generated egg"),
+        ('keep-temp', 'k',
+         "keep the pseudo-installation tree around after " +
+         "creating the distribution archive"),
+        ('dist-dir=', 'd',
+         "directory to put final built distributions in"),
+        ('skip-build', None,
+         "skip rebuilding everything (for testing/debugging)"),
     ]
 
-    boolean_options = ['keep-temp', 'skip-build', 'exclude-source-files']
+    boolean_options = [
+        'keep-temp', 'skip-build', 'exclude-source-files'
+    ]
 
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
-        self.keep_temp = False
+        self.keep_temp = 0
         self.dist_dir = None
-        self.skip_build = False
+        self.skip_build = 0
         self.egg_output = None
         self.exclude_source_files = None
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         ei_cmd = self.ei_cmd = self.get_finalized_command("egg_info")
         self.egg_info = ei_cmd.egg_info
 
@@ -110,22 +98,22 @@ class bdist_egg(Command):
             self.bdist_dir = os.path.join(bdist_base, 'egg')
 
         if self.plat_name is None:
-            from pkg_resources import get_build_platform
-
             self.plat_name = get_build_platform()
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
         if self.egg_output is None:
+
             # Compute filename of the output egg
-            basename = ei_cmd._get_egg_basename(
-                py_version=get_python_version(),
-                platform=self.distribution.has_ext_modules() and self.plat_name,
-            )
+            basename = Distribution(
+                None, None, ei_cmd.egg_name, ei_cmd.egg_version,
+                get_python_version(),
+                self.distribution.has_ext_modules() and self.plat_name
+            ).egg_name()
 
             self.egg_output = os.path.join(self.dist_dir, basename + '.egg')
 
-    def do_install_data(self) -> None:
+    def do_install_data(self):
         # Hack for packages that install data to install's --install-lib
         self.get_finalized_command('install').install_lib = self.bdist_dir
 
@@ -140,13 +128,13 @@ class bdist_egg(Command):
                     if normalized == site_packages or normalized.startswith(
                         site_packages + os.sep
                     ):
-                        item = realpath[len(site_packages) + 1 :], item[1]
+                        item = realpath[len(site_packages) + 1:], item[1]
                         # XXX else: raise ???
             self.distribution.data_files.append(item)
 
         try:
             log.info("installing package data to %s", self.bdist_dir)
-            self.call_command('install_data', force=False, root=None)
+            self.call_command('install_data', force=0, root=None)
         finally:
             self.distribution.data_files = old
 
@@ -174,15 +162,16 @@ class bdist_egg(Command):
         instcmd.root = None
         if self.distribution.has_c_libraries() and not self.skip_build:
             self.run_command('build_clib')
-        cmd = self.call_command('install_lib', warn_dir=False)
+        cmd = self.call_command('install_lib', warn_dir=0)
         instcmd.root = old_root
 
         all_outputs, ext_outputs = self.get_ext_outputs()
         self.stubs = []
         to_compile = []
-        for p, ext_name in enumerate(ext_outputs):
-            filename, _ext = os.path.splitext(ext_name)
-            pyfile = os.path.join(self.bdist_dir, strip_module(filename) + '.py')
+        for (p, ext_name) in enumerate(ext_outputs):
+            filename, ext = os.path.splitext(ext_name)
+            pyfile = os.path.join(self.bdist_dir, strip_module(filename) +
+                                  '.py')
             self.stubs.append(pyfile)
             log.info("creating stub loader for %s", ext_name)
             if not self.dry_run:
@@ -202,7 +191,8 @@ class bdist_egg(Command):
         if self.distribution.scripts:
             script_dir = os.path.join(egg_info, 'scripts')
             log.info("installing scripts to %s", script_dir)
-            self.call_command('install_scripts', install_dir=script_dir, no_ep=True)
+            self.call_command('install_scripts', install_dir=script_dir,
+                              no_ep=1)
 
         self.copy_metadata_to(egg_info)
         native_libs = os.path.join(egg_info, "native_libs.txt")
@@ -210,15 +200,18 @@ class bdist_egg(Command):
             log.info("writing %s", native_libs)
             if not self.dry_run:
                 ensure_directory(native_libs)
-                with open(native_libs, 'wt', encoding="utf-8") as libs_file:
-                    libs_file.write('\n'.join(all_outputs))
-                    libs_file.write('\n')
+                libs_file = open(native_libs, 'wt')
+                libs_file.write('\n'.join(all_outputs))
+                libs_file.write('\n')
+                libs_file.close()
         elif os.path.isfile(native_libs):
             log.info("removing %s", native_libs)
             if not self.dry_run:
                 os.unlink(native_libs)
 
-        write_safety_flag(os.path.join(archive_root, 'EGG-INFO'), self.zip_safe())
+        write_safety_flag(
+            os.path.join(archive_root, 'EGG-INFO'), self.zip_safe()
+        )
 
         if os.path.exists(os.path.join(self.egg_info, 'depends.txt')):
             log.warn(
@@ -230,22 +223,14 @@ class bdist_egg(Command):
             self.zap_pyfiles()
 
         # Make the archive
-        make_zipfile(
-            self.egg_output,
-            archive_root,
-            verbose=self.verbose,
-            dry_run=self.dry_run,
-            mode=self.gen_header(),
-        )
+        make_zipfile(self.egg_output, archive_root, verbose=self.verbose,
+                     dry_run=self.dry_run, mode=self.gen_header())
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)
 
         # Add to 'Distribution.dist_files' so that the "upload" command works
-        getattr(self.distribution, 'dist_files', []).append((
-            'bdist_egg',
-            get_python_version(),
-            self.egg_output,
-        ))
+        getattr(self.distribution, 'dist_files', []).append(
+            ('bdist_egg', get_python_version(), self.egg_output))
 
     def zap_pyfiles(self):
         log.info("Removing .py files from temporary directory")
@@ -262,8 +247,11 @@ class bdist_egg(Command):
 
                     pattern = r'(?P.+)\.(?P[^.]+)\.pyc'
                     m = re.match(pattern, name)
-                    path_new = os.path.join(base, os.pardir, m.group('name') + '.pyc')
-                    log.info(f"Renaming file from [{path_old}] to [{path_new}]")
+                    path_new = os.path.join(
+                        base, os.pardir, m.group('name') + '.pyc')
+                    log.info(
+                        "Renaming file from [%s] to [%s]"
+                        % (path_old, path_new))
                     try:
                         os.remove(path_new)
                     except OSError:
@@ -277,10 +265,10 @@ class bdist_egg(Command):
         log.warn("zip_safe flag not set; analyzing archive contents...")
         return analyze_egg(self.bdist_dir, self.stubs)
 
-    def gen_header(self) -> Literal["w"]:
+    def gen_header(self):
         return 'w'
 
-    def copy_metadata_to(self, target_dir) -> None:
+    def copy_metadata_to(self, target_dir):
         "Copy metadata (egg info) to the target_dir"
         # normalize the path (so that a forward-slash in egg_info will
         # match using startswith below)
@@ -288,7 +276,7 @@ class bdist_egg(Command):
         prefix = os.path.join(norm_egg_info, '')
         for path in self.ei_cmd.filelist.files:
             if path.startswith(prefix):
-                target = os.path.join(target_dir, path[len(prefix) :])
+                target = os.path.join(target_dir, path[len(prefix):])
                 ensure_directory(target)
                 self.copy_file(path, target)
 
@@ -300,13 +288,12 @@ class bdist_egg(Command):
 
         paths = {self.bdist_dir: ''}
         for base, dirs, files in sorted_walk(self.bdist_dir):
-            all_outputs.extend(
-                paths[base] + filename
-                for filename in files
-                if os.path.splitext(filename)[1].lower() in NATIVE_EXTENSIONS
-            )
+            for filename in files:
+                if os.path.splitext(filename)[1].lower() in NATIVE_EXTENSIONS:
+                    all_outputs.append(paths[base] + filename)
             for filename in dirs:
-                paths[os.path.join(base, filename)] = paths[base] + filename + '/'
+                paths[os.path.join(base, filename)] = (paths[base] +
+                                                       filename + '/')
 
         if self.distribution.has_ext_modules():
             build_cmd = self.get_finalized_command('build_ext')
@@ -322,7 +309,7 @@ class bdist_egg(Command):
         return all_outputs, ext_outputs
 
 
-NATIVE_EXTENSIONS: dict[str, None] = dict.fromkeys('.dll .so .dylib .pyd'.split())
+NATIVE_EXTENSIONS = dict.fromkeys('.dll .so .dylib .pyd'.split())
 
 
 def walk_egg(egg_dir):
@@ -332,7 +319,8 @@ def walk_egg(egg_dir):
     if 'EGG-INFO' in dirs:
         dirs.remove('EGG-INFO')
     yield base, dirs, files
-    yield from walker
+    for bdf in walker:
+        yield bdf
 
 
 def analyze_egg(egg_dir, stubs):
@@ -353,7 +341,7 @@ def analyze_egg(egg_dir, stubs):
     return safe
 
 
-def write_safety_flag(egg_dir, safe) -> None:
+def write_safety_flag(egg_dir, safe):
     # Write or remove zip safety flag file(s)
     for flag, fn in safety_flags.items():
         fn = os.path.join(egg_dir, fn)
@@ -361,8 +349,9 @@ def write_safety_flag(egg_dir, safe) -> None:
             if safe is None or bool(safe) != flag:
                 os.unlink(fn)
         elif safe is not None and bool(safe) == flag:
-            with open(fn, 'wt', encoding="utf-8") as f:
-                f.write('\n')
+            f = open(fn, 'wt')
+            f.write('\n')
+            f.close()
 
 
 safety_flags = {
@@ -377,9 +366,12 @@ def scan_module(egg_dir, base, name, stubs):
     filename = os.path.join(base, name)
     if filename[:-1] in stubs:
         return True  # Extension module
-    pkg = base[len(egg_dir) + 1 :].replace(os.sep, '.')
+    pkg = base[len(egg_dir) + 1:].replace(os.sep, '.')
     module = pkg + (pkg and '.' or '') + os.path.splitext(name)[0]
-    skip = 16  # skip magic & reserved? & date & file size
+    if sys.version_info < (3, 7):
+        skip = 12  # skip magic & date & file size
+    else:
+        skip = 16  # skip magic & reserved? & date & file size
     f = open(filename, 'rb')
     f.read(skip)
     code = marshal.load(f)
@@ -392,18 +384,9 @@ def scan_module(egg_dir, base, name, stubs):
             safe = False
     if 'inspect' in symbols:
         for bad in [
-            'getsource',
-            'getabsfile',
-            'getfile',
-            'getsourcefile',
-            'getsourcelines',
-            'findsource',
-            'getcomments',
-            'getframeinfo',
-            'getinnerframes',
-            'getouterframes',
-            'stack',
-            'trace',
+            'getsource', 'getabsfile', 'getsourcefile', 'getfile'
+            'getsourcelines', 'findsource', 'getcomments', 'getframeinfo',
+            'getinnerframes', 'getouterframes', 'stack', 'trace'
         ]:
             if bad in symbols:
                 log.warn("%s: module MAY be using inspect.%s", module, bad)
@@ -413,40 +396,35 @@ def scan_module(egg_dir, base, name, stubs):
 
 def iter_symbols(code):
     """Yield names and strings used by `code` and its nested code objects"""
-    yield from code.co_names
+    for name in code.co_names:
+        yield name
     for const in code.co_consts:
         if isinstance(const, str):
             yield const
         elif isinstance(const, CodeType):
-            yield from iter_symbols(const)
+            for name in iter_symbols(const):
+                yield name
 
 
-def can_scan() -> bool:
+def can_scan():
     if not sys.platform.startswith('java') and sys.platform != 'cli':
         # CPython, PyPy, etc.
         return True
     log.warn("Unable to analyze compiled code on this platform.")
-    log.warn(
-        "Please ask the author to include a 'zip_safe'"
-        " setting (either True or False) in the package's setup.py"
-    )
-    return False
+    log.warn("Please ask the author to include a 'zip_safe'"
+             " setting (either True or False) in the package's setup.py")
 
 
 # Attribute names of options for commands that might need to be convinced to
 # install to the egg build directory
 
-INSTALL_DIRECTORY_ATTRS = ['install_lib', 'install_dir', 'install_data', 'install_base']
+INSTALL_DIRECTORY_ATTRS = [
+    'install_lib', 'install_dir', 'install_data', 'install_base'
+]
 
 
-def make_zipfile(
-    zip_filename: StrPathT,
-    base_dir,
-    verbose: bool = False,
-    dry_run: bool = False,
-    compress=True,
-    mode: _ZipFileMode = 'w',
-) -> StrPathT:
+def make_zipfile(zip_filename, base_dir, verbose=0, dry_run=0, compress=True,
+                 mode='w'):
     """Create a zip file from all the files under 'base_dir'.  The output
     zip file will be named 'base_dir' + ".zip".  Uses either the "zipfile"
     Python module (if available) or the InfoZIP "zip" utility (if installed
@@ -455,14 +433,14 @@ def make_zipfile(
     """
     import zipfile
 
-    mkpath(os.path.dirname(zip_filename), dry_run=dry_run)  # type: ignore[arg-type] # python/mypy#18075
+    mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
     log.info("creating '%s' and adding '%s' to it", zip_filename, base_dir)
 
     def visit(z, dirname, names):
         for name in names:
             path = os.path.normpath(os.path.join(dirname, name))
             if os.path.isfile(path):
-                p = path[len(base_dir) + 1 :]
+                p = path[len(base_dir) + 1:]
                 if not dry_run:
                     z.write(path, p)
                 log.debug("adding '%s'", p)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_rpm.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_rpm.py
index 6dbb270..98bf5de 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_rpm.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_rpm.py
@@ -1,7 +1,7 @@
-from ..dist import Distribution
-from ..warnings import SetuptoolsDeprecationWarning
-
 import distutils.command.bdist_rpm as orig
+import warnings
+
+from setuptools import SetuptoolsDeprecationWarning
 
 
 class bdist_rpm(orig.bdist_rpm):
@@ -13,17 +13,11 @@ class bdist_rpm(orig.bdist_rpm):
        disable eggs in RPM distributions.
     """
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
-    def run(self) -> None:
-        SetuptoolsDeprecationWarning.emit(
-            "Deprecated command",
-            """
-            bdist_rpm is deprecated and will be removed in a future version.
-            Use bdist_wheel (wheel packages) instead.
-            """,
-            see_url="https://github.com/pypa/setuptools/issues/1988",
-            due_date=(2023, 10, 30),  # Deprecation introduced in 22 Oct 2021.
+    def run(self):
+        warnings.warn(
+            "bdist_rpm is deprecated and will be removed in a future "
+            "version. Use bdist_wheel (wheel packages) instead.",
+            SetuptoolsDeprecationWarning,
         )
 
         # ensure distro name is up-to-date
@@ -33,10 +27,14 @@ class bdist_rpm(orig.bdist_rpm):
 
     def _make_spec_file(self):
         spec = orig.bdist_rpm._make_spec_file(self)
-        return [
+        spec = [
             line.replace(
                 "setup.py install ",
-                "setup.py install --single-version-externally-managed ",
-            ).replace("%setup", "%setup -n %{name}-%{unmangled_version}")
+                "setup.py install --single-version-externally-managed "
+            ).replace(
+                "%setup",
+                "%setup -n %{name}-%{unmangled_version}"
+            )
             for line in spec
         ]
+        return spec
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_wheel.py
deleted file mode 100644
index 1e3f637..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/bdist_wheel.py
+++ /dev/null
@@ -1,604 +0,0 @@
-"""
-Create a wheel (.whl) distribution.
-
-A wheel is a built archive format.
-"""
-
-from __future__ import annotations
-
-import os
-import re
-import shutil
-import struct
-import sys
-import sysconfig
-import warnings
-from collections.abc import Iterable, Sequence
-from email.generator import BytesGenerator
-from glob import iglob
-from typing import Literal, cast
-from zipfile import ZIP_DEFLATED, ZIP_STORED
-
-from packaging import tags, version as _packaging_version
-from wheel.wheelfile import WheelFile
-
-from .. import Command, __version__, _shutil
-from .._core_metadata import _safe_license_file
-from .._normalization import safer_name
-from ..warnings import SetuptoolsDeprecationWarning
-from .egg_info import egg_info as egg_info_cls
-
-from distutils import log
-
-
-def safe_version(version: str) -> str:
-    """
-    Convert an arbitrary string to a standard version string
-    """
-    try:
-        # normalize the version
-        return str(_packaging_version.Version(version))
-    except _packaging_version.InvalidVersion:
-        version = version.replace(" ", ".")
-        return re.sub("[^A-Za-z0-9.]+", "-", version)
-
-
-setuptools_major_version = int(__version__.split(".")[0])
-
-PY_LIMITED_API_PATTERN = r"cp3\d"
-
-
-def _is_32bit_interpreter() -> bool:
-    return struct.calcsize("P") == 4
-
-
-def python_tag() -> str:
-    return f"py{sys.version_info.major}"
-
-
-def get_platform(archive_root: str | None) -> str:
-    """Return our platform name 'win32', 'linux_x86_64'"""
-    result = sysconfig.get_platform()
-    if result.startswith("macosx") and archive_root is not None:  # pragma: no cover
-        from wheel.macosx_libfile import calculate_macosx_platform_tag
-
-        result = calculate_macosx_platform_tag(archive_root, result)
-    elif _is_32bit_interpreter():
-        if result == "linux-x86_64":
-            # pip pull request #3497
-            result = "linux-i686"
-        elif result == "linux-aarch64":
-            # packaging pull request #234
-            # TODO armv8l, packaging pull request #690 => this did not land
-            # in pip/packaging yet
-            result = "linux-armv7l"
-
-    return result.replace("-", "_")
-
-
-def get_flag(
-    var: str, fallback: bool, expected: bool = True, warn: bool = True
-) -> bool:
-    """Use a fallback value for determining SOABI flags if the needed config
-    var is unset or unavailable."""
-    val = sysconfig.get_config_var(var)
-    if val is None:
-        if warn:
-            warnings.warn(
-                f"Config variable '{var}' is unset, Python ABI tag may be incorrect",
-                RuntimeWarning,
-                stacklevel=2,
-            )
-        return fallback
-    return val == expected
-
-
-def get_abi_tag() -> str | None:
-    """Return the ABI tag based on SOABI (if available) or emulate SOABI (PyPy2)."""
-    soabi: str = sysconfig.get_config_var("SOABI")
-    impl = tags.interpreter_name()
-    if not soabi and impl in ("cp", "pp") and hasattr(sys, "maxunicode"):
-        d = ""
-        u = ""
-        if get_flag("Py_DEBUG", hasattr(sys, "gettotalrefcount"), warn=(impl == "cp")):
-            d = "d"
-
-        abi = f"{impl}{tags.interpreter_version()}{d}{u}"
-    elif soabi and impl == "cp" and soabi.startswith("cpython"):
-        # non-Windows
-        abi = "cp" + soabi.split("-")[1]
-    elif soabi and impl == "cp" and soabi.startswith("cp"):
-        # Windows
-        abi = soabi.split("-")[0]
-        if hasattr(sys, "gettotalrefcount"):
-            # using debug build; append "d" flag
-            abi += "d"
-    elif soabi and impl == "pp":
-        # we want something like pypy36-pp73
-        abi = "-".join(soabi.split("-")[:2])
-        abi = abi.replace(".", "_").replace("-", "_")
-    elif soabi and impl == "graalpy":
-        abi = "-".join(soabi.split("-")[:3])
-        abi = abi.replace(".", "_").replace("-", "_")
-    elif soabi:
-        abi = soabi.replace(".", "_").replace("-", "_")
-    else:
-        abi = None
-
-    return abi
-
-
-def safer_version(version: str) -> str:
-    return safe_version(version).replace("-", "_")
-
-
-class bdist_wheel(Command):
-    description = "create a wheel distribution"
-
-    supported_compressions = {
-        "stored": ZIP_STORED,
-        "deflated": ZIP_DEFLATED,
-    }
-
-    user_options = [
-        ("bdist-dir=", "b", "temporary directory for creating the distribution"),
-        (
-            "plat-name=",
-            "p",
-            "platform name to embed in generated filenames "
-            f"[default: {get_platform(None)}]",
-        ),
-        (
-            "keep-temp",
-            "k",
-            "keep the pseudo-installation tree around after "
-            "creating the distribution archive",
-        ),
-        ("dist-dir=", "d", "directory to put final built distributions in"),
-        ("skip-build", None, "skip rebuilding everything (for testing/debugging)"),
-        (
-            "relative",
-            None,
-            "build the archive using relative paths [default: false]",
-        ),
-        (
-            "owner=",
-            "u",
-            "Owner name used when creating a tar file [default: current user]",
-        ),
-        (
-            "group=",
-            "g",
-            "Group name used when creating a tar file [default: current group]",
-        ),
-        ("universal", None, "*DEPRECATED* make a universal wheel [default: false]"),
-        (
-            "compression=",
-            None,
-            f"zipfile compression (one of: {', '.join(supported_compressions)}) [default: 'deflated']",
-        ),
-        (
-            "python-tag=",
-            None,
-            f"Python implementation compatibility tag [default: '{python_tag()}']",
-        ),
-        (
-            "build-number=",
-            None,
-            "Build number for this particular version. "
-            "As specified in PEP-0427, this must start with a digit. "
-            "[default: None]",
-        ),
-        (
-            "py-limited-api=",
-            None,
-            "Python tag (cp32|cp33|cpNN) for abi3 wheel tag [default: false]",
-        ),
-        (
-            "dist-info-dir=",
-            None,
-            "directory where a pre-generated dist-info can be found (e.g. as a "
-            "result of calling the PEP517 'prepare_metadata_for_build_wheel' "
-            "method)",
-        ),
-    ]
-
-    boolean_options = ["keep-temp", "skip-build", "relative", "universal"]
-
-    def initialize_options(self) -> None:
-        self.bdist_dir: str | None = None
-        self.data_dir = ""
-        self.plat_name: str | None = None
-        self.plat_tag: str | None = None
-        self.format = "zip"
-        self.keep_temp = False
-        self.dist_dir: str | None = None
-        self.dist_info_dir = None
-        self.egginfo_dir: str | None = None
-        self.root_is_pure: bool | None = None
-        self.skip_build = False
-        self.relative = False
-        self.owner = None
-        self.group = None
-        self.universal = False
-        self.compression: str | int = "deflated"
-        self.python_tag = python_tag()
-        self.build_number: str | None = None
-        self.py_limited_api: str | Literal[False] = False
-        self.plat_name_supplied = False
-
-    def finalize_options(self) -> None:
-        if not self.bdist_dir:
-            bdist_base = self.get_finalized_command("bdist").bdist_base
-            self.bdist_dir = os.path.join(bdist_base, "wheel")
-
-        if self.dist_info_dir is None:
-            egg_info = cast(egg_info_cls, self.distribution.get_command_obj("egg_info"))
-            egg_info.ensure_finalized()  # needed for correct `wheel_dist_name`
-
-        self.data_dir = self.wheel_dist_name + ".data"
-        self.plat_name_supplied = bool(self.plat_name)
-
-        need_options = ("dist_dir", "plat_name", "skip_build")
-
-        self.set_undefined_options("bdist", *zip(need_options, need_options))
-
-        self.root_is_pure = not (
-            self.distribution.has_ext_modules() or self.distribution.has_c_libraries()
-        )
-
-        self._validate_py_limited_api()
-
-        # Support legacy [wheel] section for setting universal
-        wheel = self.distribution.get_option_dict("wheel")
-        if "universal" in wheel:  # pragma: no cover
-            # please don't define this in your global configs
-            log.warn("The [wheel] section is deprecated. Use [bdist_wheel] instead.")
-            val = wheel["universal"][1].strip()
-            if val.lower() in ("1", "true", "yes"):
-                self.universal = True
-
-        if self.universal:
-            SetuptoolsDeprecationWarning.emit(
-                "bdist_wheel.universal is deprecated",
-                """
-                With Python 2.7 end-of-life, support for building universal wheels
-                (i.e., wheels that support both Python 2 and Python 3)
-                is being obviated.
-                Please discontinue using this option, or if you still need it,
-                file an issue with pypa/setuptools describing your use case.
-                """,
-                due_date=(2025, 8, 30),  # Introduced in 2024-08-30
-            )
-
-        if self.build_number is not None and not self.build_number[:1].isdigit():
-            raise ValueError("Build tag (build-number) must start with a digit.")
-
-    def _validate_py_limited_api(self) -> None:
-        if not self.py_limited_api:
-            return
-
-        if not re.match(PY_LIMITED_API_PATTERN, self.py_limited_api):
-            raise ValueError(f"py-limited-api must match '{PY_LIMITED_API_PATTERN}'")
-
-        if sysconfig.get_config_var("Py_GIL_DISABLED"):
-            raise ValueError(
-                f"`py_limited_api={self.py_limited_api!r}` not supported. "
-                "`Py_LIMITED_API` is currently incompatible with "
-                "`Py_GIL_DISABLED`."
-                "See https://github.com/python/cpython/issues/111506."
-            )
-
-    @property
-    def wheel_dist_name(self) -> str:
-        """Return distribution full name with - replaced with _"""
-        components = [
-            safer_name(self.distribution.get_name()),
-            safer_version(self.distribution.get_version()),
-        ]
-        if self.build_number:
-            components.append(self.build_number)
-        return "-".join(components)
-
-    def get_tag(self) -> tuple[str, str, str]:
-        # bdist sets self.plat_name if unset, we should only use it for purepy
-        # wheels if the user supplied it.
-        if self.plat_name_supplied and self.plat_name:
-            plat_name = self.plat_name
-        elif self.root_is_pure:
-            plat_name = "any"
-        else:
-            # macosx contains system version in platform name so need special handle
-            if self.plat_name and not self.plat_name.startswith("macosx"):
-                plat_name = self.plat_name
-            else:
-                # on macosx always limit the platform name to comply with any
-                # c-extension modules in bdist_dir, since the user can specify
-                # a higher MACOSX_DEPLOYMENT_TARGET via tools like CMake
-
-                # on other platforms, and on macosx if there are no c-extension
-                # modules, use the default platform name.
-                plat_name = get_platform(self.bdist_dir)
-
-            if _is_32bit_interpreter():
-                if plat_name in ("linux-x86_64", "linux_x86_64"):
-                    plat_name = "linux_i686"
-                if plat_name in ("linux-aarch64", "linux_aarch64"):
-                    # TODO armv8l, packaging pull request #690 => this did not land
-                    # in pip/packaging yet
-                    plat_name = "linux_armv7l"
-
-        plat_name = (
-            plat_name.lower().replace("-", "_").replace(".", "_").replace(" ", "_")
-        )
-
-        if self.root_is_pure:
-            if self.universal:
-                impl = "py2.py3"
-            else:
-                impl = self.python_tag
-            tag = (impl, "none", plat_name)
-        else:
-            impl_name = tags.interpreter_name()
-            impl_ver = tags.interpreter_version()
-            impl = impl_name + impl_ver
-            # We don't work on CPython 3.1, 3.0.
-            if self.py_limited_api and (impl_name + impl_ver).startswith("cp3"):
-                impl = self.py_limited_api
-                abi_tag = "abi3"
-            else:
-                abi_tag = str(get_abi_tag()).lower()
-            tag = (impl, abi_tag, plat_name)
-            # issue gh-374: allow overriding plat_name
-            supported_tags = [
-                (t.interpreter, t.abi, plat_name) for t in tags.sys_tags()
-            ]
-            assert tag in supported_tags, (
-                f"would build wheel with unsupported tag {tag}"
-            )
-        return tag
-
-    def run(self):
-        build_scripts = self.reinitialize_command("build_scripts")
-        build_scripts.executable = "python"
-        build_scripts.force = True
-
-        build_ext = self.reinitialize_command("build_ext")
-        build_ext.inplace = False
-
-        if not self.skip_build:
-            self.run_command("build")
-
-        install = self.reinitialize_command("install", reinit_subcommands=True)
-        install.root = self.bdist_dir
-        install.compile = False
-        install.skip_build = self.skip_build
-        install.warn_dir = False
-
-        # A wheel without setuptools scripts is more cross-platform.
-        # Use the (undocumented) `no_ep` option to setuptools'
-        # install_scripts command to avoid creating entry point scripts.
-        install_scripts = self.reinitialize_command("install_scripts")
-        install_scripts.no_ep = True
-
-        # Use a custom scheme for the archive, because we have to decide
-        # at installation time which scheme to use.
-        for key in ("headers", "scripts", "data", "purelib", "platlib"):
-            setattr(install, "install_" + key, os.path.join(self.data_dir, key))
-
-        basedir_observed = ""
-
-        if os.name == "nt":
-            # win32 barfs if any of these are ''; could be '.'?
-            # (distutils.command.install:change_roots bug)
-            basedir_observed = os.path.normpath(os.path.join(self.data_dir, ".."))
-            self.install_libbase = self.install_lib = basedir_observed
-
-        setattr(
-            install,
-            "install_purelib" if self.root_is_pure else "install_platlib",
-            basedir_observed,
-        )
-
-        log.info(f"installing to {self.bdist_dir}")
-
-        self.run_command("install")
-
-        impl_tag, abi_tag, plat_tag = self.get_tag()
-        archive_basename = f"{self.wheel_dist_name}-{impl_tag}-{abi_tag}-{plat_tag}"
-        if not self.relative:
-            archive_root = self.bdist_dir
-        else:
-            archive_root = os.path.join(
-                self.bdist_dir, self._ensure_relative(install.install_base)
-            )
-
-        self.set_undefined_options("install_egg_info", ("target", "egginfo_dir"))
-        distinfo_dirname = (
-            f"{safer_name(self.distribution.get_name())}-"
-            f"{safer_version(self.distribution.get_version())}.dist-info"
-        )
-        distinfo_dir = os.path.join(self.bdist_dir, distinfo_dirname)
-        if self.dist_info_dir:
-            # Use the given dist-info directly.
-            log.debug(f"reusing {self.dist_info_dir}")
-            shutil.copytree(self.dist_info_dir, distinfo_dir)
-            # Egg info is still generated, so remove it now to avoid it getting
-            # copied into the wheel.
-            _shutil.rmtree(self.egginfo_dir)
-        else:
-            # Convert the generated egg-info into dist-info.
-            self.egg2dist(self.egginfo_dir, distinfo_dir)
-
-        self.write_wheelfile(distinfo_dir)
-
-        # Make the archive
-        if not os.path.exists(self.dist_dir):
-            os.makedirs(self.dist_dir)
-
-        wheel_path = os.path.join(self.dist_dir, archive_basename + ".whl")
-        with WheelFile(wheel_path, "w", self._zip_compression()) as wf:
-            wf.write_files(archive_root)
-
-        # Add to 'Distribution.dist_files' so that the "upload" command works
-        getattr(self.distribution, "dist_files", []).append((
-            "bdist_wheel",
-            f"{sys.version_info.major}.{sys.version_info.minor}",
-            wheel_path,
-        ))
-
-        if not self.keep_temp:
-            log.info(f"removing {self.bdist_dir}")
-            if not self.dry_run:
-                _shutil.rmtree(self.bdist_dir)
-
-    def write_wheelfile(
-        self, wheelfile_base: str, generator: str = f"setuptools ({__version__})"
-    ) -> None:
-        from email.message import Message
-
-        msg = Message()
-        msg["Wheel-Version"] = "1.0"  # of the spec
-        msg["Generator"] = generator
-        msg["Root-Is-Purelib"] = str(self.root_is_pure).lower()
-        if self.build_number is not None:
-            msg["Build"] = self.build_number
-
-        # Doesn't work for bdist_wininst
-        impl_tag, abi_tag, plat_tag = self.get_tag()
-        for impl in impl_tag.split("."):
-            for abi in abi_tag.split("."):
-                for plat in plat_tag.split("."):
-                    msg["Tag"] = "-".join((impl, abi, plat))
-
-        wheelfile_path = os.path.join(wheelfile_base, "WHEEL")
-        log.info(f"creating {wheelfile_path}")
-        with open(wheelfile_path, "wb") as f:
-            BytesGenerator(f, maxheaderlen=0).flatten(msg)
-
-    def _ensure_relative(self, path: str) -> str:
-        # copied from dir_util, deleted
-        drive, path = os.path.splitdrive(path)
-        if path[0:1] == os.sep:
-            path = drive + path[1:]
-        return path
-
-    @property
-    def license_paths(self) -> Iterable[str]:
-        if setuptools_major_version >= 57:
-            # Setuptools has resolved any patterns to actual file names
-            return self.distribution.metadata.license_files or ()
-
-        files = set[str]()
-        metadata = self.distribution.get_option_dict("metadata")
-        if setuptools_major_version >= 42:
-            # Setuptools recognizes the license_files option but does not do globbing
-            patterns = cast(Sequence[str], self.distribution.metadata.license_files)
-        else:
-            # Prior to those, wheel is entirely responsible for handling license files
-            if "license_files" in metadata:
-                patterns = metadata["license_files"][1].split()
-            else:
-                patterns = ()
-
-        if "license_file" in metadata:
-            warnings.warn(
-                'The "license_file" option is deprecated. Use "license_files" instead.',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            files.add(metadata["license_file"][1])
-
-        if not files and not patterns and not isinstance(patterns, list):
-            patterns = ("LICEN[CS]E*", "COPYING*", "NOTICE*", "AUTHORS*")
-
-        for pattern in patterns:
-            for path in iglob(pattern):
-                if path.endswith("~"):
-                    log.debug(
-                        f'ignoring license file "{path}" as it looks like a backup'
-                    )
-                    continue
-
-                if path not in files and os.path.isfile(path):
-                    log.info(
-                        f'adding license file "{path}" (matched pattern "{pattern}")'
-                    )
-                    files.add(path)
-
-        return files
-
-    def egg2dist(self, egginfo_path: str, distinfo_path: str) -> None:
-        """Convert an .egg-info directory into a .dist-info directory"""
-
-        def adios(p: str) -> None:
-            """Appropriately delete directory, file or link."""
-            if os.path.exists(p) and not os.path.islink(p) and os.path.isdir(p):
-                _shutil.rmtree(p)
-            elif os.path.exists(p):
-                os.unlink(p)
-
-        adios(distinfo_path)
-
-        if not os.path.exists(egginfo_path):
-            # There is no egg-info. This is probably because the egg-info
-            # file/directory is not named matching the distribution name used
-            # to name the archive file. Check for this case and report
-            # accordingly.
-            import glob
-
-            pat = os.path.join(os.path.dirname(egginfo_path), "*.egg-info")
-            possible = glob.glob(pat)
-            err = f"Egg metadata expected at {egginfo_path} but not found"
-            if possible:
-                alt = os.path.basename(possible[0])
-                err += f" ({alt} found - possible misnamed archive file?)"
-
-            raise ValueError(err)
-
-        # .egg-info is a directory
-        pkginfo_path = os.path.join(egginfo_path, "PKG-INFO")
-
-        # ignore common egg metadata that is useless to wheel
-        shutil.copytree(
-            egginfo_path,
-            distinfo_path,
-            ignore=lambda x, y: {
-                "PKG-INFO",
-                "requires.txt",
-                "SOURCES.txt",
-                "not-zip-safe",
-            },
-        )
-
-        # delete dependency_links if it is only whitespace
-        dependency_links_path = os.path.join(distinfo_path, "dependency_links.txt")
-        with open(dependency_links_path, encoding="utf-8") as dependency_links_file:
-            dependency_links = dependency_links_file.read().strip()
-        if not dependency_links:
-            adios(dependency_links_path)
-
-        metadata_path = os.path.join(distinfo_path, "METADATA")
-        shutil.copy(pkginfo_path, metadata_path)
-
-        licenses_folder_path = os.path.join(distinfo_path, "licenses")
-        for license_path in self.license_paths:
-            safe_path = _safe_license_file(license_path)
-            dist_info_license_path = os.path.join(licenses_folder_path, safe_path)
-            os.makedirs(os.path.dirname(dist_info_license_path), exist_ok=True)
-            shutil.copy(license_path, dist_info_license_path)
-
-        adios(egginfo_path)
-
-    def _zip_compression(self) -> int:
-        if (
-            isinstance(self.compression, int)
-            and self.compression in self.supported_compressions.values()
-        ):
-            return self.compression
-
-        compression = self.supported_compressions.get(str(self.compression))
-        if compression is not None:
-            return compression
-
-        raise ValueError(f"Unsupported compression: {self.compression!r}")
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/build.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/build.py
index 54cbb8d..c0676d8 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/build.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/build.py
@@ -1,20 +1,37 @@
-from __future__ import annotations
-
-from typing import Protocol
-
-from ..dist import Distribution
-
+import sys
+import warnings
+from typing import TYPE_CHECKING, List, Dict
 from distutils.command.build import build as _build
 
+from setuptools import SetuptoolsDeprecationWarning
+
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+elif TYPE_CHECKING:
+    from typing_extensions import Protocol
+else:
+    from abc import ABC as Protocol
+
+
 _ORIGINAL_SUBCOMMANDS = {"build_py", "build_clib", "build_ext", "build_scripts"}
 
 
 class build(_build):
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
     # copy to avoid sharing the object with parent class
     sub_commands = _build.sub_commands[:]
 
+    def get_sub_commands(self):
+        subcommands = {cmd[0] for cmd in _build.sub_commands}
+        if subcommands - _ORIGINAL_SUBCOMMANDS:
+            msg = """
+            It seems that you are using `distutils.command.build` to add
+            new subcommands. Using `distutils` directly is considered deprecated,
+            please use `setuptools.command.build`.
+            """
+            warnings.warn(msg, SetuptoolsDeprecationWarning)
+            self.sub_commands = _build.sub_commands
+        return super().get_sub_commands()
+
 
 class SubCommand(Protocol):
     """In order to support editable installations (see :pep:`660`) all
@@ -31,8 +48,8 @@ class SubCommand(Protocol):
           Subcommands **SHOULD** take advantage of ``editable_mode=True`` to adequate
           its behaviour or perform optimisations.
 
-          For example, if a subcommand doesn't need to generate an extra file and
-          all it does is to copy a source file into the build directory,
+          For example, if a subcommand don't need to generate any extra file and
+          everything it does is to copy a source file into the build directory,
           ``run()`` **SHOULD** simply "early return".
 
           Similarly, if the subcommand creates files that would be placed alongside
@@ -85,19 +102,16 @@ class SubCommand(Protocol):
             ...
     """
 
-    def initialize_options(self) -> None:
+    def initialize_options(self):
         """(Required by the original :class:`setuptools.Command` interface)"""
-        ...
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         """(Required by the original :class:`setuptools.Command` interface)"""
-        ...
 
-    def run(self) -> None:
+    def run(self):
         """(Required by the original :class:`setuptools.Command` interface)"""
-        ...
 
-    def get_source_files(self) -> list[str]:
+    def get_source_files(self) -> List[str]:
         """
         Return a list of all files that are used by the command to create the expected
         outputs.
@@ -107,9 +121,8 @@ class SubCommand(Protocol):
         with all the files necessary to build the distribution.
         All files should be strings relative to the project root directory.
         """
-        ...
 
-    def get_outputs(self) -> list[str]:
+    def get_outputs(self) -> List[str]:
         """
         Return a list of files intended for distribution as they would have been
         produced by the build.
@@ -121,9 +134,8 @@ class SubCommand(Protocol):
            in ``get_output_mapping()`` plus files that are generated during the build
            and don't correspond to any source file already present in the project.
         """
-        ...
 
-    def get_output_mapping(self) -> dict[str, str]:
+    def get_output_mapping(self) -> Dict[str, str]:
         """
         Return a mapping between destination files as they would be produced by the
         build (dict keys) into the respective existing (source) files (dict values).
@@ -132,4 +144,3 @@ class SubCommand(Protocol):
         Destination files should be strings in the form of
         ``"{build_lib}/destination/file/path"``.
         """
-        ...
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_clib.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_clib.py
index f376f4c..67ce244 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_clib.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_clib.py
@@ -1,9 +1,7 @@
-from ..dist import Distribution
-from ..modified import newer_pairwise_group
-
 import distutils.command.build_clib as orig
-from distutils import log
 from distutils.errors import DistutilsSetupError
+from distutils import log
+from setuptools.dep_util import newer_pairwise_group
 
 
 class build_clib(orig.build_clib):
@@ -22,18 +20,15 @@ class build_clib(orig.build_clib):
                      the compiler.
     """
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
-    def build_libraries(self, libraries) -> None:
-        for lib_name, build_info in libraries:
+    def build_libraries(self, libraries):
+        for (lib_name, build_info) in libraries:
             sources = build_info.get('sources')
             if sources is None or not isinstance(sources, (list, tuple)):
                 raise DistutilsSetupError(
-                    f"in 'libraries' option (library '{lib_name}'), "
+                    "in 'libraries' option (library '%s'), "
                     "'sources' must be present and must be "
-                    "a list of source filenames"
-                )
-            sources = sorted(list(sources))
+                    "a list of source filenames" % lib_name)
+            sources = list(sources)
 
             log.info("building '%s' library", lib_name)
 
@@ -43,10 +38,9 @@ class build_clib(orig.build_clib):
             obj_deps = build_info.get('obj_deps', dict())
             if not isinstance(obj_deps, dict):
                 raise DistutilsSetupError(
-                    f"in 'libraries' option (library '{lib_name}'), "
+                    "in 'libraries' option (library '%s'), "
                     "'obj_deps' must be a dictionary of "
-                    "type 'source: list'"
-                )
+                    "type 'source: list'" % lib_name)
             dependencies = []
 
             # Get the global dependencies that are specified by the '' key.
@@ -54,10 +48,9 @@ class build_clib(orig.build_clib):
             global_deps = obj_deps.get('', list())
             if not isinstance(global_deps, (list, tuple)):
                 raise DistutilsSetupError(
-                    f"in 'libraries' option (library '{lib_name}'), "
+                    "in 'libraries' option (library '%s'), "
                     "'obj_deps' must be a dictionary of "
-                    "type 'source: list'"
-                )
+                    "type 'source: list'" % lib_name)
 
             # Build the list to be used by newer_pairwise_group
             # each source will be auto-added to its dependencies.
@@ -67,10 +60,9 @@ class build_clib(orig.build_clib):
                 extra_deps = obj_deps.get(source, list())
                 if not isinstance(extra_deps, (list, tuple)):
                     raise DistutilsSetupError(
-                        f"in 'libraries' option (library '{lib_name}'), "
+                        "in 'libraries' option (library '%s'), "
                         "'obj_deps' must be a dictionary of "
-                        "type 'source: list'"
-                    )
+                        "type 'source: list'" % lib_name)
                 src_deps.extend(extra_deps)
                 dependencies.append(src_deps)
 
@@ -79,7 +71,10 @@ class build_clib(orig.build_clib):
                 output_dir=self.build_temp,
             )
 
-            if newer_pairwise_group(dependencies, expected_objects) != ([], []):
+            if (
+                newer_pairwise_group(dependencies, expected_objects)
+                != ([], [])
+            ):
                 # First, compile the source code to object files in the library
                 # directory.  (This should probably change to putting object
                 # files in a temporary build directory.)
@@ -92,12 +87,15 @@ class build_clib(orig.build_clib):
                     macros=macros,
                     include_dirs=include_dirs,
                     extra_postargs=cflags,
-                    debug=self.debug,
+                    debug=self.debug
                 )
 
             # Now "link" the object files together into a static library.
             # (On Unix at least, this isn't really linking -- it just
             # builds an archive.  Whatever.)
             self.compiler.create_static_lib(
-                expected_objects, lib_name, output_dir=self.build_clib, debug=self.debug
+                expected_objects,
+                lib_name,
+                output_dir=self.build_clib,
+                debug=self.debug
             )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_ext.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_ext.py
index be833a3..cbfe3ec 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_ext.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_ext.py
@@ -1,41 +1,30 @@
-from __future__ import annotations
-
-import itertools
 import os
 import sys
-from collections.abc import Iterator
+import itertools
 from importlib.machinery import EXTENSION_SUFFIXES
 from importlib.util import cache_from_source as _compiled_file_name
-from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import Dict, Iterator, List, Tuple
+
+from distutils.command.build_ext import build_ext as _du_build_ext
+from distutils.ccompiler import new_compiler
+from distutils.sysconfig import customize_compiler, get_config_var
+from distutils import log
 
-from setuptools.dist import Distribution
 from setuptools.errors import BaseError
 from setuptools.extension import Extension, Library
 
-from distutils import log
-from distutils.ccompiler import new_compiler
-from distutils.sysconfig import customize_compiler, get_config_var
-
-if TYPE_CHECKING:
-    # Cython not installed on CI tests, causing _build_ext to be `Any`
-    from distutils.command.build_ext import build_ext as _build_ext
-else:
-    try:
-        # Attempt to use Cython for building extensions, if available
-        from Cython.Distutils.build_ext import build_ext as _build_ext
-
-        # Additionally, assert that the compiler module will load
-        # also. Ref #1229.
-        __import__('Cython.Compiler.Main')
-    except ImportError:
-        from distutils.command.build_ext import build_ext as _build_ext
+try:
+    # Attempt to use Cython for building extensions, if available
+    from Cython.Distutils.build_ext import build_ext as _build_ext
+    # Additionally, assert that the compiler module will load
+    # also. Ref #1229.
+    __import__('Cython.Compiler.Main')
+except ImportError:
+    _build_ext = _du_build_ext
 
 # make sure _config_vars is initialized
 get_config_var("LDSHARED")
-# Not publicly exposed in typeshed distutils stubs, but this is done on purpose
-# See https://github.com/pypa/setuptools/pull/4228#issuecomment-1959856400
-from distutils.sysconfig import _config_vars as _CONFIG_VARS  # noqa: E402
+from distutils.sysconfig import _config_vars as _CONFIG_VARS  # noqa
 
 
 def _customize_compiler_for_shlib(compiler):
@@ -47,8 +36,7 @@ def _customize_compiler_for_shlib(compiler):
         try:
             # XXX Help!  I don't have any idea whether these are right...
             _CONFIG_VARS['LDSHARED'] = (
-                "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup"
-            )
+                "gcc -Wl,-x -dynamiclib -undefined dynamic_lookup")
             _CONFIG_VARS['CCSHARED'] = " -dynamiclib"
             _CONFIG_VARS['SO'] = ".dylib"
             customize_compiler(compiler)
@@ -67,8 +55,7 @@ if sys.platform == "darwin":
     use_stubs = True
 elif os.name != 'nt':
     try:
-        import dl  # type: ignore[import-not-found] # https://github.com/python/mypy/issues/13002
-
+        import dl
         use_stubs = have_rtld = hasattr(dl, 'RTLD_NOW')
     except ImportError:
         pass
@@ -85,23 +72,21 @@ def get_abi3_suffix():
             return suffix
         elif suffix == '.pyd':  # Windows
             return suffix
-    return None
 
 
 class build_ext(_build_ext):
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-    editable_mode = False
-    inplace = False
+    editable_mode: bool = False
+    inplace: bool = False
 
     def run(self):
         """Build extensions in build directory, then copy if --inplace"""
-        old_inplace, self.inplace = self.inplace, False
+        old_inplace, self.inplace = self.inplace, 0
         _build_ext.run(self)
         self.inplace = old_inplace
         if old_inplace:
             self.copy_extensions_to_source()
 
-    def _get_inplace_equivalent(self, build_py, ext: Extension) -> tuple[str, str]:
+    def _get_inplace_equivalent(self, build_py, ext: Extension) -> Tuple[str, str]:
         fullname = self.get_ext_fullname(ext.name)
         filename = self.get_ext_filename(fullname)
         modpath = fullname.split('.')
@@ -111,7 +96,7 @@ class build_ext(_build_ext):
         regular_file = os.path.join(self.build_lib, filename)
         return (inplace_file, regular_file)
 
-    def copy_extensions_to_source(self) -> None:
+    def copy_extensions_to_source(self):
         build_py = self.get_finalized_command('build_py')
         for ext in self.extensions:
             inplace_file, regular_file = self._get_inplace_equivalent(build_py, ext)
@@ -133,7 +118,7 @@ class build_ext(_build_ext):
         _, _, name = ext.name.rpartition(".")
         return f"{os.path.join(dir_, name)}.py"
 
-    def _get_output_mapping(self) -> Iterator[tuple[str, str]]:
+    def _get_output_mapping(self) -> Iterator[Tuple[str, str]]:
         if not self.inplace:
             return
 
@@ -158,25 +143,21 @@ class build_ext(_build_ext):
                 output_cache = _compiled_file_name(regular_stub, optimization=opt)
                 yield (output_cache, inplace_cache)
 
-    def get_ext_filename(self, fullname: str) -> str:
+    def get_ext_filename(self, fullname):
         so_ext = os.getenv('SETUPTOOLS_EXT_SUFFIX')
         if so_ext:
             filename = os.path.join(*fullname.split('.')) + so_ext
         else:
             filename = _build_ext.get_ext_filename(self, fullname)
-            ext_suffix = get_config_var('EXT_SUFFIX')
-            if not isinstance(ext_suffix, str):
-                raise OSError(
-                    "Configuration variable EXT_SUFFIX not found for this platform "
-                    "and environment variable SETUPTOOLS_EXT_SUFFIX is missing"
-                )
-            so_ext = ext_suffix
+            so_ext = get_config_var('EXT_SUFFIX')
 
         if fullname in self.ext_map:
             ext = self.ext_map[fullname]
-            abi3_suffix = get_abi3_suffix()
-            if ext.py_limited_api and abi3_suffix:  # Use abi3
-                filename = filename[: -len(so_ext)] + abi3_suffix
+            use_abi3 = getattr(ext, 'py_limited_api') and get_abi3_suffix()
+            if use_abi3:
+                filename = filename[:-len(so_ext)]
+                so_ext = get_abi3_suffix()
+                filename = filename + so_ext
             if isinstance(ext, Library):
                 fn, ext = os.path.splitext(filename)
                 return self.shlib_compiler.library_filename(fn, libtype)
@@ -192,11 +173,12 @@ class build_ext(_build_ext):
         self.ext_map = {}
         self.editable_mode = False
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         _build_ext.finalize_options(self)
         self.extensions = self.extensions or []
         self.check_extensions_list(self.extensions)
-        self.shlibs = [ext for ext in self.extensions if isinstance(ext, Library)]
+        self.shlibs = [ext for ext in self.extensions
+                       if isinstance(ext, Library)]
         if self.shlibs:
             self.setup_shlib_compiler()
         for ext in self.extensions:
@@ -233,7 +215,7 @@ class build_ext(_build_ext):
             compiler.set_include_dirs(self.include_dirs)
         if self.define is not None:
             # 'define' option is a list of (name,value) tuples
-            for name, value in self.define:
+            for (name, value) in self.define:
                 compiler.define_macro(name, value)
         if self.undef is not None:
             for macro in self.undef:
@@ -248,14 +230,14 @@ class build_ext(_build_ext):
             compiler.set_link_objects(self.link_objects)
 
         # hack so distutils' build_extension() builds a library instead
-        compiler.link_shared_object = link_shared_object.__get__(compiler)  # type: ignore[method-assign]
+        compiler.link_shared_object = link_shared_object.__get__(compiler)
 
     def get_export_symbols(self, ext):
         if isinstance(ext, Library):
             return ext.export_symbols
         return _build_ext.get_export_symbols(self, ext)
 
-    def build_extension(self, ext) -> None:
+    def build_extension(self, ext):
         ext._convert_pyx_sources_to_lang()
         _compiler = self.compiler
         try:
@@ -277,53 +259,12 @@ class build_ext(_build_ext):
         pkg = '.'.join(ext._full_name.split('.')[:-1] + [''])
         return any(pkg + libname in libnames for libname in ext.libraries)
 
-    def get_source_files(self) -> list[str]:
-        return [*_build_ext.get_source_files(self), *self._get_internal_depends()]
-
-    def _get_internal_depends(self) -> Iterator[str]:
-        """Yield ``ext.depends`` that are contained by the project directory"""
-        project_root = Path(self.distribution.src_root or os.curdir).resolve()
-        depends = (dep for ext in self.extensions for dep in ext.depends)
-
-        def skip(orig_path: str, reason: str) -> None:
-            log.info(
-                "dependency %s won't be automatically "
-                "included in the manifest: the path %s",
-                orig_path,
-                reason,
-            )
-
-        for dep in depends:
-            path = Path(dep)
-
-            if path.is_absolute():
-                skip(dep, "must be relative")
-                continue
-
-            if ".." in path.parts:
-                skip(dep, "can't have `..` segments")
-                continue
-
-            try:
-                resolved = (project_root / path).resolve(strict=True)
-            except OSError:
-                skip(dep, "doesn't exist")
-                continue
-
-            try:
-                resolved.relative_to(project_root)
-            except ValueError:
-                skip(dep, "must be inside the project root")
-                continue
-
-            yield path.as_posix()
-
-    def get_outputs(self) -> list[str]:
+    def get_outputs(self) -> List[str]:
         if self.inplace:
             return list(self.get_output_mapping().keys())
         return sorted(_build_ext.get_outputs(self) + self.__get_stubs_outputs())
 
-    def get_output_mapping(self) -> dict[str, str]:
+    def get_output_mapping(self) -> Dict[str, str]:
         """See :class:`setuptools.commands.build.SubCommand`"""
         mapping = self._get_output_mapping()
         return dict(sorted(mapping, key=lambda x: x[0]))
@@ -345,7 +286,7 @@ class build_ext(_build_ext):
         if self.get_finalized_command('build_py').optimize:
             yield '.pyo'
 
-    def write_stub(self, output_dir, ext, compile=False) -> None:
+    def write_stub(self, output_dir, ext, compile=False):
         stub_file = os.path.join(output_dir, *ext._full_name.split('.')) + '.py'
         self._write_stub_file(stub_file, ext, compile)
 
@@ -354,13 +295,16 @@ class build_ext(_build_ext):
         if compile and os.path.exists(stub_file):
             raise BaseError(stub_file + " already exists! Please delete.")
         if not self.dry_run:
-            with open(stub_file, 'w', encoding="utf-8") as f:
-                content = '\n'.join([
+            f = open(stub_file, 'w')
+            f.write(
+                '\n'.join([
                     "def __bootstrap__():",
                     "   global __bootstrap__, __file__, __loader__",
-                    "   import sys, os, pkg_resources, importlib.util" + if_dl(", dl"),
+                    "   import sys, os, pkg_resources, importlib.util" +
+                    if_dl(", dl"),
                     "   __file__ = pkg_resources.resource_filename"
-                    f"(__name__,{os.path.basename(ext._file_name)!r})",
+                    "(__name__,%r)"
+                    % os.path.basename(ext._file_name),
                     "   del __bootstrap__",
                     "   if '__loader__' in globals():",
                     "       del __loader__",
@@ -377,24 +321,22 @@ class build_ext(_build_ext):
                     if_dl("     sys.setdlopenflags(old_flags)"),
                     "     os.chdir(old_dir)",
                     "__bootstrap__()",
-                    "",  # terminal \n
+                    ""  # terminal \n
                 ])
-                f.write(content)
+            )
+            f.close()
         if compile:
             self._compile_and_remove_stub(stub_file)
 
     def _compile_and_remove_stub(self, stub_file: str):
         from distutils.util import byte_compile
 
-        byte_compile([stub_file], optimize=0, force=True, dry_run=self.dry_run)
+        byte_compile([stub_file], optimize=0,
+                     force=True, dry_run=self.dry_run)
         optimize = self.get_finalized_command('install_lib').optimize
         if optimize > 0:
-            byte_compile(
-                [stub_file],
-                optimize=optimize,
-                force=True,
-                dry_run=self.dry_run,
-            )
+            byte_compile([stub_file], optimize=optimize,
+                         force=True, dry_run=self.dry_run)
         if os.path.exists(stub_file) and not self.dry_run:
             os.unlink(stub_file)
 
@@ -403,55 +345,25 @@ if use_stubs or os.name == 'nt':
     # Build shared libraries
     #
     def link_shared_object(
-        self,
-        objects,
-        output_libname,
-        output_dir=None,
-        libraries=None,
-        library_dirs=None,
-        runtime_library_dirs=None,
-        export_symbols=None,
-        debug: bool = False,
-        extra_preargs=None,
-        extra_postargs=None,
-        build_temp=None,
-        target_lang=None,
-    ) -> None:
+            self, objects, output_libname, output_dir=None, libraries=None,
+            library_dirs=None, runtime_library_dirs=None, export_symbols=None,
+            debug=0, extra_preargs=None, extra_postargs=None, build_temp=None,
+            target_lang=None):
         self.link(
-            self.SHARED_LIBRARY,
-            objects,
-            output_libname,
-            output_dir,
-            libraries,
-            library_dirs,
-            runtime_library_dirs,
-            export_symbols,
-            debug,
-            extra_preargs,
-            extra_postargs,
-            build_temp,
-            target_lang,
+            self.SHARED_LIBRARY, objects, output_libname,
+            output_dir, libraries, library_dirs, runtime_library_dirs,
+            export_symbols, debug, extra_preargs, extra_postargs,
+            build_temp, target_lang
         )
-
 else:
     # Build static libraries everywhere else
     libtype = 'static'
 
     def link_shared_object(
-        self,
-        objects,
-        output_libname,
-        output_dir=None,
-        libraries=None,
-        library_dirs=None,
-        runtime_library_dirs=None,
-        export_symbols=None,
-        debug: bool = False,
-        extra_preargs=None,
-        extra_postargs=None,
-        build_temp=None,
-        target_lang=None,
-    ) -> None:
+            self, objects, output_libname, output_dir=None, libraries=None,
+            library_dirs=None, runtime_library_dirs=None, export_symbols=None,
+            debug=0, extra_preargs=None, extra_postargs=None, build_temp=None,
+            target_lang=None):
         # XXX we need to either disallow these attrs on Library instances,
         # or warn/abort here if set, or something...
         # libraries=None, library_dirs=None, runtime_library_dirs=None,
@@ -460,10 +372,12 @@ else:
 
         assert output_dir is None  # distutils build_ext doesn't pass this
         output_dir, filename = os.path.split(output_libname)
-        basename, _ext = os.path.splitext(filename)
+        basename, ext = os.path.splitext(filename)
         if self.library_filename("x").startswith('lib'):
             # strip 'lib' prefix; this is kludgy if some platform uses
             # a different prefix
             basename = basename[3:]
 
-        self.create_static_lib(objects, basename, output_dir, debug, target_lang)
+        self.create_static_lib(
+            objects, basename, output_dir, debug, target_lang
+        )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_py.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_py.py
index 2f6fcb7..ec06274 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/build_py.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/build_py.py
@@ -1,29 +1,23 @@
-from __future__ import annotations
-
-import fnmatch
-import itertools
-import os
-import stat
-import textwrap
-from collections.abc import Iterable, Iterator
 from functools import partial
 from glob import glob
-from pathlib import Path
-
-from more_itertools import unique_everseen
-
-from .._path import StrPath, StrPathT
-from ..dist import Distribution
-from ..warnings import SetuptoolsDeprecationWarning
-
-import distutils.command.build_py as orig
-import distutils.errors
 from distutils.util import convert_path
+import distutils.command.build_py as orig
+import os
+import fnmatch
+import textwrap
+import io
+import distutils.errors
+import itertools
+import stat
+import warnings
+from pathlib import Path
+from typing import Dict, Iterable, Iterator, List, Optional, Tuple
 
-_IMPLICIT_DATA_FILES = ('*.pyi', 'py.typed')
+from setuptools._deprecation_warning import SetuptoolsDeprecationWarning
+from setuptools.extern.more_itertools import unique_everseen
 
 
-def make_writable(target) -> None:
+def make_writable(target):
     os.chmod(target, os.stat(target).st_mode | stat.S_IWRITE)
 
 
@@ -36,10 +30,8 @@ class build_py(orig.build_py):
     Also, this version of the 'build_py' command allows you to specify both
     'py_modules' and 'packages' in the same setup operation.
     """
-
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
     editable_mode: bool = False
-    existing_egg_info_dir: StrPath | None = None  #: Private API, internal use only.
+    existing_egg_info_dir: Optional[str] = None  #: Private API, internal use only.
 
     def finalize_options(self):
         orig.build_py.finalize_options(self)
@@ -47,25 +39,18 @@ class build_py(orig.build_py):
         self.exclude_package_data = self.distribution.exclude_package_data or {}
         if 'data_files' in self.__dict__:
             del self.__dict__['data_files']
+        self.__updated_files = []
 
-    def copy_file(  # type: ignore[override] # No overload, no bytes support
-        self,
-        infile: StrPath,
-        outfile: StrPathT,
-        preserve_mode: bool = True,
-        preserve_times: bool = True,
-        link: str | None = None,
-        level: object = 1,
-    ) -> tuple[StrPathT | str, bool]:
+    def copy_file(self, infile, outfile, preserve_mode=1, preserve_times=1,
+                  link=None, level=1):
         # Overwrite base class to allow using links
         if link:
             infile = str(Path(infile).resolve())
-            outfile = str(Path(outfile).resolve())  # type: ignore[assignment] # Re-assigning a str when outfile is StrPath is ok
-        return super().copy_file(  # pyright: ignore[reportReturnType] # pypa/distutils#309
-            infile, outfile, preserve_mode, preserve_times, link, level
-        )
+            outfile = str(Path(outfile).resolve())
+        return super().copy_file(infile, outfile, preserve_mode, preserve_times,
+                                 link, level)
 
-    def run(self) -> None:
+    def run(self):
         """Build modules, packages, and copy data files to build directory"""
         if not (self.py_modules or self.packages) or self.editable_mode:
             return
@@ -79,15 +64,21 @@ class build_py(orig.build_py):
 
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
-        self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=False))
+        self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=0))
 
-    def __getattr__(self, attr: str):
+    def __getattr__(self, attr):
         "lazily compute data files"
         if attr == 'data_files':
             self.data_files = self._get_data_files()
             return self.data_files
         return orig.build_py.__getattr__(self, attr)
 
+    def build_module(self, module, module_file, package):
+        outfile, copied = orig.build_py.build_module(self, module, module_file, package)
+        if copied:
+            self.__updated_files.append(outfile)
+        return outfile, copied
+
     def _get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         self.analyze_manifest()
@@ -123,7 +114,6 @@ class build_py(orig.build_py):
             self.package_data,
             package,
             src_dir,
-            extra_patterns=_IMPLICIT_DATA_FILES,
         )
         globs_expanded = map(partial(glob, recursive=True), patterns)
         # flatten the expanded globs into an iterable of matches
@@ -135,13 +125,13 @@ class build_py(orig.build_py):
         )
         return self.exclude_data_files(package, src_dir, files)
 
-    def get_outputs(self, include_bytecode: bool = True) -> list[str]:  # type: ignore[override] # Using a real boolean instead of 0|1
+    def get_outputs(self, include_bytecode=1) -> List[str]:
         """See :class:`setuptools.commands.build.SubCommand`"""
         if self.editable_mode:
             return list(self.get_output_mapping().keys())
         return super().get_outputs(include_bytecode)
 
-    def get_output_mapping(self) -> dict[str, str]:
+    def get_output_mapping(self) -> Dict[str, str]:
         """See :class:`setuptools.commands.build.SubCommand`"""
         mapping = itertools.chain(
             self._get_package_data_output_mapping(),
@@ -149,14 +139,14 @@ class build_py(orig.build_py):
         )
         return dict(sorted(mapping, key=lambda x: x[0]))
 
-    def _get_module_mapping(self) -> Iterator[tuple[str, str]]:
+    def _get_module_mapping(self) -> Iterator[Tuple[str, str]]:
         """Iterate over all modules producing (dest, src) pairs."""
-        for package, module, module_file in self.find_all_modules():
+        for (package, module, module_file) in self.find_all_modules():
             package = package.split('.')
             filename = self.get_module_outfile(self.build_lib, package, module)
             yield (filename, module_file)
 
-    def _get_package_data_output_mapping(self) -> Iterator[tuple[str, str]]:
+    def _get_package_data_output_mapping(self) -> Iterator[Tuple[str, str]]:
         """Iterate over package data producing (dest, src) pairs."""
         for package, src_dir, build_dir, filenames in self.data_files:
             for filename in filenames:
@@ -164,24 +154,24 @@ class build_py(orig.build_py):
                 srcfile = os.path.join(src_dir, filename)
                 yield (target, srcfile)
 
-    def build_package_data(self) -> None:
+    def build_package_data(self):
         """Copy data files into build directory"""
         for target, srcfile in self._get_package_data_output_mapping():
             self.mkpath(os.path.dirname(target))
             _outf, _copied = self.copy_file(srcfile, target)
             make_writable(target)
 
-    def analyze_manifest(self) -> None:
-        self.manifest_files: dict[str, list[str]] = {}
+    def analyze_manifest(self):
+        self.manifest_files = mf = {}
         if not self.distribution.include_package_data:
             return
-        src_dirs: dict[str, str] = {}
+        src_dirs = {}
         for package in self.packages or ():
             # Locate package source directory
             src_dirs[assert_relative(self.get_package_dir(package))] = package
 
         if (
-            self.existing_egg_info_dir
+            getattr(self, 'existing_egg_info_dir', None)
             and Path(self.existing_egg_info_dir, "SOURCES.txt").exists()
         ):
             egg_info_dir = self.existing_egg_info_dir
@@ -210,11 +200,9 @@ class build_py(orig.build_py):
                     importable = check.importable_subpackage(src_dirs[d], f)
                     if importable:
                         check.warn(importable)
-                self.manifest_files.setdefault(src_dirs[d], []).append(path)
+                mf.setdefault(src_dirs[d], []).append(path)
 
-    def _filter_build_files(
-        self, files: Iterable[str], egg_info: StrPath
-    ) -> Iterator[str]:
+    def _filter_build_files(self, files: Iterable[str], egg_info: str) -> Iterator[str]:
         """
         ``build_meta`` may try to create egg_info outside of the project directory,
         and this can be problematic for certain plugins (reported in issue #3500).
@@ -233,7 +221,7 @@ class build_py(orig.build_py):
             if not os.path.isabs(file) or all(d not in norm_path for d in norm_dirs):
                 yield file
 
-    def get_data_files(self) -> None:
+    def get_data_files(self):
         pass  # Lazily compute data files in _get_data_files() function.
 
     def check_package(self, package, package_dir):
@@ -255,14 +243,14 @@ class build_py(orig.build_py):
         else:
             return init_py
 
-        with open(init_py, 'rb') as f:
+        with io.open(init_py, 'rb') as f:
             contents = f.read()
         if b'declare_namespace' not in contents:
             raise distutils.errors.DistutilsError(
-                f"Namespace package problem: {package} is a namespace package, but "
+                "Namespace package problem: %s is a namespace package, but "
                 "its\n__init__.py does not call declare_namespace()! Please "
                 'fix it.\n(See the setuptools manual under '
-                '"Namespace Packages" for details.)\n"'
+                '"Namespace Packages" for details.)\n"' % (package,)
             )
         return init_py
 
@@ -295,7 +283,7 @@ class build_py(orig.build_py):
         return list(unique_everseen(keepers))
 
     @staticmethod
-    def _get_platform_patterns(spec, package, src_dir, extra_patterns=()):
+    def _get_platform_patterns(spec, package, src_dir):
         """
         yield platform-specific path patterns (suitable for glob
         or fn_match) from a glob-based spec (such as
@@ -303,7 +291,6 @@ class build_py(orig.build_py):
         matching package in src_dir.
         """
         raw_patterns = itertools.chain(
-            extra_patterns,
             spec.get('', []),
             spec.get(package, []),
         )
@@ -338,54 +325,34 @@ def assert_relative(path):
 class _IncludePackageDataAbuse:
     """Inform users that package or module is included as 'data file'"""
 
-    class _Warning(SetuptoolsDeprecationWarning):
-        _SUMMARY = """
-        Package {importable!r} is absent from the `packages` configuration.
-        """
+    MESSAGE = """\
+    Installing {importable!r} as data is deprecated, please list it in `packages`.
+    !!\n\n
+    ############################
+    # Package would be ignored #
+    ############################
+    Python recognizes {importable!r} as an importable package,
+    but it is not listed in the `packages` configuration of setuptools.
 
-        _DETAILS = """
-        ############################
-        # Package would be ignored #
-        ############################
-        Python recognizes {importable!r} as an importable package[^1],
-        but it is absent from setuptools' `packages` configuration.
+    {importable!r} has been automatically added to the distribution only
+    because it may contain data files, but this behavior is likely to change
+    in future versions of setuptools (and therefore is considered deprecated).
 
-        This leads to an ambiguous overall configuration. If you want to distribute this
-        package, please make sure that {importable!r} is explicitly added
-        to the `packages` configuration field.
+    Please make sure that {importable!r} is included as a package by using
+    the `packages` configuration field or the proper discovery methods
+    (for example by using `find_namespace_packages(...)`/`find_namespace:`
+    instead of `find_packages(...)`/`find:`).
 
-        Alternatively, you can also rely on setuptools' discovery methods
-        (for example by using `find_namespace_packages(...)`/`find_namespace:`
-        instead of `find_packages(...)`/`find:`).
-
-        You can read more about "package discovery" on setuptools documentation page:
-
-        - https://setuptools.pypa.io/en/latest/userguide/package_discovery.html
-
-        If you don't want {importable!r} to be distributed and are
-        already explicitly excluding {importable!r} via
-        `find_namespace_packages(...)/find_namespace` or `find_packages(...)/find`,
-        you can try to use `exclude_package_data`, or `include-package-data=False` in
-        combination with a more fine grained `package-data` configuration.
-
-        You can read more about "package data files" on setuptools documentation page:
-
-        - https://setuptools.pypa.io/en/latest/userguide/datafiles.html
-
-
-        [^1]: For Python, any directory (with suitable naming) can be imported,
-              even if it does not contain any `.py` files.
-              On the other hand, currently there is no concept of package data
-              directory, all directories are treated like packages.
-        """
-        # _DUE_DATE: still not defined as this is particularly controversial.
-        # Warning initially introduced in May 2022. See issue #3340 for discussion.
+    You can read more about "package discovery" and "data files" on setuptools
+    documentation page.
+    \n\n!!
+    """
 
     def __init__(self):
         self._already_warned = set()
 
     def is_module(self, file):
-        return file.endswith(".py") and file[: -len(".py")].isidentifier()
+        return file.endswith(".py") and file[:-len(".py")].isidentifier()
 
     def importable_subpackage(self, parent, file):
         pkg = Path(file).parent
@@ -396,5 +363,6 @@ class _IncludePackageDataAbuse:
 
     def warn(self, importable):
         if importable not in self._already_warned:
-            self._Warning.emit(importable=importable)
+            msg = textwrap.dedent(self.MESSAGE).format(importable=importable)
+            warnings.warn(msg, SetuptoolsDeprecationWarning, stacklevel=2)
             self._already_warned.add(importable)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/develop.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/develop.py
index 7eee29d..24fb0a7 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/develop.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/develop.py
@@ -1,15 +1,14 @@
-import glob
-import os
-
-import setuptools
-from setuptools import _normalization, _path, namespaces
-from setuptools.command.easy_install import easy_install
-
-from ..unicode_utils import _read_utf8_with_fallback
-
-from distutils import log
-from distutils.errors import DistutilsOptionError
 from distutils.util import convert_path
+from distutils import log
+from distutils.errors import DistutilsError, DistutilsOptionError
+import os
+import glob
+import io
+
+import pkg_resources
+from setuptools.command.easy_install import easy_install
+from setuptools import namespaces
+import setuptools
 
 
 class develop(namespaces.DevelopInstaller, easy_install):
@@ -42,10 +41,12 @@ class develop(namespaces.DevelopInstaller, easy_install):
         self.setup_path = None
         self.always_copy_from = '.'  # always copy eggs installed in curdir
 
-    def finalize_options(self) -> None:
-        import pkg_resources
-
+    def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
+        if ei.broken_egg_info:
+            template = "Please rename %r to %r before using 'develop'"
+            args = ei.egg_info, ei.broken_egg_info
+            raise DistutilsError(template % args)
         self.args = [ei.egg_name]
 
         easy_install.finalize_options(self)
@@ -54,16 +55,16 @@ class develop(namespaces.DevelopInstaller, easy_install):
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 
-        egg_link_fn = (
-            _normalization.filename_component_broken(ei.egg_name) + '.egg-link'
-        )
+        egg_link_fn = ei.egg_name + '.egg-link'
         self.egg_link = os.path.join(self.install_dir, egg_link_fn)
         self.egg_base = ei.egg_base
         if self.egg_path is None:
             self.egg_path = os.path.abspath(ei.egg_base)
 
-        target = _path.normpath(self.egg_base)
-        egg_path = _path.normpath(os.path.join(self.install_dir, self.egg_path))
+        target = pkg_resources.normalize_path(self.egg_base)
+        egg_path = pkg_resources.normalize_path(
+            os.path.join(self.install_dir, self.egg_path)
+        )
         if egg_path != target:
             raise DistutilsOptionError(
                 "--egg-path must be a relative path from the install"
@@ -93,22 +94,23 @@ class develop(namespaces.DevelopInstaller, easy_install):
         path_to_setup = egg_base.replace(os.sep, '/').rstrip('/')
         if path_to_setup != os.curdir:
             path_to_setup = '../' * (path_to_setup.count('/') + 1)
-        resolved = _path.normpath(os.path.join(install_dir, egg_path, path_to_setup))
-        curdir = _path.normpath(os.curdir)
-        if resolved != curdir:
+        resolved = pkg_resources.normalize_path(
+            os.path.join(install_dir, egg_path, path_to_setup)
+        )
+        if resolved != pkg_resources.normalize_path(os.curdir):
             raise DistutilsOptionError(
                 "Can't get a consistent path to setup script from"
                 " installation directory",
                 resolved,
-                curdir,
+                pkg_resources.normalize_path(os.curdir),
             )
         return path_to_setup
 
-    def install_for_development(self) -> None:
+    def install_for_development(self):
         self.run_command('egg_info')
 
         # Build extensions in-place
-        self.reinitialize_command('build_ext', inplace=True)
+        self.reinitialize_command('build_ext', inplace=1)
         self.run_command('build_ext')
 
         if setuptools.bootstrap_install_from:
@@ -120,21 +122,18 @@ class develop(namespaces.DevelopInstaller, easy_install):
         # create an .egg-link in the installation dir, pointing to our egg
         log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
         if not self.dry_run:
-            with open(self.egg_link, "w", encoding="utf-8") as f:
+            with open(self.egg_link, "w") as f:
                 f.write(self.egg_path + "\n" + self.setup_path)
         # postprocess the installed distro, fixing up .pth, installing scripts,
         # and handling requirements
         self.process_distribution(None, self.dist, not self.no_deps)
 
-    def uninstall_link(self) -> None:
+    def uninstall_link(self):
         if os.path.exists(self.egg_link):
             log.info("Removing %s (link to %s)", self.egg_link, self.egg_base)
-
-            contents = [
-                line.rstrip()
-                for line in _read_utf8_with_fallback(self.egg_link).splitlines()
-            ]
-
+            egg_link_file = open(self.egg_link)
+            contents = [line.rstrip() for line in egg_link_file]
+            egg_link_file.close()
             if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
                 log.warn("Link points to %s: uninstall aborted", contents)
                 return
@@ -160,11 +159,10 @@ class develop(namespaces.DevelopInstaller, easy_install):
         for script_name in self.distribution.scripts or []:
             script_path = os.path.abspath(convert_path(script_name))
             script_name = os.path.basename(script_path)
-            script_text = _read_utf8_with_fallback(script_path)
+            with io.open(script_path) as strm:
+                script_text = strm.read()
             self.install_script(dist, script_name, script_text, script_path)
 
-        return None
-
     def install_wrapper_scripts(self, dist):
         dist = VersionlessRequirement(dist)
         return easy_install.install_wrapper_scripts(self, dist)
@@ -185,10 +183,10 @@ class VersionlessRequirement:
     'foo'
     """
 
-    def __init__(self, dist) -> None:
+    def __init__(self, dist):
         self.__dist = dist
 
-    def __getattr__(self, name: str):
+    def __getattr__(self, name):
         return getattr(self.__dist, name)
 
     def as_requirement(self):
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/dist_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/dist_info.py
index dca01ff..0685c94 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/dist_info.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/dist_info.py
@@ -4,34 +4,30 @@ As defined in the wheel specification
 """
 
 import os
+import re
 import shutil
+import sys
+import warnings
 from contextlib import contextmanager
+from inspect import cleandoc
 from pathlib import Path
-from typing import cast
 
-from .. import _normalization
-from .._shutil import rmdir as _rm
-from .egg_info import egg_info as egg_info_cls
-
-from distutils import log
 from distutils.core import Command
+from distutils import log
+from setuptools.extern import packaging
+from setuptools._deprecation_warning import SetuptoolsDeprecationWarning
 
 
 class dist_info(Command):
-    """
-    This command is private and reserved for internal use of setuptools,
-    users should rely on ``setuptools.build_meta`` APIs.
-    """
 
-    description = "DO NOT CALL DIRECTLY, INTERNAL ONLY: create .dist-info directory"
+    description = 'create a .dist-info directory'
 
     user_options = [
-        (
-            'output-dir=',
-            'o',
-            "directory inside of which the .dist-info will be"
-            "created [default: top of the source tree]",
-        ),
+        ('egg-base=', 'e', "directory containing .egg-info directories"
+                           " (default: top of the source tree)"
+                           " DEPRECATED: use --output-dir."),
+        ('output-dir=', 'o', "directory inside of which the .dist-info will be"
+                             "created (default: top of the source tree)"),
         ('tag-date', 'd', "Add date stamp (e.g. 20050528) to version number"),
         ('tag-build=', 'b', "Specify explicit tag to add to version number"),
         ('no-date', 'D', "Don't include date stamp [default]"),
@@ -42,6 +38,7 @@ class dist_info(Command):
     negative_opt = {'no-date': 'tag-date'}
 
     def initialize_options(self):
+        self.egg_base = None
         self.output_dir = None
         self.name = None
         self.dist_info_dir = None
@@ -49,12 +46,17 @@ class dist_info(Command):
         self.tag_build = None
         self.keep_egg_info = False
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
+        if self.egg_base:
+            msg = "--egg-base is deprecated for dist_info command. Use --output-dir."
+            warnings.warn(msg, SetuptoolsDeprecationWarning)
+            self.output_dir = self.egg_base or self.output_dir
+
         dist = self.distribution
         project_dir = dist.src_root or os.curdir
         self.output_dir = Path(self.output_dir or project_dir)
 
-        egg_info = cast(egg_info_cls, self.reinitialize_command("egg_info"))
+        egg_info = self.reinitialize_command("egg_info")
         egg_info.egg_base = str(self.output_dir)
 
         if self.tag_date:
@@ -70,8 +72,8 @@ class dist_info(Command):
         egg_info.finalize_options()
         self.egg_info = egg_info
 
-        name = _normalization.safer_name(dist.get_name())
-        version = _normalization.safer_best_effort_version(dist.get_version())
+        name = _safe(dist.get_name())
+        version = _version(dist.get_version())
         self.name = f"{name}-{version}"
         self.dist_info_dir = os.path.join(self.output_dir, f"{self.name}.dist-info")
 
@@ -80,7 +82,7 @@ class dist_info(Command):
         if requires_bkp:
             bkp_name = f"{dir_path}.__bkp__"
             _rm(bkp_name, ignore_errors=True)
-            shutil.copytree(dir_path, bkp_name, dirs_exist_ok=True, symlinks=True)
+            _copy(dir_path, bkp_name, dirs_exist_ok=True, symlinks=True)
             try:
                 yield
             finally:
@@ -89,15 +91,52 @@ class dist_info(Command):
         else:
             yield
 
-    def run(self) -> None:
+    def run(self):
         self.output_dir.mkdir(parents=True, exist_ok=True)
         self.egg_info.run()
         egg_info_dir = self.egg_info.egg_info
         assert os.path.isdir(egg_info_dir), ".egg-info dir should have been created"
 
-        log.info(f"creating '{os.path.abspath(self.dist_info_dir)}'")
+        log.info("creating '{}'".format(os.path.abspath(self.dist_info_dir)))
         bdist_wheel = self.get_finalized_command('bdist_wheel')
 
         # TODO: if bdist_wheel if merged into setuptools, just add "keep_egg_info" there
         with self._maybe_bkp_dir(egg_info_dir, self.keep_egg_info):
             bdist_wheel.egg2dist(egg_info_dir, self.dist_info_dir)
+
+
+def _safe(component: str) -> str:
+    """Escape a component used to form a wheel name according to PEP 491"""
+    return re.sub(r"[^\w\d.]+", "_", component)
+
+
+def _version(version: str) -> str:
+    """Convert an arbitrary string to a version string."""
+    v = version.replace(' ', '.')
+    try:
+        return str(packaging.version.Version(v)).replace("-", "_")
+    except packaging.version.InvalidVersion:
+        msg = f"""Invalid version: {version!r}.
+        !!\n\n
+        ###################
+        # Invalid version #
+        ###################
+        {version!r} is not valid according to PEP 440.\n
+        Please make sure specify a valid version for your package.
+        Also note that future releases of setuptools may halt the build process
+        if an invalid version is given.
+        \n\n!!
+        """
+        warnings.warn(cleandoc(msg))
+        return _safe(v).strip("_")
+
+
+def _rm(dir_name, **opts):
+    if os.path.isdir(dir_name):
+        shutil.rmtree(dir_name, **opts)
+
+
+def _copy(src, dst, **opts):
+    if sys.version_info < (3, 8):
+        opts.pop("dirs_exist_ok", None)
+    shutil.copytree(src, dst, **opts)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/easy_install.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/easy_install.py
index eb1b4c1..444d3b3 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/easy_install.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/easy_install.py
@@ -10,83 +10,67 @@ __ https://setuptools.pypa.io/en/latest/deprecated/easy_install.html
 
 """
 
-from __future__ import annotations
-
-import configparser
-import contextlib
-import io
-import os
-import random
-import re
-import shlex
-import shutil
-import site
-import stat
-import struct
-import subprocess
+from glob import glob
+from distutils.util import get_platform
+from distutils.util import convert_path, subst_vars
+from distutils.errors import (
+    DistutilsArgError, DistutilsOptionError,
+    DistutilsError, DistutilsPlatformError,
+)
+from distutils import log, dir_util
+from distutils.command.build_scripts import first_line_re
+from distutils.spawn import find_executable
+from distutils.command import install
 import sys
-import sysconfig
+import os
+import zipimport
+import shutil
 import tempfile
+import zipfile
+import re
+import stat
+import random
 import textwrap
 import warnings
-import zipfile
-import zipimport
-from collections.abc import Iterable
-from glob import glob
+import site
+import struct
+import contextlib
+import subprocess
+import shlex
+import io
+import configparser
+import sysconfig
+
+
 from sysconfig import get_path
-from typing import TYPE_CHECKING, NoReturn, TypedDict
 
-from jaraco.text import yield_lines
+from setuptools import SetuptoolsDeprecationWarning
 
-import pkg_resources
-from pkg_resources import (
-    DEVELOP_DIST,
-    Distribution,
-    DistributionNotFound,
-    EggMetadata,
-    Environment,
-    PathMetadata,
-    Requirement,
-    VersionConflict,
-    WorkingSet,
-    find_distributions,
-    get_distribution,
-    normalize_path,
-    resource_string,
-)
 from setuptools import Command
-from setuptools.archive_util import unpack_archive
-from setuptools.command import bdist_egg, egg_info, setopt
-from setuptools.package_index import URL_SCHEME, PackageIndex, parse_requirement_arg
 from setuptools.sandbox import run_setup
-from setuptools.warnings import SetuptoolsDeprecationWarning, SetuptoolsWarning
-from setuptools.wheel import Wheel
-
-from .._path import ensure_directory
-from .._shutil import attempt_chmod_verbose as chmod, rmtree as _rmtree
-from ..compat import py39, py312
-
-from distutils import dir_util, log
-from distutils.command import install
-from distutils.command.build_scripts import first_line_re
-from distutils.errors import (
-    DistutilsArgError,
-    DistutilsError,
-    DistutilsOptionError,
-    DistutilsPlatformError,
+from setuptools.command import setopt
+from setuptools.archive_util import unpack_archive
+from setuptools.package_index import (
+    PackageIndex, parse_requirement_arg, URL_SCHEME,
 )
-from distutils.util import convert_path, get_platform, subst_vars
+from setuptools.command import bdist_egg, egg_info
+from setuptools.wheel import Wheel
+from pkg_resources import (
+    normalize_path, resource_string,
+    get_distribution, find_distributions, Environment, Requirement,
+    Distribution, PathMetadata, EggMetadata, WorkingSet, DistributionNotFound,
+    VersionConflict, DEVELOP_DIST,
+)
+import pkg_resources
+from .._path import ensure_directory
+from ..extern.jaraco.text import yield_lines
 
-if TYPE_CHECKING:
-    from typing_extensions import Self
 
 # Turn on PEP440Warnings
 warnings.filterwarnings("default", category=pkg_resources.PEP440Warning)
 
 __all__ = [
-    'easy_install',
-    'PthDistributions',
-    'extract_wininst_cfg',
+    'easy_install', 'PthDistributions', 'extract_wininst_cfg',
     'get_exe_prefixes',
 ]
 
@@ -102,9 +86,9 @@ def _to_bytes(s):
 def isascii(s):
     try:
         s.encode('ascii')
+        return True
     except UnicodeError:
         return False
-    return True
 
 
 def _one_liner(text):
@@ -113,7 +97,6 @@ def _one_liner(text):
 
 class easy_install(Command):
     """Manage a download/build/install process"""
-
     description = "Find/get/install Python packages"
     command_consumes_arguments = True
 
@@ -128,50 +111,45 @@ class easy_install(Command):
         ("always-copy", "a", "Copy all needed packages to install dir"),
         ("index-url=", "i", "base URL of Python Package Index"),
         ("find-links=", "f", "additional URL(s) to search for packages"),
-        ("build-directory=", "b", "download/extract/build in DIR; keep the results"),
-        (
-            'optimize=',
-            'O',
-            'also compile with optimization: -O1 for "python -O", '
-            '-O2 for "python -OO", and -O0 to disable [default: -O0]',
-        ),
-        ('record=', None, "filename in which to record list of installed files"),
+        ("build-directory=", "b",
+         "download/extract/build in DIR; keep the results"),
+        ('optimize=', 'O',
+         "also compile with optimization: -O1 for \"python -O\", "
+         "-O2 for \"python -OO\", and -O0 to disable [default: -O0]"),
+        ('record=', None,
+         "filename in which to record list of installed files"),
         ('always-unzip', 'Z', "don't install as a zipfile, no matter what"),
         ('site-dirs=', 'S', "list of directories where .pth files work"),
         ('editable', 'e', "Install specified packages in editable form"),
         ('no-deps', 'N', "don't install dependencies"),
         ('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
-        ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"),
+        ('local-snapshots-ok', 'l',
+         "allow building eggs from local checkouts"),
         ('version', None, "print version information and exit"),
-        (
-            'no-find-links',
-            None,
-            "Don't load find-links defined in packages being installed",
-        ),
-        ('user', None, f"install in user site-package '{site.USER_SITE}'"),
+        ('no-find-links', None,
+         "Don't load find-links defined in packages being installed"),
+        ('user', None, "install in user site-package '%s'" % site.USER_SITE)
     ]
     boolean_options = [
-        'zip-ok',
-        'multi-version',
-        'exclude-scripts',
-        'upgrade',
-        'always-copy',
+        'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
         'editable',
-        'no-deps',
-        'local-snapshots-ok',
-        'version',
-        'user',
+        'no-deps', 'local-snapshots-ok', 'version',
+        'user'
     ]
 
     negative_opt = {'always-unzip': 'zip-ok'}
     create_index = PackageIndex
 
     def initialize_options(self):
-        EasyInstallDeprecationWarning.emit()
+        warnings.warn(
+            "easy_install command is deprecated. "
+            "Use build and pip and other standards-based tools.",
+            EasyInstallDeprecationWarning,
+        )
 
         # the --user option seems to be an opt-in one,
         # so the default should be False.
-        self.user = False
+        self.user = 0
         self.zip_ok = self.local_snapshots_ok = None
         self.install_dir = self.script_dir = self.exclude_scripts = None
         self.index_url = None
@@ -211,10 +189,9 @@ class easy_install(Command):
             self, self.distribution.get_option_dict('easy_install')
         )
 
-    def delete_blockers(self, blockers) -> None:
+    def delete_blockers(self, blockers):
         extant_blockers = (
-            filename
-            for filename in blockers
+            filename for filename in blockers
             if os.path.exists(filename) or os.path.islink(filename)
         )
         list(map(self._delete_path, extant_blockers))
@@ -225,7 +202,7 @@ class easy_install(Command):
             return
 
         is_tree = os.path.isdir(path) and not os.path.islink(path)
-        remover = _rmtree if is_tree else os.unlink
+        remover = rmtree if is_tree else os.unlink
         remover(path)
 
     @staticmethod
@@ -233,12 +210,13 @@ class easy_install(Command):
         """
         Render the Setuptools version and installation details, then exit.
         """
-        ver = f'{sys.version_info.major}.{sys.version_info.minor}'
+        ver = '{}.{}'.format(*sys.version_info)
         dist = get_distribution('setuptools')
-        print(f'setuptools {dist.version} from {dist.location} (Python {ver})')
-        raise SystemExit
+        tmpl = 'setuptools {dist.version} from {dist.location} (Python {ver})'
+        print(tmpl.format(**locals()))
+        raise SystemExit()
 
-    def finalize_options(self) -> None:  # noqa: C901  # is too complex (25)  # FIXME
+    def finalize_options(self):  # noqa: C901  # is too complex (25)  # FIXME
         self.version and self._render_version()
 
         py_version = sys.version.split()[0]
@@ -254,9 +232,8 @@ class easy_install(Command):
             'py_version_nodot': f'{sys.version_info.major}{sys.version_info.minor}',
             'sys_prefix': self.config_vars['prefix'],
             'sys_exec_prefix': self.config_vars['exec_prefix'],
-            # Only POSIX systems have abiflags
+            # Only python 3.2+ has abiflags
             'abiflags': getattr(sys, 'abiflags', ''),
-            # Only python 3.9+ has platlibdir
             'platlibdir': getattr(sys, 'platlibdir', 'lib'),
         })
         with contextlib.suppress(AttributeError):
@@ -283,9 +260,7 @@ class easy_install(Command):
         self.expand_dirs()
 
         self._expand(
-            'install_dir',
-            'script_dir',
-            'build_directory',
+            'install_dir', 'script_dir', 'build_directory',
             'site_dirs',
         )
         # If a non-default installation directory was specified, default the
@@ -299,9 +274,13 @@ class easy_install(Command):
         # Let install_dir get set by install_lib command, which in turn
         # gets its info from the install command, and takes into account
         # --prefix and --home and all that other crud.
-        self.set_undefined_options('install_lib', ('install_dir', 'install_dir'))
+        self.set_undefined_options(
+            'install_lib', ('install_dir', 'install_dir')
+        )
         # Likewise, set default script_dir from 'install_scripts.install_dir'
-        self.set_undefined_options('install_scripts', ('install_dir', 'script_dir'))
+        self.set_undefined_options(
+            'install_scripts', ('install_dir', 'script_dir')
+        )
 
         if self.user and self.install_purelib:
             self.install_dir = self.install_purelib
@@ -327,9 +306,7 @@ class easy_install(Command):
             hosts = ['*']
         if self.package_index is None:
             self.package_index = self.create_index(
-                self.index_url,
-                search_path=self.shadow_path,
-                hosts=hosts,
+                self.index_url, search_path=self.shadow_path, hosts=hosts,
             )
         self.local_index = Environment(self.shadow_path + sys.path)
 
@@ -351,10 +328,9 @@ class easy_install(Command):
             )
         if not self.args:
             raise DistutilsArgError(
-                "No urls, filenames, or requirements specified (see --help)"
-            )
+                "No urls, filenames, or requirements specified (see --help)")
 
-        self.outputs: list[str] = []
+        self.outputs = []
 
     @staticmethod
     def _process_site_dirs(site_dirs):
@@ -362,12 +338,17 @@ class easy_install(Command):
             return
 
         normpath = map(normalize_path, sys.path)
-        site_dirs = [os.path.expanduser(s.strip()) for s in site_dirs.split(',')]
+        site_dirs = [
+            os.path.expanduser(s.strip()) for s in
+            site_dirs.split(',')
+        ]
         for d in site_dirs:
             if not os.path.isdir(d):
                 log.warn("%s (in --site-dirs) does not exist", d)
             elif normalize_path(d) not in normpath:
-                raise DistutilsOptionError(d + " (in --site-dirs) is not on sys.path")
+                raise DistutilsOptionError(
+                    d + " (in --site-dirs) is not on sys.path"
+                )
             else:
                 yield normalize_path(d)
 
@@ -378,7 +359,9 @@ class easy_install(Command):
             if value not in range(3):
                 raise ValueError
         except ValueError as e:
-            raise DistutilsOptionError("--optimize must be 0, 1, or 2") from e
+            raise DistutilsOptionError(
+                "--optimize must be 0, 1, or 2"
+            ) from e
 
         return value
 
@@ -406,12 +389,12 @@ class easy_install(Command):
                 val = subst_vars(val, self.config_vars)
                 setattr(self, attr, val)
 
-    def expand_basedirs(self) -> None:
+    def expand_basedirs(self):
         """Calls `os.path.expanduser` on install_base, install_platbase and
         root."""
         self._expand_attrs(['install_base', 'install_platbase', 'root'])
 
-    def expand_dirs(self) -> None:
+    def expand_dirs(self):
         """Calls `os.path.expanduser` on install dirs."""
         dirs = [
             'install_purelib',
@@ -423,7 +406,7 @@ class easy_install(Command):
         ]
         self._expand_attrs(dirs)
 
-    def run(self, show_deprecation: bool = True) -> None:
+    def run(self, show_deprecation=True):
         if show_deprecation:
             self.announce(
                 "WARNING: The easy_install command is deprecated "
@@ -444,9 +427,9 @@ class easy_install(Command):
                 from distutils import file_util
 
                 self.execute(
-                    file_util.write_file,
-                    (self.record, outputs),
-                    f"writing list of installed files to '{self.record}'",
+                    file_util.write_file, (self.record, outputs),
+                    "writing list of installed files to '%s'" %
+                    self.record
                 )
             self.warn_deprecated_options()
         finally:
@@ -461,12 +444,12 @@ class easy_install(Command):
             pid = os.getpid()
         except Exception:
             pid = random.randint(0, sys.maxsize)
-        return os.path.join(self.install_dir, f"test-easy-install-{pid}")
+        return os.path.join(self.install_dir, "test-easy-install-%s" % pid)
 
-    def warn_deprecated_options(self) -> None:
+    def warn_deprecated_options(self):
         pass
 
-    def check_site_dir(self) -> None:  # is too complex (12)  # FIXME
+    def check_site_dir(self):  # noqa: C901  # is too complex (12)  # FIXME
         """Verify that self.install_dir is .pth-capable dir, if needed"""
 
         instdir = normalize_path(self.install_dir)
@@ -475,7 +458,7 @@ class easy_install(Command):
         if not os.path.exists(instdir):
             try:
                 os.makedirs(instdir)
-            except OSError:
+            except (OSError, IOError):
                 self.cant_write_to_target()
 
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
@@ -491,9 +474,9 @@ class easy_install(Command):
             try:
                 if test_exists:
                     os.unlink(testfile)
-                open(testfile, 'wb').close()
+                open(testfile, 'w').close()
                 os.unlink(testfile)
-            except OSError:
+            except (OSError, IOError):
                 self.cant_write_to_target()
 
         if not is_site_dir and not self.multi_version:
@@ -511,8 +494,7 @@ class easy_install(Command):
             self.pth_file = None  # don't create a .pth file
         self.install_dir = instdir
 
-    __cant_write_msg = textwrap.dedent(
-        """
+    __cant_write_msg = textwrap.dedent("""
         can't create or remove files in install directory
 
         The following error occurred while trying to add or remove files in the
@@ -524,19 +506,15 @@ class easy_install(Command):
         the distutils default setting) was:
 
             %s
-        """
-    ).lstrip()
+        """).lstrip()  # noqa
 
-    __not_exists_id = textwrap.dedent(
-        """
+    __not_exists_id = textwrap.dedent("""
         This directory does not currently exist.  Please create it and try again, or
         choose a different installation directory (using the -d or --install-dir
         option).
-        """
-    ).lstrip()
+        """).lstrip()  # noqa
 
-    __access_msg = textwrap.dedent(
-        """
+    __access_msg = textwrap.dedent("""
         Perhaps your account does not have write access to this directory?  If the
         installation directory is a system-owned directory, you may need to sign in
         as the administrator or "root" account.  If you do not have administrative
@@ -550,14 +528,10 @@ class easy_install(Command):
           https://setuptools.pypa.io/en/latest/deprecated/easy_install.html
 
         Please make the appropriate changes for your system and try again.
-        """
-    ).lstrip()
+        """).lstrip()  # noqa
 
-    def cant_write_to_target(self) -> NoReturn:
-        msg = self.__cant_write_msg % (
-            sys.exc_info()[1],
-            self.install_dir,
-        )
+    def cant_write_to_target(self):
+        msg = self.__cant_write_msg % (sys.exc_info()[1], self.install_dir,)
 
         if not os.path.exists(self.install_dir):
             msg += '\n' + self.__not_exists_id
@@ -565,33 +539,26 @@ class easy_install(Command):
             msg += '\n' + self.__access_msg
         raise DistutilsError(msg)
 
-    def check_pth_processing(self):  # noqa: C901
+    def check_pth_processing(self):
         """Empirically verify whether .pth files are supported in inst. dir"""
         instdir = self.install_dir
         log.info("Checking .pth file support in %s", instdir)
         pth_file = self.pseudo_tempname() + ".pth"
         ok_file = pth_file + '.ok'
         ok_exists = os.path.exists(ok_file)
-        tmpl = (
-            _one_liner(
-                """
+        tmpl = _one_liner("""
             import os
-            f = open({ok_file!r}, 'w', encoding="utf-8")
+            f = open({ok_file!r}, 'w')
             f.write('OK')
             f.close()
-            """
-            )
-            + '\n'
-        )
+            """) + '\n'
         try:
             if ok_exists:
                 os.unlink(ok_file)
             dirname = os.path.dirname(ok_file)
             os.makedirs(dirname, exist_ok=True)
-            f = open(pth_file, 'w', encoding=py312.PTH_ENCODING)
-            # ^-- Python<3.13 require encoding="locale" instead of "utf-8",
-            #     see python/cpython#77102.
-        except OSError:
+            f = open(pth_file, 'w')
+        except (OSError, IOError):
             self.cant_write_to_target()
         else:
             try:
@@ -602,7 +569,10 @@ class easy_install(Command):
                 if os.name == 'nt':
                     dirname, basename = os.path.split(executable)
                     alt = os.path.join(dirname, 'pythonw.exe')
-                    use_alt = basename.lower() == 'python.exe' and os.path.exists(alt)
+                    use_alt = (
+                        basename.lower() == 'python.exe' and
+                        os.path.exists(alt)
+                    )
                     if use_alt:
                         # use pythonw.exe to avoid opening a console window
                         executable = alt
@@ -612,7 +582,10 @@ class easy_install(Command):
                 spawn([executable, '-E', '-c', 'pass'], 0)
 
                 if os.path.exists(ok_file):
-                    log.info("TEST PASSED: %s appears to support .pth files", instdir)
+                    log.info(
+                        "TEST PASSED: %s appears to support .pth files",
+                        instdir
+                    )
                     return True
             finally:
                 if f:
@@ -625,7 +598,7 @@ class easy_install(Command):
             log.warn("TEST FAILED: %s does NOT support .pth files", instdir)
         return False
 
-    def install_egg_scripts(self, dist) -> None:
+    def install_egg_scripts(self, dist):
         """Write all the scripts for `dist`, unless scripts are excluded"""
         if not self.exclude_scripts and dist.metadata_isdir('scripts'):
             for script_name in dist.metadata_listdir('scripts'):
@@ -634,11 +607,12 @@ class easy_install(Command):
                     # __pycache__ directory, so skip it.
                     continue
                 self.install_script(
-                    dist, script_name, dist.get_metadata('scripts/' + script_name)
+                    dist, script_name,
+                    dist.get_metadata('scripts/' + script_name)
                 )
         self.install_wrapper_scripts(dist)
 
-    def add_output(self, path) -> None:
+    def add_output(self, path):
         if os.path.isdir(path):
             for base, dirs, files in os.walk(path):
                 for filename in files:
@@ -646,32 +620,34 @@ class easy_install(Command):
         else:
             self.outputs.append(path)
 
-    def not_editable(self, spec) -> None:
+    def not_editable(self, spec):
         if self.editable:
             raise DistutilsArgError(
-                f"Invalid argument {spec!r}: you can't use filenames or URLs "
+                "Invalid argument %r: you can't use filenames or URLs "
                 "with --editable (except via the --find-links option)."
+                % (spec,)
             )
 
-    def check_editable(self, spec) -> None:
+    def check_editable(self, spec):
         if not self.editable:
             return
 
         if os.path.exists(os.path.join(self.build_directory, spec.key)):
             raise DistutilsArgError(
-                f"{spec.key!r} already exists in {self.build_directory}; can't do a checkout there"
+                "%r already exists in %s; can't do a checkout there" %
+                (spec.key, self.build_directory)
             )
 
     @contextlib.contextmanager
     def _tmpdir(self):
-        tmpdir = tempfile.mkdtemp(prefix="easy_install-")
+        tmpdir = tempfile.mkdtemp(prefix=u"easy_install-")
         try:
             # cast to str as workaround for #709 and #710 and #712
             yield str(tmpdir)
         finally:
-            os.path.exists(tmpdir) and _rmtree(tmpdir)
+            os.path.exists(tmpdir) and rmtree(tmpdir)
 
-    def easy_install(self, spec, deps: bool = False) -> Distribution | None:
+    def easy_install(self, spec, deps=False):
         with self._tmpdir() as tmpdir:
             if not isinstance(spec, Requirement):
                 if URL_SCHEME(spec):
@@ -689,15 +665,11 @@ class easy_install(Command):
 
             self.check_editable(spec)
             dist = self.package_index.fetch_distribution(
-                spec,
-                tmpdir,
-                self.upgrade,
-                self.editable,
-                not self.always_copy,
-                self.local_index,
+                spec, tmpdir, self.upgrade, self.editable,
+                not self.always_copy, self.local_index
             )
             if dist is None:
-                msg = f"Could not find suitable distribution for {spec!r}"
+                msg = "Could not find suitable distribution for %r" % spec
                 if self.always_copy:
                     msg += " (--always-copy skips system and development eggs)"
                 raise DistutilsError(msg)
@@ -708,17 +680,16 @@ class easy_install(Command):
             else:
                 return self.install_item(spec, dist.location, tmpdir, deps)
 
-    def install_item(
-        self, spec, download, tmpdir, deps, install_needed: bool = False
-    ) -> Distribution | None:
+    def install_item(self, spec, download, tmpdir, deps, install_needed=False):
+
         # Installation is also needed if file in tmpdir or is not an egg
-        install_needed = install_needed or bool(self.always_copy)
+        install_needed = install_needed or self.always_copy
         install_needed = install_needed or os.path.dirname(download) == tmpdir
         install_needed = install_needed or not download.endswith('.egg')
         install_needed = install_needed or (
-            self.always_copy_from is not None
-            and os.path.dirname(normalize_path(download))
-            == normalize_path(self.always_copy_from)
+            self.always_copy_from is not None and
+            os.path.dirname(normalize_path(download)) ==
+            normalize_path(self.always_copy_from)
         )
 
         if spec and not install_needed:
@@ -744,7 +715,6 @@ class easy_install(Command):
             for dist in dists:
                 if dist in spec:
                     return dist
-        return None
 
     def select_scheme(self, name):
         try:
@@ -755,12 +725,8 @@ class easy_install(Command):
 
     # FIXME: 'easy_install.process_distribution' is too complex (12)
     def process_distribution(  # noqa: C901
-        self,
-        requirement,
-        dist,
-        deps: bool = True,
-        *info,
-    ) -> None:
+            self, requirement, dist, deps=True, *info,
+    ):
         self.update_pth(dist)
         self.package_index.add(dist)
         if dist in self.local_index[dist.key]:
@@ -769,7 +735,8 @@ class easy_install(Command):
         self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
-        if dist.has_metadata('dependency_links.txt') and not self.no_find_links:
+        if (dist.has_metadata('dependency_links.txt') and
+                not self.no_find_links):
             self.package_index.add_find_links(
                 dist.get_metadata_lines('dependency_links.txt')
             )
@@ -798,7 +765,7 @@ class easy_install(Command):
                     self.easy_install(dist.as_requirement())
         log.info("Finished processing dependencies for %s", requirement)
 
-    def should_unzip(self, dist) -> bool:
+    def should_unzip(self, dist):
         if self.zip_ok is not None:
             return not self.zip_ok
         if dist.has_metadata('not-zip-safe'):
@@ -810,7 +777,9 @@ class easy_install(Command):
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)
         if os.path.exists(dst):
-            msg = "%r already exists in %s; build directory %s will not be kept"
+            msg = (
+                "%r already exists in %s; build directory %s will not be kept"
+            )
             log.warn(msg, spec.key, self.build_directory, setup_base)
             return setup_base
         if os.path.isdir(dist_filename):
@@ -828,13 +797,13 @@ class easy_install(Command):
         shutil.move(setup_base, dst)
         return dst
 
-    def install_wrapper_scripts(self, dist) -> None:
+    def install_wrapper_scripts(self, dist):
         if self.exclude_scripts:
             return
         for args in ScriptWriter.best().get_args(dist):
             self.write_script(*args)
 
-    def install_script(self, dist, script_name, script_text, dev_path=None) -> None:
+    def install_script(self, dist, script_name, script_text, dev_path=None):
         """Generate a legacy script wrapper and install it"""
         spec = str(dist.as_requirement())
         is_script = is_python_script(script_text, script_name)
@@ -859,7 +828,7 @@ class easy_install(Command):
         raw_bytes = resource_string('setuptools', name)
         return raw_bytes.decode('utf-8')
 
-    def write_script(self, script_name, contents, mode: str = "t", blockers=()) -> None:
+    def write_script(self, script_name, contents, mode="t", blockers=()):
         """Write an executable file to the scripts directory"""
         self.delete_blockers(  # clean up old .py/.pyw w/o a script
             [os.path.join(self.script_dir, x) for x in blockers]
@@ -875,13 +844,11 @@ class easy_install(Command):
         ensure_directory(target)
         if os.path.exists(target):
             os.unlink(target)
-
-        encoding = None if "b" in mode else "utf-8"
-        with open(target, "w" + mode, encoding=encoding) as f:
+        with open(target, "w" + mode) as f:
             f.write(contents)
         chmod(target, 0o777 - mask)
 
-    def install_eggs(self, spec, dist_filename, tmpdir) -> list[Distribution]:
+    def install_eggs(self, spec, dist_filename, tmpdir):
         # .egg dirs or files are already built, so just return them
         installer_map = {
             '.egg': self.install_egg,
@@ -889,7 +856,9 @@ class easy_install(Command):
             '.whl': self.install_wheel,
         }
         try:
-            install_dist = installer_map[dist_filename.lower()[-4:]]
+            install_dist = installer_map[
+                dist_filename.lower()[-4:]
+            ]
         except KeyError:
             pass
         else:
@@ -902,11 +871,8 @@ class easy_install(Command):
         elif os.path.isdir(dist_filename):
             setup_base = os.path.abspath(dist_filename)
 
-        if (
-            setup_base.startswith(tmpdir)  # something we downloaded
-            and self.build_directory
-            and spec is not None
-        ):
+        if (setup_base.startswith(tmpdir)  # something we downloaded
+                and self.build_directory and spec is not None):
             setup_base = self.maybe_move(spec, dist_filename, setup_base)
 
         # Find the setup.py file
@@ -916,11 +882,13 @@ class easy_install(Command):
             setups = glob(os.path.join(setup_base, '*', 'setup.py'))
             if not setups:
                 raise DistutilsError(
-                    f"Couldn't find a setup script in {os.path.abspath(dist_filename)}"
+                    "Couldn't find a setup script in %s" %
+                    os.path.abspath(dist_filename)
                 )
             if len(setups) > 1:
                 raise DistutilsError(
-                    f"Multiple setup scripts in {os.path.abspath(dist_filename)}"
+                    "Multiple setup scripts in %s" %
+                    os.path.abspath(dist_filename)
                 )
             setup_script = setups[0]
 
@@ -933,13 +901,14 @@ class easy_install(Command):
 
     def egg_distribution(self, egg_path):
         if os.path.isdir(egg_path):
-            metadata = PathMetadata(egg_path, os.path.join(egg_path, 'EGG-INFO'))
+            metadata = PathMetadata(egg_path, os.path.join(egg_path,
+                                                           'EGG-INFO'))
         else:
             metadata = EggMetadata(zipimport.zipimporter(egg_path))
         return Distribution.from_filename(egg_path, metadata=metadata)
 
     # FIXME: 'easy_install.install_egg' is too complex (11)
-    def install_egg(self, egg_path, tmpdir):
+    def install_egg(self, egg_path, tmpdir):  # noqa: C901
         destination = os.path.join(
             self.install_dir,
             os.path.basename(egg_path),
@@ -979,8 +948,10 @@ class easy_install(Command):
                 self.execute(
                     f,
                     (egg_path, destination),
-                    (m + " %s to %s")
-                    % (os.path.basename(egg_path), os.path.dirname(destination)),
+                    (m + " %s to %s") % (
+                        os.path.basename(egg_path),
+                        os.path.dirname(destination)
+                    ),
                 )
                 update_dist_caches(
                     destination,
@@ -998,14 +969,13 @@ class easy_install(Command):
         cfg = extract_wininst_cfg(dist_filename)
         if cfg is None:
             raise DistutilsError(
-                f"{dist_filename} is not a valid distutils Windows .exe"
+                "%s is not a valid distutils Windows .exe" % dist_filename
             )
         # Create a dummy distribution object until we build the real distro
         dist = Distribution(
             None,
             project_name=cfg.get('metadata', 'name'),
-            version=cfg.get('metadata', 'version'),
-            platform=get_platform(),
+            version=cfg.get('metadata', 'version'), platform=get_platform(),
         )
 
         # Convert the .exe to an unpacked egg
@@ -1020,50 +990,48 @@ class easy_install(Command):
 
         # Write EGG-INFO/PKG-INFO
         if not os.path.exists(pkg_inf):
-            with open(pkg_inf, 'w', encoding="utf-8") as f:
-                f.write('Metadata-Version: 1.0\n')
-                for k, v in cfg.items('metadata'):
-                    if k != 'target_version':
-                        k = k.replace('_', '-').title()
-                        f.write(f'{k}: {v}\n')
+            f = open(pkg_inf, 'w')
+            f.write('Metadata-Version: 1.0\n')
+            for k, v in cfg.items('metadata'):
+                if k != 'target_version':
+                    f.write('%s: %s\n' % (k.replace('_', '-').title(), v))
+            f.close()
         script_dir = os.path.join(_egg_info, 'scripts')
         # delete entry-point scripts to avoid duping
         self.delete_blockers([
-            os.path.join(script_dir, args[0]) for args in ScriptWriter.get_args(dist)
+            os.path.join(script_dir, args[0])
+            for args in ScriptWriter.get_args(dist)
         ])
         # Build .egg file from tmpdir
         bdist_egg.make_zipfile(
-            egg_path,
-            egg_tmp,
-            verbose=self.verbose,
-            dry_run=self.dry_run,
+            egg_path, egg_tmp, verbose=self.verbose, dry_run=self.dry_run,
         )
         # install the .egg
         return self.install_egg(egg_path, tmpdir)
 
     # FIXME: 'easy_install.exe_to_egg' is too complex (12)
-    def exe_to_egg(self, dist_filename, egg_tmp) -> None:  # noqa: C901
+    def exe_to_egg(self, dist_filename, egg_tmp):  # noqa: C901
         """Extract a bdist_wininst to the directories an egg would use"""
         # Check for .pth file and set up prefix translations
         prefixes = get_exe_prefixes(dist_filename)
         to_compile = []
         native_libs = []
-        top_level = set()
+        top_level = {}
 
         def process(src, dst):
             s = src.lower()
             for old, new in prefixes:
                 if s.startswith(old):
-                    src = new + src[len(old) :]
+                    src = new + src[len(old):]
                     parts = src.split('/')
                     dst = os.path.join(egg_tmp, *parts)
                     dl = dst.lower()
                     if dl.endswith('.pyd') or dl.endswith('.dll'):
                         parts[-1] = bdist_egg.strip_module(parts[-1])
-                        top_level.add([os.path.splitext(parts[0])[0]])
+                        top_level[os.path.splitext(parts[0])[0]] = 1
                         native_libs.append(src)
                     elif dl.endswith('.py') and old != 'SCRIPTS/':
-                        top_level.add([os.path.splitext(parts[0])[0]])
+                        top_level[os.path.splitext(parts[0])[0]] = 1
                         to_compile.append(dst)
                     return dst
             if not src.endswith('.pth'):
@@ -1084,15 +1052,16 @@ class easy_install(Command):
                 bdist_egg.write_stub(resource, pyfile)
         self.byte_compile(to_compile)  # compile .py's
         bdist_egg.write_safety_flag(
-            os.path.join(egg_tmp, 'EGG-INFO'), bdist_egg.analyze_egg(egg_tmp, stubs)
-        )  # write zip-safety flag
+            os.path.join(egg_tmp, 'EGG-INFO'),
+            bdist_egg.analyze_egg(egg_tmp, stubs))  # write zip-safety flag
 
         for name in 'top_level', 'native_libs':
             if locals()[name]:
                 txt = os.path.join(egg_tmp, 'EGG-INFO', name + '.txt')
                 if not os.path.exists(txt):
-                    with open(txt, 'w', encoding="utf-8") as f:
-                        f.write('\n'.join(locals()[name]) + '\n')
+                    f = open(txt, 'w')
+                    f.write('\n'.join(locals()[name]) + '\n')
+                    f.close()
 
     def install_wheel(self, wheel_path, tmpdir):
         wheel = Wheel(wheel_path)
@@ -1113,8 +1082,9 @@ class easy_install(Command):
             self.execute(
                 wheel.install_as_egg,
                 (destination,),
-                (
-                    f"Installing {os.path.basename(wheel_path)} to {os.path.dirname(destination)}"
+                ("Installing %s to %s") % (
+                    os.path.basename(wheel_path),
+                    os.path.dirname(destination)
                 ),
             )
         finally:
@@ -1122,8 +1092,7 @@ class easy_install(Command):
         self.add_output(destination)
         return self.egg_distribution(destination)
 
-    __mv_warning = textwrap.dedent(
-        """
+    __mv_warning = textwrap.dedent("""
         Because this distribution was installed --multi-version, before you can
         import modules from this package in an application, you will need to
         'import pkg_resources' and then use a 'require()' call similar to one of
@@ -1132,18 +1101,15 @@ class easy_install(Command):
             pkg_resources.require("%(name)s")  # latest installed version
             pkg_resources.require("%(name)s==%(version)s")  # this exact version
             pkg_resources.require("%(name)s>=%(version)s")  # this version or higher
-        """
-    ).lstrip()
+        """).lstrip()  # noqa
 
-    __id_warning = textwrap.dedent(
-        """
+    __id_warning = textwrap.dedent("""
         Note also that the installation directory must be on sys.path at runtime for
         this to work.  (e.g. by being the application's script directory, by being on
         PYTHONPATH, or by being added to sys.path by your code.)
-        """
-    )
+        """)  # noqa
 
-    def installation_report(self, req, dist, what: str = "Installed") -> str:
+    def installation_report(self, req, dist, what="Installed"):
         """Helpful installation message for display to package users"""
         msg = "\n%(what)s %(eggloc)s%(extras)s"
         if self.multi_version and not self.no_report:
@@ -1157,8 +1123,7 @@ class easy_install(Command):
         extras = ''  # TODO: self.report_extras(req, dist)
         return msg % locals()
 
-    __editable_msg = textwrap.dedent(
-        """
+    __editable_msg = textwrap.dedent("""
         Extracted editable version of %(spec)s to %(dirname)s
 
         If it uses setuptools in its setup script, you can activate it in
@@ -1167,15 +1132,14 @@ class easy_install(Command):
             %(python)s setup.py develop
 
         See the setuptools documentation for the "develop" command for more info.
-        """
-    ).lstrip()
+        """).lstrip()  # noqa
 
     def report_editable(self, spec, setup_script):
         dirname = os.path.dirname(setup_script)
         python = sys.executable
         return '\n' + self.__editable_msg % locals()
 
-    def run_setup(self, setup_script, setup_base, args) -> None:
+    def run_setup(self, setup_script, setup_base, args):
         sys.modules.setdefault('distutils.command.bdist_egg', bdist_egg)
         sys.modules.setdefault('distutils.command.egg_info', egg_info)
 
@@ -1187,11 +1151,15 @@ class easy_install(Command):
             args.insert(0, '-q')
         if self.dry_run:
             args.insert(0, '-n')
-        log.info("Running %s %s", setup_script[len(setup_base) + 1 :], ' '.join(args))
+        log.info(
+            "Running %s %s", setup_script[len(setup_base) + 1:], ' '.join(args)
+        )
         try:
             run_setup(setup_script, args)
         except SystemExit as v:
-            raise DistutilsError(f"Setup script exited with {v.args[0]}") from v
+            raise DistutilsError(
+                "Setup script exited with %s" % (v.args[0],)
+            ) from v
 
     def build_and_install(self, setup_script, setup_base):
         args = ['bdist_egg', '--dist-dir']
@@ -1205,16 +1173,16 @@ class easy_install(Command):
 
             self.run_setup(setup_script, setup_base, args)
             all_eggs = Environment([dist_dir])
-            eggs = [
-                self.install_egg(dist.location, setup_base)
-                for key in all_eggs
-                for dist in all_eggs[key]
-            ]
+            eggs = []
+            for key in all_eggs:
+                for dist in all_eggs[key]:
+                    eggs.append(self.install_egg(dist.location, setup_base))
             if not eggs and not self.dry_run:
-                log.warn("No eggs found in %s (setup script problem?)", dist_dir)
+                log.warn("No eggs found in %s (setup script problem?)",
+                         dist_dir)
             return eggs
         finally:
-            _rmtree(dist_dir)
+            rmtree(dist_dir)
             log.set_verbosity(self.verbose)  # restore our log verbosity
 
     def _set_fetcher_options(self, base):
@@ -1228,11 +1196,7 @@ class easy_install(Command):
         # to the setup.cfg file.
         ei_opts = self.distribution.get_option_dict('easy_install').copy()
         fetch_directives = (
-            'find_links',
-            'site_dirs',
-            'index_url',
-            'optimize',
-            'allow_hosts',
+            'find_links', 'site_dirs', 'index_url', 'optimize', 'allow_hosts',
         )
         fetch_options = {}
         for key, val in ei_opts.items():
@@ -1244,7 +1208,7 @@ class easy_install(Command):
         cfg_filename = os.path.join(base, 'setup.cfg')
         setopt.edit_config(cfg_filename, settings)
 
-    def update_pth(self, dist) -> None:  # noqa: C901  # is too complex (11)  # FIXME
+    def update_pth(self, dist):  # noqa: C901  # is too complex (11)  # FIXME
         if self.pth_file is None:
             return
 
@@ -1282,10 +1246,7 @@ class easy_install(Command):
         filename = os.path.join(self.install_dir, 'setuptools.pth')
         if os.path.islink(filename):
             os.unlink(filename)
-
-        with open(filename, 'wt', encoding=py312.PTH_ENCODING) as f:
-            # ^-- Python<3.13 require encoding="locale" instead of "utf-8",
-            #     see python/cpython#77102.
+        with open(filename, 'wt') as f:
             f.write(self.pth_file.make_relative(dist.location) + '\n')
 
     def unpack_progress(self, src, dst):
@@ -1293,7 +1254,7 @@ class easy_install(Command):
         log.debug("Unpacking %s to %s", src, dst)
         return dst  # only unpack-and-compile skips files for dry run
 
-    def unpack_and_compile(self, egg_path, destination) -> None:
+    def unpack_and_compile(self, egg_path, destination):
         to_compile = []
         to_chmod = []
 
@@ -1312,7 +1273,7 @@ class easy_install(Command):
                 mode = ((os.stat(f)[stat.ST_MODE]) | 0o555) & 0o7755
                 chmod(f, mode)
 
-    def byte_compile(self, to_compile) -> None:
+    def byte_compile(self, to_compile):
         if sys.dont_write_bytecode:
             return
 
@@ -1322,19 +1283,16 @@ class easy_install(Command):
             # try to make the byte compile messages quieter
             log.set_verbosity(self.verbose - 1)
 
-            byte_compile(to_compile, optimize=0, force=True, dry_run=self.dry_run)
+            byte_compile(to_compile, optimize=0, force=1, dry_run=self.dry_run)
             if self.optimize:
                 byte_compile(
-                    to_compile,
-                    optimize=self.optimize,
-                    force=True,
+                    to_compile, optimize=self.optimize, force=1,
                     dry_run=self.dry_run,
                 )
         finally:
             log.set_verbosity(self.verbose)  # restore original verbosity
 
-    __no_default_msg = textwrap.dedent(
-        """
+    __no_default_msg = textwrap.dedent("""
         bad install directory or PYTHONPATH
 
         You are attempting to install a package to a directory that is not
@@ -1364,17 +1322,16 @@ class easy_install(Command):
 
 
         Please make the appropriate changes for your system and try again.
-        """
-    ).strip()
+        """).strip()
 
-    def create_home_path(self) -> None:
+    def create_home_path(self):
         """Create directories under ~."""
         if not self.user:
             return
         home = convert_path(os.path.expanduser("~"))
         for path in only_strs(self.config_vars.values()):
             if path.startswith(home) and not os.path.isdir(path):
-                self.debug_print(f"os.makedirs('{path}', 0o700)")
+                self.debug_print("os.makedirs('%s', 0o700)" % path)
                 os.makedirs(path, 0o700)
 
     INSTALL_SCHEMES = dict(
@@ -1441,7 +1398,7 @@ def get_site_dirs():
                 os.path.join(
                     prefix,
                     "lib",
-                    f"python{sys.version_info.major}.{sys.version_info.minor}",
+                    "python{}.{}".format(*sys.version_info),
                     "site-packages",
                 ),
                 os.path.join(prefix, "lib", "site-python"),
@@ -1468,7 +1425,7 @@ def get_site_dirs():
             home,
             'Library',
             'Python',
-            f'{sys.version_info.major}.{sys.version_info.minor}',
+            '{}.{}'.format(*sys.version_info),
             'site-packages',
         )
         sitedirs.append(home_sp)
@@ -1482,20 +1439,22 @@ def get_site_dirs():
     with contextlib.suppress(AttributeError):
         sitedirs.extend(site.getsitepackages())
 
-    return list(map(normalize_path, sitedirs))
+    sitedirs = list(map(normalize_path, sitedirs))
+
+    return sitedirs
 
 
 def expand_paths(inputs):  # noqa: C901  # is too complex (11)  # FIXME
     """Yield sys.path directories that might contain "old-style" packages"""
 
-    seen = set()
+    seen = {}
 
     for dirname in inputs:
         dirname = normalize_path(dirname)
         if dirname in seen:
             continue
 
-        seen.add(dirname)
+        seen[dirname] = 1
         if not os.path.isdir(dirname):
             continue
 
@@ -1511,8 +1470,9 @@ def expand_paths(inputs):  # noqa: C901  # is too complex (11)  # FIXME
                 continue
 
             # Read the .pth file
-            content = _read_pth(os.path.join(dirname, name))
-            lines = list(yield_lines(content))
+            f = open(os.path.join(dirname, name))
+            lines = list(yield_lines(f))
+            f.close()
 
             # Yield existing non-dupe, non-import directory lines from it
             for line in lines:
@@ -1523,7 +1483,7 @@ def expand_paths(inputs):  # noqa: C901  # is too complex (11)  # FIXME
                 if line in seen:
                     continue
 
-                seen.add(line)
+                seen[line] = 1
                 if not os.path.isdir(line):
                     continue
 
@@ -1546,7 +1506,7 @@ def extract_wininst_cfg(dist_filename):
             return None
         f.seek(prepended - 12)
 
-        tag, cfglen, _bmlen = struct.unpack(" None:
+    dirty = False
+
+    def __init__(self, filename, sitedirs=()):
         self.filename = filename
         self.sitedirs = list(map(normalize_path, sitedirs))
         self.basedir = normalize_path(os.path.dirname(self.filename))
-        self.paths, self.dirty = self._load()
-        # keep a copy if someone manually updates the paths attribute on the instance
-        self._init_paths = self.paths[:]
+        self._load()
         super().__init__([], None, None)
         for path in yield_lines(self.paths):
             list(map(self.add, find_distributions(path, True)))
 
-    def _load_raw(self):
-        paths = []
-        dirty = saw_import = False
-        seen = set(self.sitedirs)
-        content = _read_pth(self.filename)
-        for line in content.splitlines():
-            path = line.rstrip()
-            # still keep imports and empty/commented lines for formatting
-            paths.append(path)
-            if line.startswith(('import ', 'from ')):
-                saw_import = True
-                continue
-            stripped_path = path.strip()
-            if not stripped_path or stripped_path.startswith('#'):
-                continue
-            # skip non-existent paths, in case somebody deleted a package
-            # manually, and duplicate paths as well
-            normalized_path = normalize_path(os.path.join(self.basedir, path))
-            if normalized_path in seen or not os.path.exists(normalized_path):
-                log.debug("cleaned up dirty or duplicated %r", path)
-                dirty = True
-                paths.pop()
-                continue
-            seen.add(normalized_path)
-        # remove any trailing empty/blank line
-        while paths and not paths[-1].strip():
-            paths.pop()
-            dirty = True
-        return paths, dirty or (paths and saw_import)
-
     def _load(self):
+        self.paths = []
+        saw_import = False
+        seen = dict.fromkeys(self.sitedirs)
         if os.path.isfile(self.filename):
-            return self._load_raw()
-        return [], False
-
-    def save(self) -> None:
-        """Write changed .pth file back to disk"""
-        # first reload the file
-        last_paths, last_dirty = self._load()
-        # and check that there are no difference with what we have.
-        # there can be difference if someone else has written to the file
-        # since we first loaded it.
-        # we don't want to lose the eventual new paths added since then.
-        for path in last_paths[:]:
-            if path not in self.paths:
+            f = open(self.filename, 'rt')
+            for line in f:
+                if line.startswith('import'):
+                    saw_import = True
+                    continue
+                path = line.rstrip()
                 self.paths.append(path)
-                log.info("detected new path %r", path)
-                last_dirty = True
-            else:
-                last_paths.remove(path)
-        # also, re-check that all paths are still valid before saving them
-        for path in self.paths[:]:
-            if path not in last_paths and not path.startswith((
-                'import ',
-                'from ',
-                '#',
-            )):
-                absolute_path = os.path.join(self.basedir, path)
-                if not os.path.exists(absolute_path):
-                    self.paths.remove(path)
-                    log.info("removing now non-existent path %r", path)
-                    last_dirty = True
+                if not path.strip() or path.strip().startswith('#'):
+                    continue
+                # skip non-existent paths, in case somebody deleted a package
+                # manually, and duplicate paths as well
+                path = self.paths[-1] = normalize_path(
+                    os.path.join(self.basedir, path)
+                )
+                if not os.path.exists(path) or path in seen:
+                    self.paths.pop()  # skip it
+                    self.dirty = True  # we cleaned up, so we're dirty now :)
+                    continue
+                seen[path] = 1
+            f.close()
 
-        self.dirty |= last_dirty or self.paths != self._init_paths
+        if self.paths and not saw_import:
+            self.dirty = True  # ensure anything we touch has import wrappers
+        while self.paths and not self.paths[-1].strip():
+            self.paths.pop()
+
+    def save(self):
+        """Write changed .pth file back to disk"""
         if not self.dirty:
             return
 
@@ -1694,37 +1623,37 @@ class PthDistributions(Environment):
             log.debug("Saving %s", self.filename)
             lines = self._wrap_lines(rel_paths)
             data = '\n'.join(lines) + '\n'
+
             if os.path.islink(self.filename):
                 os.unlink(self.filename)
-            with open(self.filename, 'wt', encoding=py312.PTH_ENCODING) as f:
-                # ^-- Python<3.13 require encoding="locale" instead of "utf-8",
-                #     see python/cpython#77102.
+            with open(self.filename, 'wt') as f:
                 f.write(data)
+
         elif os.path.exists(self.filename):
             log.debug("Deleting empty %s", self.filename)
             os.unlink(self.filename)
 
         self.dirty = False
-        self._init_paths[:] = self.paths[:]
 
     @staticmethod
     def _wrap_lines(lines):
         return lines
 
-    def add(self, dist) -> None:
+    def add(self, dist):
         """Add `dist` to the distribution map"""
-        new_path = dist.location not in self.paths and (
-            dist.location not in self.sitedirs
-            or
-            # account for '.' being in PYTHONPATH
-            dist.location == os.getcwd()
+        new_path = (
+            dist.location not in self.paths and (
+                dist.location not in self.sitedirs or
+                # account for '.' being in PYTHONPATH
+                dist.location == os.getcwd()
+            )
         )
         if new_path:
             self.paths.append(dist.location)
             self.dirty = True
         super().add(dist)
 
-    def remove(self, dist) -> None:
+    def remove(self, dist):
         """Remove `dist` from the distribution map"""
         while dist.location in self.paths:
             self.paths.remove(dist.location)
@@ -1751,29 +1680,26 @@ class RewritePthDistributions(PthDistributions):
     @classmethod
     def _wrap_lines(cls, lines):
         yield cls.prelude
-        yield from lines
+        for line in lines:
+            yield line
         yield cls.postlude
 
-    prelude = _one_liner(
-        """
+    prelude = _one_liner("""
         import sys
         sys.__plen = len(sys.path)
-        """
-    )
-    postlude = _one_liner(
-        """
+        """)
+    postlude = _one_liner("""
         import sys
         new = sys.path[sys.__plen:]
         del sys.path[sys.__plen:]
         p = getattr(sys, '__egginsert', 0)
         sys.path[p:p] = new
         sys.__egginsert = p + len(new)
-        """
-    )
+        """)
 
 
 if os.environ.get('SETUPTOOLS_SYS_PATH_TECHNIQUE', 'raw') == 'rewrite':
-    PthDistributions = RewritePthDistributions  # type: ignore[misc]  # Overwriting type
+    PthDistributions = RewritePthDistributions
 
 
 def _first_line_re():
@@ -1788,6 +1714,15 @@ def _first_line_re():
     return re.compile(first_line_re.pattern.decode())
 
 
+def auto_chmod(func, arg, exc):
+    if func in [os.unlink, os.remove] and os.name == 'nt':
+        chmod(arg, stat.S_IWRITE)
+        return func(arg)
+    et, ev, _ = sys.exc_info()
+    # TODO: This code doesn't make sense. What is it trying to do?
+    raise (ev[0], ev[1] + (" %s %s" % (func, arg)))
+
+
 def update_dist_caches(dist_path, fix_zipimporter_caches):
     """
     Fix any globally cached `dist_path` related data
@@ -1884,10 +1819,8 @@ def _collect_zipimporter_cache_entries(normalized_path, cache):
     prefix_len = len(normalized_path)
     for p in cache:
         np = normalize_path(p)
-        if np.startswith(normalized_path) and np[prefix_len : prefix_len + 1] in (
-            os.sep,
-            '',
-        ):
+        if (np.startswith(normalized_path) and
+                np[prefix_len:prefix_len + 1] in (os.sep, '')):
             result.append(p)
     return result
 
@@ -1916,7 +1849,7 @@ def _update_zipimporter_cache(normalized_path, cache, updater=None):
         #    get/del patterns instead. For more detailed information see the
         #    following links:
         #      https://github.com/pypa/setuptools/issues/202#issuecomment-202913420
-        #      https://foss.heptapod.net/pypy/pypy/-/blob/144c4e65cb6accb8e592f3a7584ea38265d1873c/pypy/module/zipimport/interp_zipimport.py
+        #      http://bit.ly/2h9itJX
         old_entry = cache[p]
         del cache[p]
         new_entry = updater and updater(p, old_entry)
@@ -1933,10 +1866,8 @@ def _remove_and_clear_zip_directory_cache_data(normalized_path):
         old_entry.clear()
 
     _update_zipimporter_cache(
-        normalized_path,
-        zipimport._zip_directory_cache,
-        updater=clear_and_remove_cached_zip_archive_directory_data,
-    )
+        normalized_path, zipimport._zip_directory_cache,
+        updater=clear_and_remove_cached_zip_archive_directory_data)
 
 
 # PyPy Python implementation does not allow directly writing to the
@@ -1948,7 +1879,8 @@ def _remove_and_clear_zip_directory_cache_data(normalized_path):
 # instead of being automatically corrected to use the new correct zip archive
 # directory information.
 if '__pypy__' in sys.builtin_module_names:
-    _replace_zip_directory_cache_data = _remove_and_clear_zip_directory_cache_data
+    _replace_zip_directory_cache_data = \
+        _remove_and_clear_zip_directory_cache_data
 else:
 
     def _replace_zip_directory_cache_data(normalized_path):
@@ -1966,10 +1898,8 @@ else:
             return old_entry
 
         _update_zipimporter_cache(
-            normalized_path,
-            zipimport._zip_directory_cache,
-            updater=replace_cached_zip_archive_directory_data,
-        )
+            normalized_path, zipimport._zip_directory_cache,
+            updater=replace_cached_zip_archive_directory_data)
 
 
 def is_python(text, filename=''):
@@ -1985,9 +1915,9 @@ def is_python(text, filename=''):
 def is_sh(executable):
     """Determine if the specified executable is a .sh (contains a #! line)"""
     try:
-        with open(executable, encoding='latin-1') as fp:
+        with io.open(executable, encoding='latin-1') as fp:
             magic = fp.read(2)
-    except OSError:
+    except (OSError, IOError):
         return executable
     return magic == '#!'
 
@@ -1998,7 +1928,8 @@ def nt_quote_arg(arg):
 
 
 def is_python_script(script_text, filename):
-    """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc."""
+    """Is this text, as a whole, a Python script? (as opposed to shell/bat/etc.
+    """
     if filename.endswith('.py') or filename.endswith('.pyw'):
         return True  # extension says it's Python
     if is_python(script_text, filename):
@@ -2010,9 +1941,20 @@ def is_python_script(script_text, filename):
     return False  # Not any Python I can recognize
 
 
-class _SplitArgs(TypedDict, total=False):
-    comments: bool
-    posix: bool
+try:
+    from os import chmod as _chmod
+except ImportError:
+    # Jython compatibility
+    def _chmod(*args):
+        pass
+
+
+def chmod(path, mode):
+    log.debug("changing mode of %s to %o", path, mode)
+    try:
+        _chmod(path, mode)
+    except os.error as e:
+        log.debug("chmod failed: %s", e)
 
 
 class CommandSpec(list):
@@ -2021,8 +1963,8 @@ class CommandSpec(list):
     those passed to Popen.
     """
 
-    options: list[str] = []
-    split_args = _SplitArgs()
+    options = []
+    split_args = dict()
 
     @classmethod
     def best(cls):
@@ -2037,27 +1979,26 @@ class CommandSpec(list):
         return os.environ.get('__PYVENV_LAUNCHER__', _default)
 
     @classmethod
-    def from_param(cls, param: Self | str | Iterable[str] | None) -> Self:
+    def from_param(cls, param):
         """
         Construct a CommandSpec from a parameter to build_scripts, which may
         be None.
         """
         if isinstance(param, cls):
             return param
-        if isinstance(param, str):
-            return cls.from_string(param)
-        if isinstance(param, Iterable):
+        if isinstance(param, list):
             return cls(param)
         if param is None:
             return cls.from_environment()
-        raise TypeError(f"Argument has an unsupported type {type(param)}")
+        # otherwise, assume it's a string.
+        return cls.from_string(param)
 
     @classmethod
     def from_environment(cls):
         return cls([cls._sys_executable()])
 
     @classmethod
-    def from_string(cls, string: str) -> Self:
+    def from_string(cls, string):
         """
         Construct a command spec from a simple string representing a command
         line parseable by shlex.split.
@@ -2065,7 +2006,7 @@ class CommandSpec(list):
         items = shlex.split(string, **cls.split_args)
         return cls(items)
 
-    def install_options(self, script_text: str):
+    def install_options(self, script_text):
         self.options = shlex.split(self._extract_options(script_text))
         cmdline = subprocess.list2cmdline(self)
         if not isascii(cmdline):
@@ -2095,8 +2036,7 @@ class CommandSpec(list):
     @staticmethod
     def _render(items):
         cmdline = subprocess.list2cmdline(
-            CommandSpec._strip_quotes(item.strip()) for item in items
-        )
+            CommandSpec._strip_quotes(item.strip()) for item in items)
         return '#!' + cmdline + '\n'
 
 
@@ -2105,7 +2045,7 @@ sys_executable = CommandSpec._sys_executable()
 
 
 class WindowsCommandSpec(CommandSpec):
-    split_args = _SplitArgs(posix=False)
+    split_args = dict(posix=False)
 
 
 class ScriptWriter:
@@ -2114,8 +2054,7 @@ class ScriptWriter:
     gui apps.
     """
 
-    template = textwrap.dedent(
-        r"""
+    template = textwrap.dedent(r"""
         # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r
         import re
         import sys
@@ -2148,11 +2087,27 @@ class ScriptWriter:
         if __name__ == '__main__':
             sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
             sys.exit(load_entry_point(%(spec)r, %(group)r, %(name)r)())
-        """
-    ).lstrip()
+        """).lstrip()
 
     command_spec_class = CommandSpec
 
+    @classmethod
+    def get_script_args(cls, dist, executable=None, wininst=False):
+        # for backward compatibility
+        warnings.warn("Use get_args", EasyInstallDeprecationWarning)
+        writer = (WindowsScriptWriter if wininst else ScriptWriter).best()
+        header = cls.get_script_header("", executable, wininst)
+        return writer.get_args(dist, header)
+
+    @classmethod
+    def get_script_header(cls, script_text, executable=None, wininst=False):
+        # for backward compatibility
+        warnings.warn(
+            "Use get_header", EasyInstallDeprecationWarning, stacklevel=2)
+        if wininst:
+            executable = "python.exe"
+        return cls.get_header(script_text, executable)
+
     @classmethod
     def get_args(cls, dist, header=None):
         """
@@ -2164,11 +2119,12 @@ class ScriptWriter:
         spec = str(dist.as_requirement())
         for type_ in 'console', 'gui':
             group = type_ + '_scripts'
-            for name in dist.get_entry_map(group).keys():
+            for name, ep in dist.get_entry_map(group).items():
                 cls._ensure_safe_name(name)
                 script_text = cls.template % locals()
                 args = cls._get_script_args(type_, name, header, script_text)
-                yield from args
+                for res in args:
+                    yield res
 
     @staticmethod
     def _ensure_safe_name(name):
@@ -2179,6 +2135,12 @@ class ScriptWriter:
         if has_path_sep:
             raise ValueError("Path separators not allowed in script names")
 
+    @classmethod
+    def get_writer(cls, force_windows):
+        # for backward compatibility
+        warnings.warn("Use best", EasyInstallDeprecationWarning)
+        return WindowsScriptWriter.best() if force_windows else cls.best()
+
     @classmethod
     def best(cls):
         """
@@ -2195,11 +2157,7 @@ class ScriptWriter:
         yield (name, header + script_text)
 
     @classmethod
-    def get_header(
-        cls,
-        script_text: str = "",
-        executable: str | CommandSpec | Iterable[str] | None = None,
-    ) -> str:
+    def get_header(cls, script_text="", executable=None):
         """Create a #! line, getting options (if any) from script_text"""
         cmd = cls.command_spec_class.best().from_param(executable)
         cmd.install_options(script_text)
@@ -2209,6 +2167,12 @@ class ScriptWriter:
 class WindowsScriptWriter(ScriptWriter):
     command_spec_class = WindowsCommandSpec
 
+    @classmethod
+    def get_writer(cls):
+        # for backward compatibility
+        warnings.warn("Use best", EasyInstallDeprecationWarning)
+        return cls.best()
+
     @classmethod
     def best(cls):
         """
@@ -2231,7 +2195,7 @@ class WindowsScriptWriter(ScriptWriter):
                 "{ext} not listed in PATHEXT; scripts will not be "
                 "recognized as executables."
             ).format(**locals())
-            SetuptoolsWarning.emit(msg)
+            warnings.warn(msg, UserWarning)
         old = ['.pya', '.py', '-script.py', '.pyc', '.pyo', '.pyw', '.exe']
         old.remove(ext)
         header = cls._adjust_header(type_, header)
@@ -2262,7 +2226,7 @@ class WindowsScriptWriter(ScriptWriter):
         to an executable on the system.
         """
         clean_header = new_header[2:-1].strip('"')
-        return sys.platform != 'win32' or shutil.which(clean_header)
+        return sys.platform != 'win32' or find_executable(clean_header)
 
 
 class WindowsExecutableLauncherWriter(WindowsScriptWriter):
@@ -2283,9 +2247,8 @@ class WindowsExecutableLauncherWriter(WindowsScriptWriter):
         blockers = [name + x for x in old]
         yield (name + ext, hdr + script_text, 't', blockers)
         yield (
-            name + '.exe',
-            get_win_launcher(launcher_type),
-            'b',  # write in binary mode
+            name + '.exe', get_win_launcher(launcher_type),
+            'b'  # write in binary mode
         )
         if not is_64bit():
             # install a manifest for the launcher to prevent Windows
@@ -2297,6 +2260,11 @@ class WindowsExecutableLauncherWriter(WindowsScriptWriter):
             yield (m_name, load_launcher_manifest(name), 't')
 
 
+# for backward-compatibility
+get_script_args = ScriptWriter.get_script_args
+get_script_header = ScriptWriter.get_script_header
+
+
 def get_win_launcher(type):
     """
     Load the Windows launcher (executable) suitable for launching a script.
@@ -2305,7 +2273,7 @@ def get_win_launcher(type):
 
     Returns the executable as a byte string.
     """
-    launcher_fn = f'{type}.exe'
+    launcher_fn = '%s.exe' % type
     if is_64bit():
         if get_platform() == "win-arm64":
             launcher_fn = launcher_fn.replace(".", "-arm64.")
@@ -2321,6 +2289,10 @@ def load_launcher_manifest(name):
     return manifest.decode('utf-8') % vars()
 
 
+def rmtree(path, ignore_errors=False, onerror=auto_chmod):
+    return shutil.rmtree(path, ignore_errors, onerror)
+
+
 def current_umask():
     tmp = os.umask(0o022)
     os.umask(tmp)
@@ -2334,32 +2306,7 @@ def only_strs(values):
     return filter(lambda val: isinstance(val, str), values)
 
 
-def _read_pth(fullname: str) -> str:
-    # Python<3.13 require encoding="locale" instead of "utf-8", see python/cpython#77102
-    # In the case old versions of setuptools are producing `pth` files with
-    # different encodings that might be problematic... So we fallback to "locale".
-
-    try:
-        with open(fullname, encoding=py312.PTH_ENCODING) as f:
-            return f.read()
-    except UnicodeDecodeError:  # pragma: no cover
-        # This error may only happen for Python >= 3.13
-        # TODO: Possible deprecation warnings to be added in the future:
-        #       ``.pth file {fullname!r} is not UTF-8.``
-        #       Your environment contain {fullname!r} that cannot be read as UTF-8.
-        #       This is likely to have been produced with an old version of setuptools.
-        #       Please be mindful that this is deprecated and in the future, non-utf8
-        #       .pth files may cause setuptools to fail.
-        with open(fullname, encoding=py39.LOCALE_ENCODING) as f:
-            return f.read()
-
-
 class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
-    _SUMMARY = "easy_install command is deprecated."
-    _DETAILS = """
-    Please avoid running ``setup.py`` and ``easy_install``.
-    Instead, use pypa/build, pypa/installer or other
-    standards-based tools.
     """
-    _SEE_URL = "https://github.com/pypa/setuptools/issues/917"
-    # _DUE_DATE not defined yet
+    Warning for EasyInstall deprecations, bypassing suppression.
+    """
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/editable_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/editable_wheel.py
index 1a544ec..d60cfbe 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/editable_wheel.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/editable_wheel.py
@@ -10,42 +10,49 @@ Create a wheel that, when installed, will make the source package 'editable'
    *auxiliary build directory* or ``auxiliary_dir``.
 """
 
-from __future__ import annotations
-
-import io
 import logging
 import os
+import re
 import shutil
+import sys
 import traceback
-from collections.abc import Iterable, Iterator, Mapping
+import warnings
 from contextlib import suppress
 from enum import Enum
 from inspect import cleandoc
-from itertools import chain, starmap
+from itertools import chain
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from types import TracebackType
-from typing import TYPE_CHECKING, Protocol, TypeVar, cast
+from typing import (
+    TYPE_CHECKING,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    Optional,
+    Tuple,
+    TypeVar,
+    Union,
+)
 
-from .. import Command, _normalization, _path, _shutil, errors, namespaces
-from .._path import StrPath
-from ..compat import py312
-from ..discovery import find_package_path
-from ..dist import Distribution
-from ..warnings import InformationOnly, SetuptoolsDeprecationWarning, SetuptoolsWarning
-from .build import build as build_cls
-from .build_py import build_py as build_py_cls
-from .dist_info import dist_info as dist_info_cls
-from .egg_info import egg_info as egg_info_cls
-from .install import install as install_cls
-from .install_scripts import install_scripts as install_scripts_cls
+from setuptools import Command, SetuptoolsDeprecationWarning, errors, namespaces
+from setuptools.command.build_py import build_py as build_py_cls
+from setuptools.discovery import find_package_path
+from setuptools.dist import Distribution
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
+    from wheel.wheelfile import WheelFile  # noqa
 
-    from .._vendor.wheel.wheelfile import WheelFile
+if sys.version_info >= (3, 8):
+    from typing import Protocol
+elif TYPE_CHECKING:
+    from typing_extensions import Protocol
+else:
+    from abc import ABC as Protocol
 
-_P = TypeVar("_P", bound=StrPath)
+_Path = Union[str, Path]
+_P = TypeVar("_P", bound=_Path)
 _logger = logging.getLogger(__name__)
 
 
@@ -62,7 +69,7 @@ class _EditableMode(Enum):
     COMPAT = "compat"  # TODO: Remove `compat` after Dec/2022.
 
     @classmethod
-    def convert(cls, mode: str | None) -> _EditableMode:
+    def convert(cls, mode: Optional[str]) -> "_EditableMode":
         if not mode:
             return _EditableMode.LENIENT  # default
 
@@ -71,21 +78,16 @@ class _EditableMode(Enum):
             raise errors.OptionError(f"Invalid editable mode: {mode!r}. Try: 'strict'.")
 
         if _mode == "COMPAT":
-            SetuptoolsDeprecationWarning.emit(
-                "Compat editable installs",
-                """
-                The 'compat' editable mode is transitional and will be removed
-                in future versions of `setuptools`.
-                Please adapt your code accordingly to use either the 'strict' or the
-                'lenient' modes.
-                """,
-                see_docs="userguide/development_mode.html",
-                # TODO: define due_date
-                # There is a series of shortcomings with the available editable install
-                # methods, and they are very controversial. This is something that still
-                # needs work.
-                # Moreover, `pip` is still hiding this warning, so users are not aware.
-            )
+            msg = """
+            The 'compat' editable mode is transitional and will be removed
+            in future versions of `setuptools`.
+            Please adapt your code accordingly to use either the 'strict' or the
+            'lenient' modes.
+
+            For more information, please check:
+            https://setuptools.pypa.io/en/latest/userguide/development_mode.html
+            """
+            warnings.warn(msg, SetuptoolsDeprecationWarning)
 
         return _EditableMode[_mode]
 
@@ -102,11 +104,10 @@ Options like `package-data`, `include/exclude-package-data` or
 
 class editable_wheel(Command):
     """Build 'editable' wheel for development.
-    This command is private and reserved for internal use of setuptools,
-    users should rely on ``setuptools.build_meta`` APIs.
+    (This command is reserved for internal use of setuptools).
     """
 
-    description = "DO NOT CALL DIRECTLY, INTERNAL ONLY: create PEP 660 editable wheel"
+    description = "create a PEP 660 'editable' wheel"
 
     user_options = [
         ("dist-dir=", "d", "directory to put final built distributions in"),
@@ -120,13 +121,13 @@ class editable_wheel(Command):
         self.project_dir = None
         self.mode = None
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         dist = self.distribution
         self.project_dir = dist.src_root or os.curdir
         self.package_dir = dist.package_dir or {}
         self.dist_dir = Path(self.dist_dir or os.path.join(self.project_dir, "dist"))
 
-    def run(self) -> None:
+    def run(self):
         try:
             self.dist_dir.mkdir(exist_ok=True)
             self._ensure_dist_info()
@@ -137,15 +138,24 @@ class editable_wheel(Command):
             bdist_wheel.write_wheelfile(self.dist_info_dir)
 
             self._create_wheel_file(bdist_wheel)
-        except Exception:
+        except Exception as ex:
             traceback.print_exc()
-            project = self.distribution.name or self.distribution.get_name()
-            _DebuggingTips.emit(project=project)
-            raise
+            msg = """
+            Support for editable installs via PEP 660 was recently introduced
+            in `setuptools`. If you are seeing this error, please report to:
+
+            https://github.com/pypa/setuptools/issues
+
+            Meanwhile you can try the legacy behavior by setting an
+            environment variable and trying to install again:
+
+            SETUPTOOLS_ENABLE_FEATURES="legacy-editable"
+            """
+            raise errors.InternalError(cleandoc(msg)) from ex
 
     def _ensure_dist_info(self):
         if self.dist_info_dir is None:
-            dist_info = cast(dist_info_cls, self.reinitialize_command("dist_info"))
+            dist_info = self.reinitialize_command("dist_info")
             dist_info.output_dir = self.dist_dir
             dist_info.ensure_finalized()
             dist_info.run()
@@ -164,13 +174,13 @@ class editable_wheel(Command):
         installer = _NamespaceInstaller(dist, installation_dir, pth_prefix, src_root)
         installer.install_namespaces()
 
-    def _find_egg_info_dir(self) -> str | None:
+    def _find_egg_info_dir(self) -> Optional[str]:
         parent_dir = Path(self.dist_info_dir).parent if self.dist_info_dir else Path()
         candidates = map(str, parent_dir.glob("*.egg-info"))
         return next(candidates, None)
 
     def _configure_build(
-        self, name: str, unpacked_wheel: StrPath, build_lib: StrPath, tmp_dir: StrPath
+        self, name: str, unpacked_wheel: _Path, build_lib: _Path, tmp_dir: _Path
     ):
         """Configure commands to behave in the following ways:
 
@@ -192,18 +202,12 @@ class editable_wheel(Command):
         scripts = str(Path(unpacked_wheel, f"{name}.data", "scripts"))
 
         # egg-info may be generated again to create a manifest (used for package data)
-        egg_info = cast(
-            egg_info_cls, dist.reinitialize_command("egg_info", reinit_subcommands=True)
-        )
+        egg_info = dist.reinitialize_command("egg_info", reinit_subcommands=True)
         egg_info.egg_base = str(tmp_dir)
         egg_info.ignore_egg_info_in_manifest = True
 
-        build = cast(
-            build_cls, dist.reinitialize_command("build", reinit_subcommands=True)
-        )
-        install = cast(
-            install_cls, dist.reinitialize_command("install", reinit_subcommands=True)
-        )
+        build = dist.reinitialize_command("build", reinit_subcommands=True)
+        install = dist.reinitialize_command("install", reinit_subcommands=True)
 
         build.build_platlib = build.build_purelib = build.build_lib = build_lib
         install.install_purelib = install.install_platlib = install.install_lib = wheel
@@ -211,14 +215,12 @@ class editable_wheel(Command):
         install.install_headers = headers
         install.install_data = data
 
-        install_scripts = cast(
-            install_scripts_cls, dist.get_command_obj("install_scripts")
-        )
+        install_scripts = dist.get_command_obj("install_scripts")
         install_scripts.no_ep = True
 
         build.build_temp = str(tmp_dir)
 
-        build_py = cast(build_py_cls, dist.get_command_obj("build_py"))
+        build_py = dist.get_command_obj("build_py")
         build_py.compile = False
         build_py.existing_egg_info_dir = self._find_egg_info_dir()
 
@@ -238,9 +240,9 @@ class editable_wheel(Command):
             elif hasattr(cmd, "inplace"):
                 cmd.inplace = True  # backward compatibility with distutils
 
-    def _collect_build_outputs(self) -> tuple[list[str], dict[str, str]]:
-        files: list[str] = []
-        mapping: dict[str, str] = {}
+    def _collect_build_outputs(self) -> Tuple[List[str], Dict[str, str]]:
+        files: List[str] = []
+        mapping: Dict[str, str] = {}
         build = self.get_finalized_command("build")
 
         for cmd_name in build.get_sub_commands():
@@ -253,12 +255,8 @@ class editable_wheel(Command):
         return files, mapping
 
     def _run_build_commands(
-        self,
-        dist_name: str,
-        unpacked_wheel: StrPath,
-        build_lib: StrPath,
-        tmp_dir: StrPath,
-    ) -> tuple[list[str], dict[str, str]]:
+        self, dist_name: str, unpacked_wheel: _Path, build_lib: _Path, tmp_dir: _Path
+    ) -> Tuple[List[str], Dict[str, str]]:
         self._configure_build(dist_name, unpacked_wheel, build_lib, tmp_dir)
         self._run_build_subcommands()
         files, mapping = self._collect_build_outputs()
@@ -267,7 +265,7 @@ class editable_wheel(Command):
         self._run_install("data")
         return files, mapping
 
-    def _run_build_subcommands(self) -> None:
+    def _run_build_subcommands(self):
         """
         Issue #3501 indicates that some plugins/customizations might rely on:
 
@@ -278,13 +276,13 @@ class editable_wheel(Command):
         This method implements a temporary workaround to support the ecosystem
         while the implementations catch up.
         """
-        # TODO: Once plugins/customizations had the chance to catch up, replace
+        # TODO: Once plugins/customisations had the chance to catch up, replace
         #       `self._run_build_subcommands()` with `self.run_command("build")`.
         #       Also remove _safely_run, TestCustomBuildPy. Suggested date: Aug/2023.
-        build = self.get_finalized_command("build")
+        build: Command = self.get_finalized_command("build")
         for name in build.get_sub_commands():
             cmd = self.get_finalized_command(name)
-            if name == "build_py" and type(cmd) is not build_py_cls:
+            if name == "build_py" and type(cmd) != build_py_cls:
                 self._safely_run(name)
             else:
                 self.run_command(name)
@@ -293,29 +291,21 @@ class editable_wheel(Command):
         try:
             return self.run_command(cmd_name)
         except Exception:
-            SetuptoolsDeprecationWarning.emit(
-                "Customization incompatible with editable install",
-                f"""
-                {traceback.format_exc()}
+            msg = f"""{traceback.format_exc()}\n
+            If you are seeing this warning it is very likely that a setuptools
+            plugin or customization overrides the `{cmd_name}` command, without
+            taking into consideration how editable installs run build steps
+            starting from v64.0.0.
 
-                If you are seeing this warning it is very likely that a setuptools
-                plugin or customization overrides the `{cmd_name}` command, without
-                taking into consideration how editable installs run build steps
-                starting from setuptools v64.0.0.
+            Plugin authors and developers relying on custom build steps are encouraged
+            to update their `{cmd_name}` implementation considering the information in
+            https://setuptools.pypa.io/en/latest/userguide/extension.html
+            about editable installs.
 
-                Plugin authors and developers relying on custom build steps are
-                encouraged to update their `{cmd_name}` implementation considering the
-                information about editable installs in
-                https://setuptools.pypa.io/en/latest/userguide/extension.html.
-
-                For the time being `setuptools` will silence this error and ignore
-                the faulty command, but this behavior will change in future versions.
-                """,
-                # TODO: define due_date
-                # There is a series of shortcomings with the available editable install
-                # methods, and they are very controversial. This is something that still
-                # needs work.
-            )
+            For the time being `setuptools` will silence this error and ignore
+            the faulty command, but this behaviour will change in future versions.\n
+            """
+            warnings.warn(msg, SetuptoolsDeprecationWarning, stacklevel=2)
 
     def _create_wheel_file(self, bdist_wheel):
         from wheel.wheelfile import WheelFile
@@ -336,7 +326,7 @@ class editable_wheel(Command):
         with unpacked_wheel as unpacked, build_lib as lib, build_tmp as tmp:
             unpacked_dist_info = Path(unpacked, Path(self.dist_info_dir).name)
             shutil.copytree(self.dist_info_dir, unpacked_dist_info)
-            self._install_namespaces(unpacked, dist_name)
+            self._install_namespaces(unpacked, dist_info.name)
             files, mapping = self._run_build_commands(dist_name, unpacked, lib, tmp)
             strategy = self._select_strategy(dist_name, tag, lib)
             with strategy, WheelFile(wheel_path, "w") as wheel_obj:
@@ -355,8 +345,8 @@ class editable_wheel(Command):
         self,
         name: str,
         tag: str,
-        build_lib: StrPath,
-    ) -> EditableStrategy:
+        build_lib: _Path,
+    ) -> "EditableStrategy":
         """Decides which strategy to use to implement an editable installation."""
         build_name = f"__editable__.{name}-{tag}"
         project_dir = Path(self.project_dir)
@@ -379,30 +369,28 @@ class editable_wheel(Command):
 
 
 class EditableStrategy(Protocol):
-    def __call__(
-        self, wheel: WheelFile, files: list[str], mapping: Mapping[str, str]
-    ) -> object: ...
-    def __enter__(self) -> Self: ...
-    def __exit__(
-        self,
-        _exc_type: type[BaseException] | None,
-        _exc_value: BaseException | None,
-        _traceback: TracebackType | None,
-    ) -> object: ...
+    def __call__(self, wheel: "WheelFile", files: List[str], mapping: Dict[str, str]):
+        ...
+
+    def __enter__(self):
+        ...
+
+    def __exit__(self, _exc_type, _exc_value, _traceback):
+        ...
 
 
 class _StaticPth:
-    def __init__(self, dist: Distribution, name: str, path_entries: list[Path]) -> None:
+    def __init__(self, dist: Distribution, name: str, path_entries: List[Path]):
         self.dist = dist
         self.name = name
         self.path_entries = path_entries
 
-    def __call__(self, wheel: WheelFile, files: list[str], mapping: Mapping[str, str]):
-        entries = "\n".join(str(p.resolve()) for p in self.path_entries)
-        contents = _encode_pth(f"{entries}\n")
+    def __call__(self, wheel: "WheelFile", files: List[str], mapping: Dict[str, str]):
+        entries = "\n".join((str(p.resolve()) for p in self.path_entries))
+        contents = bytes(f"{entries}\n", "utf-8")
         wheel.writestr(f"__editable__.{self.name}.pth", contents)
 
-    def __enter__(self) -> Self:
+    def __enter__(self):
         msg = f"""
         Editable install will be performed using .pth file to extend `sys.path` with:
         {list(map(os.fspath, self.path_entries))!r}
@@ -410,13 +398,8 @@ class _StaticPth:
         _logger.warning(msg + _LENIENT_WARNING)
         return self
 
-    def __exit__(
-        self,
-        _exc_type: object,
-        _exc_value: object,
-        _traceback: object,
-    ) -> None:
-        pass
+    def __exit__(self, _exc_type, _exc_value, _traceback):
+        ...
 
 
 class _LinkTree(_StaticPth):
@@ -429,24 +412,22 @@ class _LinkTree(_StaticPth):
     By collocating ``auxiliary_dir`` and the original source code, limitations
     with hardlinks should be avoided.
     """
-
     def __init__(
-        self,
-        dist: Distribution,
+        self, dist: Distribution,
         name: str,
-        auxiliary_dir: StrPath,
-        build_lib: StrPath,
-    ) -> None:
+        auxiliary_dir: _Path,
+        build_lib: _Path,
+    ):
         self.auxiliary_dir = Path(auxiliary_dir)
         self.build_lib = Path(build_lib).resolve()
         self._file = dist.get_command_obj("build_py").copy_file
         super().__init__(dist, name, [self.auxiliary_dir])
 
-    def __call__(self, wheel: WheelFile, files: list[str], mapping: Mapping[str, str]):
+    def __call__(self, wheel: "WheelFile", files: List[str], mapping: Dict[str, str]):
         self._create_links(files, mapping)
         super().__call__(wheel, files, mapping)
 
-    def _normalize_output(self, file: str) -> str | None:
+    def _normalize_output(self, file: str) -> Optional[str]:
         # Files relative to build_lib will be normalized to None
         with suppress(ValueError):
             path = Path(file).resolve().relative_to(self.build_lib)
@@ -459,12 +440,14 @@ class _LinkTree(_StaticPth):
             dest.parent.mkdir(parents=True)
         self._file(src_file, dest, link=link)
 
-    def _create_links(self, outputs, output_mapping: Mapping[str, str]):
+    def _create_links(self, outputs, output_mapping):
         self.auxiliary_dir.mkdir(parents=True, exist_ok=True)
         link_type = "sym" if _can_symlink_files(self.auxiliary_dir) else "hard"
-        normalised = ((self._normalize_output(k), v) for k, v in output_mapping.items())
-        # remove files that are not relative to build_lib
-        mappings = {k: v for k, v in normalised if k is not None}
+        mappings = {
+            self._normalize_output(k): v
+            for k, v in output_mapping.items()
+        }
+        mappings.pop(None, None)  # remove files that are not relative to build_lib
 
         for output in outputs:
             relative = self._normalize_output(output)
@@ -474,17 +457,12 @@ class _LinkTree(_StaticPth):
         for relative, src in mappings.items():
             self._create_file(relative, src, link=link_type)
 
-    def __enter__(self) -> Self:
+    def __enter__(self):
         msg = "Strict editable install will be performed using a link tree.\n"
         _logger.warning(msg + _STRICT_WARNING)
         return self
 
-    def __exit__(
-        self,
-        _exc_type: object,
-        _exc_value: object,
-        _traceback: object,
-    ) -> None:
+    def __exit__(self, _exc_type, _exc_value, _traceback):
         msg = f"""\n
         Strict editable installation performed using the auxiliary directory:
             {self.auxiliary_dir}
@@ -492,91 +470,44 @@ class _LinkTree(_StaticPth):
         Please be careful to not remove this directory, otherwise you might not be able
         to import/use your package.
         """
-        InformationOnly.emit("Editable installation.", msg)
+        warnings.warn(msg, InformationOnly)
 
 
 class _TopLevelFinder:
-    def __init__(self, dist: Distribution, name: str) -> None:
+    def __init__(self, dist: Distribution, name: str):
         self.dist = dist
         self.name = name
 
-    def template_vars(self) -> tuple[str, str, dict[str, str], dict[str, list[str]]]:
+    def __call__(self, wheel: "WheelFile", files: List[str], mapping: Dict[str, str]):
         src_root = self.dist.src_root or os.curdir
         top_level = chain(_find_packages(self.dist), _find_top_level_modules(self.dist))
         package_dir = self.dist.package_dir or {}
         roots = _find_package_roots(top_level, package_dir, src_root)
 
-        namespaces_ = dict(
-            chain(
-                _find_namespaces(self.dist.packages or [], roots),
-                ((ns, []) for ns in _find_virtual_namespaces(roots)),
-            )
-        )
-
-        legacy_namespaces = {
-            pkg: find_package_path(pkg, roots, self.dist.src_root or "")
-            for pkg in self.dist.namespace_packages or []
-        }
-
-        mapping = {**roots, **legacy_namespaces}
-        # ^-- We need to explicitly add the legacy_namespaces to the mapping to be
-        #     able to import their modules even if another package sharing the same
-        #     namespace is installed in a conventional (non-editable) way.
+        namespaces_: Dict[str, List[str]] = dict(chain(
+            _find_namespaces(self.dist.packages or [], roots),
+            ((ns, []) for ns in _find_virtual_namespaces(roots)),
+        ))
 
         name = f"__editable__.{self.name}.finder"
-        finder = _normalization.safe_identifier(name)
-        return finder, name, mapping, namespaces_
+        finder = _make_identifier(name)
+        content = bytes(_finder_template(name, roots, namespaces_), "utf-8")
+        wheel.writestr(f"{finder}.py", content)
 
-    def get_implementation(self) -> Iterator[tuple[str, bytes]]:
-        finder, name, mapping, namespaces_ = self.template_vars()
+        content = bytes(f"import {finder}; {finder}.install()", "utf-8")
+        wheel.writestr(f"__editable__.{self.name}.pth", content)
 
-        content = bytes(_finder_template(name, mapping, namespaces_), "utf-8")
-        yield (f"{finder}.py", content)
-
-        content = _encode_pth(f"import {finder}; {finder}.install()")
-        yield (f"__editable__.{self.name}.pth", content)
-
-    def __call__(self, wheel: WheelFile, files: list[str], mapping: Mapping[str, str]):
-        for file, content in self.get_implementation():
-            wheel.writestr(file, content)
-
-    def __enter__(self) -> Self:
+    def __enter__(self):
         msg = "Editable install will be performed using a meta path finder.\n"
         _logger.warning(msg + _LENIENT_WARNING)
         return self
 
-    def __exit__(
-        self,
-        _exc_type: object,
-        _exc_value: object,
-        _traceback: object,
-    ) -> None:
+    def __exit__(self, _exc_type, _exc_value, _traceback):
         msg = """\n
         Please be careful with folders in your working directory with the same
         name as your package as they may take precedence during imports.
         """
-        InformationOnly.emit("Editable installation.", msg)
-
-
-def _encode_pth(content: str) -> bytes:
-    """
-    Prior to Python 3.13 (see https://github.com/python/cpython/issues/77102),
-    .pth files are always read with 'locale' encoding, the recommendation
-    from the cpython core developers is to write them as ``open(path, "w")``
-    and ignore warnings (see python/cpython#77102, pypa/setuptools#3937).
-    This function tries to simulate this behavior without having to create an
-    actual file, in a way that supports a range of active Python versions.
-    (There seems to be some variety in the way different version of Python handle
-    ``encoding=None``, not all of them use ``locale.getpreferredencoding(False)``
-    or ``locale.getencoding()``).
-    """
-    with io.BytesIO() as buffer:
-        wrapper = io.TextIOWrapper(buffer, encoding=py312.PTH_ENCODING)
-        # TODO: Python 3.13 replace the whole function with `bytes(content, "utf-8")`
-        wrapper.write(content)
-        wrapper.flush()
-        buffer.seek(0)
-        return buffer.read()
+        warnings.warn(msg, InformationOnly)
 
 
 def _can_symlink_files(base_dir: Path) -> bool:
@@ -600,7 +531,7 @@ def _can_symlink_files(base_dir: Path) -> bool:
 
 
 def _simple_layout(
-    packages: Iterable[str], package_dir: dict[str, str], project_dir: StrPath
+    packages: Iterable[str], package_dir: Dict[str, str], project_dir: Path
 ) -> bool:
     """Return ``True`` if:
     - all packages are contained by the same parent directory, **and**
@@ -630,12 +561,15 @@ def _simple_layout(
     >>> _simple_layout([], {"a": "_a", "": "src"}, "/tmp/myproj")
     False
     """
-    layout = {pkg: find_package_path(pkg, package_dir, project_dir) for pkg in packages}
+    layout = {
+        pkg: find_package_path(pkg, package_dir, project_dir)
+        for pkg in packages
+    }
     if not layout:
         return set(package_dir) in ({}, {""})
-    parent = os.path.commonpath(starmap(_parent_path, layout.items()))
+    parent = os.path.commonpath([_parent_path(k, v) for k, v in layout.items()])
     return all(
-        _path.same_path(Path(parent, *key.split('.')), value)
+        _normalize_path(Path(parent, *key.split('.'))) == _normalize_path(value)
         for key, value in layout.items()
     )
 
@@ -650,7 +584,7 @@ def _parent_path(pkg, pkg_path):
     >>> _parent_path("b", "src/c")
     'src/c'
     """
-    parent = pkg_path[: -len(pkg)] if pkg_path.endswith(pkg) else pkg_path
+    parent = pkg_path[:-len(pkg)] if pkg_path.endswith(pkg) else pkg_path
     return parent.rstrip("/" + os.sep)
 
 
@@ -682,9 +616,9 @@ def _find_top_level_modules(dist: Distribution) -> Iterator[str]:
 def _find_package_roots(
     packages: Iterable[str],
     package_dir: Mapping[str, str],
-    src_root: StrPath,
-) -> dict[str, str]:
-    pkg_roots: dict[str, str] = {
+    src_root: _Path,
+) -> Dict[str, str]:
+    pkg_roots: Dict[str, str] = {
         pkg: _absolute_root(find_package_path(pkg, package_dir, src_root))
         for pkg in sorted(packages)
     }
@@ -692,7 +626,7 @@ def _find_package_roots(
     return _remove_nested(pkg_roots)
 
 
-def _absolute_root(path: StrPath) -> str:
+def _absolute_root(path: _Path) -> str:
     """Works for packages and top-level modules"""
     path_ = Path(path)
     parent = path_.parent
@@ -703,7 +637,7 @@ def _absolute_root(path: StrPath) -> str:
         return str(parent.resolve() / path_.name)
 
 
-def _find_virtual_namespaces(pkg_roots: dict[str, str]) -> Iterator[str]:
+def _find_virtual_namespaces(pkg_roots: Dict[str, str]) -> Iterator[str]:
     """By carefully designing ``package_dir``, it is possible to implement the logical
     structure of PEP 420 in a package without the corresponding directories.
 
@@ -728,15 +662,15 @@ def _find_virtual_namespaces(pkg_roots: dict[str, str]) -> Iterator[str]:
 
 
 def _find_namespaces(
-    packages: list[str], pkg_roots: dict[str, str]
-) -> Iterator[tuple[str, list[str]]]:
+    packages: List[str], pkg_roots: Dict[str, str]
+) -> Iterator[Tuple[str, List[str]]]:
     for pkg in packages:
         path = find_package_path(pkg, pkg_roots, "")
         if Path(path).exists() and not Path(path, "__init__.py").exists():
             yield (pkg, [path])
 
 
-def _remove_nested(pkg_roots: dict[str, str]) -> dict[str, str]:
+def _remove_nested(pkg_roots: Dict[str, str]) -> Dict[str, str]:
     output = dict(pkg_roots.copy())
 
     for pkg, path in reversed(list(pkg_roots.items())):
@@ -764,32 +698,52 @@ def _is_nested(pkg: str, pkg_path: str, parent: str, parent_path: str) -> bool:
     >>> _is_nested("b.a", "path/b/a", "a", "path/a")
     False
     """
-    norm_pkg_path = _path.normpath(pkg_path)
+    norm_pkg_path = _normalize_path(pkg_path)
     rest = pkg.replace(parent, "", 1).strip(".").split(".")
-    return pkg.startswith(parent) and norm_pkg_path == _path.normpath(
-        Path(parent_path, *rest)
+    return (
+        pkg.startswith(parent)
+        and norm_pkg_path == _normalize_path(Path(parent_path, *rest))
     )
 
 
+def _normalize_path(filename: _Path) -> str:
+    """Normalize a file/dir name for comparison purposes"""
+    # See pkg_resources.normalize_path
+    file = os.path.abspath(filename) if sys.platform == 'cygwin' else filename
+    return os.path.normcase(os.path.realpath(os.path.normpath(file)))
+
+
 def _empty_dir(dir_: _P) -> _P:
     """Create a directory ensured to be empty. Existing files may be removed."""
-    _shutil.rmtree(dir_, ignore_errors=True)
+    shutil.rmtree(dir_, ignore_errors=True)
     os.makedirs(dir_)
     return dir_
 
 
+def _make_identifier(name: str) -> str:
+    """Make a string safe to be used as Python identifier.
+    >>> _make_identifier("12abc")
+    '_12abc'
+    >>> _make_identifier("__editable__.myns.pkg-78.9.3_local")
+    '__editable___myns_pkg_78_9_3_local'
+    """
+    safe = re.sub(r'\W|^(?=\d)', '_', name)
+    assert safe.isidentifier()
+    return safe
+
+
 class _NamespaceInstaller(namespaces.Installer):
-    def __init__(self, distribution, installation_dir, editable_name, src_root) -> None:
+    def __init__(self, distribution, installation_dir, editable_name, src_root):
         self.distribution = distribution
         self.src_root = src_root
         self.installation_dir = installation_dir
         self.editable_name = editable_name
-        self.outputs: list[str] = []
+        self.outputs = []
         self.dry_run = False
 
-    def _get_nspkg_file(self):
+    def _get_target(self):
         """Installation target."""
-        return os.path.join(self.installation_dir, self.editable_name + self.nspkg_ext)
+        return os.path.join(self.installation_dir, self.editable_name)
 
     def _get_root(self):
         """Where the modules/packages should be loaded from."""
@@ -797,68 +751,51 @@ class _NamespaceInstaller(namespaces.Installer):
 
 
 _FINDER_TEMPLATE = """\
-from __future__ import annotations
 import sys
-from importlib.machinery import ModuleSpec, PathFinder
+from importlib.machinery import ModuleSpec
 from importlib.machinery import all_suffixes as module_suffixes
 from importlib.util import spec_from_file_location
 from itertools import chain
 from pathlib import Path
 
-MAPPING: dict[str, str] = {mapping!r}
-NAMESPACES: dict[str, list[str]] = {namespaces!r}
+MAPPING = {mapping!r}
+NAMESPACES = {namespaces!r}
 PATH_PLACEHOLDER = {name!r} + ".__path_hook__"
 
 
 class _EditableFinder:  # MetaPathFinder
     @classmethod
-    def find_spec(cls, fullname: str, path=None, target=None) -> ModuleSpec | None:  # type: ignore
-        # Top-level packages and modules (we know these exist in the FS)
-        if fullname in MAPPING:
-            pkg_path = MAPPING[fullname]
-            return cls._find_spec(fullname, Path(pkg_path))
+    def find_spec(cls, fullname, path=None, target=None):
+        for pkg, pkg_path in reversed(list(MAPPING.items())):
+            if fullname == pkg or fullname.startswith(f"{{pkg}}."):
+                rest = fullname.replace(pkg, "", 1).strip(".").split(".")
+                return cls._find_spec(fullname, Path(pkg_path, *rest))
 
-        # Handle immediate children modules (required for namespaces to work)
-        # To avoid problems with case sensitivity in the file system we delegate
-        # to the importlib.machinery implementation.
-        parent, _, child = fullname.rpartition(".")
-        if parent and parent in MAPPING:
-            return PathFinder.find_spec(fullname, path=[MAPPING[parent]])
-
-        # Other levels of nesting should be handled automatically by importlib
-        # using the parent path.
         return None
 
     @classmethod
-    def _find_spec(cls, fullname: str, candidate_path: Path) -> ModuleSpec | None:
+    def _find_spec(cls, fullname, candidate_path):
         init = candidate_path / "__init__.py"
         candidates = (candidate_path.with_suffix(x) for x in module_suffixes())
         for candidate in chain([init], candidates):
             if candidate.exists():
                 return spec_from_file_location(fullname, candidate)
-        return None
 
 
 class _EditableNamespaceFinder:  # PathEntryFinder
     @classmethod
-    def _path_hook(cls, path) -> type[_EditableNamespaceFinder]:
+    def _path_hook(cls, path):
         if path == PATH_PLACEHOLDER:
             return cls
         raise ImportError
 
     @classmethod
-    def _paths(cls, fullname: str) -> list[str]:
-        paths = NAMESPACES[fullname]
-        if not paths and fullname in MAPPING:
-            paths = [MAPPING[fullname]]
-        # Always add placeholder, for 2 reasons:
-        # 1. __path__ cannot be empty for the spec to be considered namespace.
-        # 2. In the case of nested namespaces, we need to force
-        #    import machinery to query _EditableNamespaceFinder again.
-        return [*paths, PATH_PLACEHOLDER]
+    def _paths(cls, fullname):
+        # Ensure __path__ is not empty for the spec to be considered a namespace.
+        return NAMESPACES[fullname] or MAPPING.get(fullname) or [PATH_PLACEHOLDER]
 
     @classmethod
-    def find_spec(cls, fullname: str, target=None) -> ModuleSpec | None:  # type: ignore
+    def find_spec(cls, fullname, target=None):
         if fullname in NAMESPACES:
             spec = ModuleSpec(fullname, None, is_package=True)
             spec.submodule_search_locations = cls._paths(fullname)
@@ -866,7 +803,7 @@ class _EditableNamespaceFinder:  # PathEntryFinder
         return None
 
     @classmethod
-    def find_module(cls, _fullname) -> None:
+    def find_module(cls, fullname):
         return None
 
 
@@ -886,7 +823,7 @@ def install():
 
 
 def _finder_template(
-    name: str, mapping: Mapping[str, str], namespaces: dict[str, list[str]]
+    name: str, mapping: Mapping[str, str], namespaces: Dict[str, List[str]]
 ) -> str:
     """Create a string containing the code for the``MetaPathFinder`` and
     ``PathEntryFinder``.
@@ -895,31 +832,13 @@ def _finder_template(
     return _FINDER_TEMPLATE.format(name=name, mapping=mapping, namespaces=namespaces)
 
 
+class InformationOnly(UserWarning):
+    """Currently there is no clear way of displaying messages to the users
+    that use the setuptools backend directly via ``pip``.
+    The only thing that might work is a warning, although it is not the
+    most appropriate tool for the job...
+    """
+
+
 class LinksNotSupported(errors.FileError):
     """File system does not seem to support either symlinks or hard links."""
-
-
-class _DebuggingTips(SetuptoolsWarning):
-    _SUMMARY = "Problem in editable installation."
-    _DETAILS = """
-    An error happened while installing `{project}` in editable mode.
-
-    The following steps are recommended to help debug this problem:
-
-    - Try to install the project normally, without using the editable mode.
-      Does the error still persist?
-      (If it does, try fixing the problem before attempting the editable mode).
-    - If you are using binary extensions, make sure you have all OS-level
-      dependencies installed (e.g. compilers, toolchains, binary libraries, ...).
-    - Try the latest version of setuptools (maybe the error was already fixed).
-    - If you (or your project dependencies) are using any setuptools extension
-      or customization, make sure they support the editable mode.
-
-    After following the steps above, if the problem still persists and
-    you think this is related to how setuptools handles editable installations,
-    please submit a reproducible example
-    (see https://stackoverflow.com/help/minimal-reproducible-example) to:
-
-        https://github.com/pypa/setuptools/issues
-    """
-    _SEE_DOCS = "userguide/development_mode.html"
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/egg_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/egg_info.py
index f776311..25888ed 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/egg_info.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/egg_info.py
@@ -2,37 +2,38 @@
 
 Create a distribution's .egg-info directory and contents"""
 
+from distutils.filelist import FileList as _FileList
+from distutils.errors import DistutilsInternalError
+from distutils.util import convert_path
+from distutils import log
+import distutils.errors
+import distutils.filelist
 import functools
 import os
 import re
 import sys
+import io
+import warnings
 import time
-from collections.abc import Callable
+import collections
 
-import packaging
-import packaging.requirements
-import packaging.version
+from .._importlib import metadata
+from .. import _entry_points
 
-import setuptools.unicode_utils as unicode_utils
 from setuptools import Command
-from setuptools.command import bdist_egg
-from setuptools.command.sdist import sdist, walk_revctrl
+from setuptools.command.sdist import sdist
+from setuptools.command.sdist import walk_revctrl
 from setuptools.command.setopt import edit_config
+from setuptools.command import bdist_egg
+from pkg_resources import (
+    Requirement, safe_name, parse_version,
+    safe_version, to_filename)
+import setuptools.unicode_utils as unicode_utils
 from setuptools.glob import glob
 
-from .. import _entry_points, _normalization
-from .._importlib import metadata
-from ..warnings import SetuptoolsDeprecationWarning
-from . import _requirestxt
-
-import distutils.errors
-import distutils.filelist
-from distutils import log
-from distutils.errors import DistutilsInternalError
-from distutils.filelist import FileList as _FileList
-from distutils.util import convert_path
-
-PY_MAJOR = f'{sys.version_info.major}.{sys.version_info.minor}'
+from setuptools.extern import packaging
+from setuptools.extern.jaraco.text import yield_lines
+from setuptools import SetuptoolsDeprecationWarning
 
 
 def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
@@ -48,7 +49,7 @@ def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
     chunks = glob.split(os.path.sep)
 
     sep = re.escape(os.sep)
-    valid_char = f'[^{sep}]'
+    valid_char = '[^%s]' % (sep,)
 
     for c, chunk in enumerate(chunks):
         last_chunk = c == len(chunks) - 1
@@ -60,7 +61,7 @@ def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
                 pat += '.*'
             else:
                 # Match '(name/)*'
-                pat += f'(?:{valid_char}+{sep})*'
+                pat += '(?:%s+%s)*' % (valid_char, sep)
             continue  # Break here as the whole path component has been handled
 
         # Find any special characters in the remainder
@@ -93,7 +94,7 @@ def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
                     pat += re.escape(char)
                 else:
                     # Grab the insides of the [brackets]
-                    inner = chunk[i + 1 : inner_i]
+                    inner = chunk[i + 1:inner_i]
                     char_class = ''
 
                     # Class negation
@@ -102,7 +103,7 @@ def translate_pattern(glob):  # noqa: C901  # is too complex (14)  # FIXME
                         inner = inner[1:]
 
                     char_class += re.escape(inner)
-                    pat += f'[{char_class}]'
+                    pat += '[%s]' % (char_class,)
 
                     # Skip to the end ]
                     i = inner_i
@@ -124,11 +125,10 @@ class InfoCommon:
 
     @property
     def name(self):
-        return _normalization.safe_name(self.distribution.get_name())
+        return safe_name(self.distribution.get_name())
 
     def tagged_version(self):
-        tagged = self._maybe_tag(self.distribution.get_version())
-        return _normalization.safe_version(tagged)
+        return safe_version(self._maybe_tag(self.distribution.get_version()))
 
     def _maybe_tag(self, version):
         """
@@ -136,8 +136,7 @@ class InfoCommon:
         in which case the version string already contains all tags.
         """
         return (
-            version
-            if self.vtags and self._already_tagged(version)
+            version if self.vtags and self._already_tagged(version)
             else version + self.vtags
         )
 
@@ -149,19 +148,15 @@ class InfoCommon:
     def _safe_tags(self) -> str:
         # To implement this we can rely on `safe_version` pretending to be version 0
         # followed by tags. Then we simply discard the starting 0 (fake version number)
-        try:
-            return _normalization.safe_version(f"0{self.vtags}")[1:]
-        except packaging.version.InvalidVersion:
-            return _normalization.safe_name(self.vtags.replace(' ', '.'))
+        return safe_version(f"0{self.vtags}")[1:]
 
     def tags(self) -> str:
         version = ''
         if self.tag_build:
             version += self.tag_build
         if self.tag_date:
-            version += time.strftime("%Y%m%d")
+            version += time.strftime("-%Y%m%d")
         return version
-
     vtags = property(tags)
 
 
@@ -169,12 +164,8 @@ class egg_info(InfoCommon, Command):
     description = "create a distribution's .egg-info directory"
 
     user_options = [
-        (
-            'egg-base=',
-            'e',
-            "directory containing .egg-info directories"
-            " [default: top of the source tree]",
-        ),
+        ('egg-base=', 'e', "directory containing .egg-info directories"
+                           " (default: top of the source tree)"),
         ('tag-date', 'd', "Add date stamp (e.g. 20050528) to version number"),
         ('tag-build=', 'b', "Specify explicit tag to add to version number"),
         ('no-date', 'D', "Don't include date stamp [default]"),
@@ -190,48 +181,51 @@ class egg_info(InfoCommon, Command):
         self.egg_name = None
         self.egg_info = None
         self.egg_version = None
+        self.broken_egg_info = False
         self.ignore_egg_info_in_manifest = False
 
     ####################################
     # allow the 'tag_svn_revision' to be detected and
     # set, supporting sdists built on older Setuptools.
     @property
-    def tag_svn_revision(self) -> None:
+    def tag_svn_revision(self):
         pass
 
     @tag_svn_revision.setter
     def tag_svn_revision(self, value):
         pass
-
     ####################################
 
-    def save_version_info(self, filename) -> None:
+    def save_version_info(self, filename):
         """
         Materialize the value of date into the
         build tag. Install build keys in a deterministic order
         to avoid arbitrary reordering on subsequent builds.
         """
+        egg_info = collections.OrderedDict()
         # follow the order these keys would have been added
         # when PYTHONHASHSEED=0
-        egg_info = dict(tag_build=self.tags(), tag_date=0)
+        egg_info['tag_build'] = self.tags()
+        egg_info['tag_date'] = 0
         edit_config(filename, dict(egg_info=egg_info))
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         # Note: we need to capture the current value returned
         # by `self.tagged_version()`, so we can later update
         # `self.distribution.metadata.version` without
         # repercussions.
         self.egg_name = self.name
         self.egg_version = self.tagged_version()
-        parsed_version = packaging.version.Version(self.egg_version)
+        parsed_version = parse_version(self.egg_version)
 
         try:
             is_version = isinstance(parsed_version, packaging.version.Version)
             spec = "%s==%s" if is_version else "%s===%s"
-            packaging.requirements.Requirement(spec % (self.egg_name, self.egg_version))
+            Requirement(spec % (self.egg_name, self.egg_version))
         except ValueError as e:
             raise distutils.errors.DistutilsOptionError(
-                f"Invalid distribution name or version syntax: {self.egg_name}-{self.egg_version}"
+                "Invalid distribution name or version syntax: %s-%s" %
+                (self.egg_name, self.egg_version)
             ) from e
 
         if self.egg_base is None:
@@ -239,20 +233,28 @@ class egg_info(InfoCommon, Command):
             self.egg_base = (dirs or {}).get('', os.curdir)
 
         self.ensure_dirname('egg_base')
-        self.egg_info = _normalization.filename_component(self.egg_name) + '.egg-info'
+        self.egg_info = to_filename(self.egg_name) + '.egg-info'
         if self.egg_base != os.curdir:
             self.egg_info = os.path.join(self.egg_base, self.egg_info)
+        if '-' in self.egg_name:
+            self.check_broken_egg_info()
 
         # Set package version for the benefit of dumber commands
         # (e.g. sdist, bdist_wininst, etc.)
         #
         self.distribution.metadata.version = self.egg_version
 
-    def _get_egg_basename(self, py_version=PY_MAJOR, platform=None):
-        """Compute filename of the output egg. Private API."""
-        return _egg_basename(self.egg_name, self.egg_version, py_version, platform)
+        # If we bootstrapped around the lack of a PKG-INFO, as might be the
+        # case in a fresh checkout, make sure that any special tags get added
+        # to the version info
+        #
+        pd = self.distribution._patched_dist
+        if pd is not None and pd.key == self.egg_name.lower():
+            pd._version = self.egg_version
+            pd._parsed_version = parse_version(self.egg_version)
+            self.distribution._patched_dist = None
 
-    def write_or_delete_file(self, what, filename, data, force: bool = False) -> None:
+    def write_or_delete_file(self, what, filename, data, force=False):
         """Write `data` to `filename` or delete if empty
 
         If `data` is non-empty, this routine is the same as ``write_file()``.
@@ -265,12 +267,14 @@ class egg_info(InfoCommon, Command):
             self.write_file(what, filename, data)
         elif os.path.exists(filename):
             if data is None and not force:
-                log.warn("%s not set in setup(), but %s exists", what, filename)
+                log.warn(
+                    "%s not set in setup(), but %s exists", what, filename
+                )
                 return
             else:
                 self.delete_file(filename)
 
-    def write_file(self, what, filename, data) -> None:
+    def write_file(self, what, filename, data):
         """Write `data` to `filename` (if not a dry run) after announcing it
 
         `what` is used in a log message to identify what is being written
@@ -283,24 +287,16 @@ class egg_info(InfoCommon, Command):
             f.write(data)
             f.close()
 
-    def delete_file(self, filename) -> None:
+    def delete_file(self, filename):
         """Delete `filename` (if not a dry run) after announcing it"""
         log.info("deleting %s", filename)
         if not self.dry_run:
             os.unlink(filename)
 
-    def run(self) -> None:
-        # Pre-load to avoid iterating over entry-points while an empty .egg-info
-        # exists in sys.path. See pypa/pyproject-hooks#206
-        writers = list(metadata.entry_points(group='egg_info.writers'))
-
+    def run(self):
         self.mkpath(self.egg_info)
-        try:
-            os.utime(self.egg_info, None)
-        except OSError as e:
-            msg = f"Cannot update time stamp of directory '{self.egg_info}'"
-            raise distutils.errors.DistutilsFileError(msg) from e
-        for ep in writers:
+        os.utime(self.egg_info, None)
+        for ep in metadata.entry_points(group='egg_info.writers'):
             writer = ep.load()
             writer(self, ep.name, os.path.join(self.egg_info, ep.name))
 
@@ -311,7 +307,7 @@ class egg_info(InfoCommon, Command):
 
         self.find_sources()
 
-    def find_sources(self) -> None:
+    def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info, "SOURCES.txt")
         mm = manifest_maker(self.distribution)
@@ -320,17 +316,30 @@ class egg_info(InfoCommon, Command):
         mm.run()
         self.filelist = mm.filelist
 
+    def check_broken_egg_info(self):
+        bei = self.egg_name + '.egg-info'
+        if self.egg_base != os.curdir:
+            bei = os.path.join(self.egg_base, bei)
+        if os.path.exists(bei):
+            log.warn(
+                "-" * 78 + '\n'
+                "Note: Your current .egg-info directory has a '-' in its name;"
+                '\nthis will not work correctly with "setup.py develop".\n\n'
+                'Please rename %s to %s to correct this problem.\n' + '-' * 78,
+                bei, self.egg_info
+            )
+            self.broken_egg_info = self.egg_info
+            self.egg_info = bei  # make it work for now
+
 
 class FileList(_FileList):
     # Implementations of the various MANIFEST.in commands
 
-    def __init__(
-        self, warn=None, debug_print=None, ignore_egg_info_dir: bool = False
-    ) -> None:
+    def __init__(self, warn=None, debug_print=None, ignore_egg_info_dir=False):
         super().__init__(warn, debug_print)
         self.ignore_egg_info_dir = ignore_egg_info_dir
 
-    def process_template_line(self, line) -> None:
+    def process_template_line(self, line):
         # Parse the line: split it up, make sure the right number of words
         # is there, and return the relevant words.  'action' is always
         # defined: it's the first word of the line.  Which of the other
@@ -338,34 +347,37 @@ class FileList(_FileList):
         # patterns, (dir and patterns), or (dir_pattern).
         (action, patterns, dir, dir_pattern) = self._parse_template_line(line)
 
-        action_map: dict[str, Callable] = {
+        action_map = {
             'include': self.include,
             'exclude': self.exclude,
             'global-include': self.global_include,
             'global-exclude': self.global_exclude,
             'recursive-include': functools.partial(
-                self.recursive_include,
-                dir,
+                self.recursive_include, dir,
             ),
             'recursive-exclude': functools.partial(
-                self.recursive_exclude,
-                dir,
+                self.recursive_exclude, dir,
             ),
             'graft': self.graft,
             'prune': self.prune,
         }
         log_map = {
             'include': "warning: no files found matching '%s'",
-            'exclude': ("warning: no previously-included files found matching '%s'"),
+            'exclude': (
+                "warning: no previously-included files found "
+                "matching '%s'"
+            ),
             'global-include': (
-                "warning: no files found matching '%s' anywhere in distribution"
+                "warning: no files found matching '%s' "
+                "anywhere in distribution"
             ),
             'global-exclude': (
                 "warning: no previously-included files matching "
                 "'%s' found anywhere in distribution"
             ),
             'recursive-include': (
-                "warning: no files found matching '%s' under directory '%s'"
+                "warning: no files found matching '%s' "
+                "under directory '%s'"
             ),
             'recursive-exclude': (
                 "warning: no previously-included files matching "
@@ -378,8 +390,10 @@ class FileList(_FileList):
         try:
             process_action = action_map[action]
         except KeyError:
-            msg = f"Invalid MANIFEST.in: unknown action {action!r} in {line!r}"
-            raise DistutilsInternalError(msg) from None
+            raise DistutilsInternalError(
+                "this cannot happen: invalid action '{action!s}'".
+                format(action=action),
+            )
 
         # OK, now we know that the action is valid and we have the
         # right number of words on the line for that action -- so we
@@ -388,12 +402,14 @@ class FileList(_FileList):
         action_is_recursive = action.startswith('recursive-')
         if action in {'graft', 'prune'}:
             patterns = [dir_pattern]
-        extra_log_args = (dir,) if action_is_recursive else ()
+        extra_log_args = (dir, ) if action_is_recursive else ()
         log_tmpl = log_map[action]
 
         self.debug_print(
             ' '.join(
-                [action] + ([dir] if action_is_recursive else []) + patterns,
+                [action] +
+                ([dir] if action_is_recursive else []) +
+                patterns,
             )
         )
         for pattern in patterns:
@@ -429,7 +445,8 @@ class FileList(_FileList):
         Include all files anywhere in 'dir/' that match the pattern.
         """
         full_pattern = os.path.join(dir, '**', pattern)
-        found = [f for f in glob(full_pattern, recursive=True) if not os.path.isdir(f)]
+        found = [f for f in glob(full_pattern, recursive=True)
+                 if not os.path.isdir(f)]
         self.extend(found)
         return bool(found)
 
@@ -474,7 +491,7 @@ class FileList(_FileList):
         match = translate_pattern(os.path.join('**', pattern))
         return self._remove_files(match.match)
 
-    def append(self, item) -> None:
+    def append(self, item):
         if item.endswith('\r'):  # Fix older sdists built on Windows
             item = item[:-1]
         path = convert_path(item)
@@ -482,7 +499,7 @@ class FileList(_FileList):
         if self._safe_path(path):
             self.files.append(path)
 
-    def extend(self, paths) -> None:
+    def extend(self, paths):
         self.files.extend(filter(self._safe_path, paths))
 
     def _repair(self):
@@ -501,7 +518,7 @@ class FileList(_FileList):
         # To avoid accidental trans-codings errors, first to unicode
         u_path = unicode_utils.filesys_decode(path)
         if u_path is None:
-            log.warn(f"'{path}' in unexpected encoding -- skipping")
+            log.warn("'%s' in unexpected encoding -- skipping" % path)
             return False
 
         # Must ensure utf-8 encodability
@@ -526,17 +543,17 @@ class FileList(_FileList):
 class manifest_maker(sdist):
     template = "MANIFEST.in"
 
-    def initialize_options(self) -> None:
-        self.use_defaults = True
-        self.prune = True
-        self.manifest_only = True
-        self.force_manifest = True
+    def initialize_options(self):
+        self.use_defaults = 1
+        self.prune = 1
+        self.manifest_only = 1
+        self.force_manifest = 1
         self.ignore_egg_info_dir = False
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         pass
 
-    def run(self) -> None:
+    def run(self):
         self.filelist = FileList(ignore_egg_info_dir=self.ignore_egg_info_dir)
         if not os.path.exists(self.manifest):
             self.write_manifest()  # it must exist so it'll get in the list
@@ -544,7 +561,6 @@ class manifest_maker(sdist):
         if os.path.exists(self.template):
             self.read_template()
         self.add_license_files()
-        self._add_referenced_files()
         self.prune_file_list()
         self.filelist.sort()
         self.filelist.remove_duplicates()
@@ -554,7 +570,7 @@ class manifest_maker(sdist):
         path = unicode_utils.filesys_decode(path)
         return path.replace(os.sep, '/')
 
-    def write_manifest(self) -> None:
+    def write_manifest(self):
         """
         Write the file list in 'self.filelist' to the manifest file
         named by 'self.manifest'.
@@ -563,10 +579,10 @@ class manifest_maker(sdist):
 
         # Now _repairs should encodability, but not unicode
         files = [self._manifest_normalize(f) for f in self.filelist.files]
-        msg = f"writing manifest file '{self.manifest}'"
+        msg = "writing manifest file '%s'" % self.manifest
         self.execute(write_file, (self.manifest, files), msg)
 
-    def warn(self, msg) -> None:
+    def warn(self, msg):
         if not self._should_suppress_warning(msg):
             sdist.warn(self, msg)
 
@@ -577,7 +593,7 @@ class manifest_maker(sdist):
         """
         return re.match(r"standard file .*not found", msg)
 
-    def add_defaults(self) -> None:
+    def add_defaults(self):
         sdist.add_defaults(self)
         self.filelist.append(self.template)
         self.filelist.append(self.manifest)
@@ -595,19 +611,21 @@ class manifest_maker(sdist):
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 
-    def add_license_files(self) -> None:
+    def add_license_files(self):
         license_files = self.distribution.metadata.license_files or []
         for lf in license_files:
             log.info("adding license file '%s'", lf)
+            pass
         self.filelist.extend(license_files)
 
-    def _add_referenced_files(self):
-        """Add files referenced by the config (e.g. `file:` directive) to filelist"""
-        referenced = getattr(self.distribution, '_referenced_files', [])
-        # ^-- fallback if dist comes from distutils or is a custom class
-        for rf in referenced:
-            log.debug("adding file referenced by config '%s'", rf)
-        self.filelist.extend(referenced)
+    def prune_file_list(self):
+        build = self.get_finalized_command('build')
+        base_dir = self.distribution.get_fullname()
+        self.filelist.prune(build.build_base)
+        self.filelist.prune(base_dir)
+        sep = re.escape(os.sep)
+        self.filelist.exclude_pattern(r'(^|' + sep + r')(RCS|CVS|\.svn)' + sep,
+                                      is_regex=1)
 
     def _safe_data_files(self, build_py):
         """
@@ -622,19 +640,16 @@ class manifest_maker(sdist):
         if hasattr(build_py, 'get_data_files_without_manifest'):
             return build_py.get_data_files_without_manifest()
 
-        SetuptoolsDeprecationWarning.emit(
-            "`build_py` command does not inherit from setuptools' `build_py`.",
-            """
-            Custom 'build_py' does not implement 'get_data_files_without_manifest'.
-            Please extend command classes from setuptools instead of distutils.
-            """,
-            see_url="https://peps.python.org/pep-0632/",
-            # due_date not defined yet, old projects might still do it?
+        warnings.warn(
+            "Custom 'build_py' does not implement "
+            "'get_data_files_without_manifest'.\nPlease extend command classes"
+            " from setuptools instead of distutils.",
+            SetuptoolsDeprecationWarning
         )
         return build_py.get_data_files()
 
 
-def write_file(filename, contents) -> None:
+def write_file(filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
@@ -647,7 +662,7 @@ def write_file(filename, contents) -> None:
         f.write(contents)
 
 
-def write_pkg_info(cmd, basename, filename) -> None:
+def write_pkg_info(cmd, basename, filename):
     log.info("writing %s", filename)
     if not cmd.dry_run:
         metadata = cmd.distribution.metadata
@@ -666,33 +681,55 @@ def write_pkg_info(cmd, basename, filename) -> None:
         bdist_egg.write_safety_flag(cmd.egg_info, safe)
 
 
-def warn_depends_obsolete(cmd, basename, filename) -> None:
-    """
-    Unused: left to avoid errors when updating (from source) from <= 67.8.
-    Old installations have a .dist-info directory with the entry-point
-    ``depends.txt = setuptools.command.egg_info:warn_depends_obsolete``.
-    This may trigger errors when running the first egg_info in build_meta.
-    TODO: Remove this function in a version sufficiently > 68.
-    """
+def warn_depends_obsolete(cmd, basename, filename):
+    if os.path.exists(filename):
+        log.warn(
+            "WARNING: 'depends.txt' is not used by setuptools 0.6!\n"
+            "Use the install_requires/extras_require setup() args instead."
+        )
 
 
-# Export API used in entry_points
-write_requirements = _requirestxt.write_requirements
-write_setup_requirements = _requirestxt.write_setup_requirements
+def _write_requirements(stream, reqs):
+    lines = yield_lines(reqs or ())
+
+    def append_cr(line):
+        return line + '\n'
+    lines = map(append_cr, lines)
+    stream.writelines(lines)
 
 
-def write_toplevel_names(cmd, basename, filename) -> None:
-    pkgs = dict.fromkeys([
-        k.split('.', 1)[0] for k in cmd.distribution.iter_distribution_names()
-    ])
+def write_requirements(cmd, basename, filename):
+    dist = cmd.distribution
+    data = io.StringIO()
+    _write_requirements(data, dist.install_requires)
+    extras_require = dist.extras_require or {}
+    for extra in sorted(extras_require):
+        data.write('\n[{extra}]\n'.format(**vars()))
+        _write_requirements(data, extras_require[extra])
+    cmd.write_or_delete_file("requirements", filename, data.getvalue())
+
+
+def write_setup_requirements(cmd, basename, filename):
+    data = io.StringIO()
+    _write_requirements(data, cmd.distribution.setup_requires)
+    cmd.write_or_delete_file("setup-requirements", filename, data.getvalue())
+
+
+def write_toplevel_names(cmd, basename, filename):
+    pkgs = dict.fromkeys(
+        [
+            k.split('.', 1)[0]
+            for k in cmd.distribution.iter_distribution_names()
+        ]
+    )
     cmd.write_file("top-level names", filename, '\n'.join(sorted(pkgs)) + '\n')
 
 
-def overwrite_arg(cmd, basename, filename) -> None:
+def overwrite_arg(cmd, basename, filename):
     write_arg(cmd, basename, filename, True)
 
 
-def write_arg(cmd, basename, filename, force: bool = False) -> None:
+def write_arg(cmd, basename, filename, force=False):
     argname = os.path.splitext(basename)[0]
     value = getattr(cmd.distribution, argname, None)
     if value is not None:
@@ -700,20 +737,26 @@ def write_arg(cmd, basename, filename, force: bool = False) -> None:
     cmd.write_or_delete_file(argname, filename, value, force)
 
 
-def write_entries(cmd, basename, filename) -> None:
+def write_entries(cmd, basename, filename):
     eps = _entry_points.load(cmd.distribution.entry_points)
     defn = _entry_points.render(eps)
     cmd.write_or_delete_file('entry points', filename, defn, True)
 
 
-def _egg_basename(egg_name, egg_version, py_version=None, platform=None):
-    """Compute filename of the output egg. Private API."""
-    name = _normalization.filename_component(egg_name)
-    version = _normalization.filename_component(egg_version)
-    egg = f"{name}-{version}-py{py_version or PY_MAJOR}"
-    if platform:
-        egg += f"-{platform}"
-    return egg
+def get_pkg_info_revision():
+    """
+    Get a -r### off of PKG-INFO Version in case this is an sdist of
+    a subversion revision.
+    """
+    warnings.warn(
+        "get_pkg_info_revision is deprecated.", EggInfoDeprecationWarning)
+    if os.path.exists('PKG-INFO'):
+        with io.open('PKG-INFO') as f:
+            for line in f:
+                match = re.match(r"Version:.*-r(\d+)\s*$", line)
+                if match:
+                    return int(match.group(1))
+    return 0
 
 
 class EggInfoDeprecationWarning(SetuptoolsDeprecationWarning):
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/install.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/install.py
index 15ef364..55fdb12 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/install.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/install.py
@@ -1,89 +1,55 @@
-from __future__ import annotations
-
-import glob
+from distutils.errors import DistutilsArgError
 import inspect
+import glob
+import warnings
 import platform
-from collections.abc import Callable
-from typing import TYPE_CHECKING, Any, ClassVar, cast
+import distutils.command.install as orig
 
 import setuptools
 
-from ..dist import Distribution
-from ..warnings import SetuptoolsDeprecationWarning, SetuptoolsWarning
-from .bdist_egg import bdist_egg as bdist_egg_cls
-
-import distutils.command.install as orig
-from distutils.errors import DistutilsArgError
-
-if TYPE_CHECKING:
-    # This is only used for a type-cast, don't import at runtime or it'll cause deprecation warnings
-    from .easy_install import easy_install as easy_install_cls
-else:
-    easy_install_cls = None
-
-
-def __getattr__(name: str):  # pragma: no cover
-    if name == "_install":
-        SetuptoolsDeprecationWarning.emit(
-            "`setuptools.command._install` was an internal implementation detail "
-            + "that was left in for numpy<1.9 support.",
-            due_date=(2025, 5, 2),  # Originally added on 2024-11-01
-        )
-        return orig.install
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+# Prior to numpy 1.9, NumPy relies on the '_install' name, so provide it for
+# now. See https://github.com/pypa/setuptools/issues/199/
+_install = orig.install
 
 
 class install(orig.install):
     """Use easy_install to install the package, w/dependencies"""
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
     user_options = orig.install.user_options + [
         ('old-and-unmanageable', None, "Try not to use this!"),
-        (
-            'single-version-externally-managed',
-            None,
-            "used by system package builders to create 'flat' eggs",
-        ),
+        ('single-version-externally-managed', None,
+         "used by system package builders to create 'flat' eggs"),
     ]
     boolean_options = orig.install.boolean_options + [
-        'old-and-unmanageable',
-        'single-version-externally-managed',
+        'old-and-unmanageable', 'single-version-externally-managed',
     ]
-    # Type the same as distutils.command.install.install.sub_commands
-    # Must keep the second tuple item potentially None due to invariance
-    new_commands: ClassVar[list[tuple[str, Callable[[Any], bool] | None]]] = [
+    new_commands = [
         ('install_egg_info', lambda self: True),
         ('install_scripts', lambda self: True),
     ]
     _nc = dict(new_commands)
 
     def initialize_options(self):
-        SetuptoolsDeprecationWarning.emit(
-            "setup.py install is deprecated.",
-            """
-            Please avoid running ``setup.py`` directly.
-            Instead, use pypa/build, pypa/installer or other
-            standards-based tools.
-            """,
-            see_url="https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html",
-            # TODO: Document how to bootstrap setuptools without install
-            #       (e.g. by unzipping the wheel file)
-            #       and then add a due_date to this warning.
+
+        warnings.warn(
+            "setup.py install is deprecated. "
+            "Use build and pip and other standards-based tools.",
+            setuptools.SetuptoolsDeprecationWarning,
         )
 
-        super().initialize_options()
+        orig.install.initialize_options(self)
         self.old_and_unmanageable = None
         self.single_version_externally_managed = None
 
-    def finalize_options(self) -> None:
-        super().finalize_options()
+    def finalize_options(self):
+        orig.install.finalize_options(self)
         if self.root:
             self.single_version_externally_managed = True
         elif self.single_version_externally_managed:
             if not self.root and not self.record:
                 raise DistutilsArgError(
-                    "You must specify --record or --root when building system packages"
+                    "You must specify --record or --root when building system"
+                    " packages"
                 )
 
     def handle_extra_path(self):
@@ -95,21 +61,18 @@ class install(orig.install):
         # command without --root or --single-version-externally-managed
         self.path_file = None
         self.extra_dirs = ''
-        return None
 
     def run(self):
         # Explicit request for old-style install?  Just do it
         if self.old_and_unmanageable or self.single_version_externally_managed:
-            return super().run()
+            return orig.install.run(self)
 
         if not self._called_from_setup(inspect.currentframe()):
             # Run in backward-compatibility mode to support bdist_* commands.
-            super().run()
+            orig.install.run(self)
         else:
             self.do_egg_install()
 
-        return None
-
     @staticmethod
     def _called_from_setup(run_frame):
         """
@@ -123,15 +86,15 @@ class install(orig.install):
         """
         if run_frame is None:
             msg = "Call stack not available. bdist_* commands may fail."
-            SetuptoolsWarning.emit(msg)
+            warnings.warn(msg)
             if platform.python_implementation() == 'IronPython':
                 msg = "For best results, pass -X:Frames to enable call stack."
-                SetuptoolsWarning.emit(msg)
+                warnings.warn(msg)
             return True
 
         frames = inspect.getouterframes(run_frame)
         for frame in frames[2:4]:
-            (caller,) = frame[:1]
+            caller, = frame[:1]
             info = inspect.getframeinfo(caller)
             caller_module = caller.f_globals.get('__name__', '')
 
@@ -139,24 +102,17 @@ class install(orig.install):
                 # Starting from v61.0.0 setuptools overwrites dist.run_command
                 continue
 
-            return caller_module == 'distutils.dist' and info.function == 'run_commands'
+            return (
+                caller_module == 'distutils.dist'
+                and info.function == 'run_commands'
+            )
 
-        return False
+    def do_egg_install(self):
 
-    def do_egg_install(self) -> None:
         easy_install = self.distribution.get_command_class('easy_install')
 
-        cmd = cast(
-            # We'd want to cast easy_install as type[easy_install_cls] but a bug in
-            # mypy makes it think easy_install() returns a Command on Python 3.12+
-            # https://github.com/python/mypy/issues/18088
-            easy_install_cls,
-            easy_install(  # type: ignore[call-arg]
-                self.distribution,
-                args="x",
-                root=self.root,
-                record=self.record,
-            ),
+        cmd = easy_install(
+            self.distribution, args="x", root=self.root, record=self.record,
         )
         cmd.ensure_finalized()  # finalize before bdist_egg munges install cmd
         cmd.always_copy_from = '.'  # make sure local-dir eggs get installed
@@ -165,8 +121,7 @@ class install(orig.install):
         cmd.package_index.scan(glob.glob('*.egg'))
 
         self.run_command('bdist_egg')
-        bdist_egg = cast(bdist_egg_cls, self.distribution.get_command_obj('bdist_egg'))
-        args = [bdist_egg.egg_output]
+        args = [self.distribution.get_command_obj('bdist_egg').egg_output]
 
         if setuptools.bootstrap_install_from:
             # Bootstrap self-installation of setuptools
@@ -178,6 +133,7 @@ class install(orig.install):
 
 
 # XXX Python 3.1 doesn't see _nc if this is inside the class
-install.sub_commands = [
-    cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc
-] + install.new_commands
+install.sub_commands = (
+    [cmd for cmd in orig.install.sub_commands if cmd[0] not in install._nc] +
+    install.new_commands
+)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_egg_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_egg_info.py
index 44f22cc..65ede40 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_egg_info.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_egg_info.py
@@ -1,11 +1,11 @@
+from distutils import log, dir_util
 import os
 
-from setuptools import Command, namespaces
+from setuptools import Command
+from setuptools import namespaces
 from setuptools.archive_util import unpack_archive
-
 from .._path import ensure_directory
-
-from distutils import dir_util, log
+import pkg_resources
 
 
 class install_egg_info(namespaces.Installer, Command):
@@ -20,15 +20,18 @@ class install_egg_info(namespaces.Installer, Command):
     def initialize_options(self):
         self.install_dir = None
 
-    def finalize_options(self) -> None:
-        self.set_undefined_options('install_lib', ('install_dir', 'install_dir'))
+    def finalize_options(self):
+        self.set_undefined_options('install_lib',
+                                   ('install_dir', 'install_dir'))
         ei_cmd = self.get_finalized_command("egg_info")
-        basename = f"{ei_cmd._get_egg_basename()}.egg-info"
+        basename = pkg_resources.Distribution(
+            None, None, ei_cmd.egg_name, ei_cmd.egg_version
+        ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs: list[str] = []
+        self.outputs = []
 
-    def run(self) -> None:
+    def run(self):
         self.run_command('egg_info')
         if os.path.isdir(self.target) and not os.path.islink(self.target):
             dir_util.remove_tree(self.target, dry_run=self.dry_run)
@@ -36,13 +39,15 @@ class install_egg_info(namespaces.Installer, Command):
             self.execute(os.unlink, (self.target,), "Removing " + self.target)
         if not self.dry_run:
             ensure_directory(self.target)
-        self.execute(self.copytree, (), f"Copying {self.source} to {self.target}")
+        self.execute(
+            self.copytree, (), "Copying %s to %s" % (self.source, self.target)
+        )
         self.install_namespaces()
 
     def get_outputs(self):
         return self.outputs
 
-    def copytree(self) -> None:
+    def copytree(self):
         # Copy the .egg-info tree to site-packages
         def skimmer(src, dst):
             # filter out source-control directories; note that 'src' is always
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_lib.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_lib.py
index 8e1e072..2e9d875 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_lib.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_lib.py
@@ -1,21 +1,13 @@
-from __future__ import annotations
-
 import os
 import sys
 from itertools import product, starmap
-
-from .._path import StrPath
-from ..dist import Distribution
-
 import distutils.command.install_lib as orig
 
 
 class install_lib(orig.install_lib):
     """Don't add compiled flags to filenames of non-Python files"""
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
-    def run(self) -> None:
+    def run(self):
         self.build()
         outfiles = self.install()
         if outfiles is not None:
@@ -52,7 +44,7 @@ class install_lib(orig.install_lib):
         """
         while pkg_name:
             yield pkg_name
-            pkg_name, _sep, _child = pkg_name.rpartition('.')
+            pkg_name, sep, child = pkg_name.rpartition('.')
 
     def _get_SVEM_NSPs(self):
         """
@@ -85,25 +77,18 @@ class install_lib(orig.install_lib):
         if not hasattr(sys, 'implementation'):
             return
 
-        base = os.path.join('__pycache__', '__init__.' + sys.implementation.cache_tag)
+        base = os.path.join(
+            '__pycache__', '__init__.' + sys.implementation.cache_tag)
         yield base + '.pyc'
         yield base + '.pyo'
         yield base + '.opt-1.pyc'
         yield base + '.opt-2.pyc'
 
     def copy_tree(
-        self,
-        infile: StrPath,
-        outfile: str,
-        # override: Using actual booleans
-        preserve_mode: bool = True,  # type: ignore[override]
-        preserve_times: bool = True,  # type: ignore[override]
-        preserve_symlinks: bool = False,  # type: ignore[override]
-        level: object = 1,
-    ) -> list[str]:
-        assert preserve_mode
-        assert preserve_times
-        assert not preserve_symlinks
+            self, infile, outfile,
+            preserve_mode=1, preserve_times=1, preserve_symlinks=0, level=1
+    ):
+        assert preserve_mode and preserve_times and not preserve_symlinks
         exclude = self.get_exclusions()
 
         if not exclude:
@@ -112,14 +97,14 @@ class install_lib(orig.install_lib):
         # Exclude namespace package __init__.py* files from the output
 
         from setuptools.archive_util import unpack_directory
-
         from distutils import log
 
-        outfiles: list[str] = []
+        outfiles = []
 
-        def pf(src: str, dst: str):
+        def pf(src, dst):
             if dst in exclude:
-                log.warn("Skipping installation of %s (namespace package)", dst)
+                log.warn("Skipping installation of %s (namespace package)",
+                         dst)
                 return False
 
             log.info("copying %s -> %s", src, os.path.dirname(dst))
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_scripts.py
index 4401cf6..aeb0e42 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/install_scripts.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/install_scripts.py
@@ -1,51 +1,48 @@
-from __future__ import annotations
-
+from distutils import log
+import distutils.command.install_scripts as orig
+from distutils.errors import DistutilsModuleError
 import os
 import sys
 
+from pkg_resources import Distribution, PathMetadata
 from .._path import ensure_directory
-from ..dist import Distribution
-
-import distutils.command.install_scripts as orig
-from distutils import log
 
 
 class install_scripts(orig.install_scripts):
     """Do normal script install, plus any egg_info wrapper scripts"""
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-
-    def initialize_options(self) -> None:
+    def initialize_options(self):
         orig.install_scripts.initialize_options(self)
         self.no_ep = False
 
-    def run(self) -> None:
+    def run(self):
+        import setuptools.command.easy_install as ei
+
         self.run_command("egg_info")
         if self.distribution.scripts:
             orig.install_scripts.run(self)  # run first to set up self.outfiles
         else:
-            self.outfiles: list[str] = []
+            self.outfiles = []
         if self.no_ep:
             # don't install entry point scripts into .egg file!
             return
-        self._install_ep_scripts()
-
-    def _install_ep_scripts(self):
-        # Delay import side-effects
-        from pkg_resources import Distribution, PathMetadata
-
-        from . import easy_install as ei
 
         ei_cmd = self.get_finalized_command("egg_info")
         dist = Distribution(
-            ei_cmd.egg_base,
-            PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info),
-            ei_cmd.egg_name,
-            ei_cmd.egg_version,
+            ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info),
+            ei_cmd.egg_name, ei_cmd.egg_version,
         )
         bs_cmd = self.get_finalized_command('build_scripts')
         exec_param = getattr(bs_cmd, 'executable', None)
+        try:
+            bw_cmd = self.get_finalized_command("bdist_wininst")
+            is_wininst = getattr(bw_cmd, '_is_running', False)
+        except (ImportError, DistutilsModuleError):
+            is_wininst = False
         writer = ei.ScriptWriter
+        if is_wininst:
+            exec_param = "python.exe"
+            writer = ei.WindowsScriptWriter
         if exec_param == sys.executable:
             # In case the path to the Python executable contains a space, wrap
             # it so it's not split up.
@@ -56,7 +53,7 @@ class install_scripts(orig.install_scripts):
         for args in writer.get_args(dist, cmd.as_header()):
             self.write_script(*args)
 
-    def write_script(self, script_name, contents, mode: str = "t", *ignored) -> None:
+    def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
         from setuptools.command.easy_install import chmod, current_umask
 
@@ -64,10 +61,10 @@ class install_scripts(orig.install_scripts):
         target = os.path.join(self.install_dir, script_name)
         self.outfiles.append(target)
 
-        encoding = None if "b" in mode else "utf-8"
         mask = current_umask()
         if not self.dry_run:
             ensure_directory(target)
-            with open(target, "w" + mode, encoding=encoding) as f:
-                f.write(contents)
+            f = open(target, "w" + mode)
+            f.write(contents)
+            f.close()
             chmod(target, 0o777 - mask)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/rotate.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/rotate.py
index acdce07..74795ba 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/rotate.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/rotate.py
@@ -1,13 +1,10 @@
-from __future__ import annotations
-
-import os
-from typing import ClassVar
-
-from .. import Command, _shutil
-
+from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
-from distutils.util import convert_path
+import os
+import shutil
+
+from setuptools import Command
 
 
 class rotate(Command):
@@ -20,14 +17,14 @@ class rotate(Command):
         ('keep=', 'k', "number of matching distributions to keep"),
     ]
 
-    boolean_options: ClassVar[list[str]] = []
+    boolean_options = []
 
     def initialize_options(self):
         self.match = None
         self.dist_dir = None
         self.keep = None
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         if self.match is None:
             raise DistutilsOptionError(
                 "Must specify one or more (comma-separated) match patterns "
@@ -40,10 +37,12 @@ class rotate(Command):
         except ValueError as e:
             raise DistutilsOptionError("--keep must be an integer") from e
         if isinstance(self.match, str):
-            self.match = [convert_path(p.strip()) for p in self.match.split(',')]
+            self.match = [
+                convert_path(p.strip()) for p in self.match.split(',')
+            ]
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'))
 
-    def run(self) -> None:
+    def run(self):
         self.run_command("egg_info")
         from glob import glob
 
@@ -55,11 +54,11 @@ class rotate(Command):
             files.reverse()
 
             log.info("%d file(s) matching %s", len(files), pattern)
-            files = files[self.keep :]
-            for t, f in files:
+            files = files[self.keep:]
+            for (t, f) in files:
                 log.info("Deleting %s", f)
                 if not self.dry_run:
                     if os.path.isdir(f):
-                        _shutil.rmtree(f)
+                        shutil.rmtree(f)
                     else:
                         os.unlink(f)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/saveopts.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/saveopts.py
index 2a2cbce..611cec5 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/saveopts.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/saveopts.py
@@ -6,11 +6,12 @@ class saveopts(option_base):
 
     description = "save supplied options to setup.cfg or other config file"
 
-    def run(self) -> None:
+    def run(self):
         dist = self.distribution
-        settings: dict[str, dict[str, str]] = {}
+        settings = {}
 
         for cmd in dist.command_options:
+
             if cmd == 'saveopts':
                 continue  # don't save our own options!
 
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/sdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/sdist.py
index 9631cf3..4a8cde7 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/sdist.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/sdist.py
@@ -1,61 +1,50 @@
-from __future__ import annotations
-
-import contextlib
+from distutils import log
+import distutils.command.sdist as orig
 import os
-import re
+import sys
+import io
+import contextlib
 from itertools import chain
-from typing import ClassVar
+
+from .py36compat import sdist_add_defaults
 
 from .._importlib import metadata
-from ..dist import Distribution
 from .build import _ORIGINAL_SUBCOMMANDS
 
-import distutils.command.sdist as orig
-from distutils import log
-
 _default_revctrl = list
 
 
 def walk_revctrl(dirname=''):
     """Find all files under revision control"""
     for ep in metadata.entry_points(group='setuptools.file_finders'):
-        yield from ep.load()(dirname)
+        for item in ep.load()(dirname):
+            yield item
 
 
-class sdist(orig.sdist):
+class sdist(sdist_add_defaults, orig.sdist):
     """Smart sdist that finds anything supported by revision control"""
 
     user_options = [
-        ('formats=', None, "formats for source distribution (comma-separated list)"),
-        (
-            'keep-temp',
-            'k',
-            "keep the distribution tree around after creating " + "archive file(s)",
-        ),
-        (
-            'dist-dir=',
-            'd',
-            "directory to put the source distribution archive(s) in [default: dist]",
-        ),
-        (
-            'owner=',
-            'u',
-            "Owner name used when creating a tar file [default: current user]",
-        ),
-        (
-            'group=',
-            'g',
-            "Group name used when creating a tar file [default: current group]",
-        ),
+        ('formats=', None,
+         "formats for source distribution (comma-separated list)"),
+        ('keep-temp', 'k',
+         "keep the distribution tree around after creating " +
+         "archive file(s)"),
+        ('dist-dir=', 'd',
+         "directory to put the source distribution archive(s) in "
+         "[default: dist]"),
+        ('owner=', 'u',
+         "Owner name used when creating a tar file [default: current user]"),
+        ('group=', 'g',
+         "Group name used when creating a tar file [default: current group]"),
     ]
 
-    distribution: Distribution  # override distutils.dist.Distribution with setuptools.dist.Distribution
-    negative_opt: ClassVar[dict[str, str]] = {}
+    negative_opt = {}
 
     README_EXTENSIONS = ['', '.rst', '.txt', '.md']
-    READMES = tuple(f'README{ext}' for ext in README_EXTENSIONS)
+    READMES = tuple('README{0}'.format(ext) for ext in README_EXTENSIONS)
 
-    def run(self) -> None:
+    def run(self):
         self.run_command('egg_info')
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist = ei_cmd.filelist
@@ -74,10 +63,18 @@ class sdist(orig.sdist):
             if data not in dist_files:
                 dist_files.append(data)
 
-    def initialize_options(self) -> None:
+    def initialize_options(self):
         orig.sdist.initialize_options(self)
 
-    def make_distribution(self) -> None:
+        self._default_to_gztar()
+
+    def _default_to_gztar(self):
+        # only needed on Python prior to 3.6.
+        if sys.version_info >= (3, 6, 0, 'beta', 1):
+            return
+        self.formats = ['gztar']
+
+    def make_distribution(self):
         """
         Workaround for #516
         """
@@ -103,9 +100,9 @@ class sdist(orig.sdist):
             yield
         finally:
             if orig_val is not NoValue:
-                os.link = orig_val
+                setattr(os, 'link', orig_val)
 
-    def add_defaults(self) -> None:
+    def add_defaults(self):
         super().add_defaults()
         self._add_defaults_build_sub_commands()
 
@@ -158,22 +155,17 @@ class sdist(orig.sdist):
         except TypeError:
             log.warn("data_files contains unexpected objects")
 
-    def prune_file_list(self) -> None:
-        super().prune_file_list()
-        # Prevent accidental inclusion of test-related cache dirs at the project root
-        sep = re.escape(os.sep)
-        self.filelist.exclude_pattern(r"^(\.tox|\.nox|\.venv)" + sep, is_regex=True)
-
-    def check_readme(self) -> None:
+    def check_readme(self):
         for f in self.READMES:
             if os.path.exists(f):
                 return
         else:
             self.warn(
-                "standard file not found: should have one of " + ', '.join(self.READMES)
+                "standard file not found: should have one of " +
+                ', '.join(self.READMES)
             )
 
-    def make_release_tree(self, base_dir, files) -> None:
+    def make_release_tree(self, base_dir, files):
         orig.sdist.make_release_tree(self, base_dir, files)
 
         # Save any egg_info command line options used to create this sdist
@@ -191,9 +183,10 @@ class sdist(orig.sdist):
         if not os.path.isfile(self.manifest):
             return False
 
-        with open(self.manifest, 'rb') as fp:
+        with io.open(self.manifest, 'rb') as fp:
             first_line = fp.readline()
-        return first_line != b'# file GENERATED by distutils, do NOT edit\n'
+        return (first_line !=
+                '# file GENERATED by distutils, do NOT edit\n'.encode())
 
     def read_manifest(self):
         """Read the manifest file (named by 'self.manifest') and use it to
@@ -202,12 +195,12 @@ class sdist(orig.sdist):
         """
         log.info("reading manifest file '%s'", self.manifest)
         manifest = open(self.manifest, 'rb')
-        for bytes_line in manifest:
+        for line in manifest:
             # The manifest must contain UTF-8. See #303.
             try:
-                line = bytes_line.decode('UTF-8')
+                line = line.decode('UTF-8')
             except UnicodeDecodeError:
-                log.warn(f"{line!r} not UTF-8 decodable -- skipping")
+                log.warn("%r not UTF-8 decodable -- skipping" % line)
                 continue
             # ignore comments and blank lines
             line = line.strip()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/setopt.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/setopt.py
index 678a059..6358c04 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/setopt.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/setopt.py
@@ -1,13 +1,11 @@
-import configparser
-import os
-
-from .. import Command
-from ..unicode_utils import _cfg_read_utf8_with_fallback
-
-import distutils
+from distutils.util import convert_path
 from distutils import log
 from distutils.errors import DistutilsOptionError
-from distutils.util import convert_path
+import distutils
+import os
+import configparser
+
+from setuptools import Command
 
 __all__ = ['config_file', 'edit_config', 'option_base', 'setopt']
 
@@ -20,11 +18,15 @@ def config_file(kind="local"):
     if kind == 'local':
         return 'setup.cfg'
     if kind == 'global':
-        return os.path.join(os.path.dirname(distutils.__file__), 'distutils.cfg')
+        return os.path.join(
+            os.path.dirname(distutils.__file__), 'distutils.cfg'
+        )
     if kind == 'user':
         dot = os.name == 'posix' and '.' or ''
-        return os.path.expanduser(convert_path(f"~/{dot}pydistutils.cfg"))
-    raise ValueError("config_file() type must be 'local', 'global', or 'user'", kind)
+        return os.path.expanduser(convert_path("~/%spydistutils.cfg" % dot))
+    raise ValueError(
+        "config_file() type must be 'local', 'global', or 'user'", kind
+    )
 
 
 def edit_config(filename, settings, dry_run=False):
@@ -37,9 +39,8 @@ def edit_config(filename, settings, dry_run=False):
     """
     log.debug("Reading configuration from %s", filename)
     opts = configparser.RawConfigParser()
-    opts.optionxform = lambda optionstr: optionstr  # type: ignore[method-assign] # overriding method
-    _cfg_read_utf8_with_fallback(opts, filename)
-
+    opts.optionxform = lambda x: x
+    opts.read([filename])
     for section, options in settings.items():
         if options is None:
             log.info("Deleting section [%s] from %s", section, filename)
@@ -50,22 +51,25 @@ def edit_config(filename, settings, dry_run=False):
                 opts.add_section(section)
             for option, value in options.items():
                 if value is None:
-                    log.debug("Deleting %s.%s from %s", section, option, filename)
+                    log.debug(
+                        "Deleting %s.%s from %s",
+                        section, option, filename
+                    )
                     opts.remove_option(section, option)
                     if not opts.options(section):
-                        log.info(
-                            "Deleting empty [%s] section from %s", section, filename
-                        )
+                        log.info("Deleting empty [%s] section from %s",
+                                 section, filename)
                         opts.remove_section(section)
                 else:
                     log.debug(
-                        "Setting %s.%s to %r in %s", section, option, value, filename
+                        "Setting %s.%s to %r in %s",
+                        section, option, value, filename
                     )
                     opts.set(section, option, value)
 
     log.info("Writing %s", filename)
     if not dry_run:
-        with open(filename, 'w', encoding="utf-8") as f:
+        with open(filename, 'w') as f:
             opts.write(f)
 
 
@@ -73,14 +77,16 @@ class option_base(Command):
     """Abstract base class for commands that mess with config files"""
 
     user_options = [
-        ('global-config', 'g', "save options to the site-wide distutils.cfg file"),
-        ('user-config', 'u', "save options to the current user's pydistutils.cfg file"),
-        ('filename=', 'f', "configuration file to use (default=setup.cfg)"),
+        ('global-config', 'g',
+         "save options to the site-wide distutils.cfg file"),
+        ('user-config', 'u',
+         "save options to the current user's pydistutils.cfg file"),
+        ('filename=', 'f',
+         "configuration file to use (default=setup.cfg)"),
     ]
 
     boolean_options = [
-        'global-config',
-        'user-config',
+        'global-config', 'user-config',
     ]
 
     def initialize_options(self):
@@ -100,9 +106,10 @@ class option_base(Command):
             filenames.append(config_file('local'))
         if len(filenames) > 1:
             raise DistutilsOptionError(
-                "Must specify only one configuration file option", filenames
+                "Must specify only one configuration file option",
+                filenames
             )
-        (self.filename,) = filenames
+        self.filename, = filenames
 
 
 class setopt(option_base):
@@ -126,16 +133,17 @@ class setopt(option_base):
         self.set_value = None
         self.remove = None
 
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         option_base.finalize_options(self)
         if self.command is None or self.option is None:
             raise DistutilsOptionError("Must specify --command *and* --option")
         if self.set_value is None and not self.remove:
             raise DistutilsOptionError("Must specify --set-value or --remove")
 
-    def run(self) -> None:
+    def run(self):
         edit_config(
-            self.filename,
-            {self.command: {self.option.replace('-', '_'): self.set_value}},
-            self.dry_run,
+            self.filename, {
+                self.command: {self.option.replace('-', '_'): self.set_value}
+            },
+            self.dry_run
         )
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/command/test.py b/server/.venv/lib/python3.11/site-packages/setuptools/command/test.py
index 341b11a..8dde513 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/command/test.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/command/test.py
@@ -1,29 +1,82 @@
-from __future__ import annotations
+import os
+import operator
+import sys
+import contextlib
+import itertools
+import unittest
+from distutils.errors import DistutilsError, DistutilsOptionError
+from distutils import log
+from unittest import TestLoader
 
+from pkg_resources import (
+    resource_listdir,
+    resource_exists,
+    normalize_path,
+    working_set,
+    evaluate_marker,
+    add_activation_listener,
+    require,
+)
+from .._importlib import metadata
 from setuptools import Command
-from setuptools.warnings import SetuptoolsDeprecationWarning
+from setuptools.extern.more_itertools import unique_everseen
+from setuptools.extern.jaraco.functools import pass_none
 
 
-# Would restrict to Literal["test"], but mypy doesn't support it: https://github.com/python/mypy/issues/8203
-def __getattr__(name: str) -> type[_test]:
-    if name == 'test':
-        SetuptoolsDeprecationWarning.emit(
-            "The test command is disabled and references to it are deprecated.",
-            "Please remove any references to `setuptools.command.test` in all "
-            "supported versions of the affected package.",
-            due_date=(2024, 11, 15),
-            stacklevel=2,
-        )
-        return _test
-    raise AttributeError(name)
+class ScanningLoader(TestLoader):
+    def __init__(self):
+        TestLoader.__init__(self)
+        self._visited = set()
+
+    def loadTestsFromModule(self, module, pattern=None):
+        """Return a suite of all tests cases contained in the given module
+
+        If the module is a package, load tests from all the modules in it.
+        If the module has an ``additional_tests`` function, call it and add
+        the return value to the tests.
+        """
+        if module in self._visited:
+            return None
+        self._visited.add(module)
+
+        tests = []
+        tests.append(TestLoader.loadTestsFromModule(self, module))
+
+        if hasattr(module, "additional_tests"):
+            tests.append(module.additional_tests())
+
+        if hasattr(module, '__path__'):
+            for file in resource_listdir(module.__name__, ''):
+                if file.endswith('.py') and file != '__init__.py':
+                    submodule = module.__name__ + '.' + file[:-3]
+                else:
+                    if resource_exists(module.__name__, file + '/__init__.py'):
+                        submodule = module.__name__ + '.' + file
+                    else:
+                        continue
+                tests.append(self.loadTestsFromName(submodule))
+
+        if len(tests) != 1:
+            return self.suiteClass(tests)
+        else:
+            return tests[0]  # don't create a nested suite for only one return
 
 
-class _test(Command):
-    """
-    Stub to warn when test command is referenced or used.
-    """
+# adapted from jaraco.classes.properties:NonDataProperty
+class NonDataProperty:
+    def __init__(self, fget):
+        self.fget = fget
 
-    description = "stub for old test command (do not use)"
+    def __get__(self, obj, objtype=None):
+        if obj is None:
+            return self
+        return self.fget(obj)
+
+
+class test(Command):
+    """Command to run unit tests after in-place build"""
+
+    description = "run unit tests after in-place build (deprecated)"
 
     user_options = [
         ('test-module=', 'm', "Run 'test_suite' in specified module"),
@@ -36,10 +89,163 @@ class _test(Command):
     ]
 
     def initialize_options(self):
-        pass
+        self.test_suite = None
+        self.test_module = None
+        self.test_loader = None
+        self.test_runner = None
 
     def finalize_options(self):
-        pass
+
+        if self.test_suite and self.test_module:
+            msg = "You may specify a module or a suite, but not both"
+            raise DistutilsOptionError(msg)
+
+        if self.test_suite is None:
+            if self.test_module is None:
+                self.test_suite = self.distribution.test_suite
+            else:
+                self.test_suite = self.test_module + ".test_suite"
+
+        if self.test_loader is None:
+            self.test_loader = getattr(self.distribution, 'test_loader', None)
+        if self.test_loader is None:
+            self.test_loader = "setuptools.command.test:ScanningLoader"
+        if self.test_runner is None:
+            self.test_runner = getattr(self.distribution, 'test_runner', None)
+
+    @NonDataProperty
+    def test_args(self):
+        return list(self._test_args())
+
+    def _test_args(self):
+        if not self.test_suite:
+            yield 'discover'
+        if self.verbose:
+            yield '--verbose'
+        if self.test_suite:
+            yield self.test_suite
+
+    def with_project_on_sys_path(self, func):
+        """
+        Backward compatibility for project_on_sys_path context.
+        """
+        with self.project_on_sys_path():
+            func()
+
+    @contextlib.contextmanager
+    def project_on_sys_path(self, include_dists=[]):
+        self.run_command('egg_info')
+
+        # Build extensions in-place
+        self.reinitialize_command('build_ext', inplace=1)
+        self.run_command('build_ext')
+
+        ei_cmd = self.get_finalized_command("egg_info")
+
+        old_path = sys.path[:]
+        old_modules = sys.modules.copy()
+
+        try:
+            project_path = normalize_path(ei_cmd.egg_base)
+            sys.path.insert(0, project_path)
+            working_set.__init__()
+            add_activation_listener(lambda dist: dist.activate())
+            require('%s==%s' % (ei_cmd.egg_name, ei_cmd.egg_version))
+            with self.paths_on_pythonpath([project_path]):
+                yield
+        finally:
+            sys.path[:] = old_path
+            sys.modules.clear()
+            sys.modules.update(old_modules)
+            working_set.__init__()
+
+    @staticmethod
+    @contextlib.contextmanager
+    def paths_on_pythonpath(paths):
+        """
+        Add the indicated paths to the head of the PYTHONPATH environment
+        variable so that subprocesses will also see the packages at
+        these paths.
+
+        Do this in a context that restores the value on exit.
+        """
+        nothing = object()
+        orig_pythonpath = os.environ.get('PYTHONPATH', nothing)
+        current_pythonpath = os.environ.get('PYTHONPATH', '')
+        try:
+            prefix = os.pathsep.join(unique_everseen(paths))
+            to_join = filter(None, [prefix, current_pythonpath])
+            new_path = os.pathsep.join(to_join)
+            if new_path:
+                os.environ['PYTHONPATH'] = new_path
+            yield
+        finally:
+            if orig_pythonpath is nothing:
+                os.environ.pop('PYTHONPATH', None)
+            else:
+                os.environ['PYTHONPATH'] = orig_pythonpath
+
+    @staticmethod
+    def install_dists(dist):
+        """
+        Install the requirements indicated by self.distribution and
+        return an iterable of the dists that were built.
+        """
+        ir_d = dist.fetch_build_eggs(dist.install_requires)
+        tr_d = dist.fetch_build_eggs(dist.tests_require or [])
+        er_d = dist.fetch_build_eggs(
+            v
+            for k, v in dist.extras_require.items()
+            if k.startswith(':') and evaluate_marker(k[1:])
+        )
+        return itertools.chain(ir_d, tr_d, er_d)
 
     def run(self):
-        raise RuntimeError("Support for the test command was removed in Setuptools 72")
+        self.announce(
+            "WARNING: Testing via this command is deprecated and will be "
+            "removed in a future version. Users looking for a generic test "
+            "entry point independent of test runner are encouraged to use "
+            "tox.",
+            log.WARN,
+        )
+
+        installed_dists = self.install_dists(self.distribution)
+
+        cmd = ' '.join(self._argv)
+        if self.dry_run:
+            self.announce('skipping "%s" (dry run)' % cmd)
+            return
+
+        self.announce('running "%s"' % cmd)
+
+        paths = map(operator.attrgetter('location'), installed_dists)
+        with self.paths_on_pythonpath(paths):
+            with self.project_on_sys_path():
+                self.run_tests()
+
+    def run_tests(self):
+        test = unittest.main(
+            None,
+            None,
+            self._argv,
+            testLoader=self._resolve_as_ep(self.test_loader),
+            testRunner=self._resolve_as_ep(self.test_runner),
+            exit=False,
+        )
+        if not test.result.wasSuccessful():
+            msg = 'Test failed: %s' % test.result
+            self.announce(msg, log.ERROR)
+            raise DistutilsError(msg)
+
+    @property
+    def _argv(self):
+        return ['unittest'] + self.test_args
+
+    @staticmethod
+    @pass_none
+    def _resolve_as_ep(val):
+        """
+        Load the indicated attribute value, called, as a as if it were
+        specified as an entry point.
+        """
+        return metadata.EntryPoint(value=val, name=None, group=None).load()()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 0bc9a4e..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py310.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py310.cpython-311.pyc
deleted file mode 100644
index 5d4d9cc..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py310.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py311.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py311.cpython-311.pyc
deleted file mode 100644
index 63fa172..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py311.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py312.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py312.cpython-311.pyc
deleted file mode 100644
index 09e7cd5..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py312.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py39.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py39.cpython-311.pyc
deleted file mode 100644
index f1c34b4..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/compat/__pycache__/py39.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py310.py b/server/.venv/lib/python3.11/site-packages/setuptools/compat/py310.py
deleted file mode 100644
index b3912f8..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py310.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sys
-
-__all__ = ['tomllib']
-
-
-if sys.version_info >= (3, 11):
-    import tomllib
-else:  # pragma: no cover
-    import tomli as tomllib
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py311.py b/server/.venv/lib/python3.11/site-packages/setuptools/compat/py311.py
deleted file mode 100644
index 52b58af..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py311.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import annotations
-
-import shutil
-import sys
-from typing import TYPE_CHECKING, Any, Callable
-
-if TYPE_CHECKING:
-    from _typeshed import ExcInfo, StrOrBytesPath
-    from typing_extensions import TypeAlias
-
-# Same as shutil._OnExcCallback from typeshed
-_OnExcCallback: TypeAlias = Callable[[Callable[..., Any], str, BaseException], object]
-
-
-def shutil_rmtree(
-    path: StrOrBytesPath,
-    ignore_errors: bool = False,
-    onexc: _OnExcCallback | None = None,
-) -> None:
-    if sys.version_info >= (3, 12):
-        return shutil.rmtree(path, ignore_errors, onexc=onexc)
-
-    def _handler(fn: Callable[..., Any], path: str, excinfo: ExcInfo) -> None:
-        if onexc:
-            onexc(fn, path, excinfo[1])
-
-    return shutil.rmtree(path, ignore_errors, onerror=_handler)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py312.py b/server/.venv/lib/python3.11/site-packages/setuptools/compat/py312.py
deleted file mode 100644
index b20c5f6..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py312.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import annotations
-
-import sys
-
-if sys.version_info >= (3, 12, 4):
-    # Python 3.13 should support `.pth` files encoded in UTF-8
-    # See discussion in https://github.com/python/cpython/issues/77102
-    PTH_ENCODING: str | None = "utf-8"
-else:
-    from .py39 import LOCALE_ENCODING
-
-    # PTH_ENCODING = "locale"
-    PTH_ENCODING = LOCALE_ENCODING
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py39.py b/server/.venv/lib/python3.11/site-packages/setuptools/compat/py39.py
deleted file mode 100644
index 04a4abe..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/compat/py39.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import sys
-
-# Explicitly use the ``"locale"`` encoding in versions that support it,
-# otherwise just rely on the implicit handling of ``encoding=None``.
-# Since all platforms that support ``EncodingWarning`` also support
-# ``encoding="locale"``, this can be used to suppress the warning.
-# However, please try to use UTF-8 when possible
-# (.pth files are the notorious exception: python/cpython#77102, pypa/setuptools#3937).
-LOCALE_ENCODING = "locale" if sys.version_info >= (3, 10) else None
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/NOTICE b/server/.venv/lib/python3.11/site-packages/setuptools/config/NOTICE
deleted file mode 100644
index 0186451..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-The following files include code from opensource projects
-(either as direct copies or modified versions):
-
-- `setuptools.schema.json`, `distutils.schema.json`:
-    - project: `validate-pyproject` - licensed under MPL-2.0
-      (https://github.com/abravalheri/validate-pyproject):
-
-      This Source Code Form is subject to the terms of the Mozilla Public
-      License, v. 2.0. If a copy of the MPL was not distributed with this file,
-      You can obtain one at https://mozilla.org/MPL/2.0/.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/__init__.py
index fcc7d00..1a5153a 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/__init__.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/__init__.py
@@ -1,11 +1,12 @@
 """For backward compatibility, expose main functions from
 ``setuptools.config.setupcfg``
 """
-
+import warnings
 from functools import wraps
+from textwrap import dedent
 from typing import Callable, TypeVar, cast
 
-from ..warnings import SetuptoolsDeprecationWarning
+from .._deprecation_warning import SetuptoolsDeprecationWarning
 from . import setupcfg
 
 Fn = TypeVar("Fn", bound=Callable)
@@ -16,24 +17,15 @@ __all__ = ('parse_configuration', 'read_configuration')
 def _deprecation_notice(fn: Fn) -> Fn:
     @wraps(fn)
     def _wrapper(*args, **kwargs):
-        SetuptoolsDeprecationWarning.emit(
-            "Deprecated API usage.",
-            f"""
-            As setuptools moves its configuration towards `pyproject.toml`,
-            `{__name__}.{fn.__name__}` became deprecated.
+        msg = f"""\
+        As setuptools moves its configuration towards `pyproject.toml`,
+        `{__name__}.{fn.__name__}` became deprecated.
 
-            For the time being, you can use the `{setupcfg.__name__}` module
-            to access a backward compatible API, but this module is provisional
-            and might be removed in the future.
-
-            To read project metadata, consider using
-            ``build.util.project_wheel_metadata`` (https://pypi.org/project/build/).
-            For simple scenarios, you can also try parsing the file directly
-            with the help of ``configparser``.
-            """,
-            # due_date not defined yet, because the community still heavily relies on it
-            # Warning introduced in 24 Mar 2022
-        )
+        For the time being, you can use the `{setupcfg.__name__}` module
+        to access a backward compatible API, but this module is provisional
+        and might be removed in the future.
+        """
+        warnings.warn(dedent(msg), SetuptoolsDeprecationWarning, stacklevel=2)
         return fn(*args, **kwargs)
 
     return cast(Fn, _wrapper)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/__init__.cpython-311.pyc
index 58a70b6..14034d5 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/__init__.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/_apply_pyprojecttoml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/_apply_pyprojecttoml.cpython-311.pyc
index baacac7..0b3d19f 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/_apply_pyprojecttoml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/_apply_pyprojecttoml.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/expand.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/expand.cpython-311.pyc
index c613009..50e0cac 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/expand.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/expand.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/pyprojecttoml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/pyprojecttoml.cpython-311.pyc
index cf993f9..b5c1e26 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/pyprojecttoml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/pyprojecttoml.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/setupcfg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/setupcfg.cpython-311.pyc
index 680e74b..9c4bbe5 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/setupcfg.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/__pycache__/setupcfg.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_apply_pyprojecttoml.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_apply_pyprojecttoml.py
index 9088bc1..8af5561 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_apply_pyprojecttoml.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_apply_pyprojecttoml.py
@@ -7,43 +7,33 @@ need to be processed before being applied.
 
 **PRIVATE MODULE**: API reserved for setuptools internal usage only.
 """
-
-from __future__ import annotations
-
 import logging
 import os
+import warnings
 from collections.abc import Mapping
 from email.headerregistry import Address
 from functools import partial, reduce
-from inspect import cleandoc
 from itertools import chain
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union
+from typing import (TYPE_CHECKING, Any, Callable, Dict, List, Optional, Set, Tuple,
+                    Type, Union)
 
-from .. import _static
-from .._path import StrPath
-from ..errors import InvalidConfigError, RemovedConfigError
-from ..extension import Extension
-from ..warnings import SetuptoolsDeprecationWarning, SetuptoolsWarning
+from setuptools._deprecation_warning import SetuptoolsDeprecationWarning
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-
-    from setuptools._importlib import metadata
-    from setuptools.dist import Distribution
-
-    from distutils.dist import _OptionsList  # Comes from typeshed
-
+    from setuptools._importlib import metadata  # noqa
+    from setuptools.dist import Distribution  # noqa
 
 EMPTY: Mapping = MappingProxyType({})  # Immutable dict-like
-_ProjectReadmeValue: TypeAlias = Union[str, dict[str, str]]
-_Correspondence: TypeAlias = Callable[["Distribution", Any, Union[StrPath, None]], None]
-_T = TypeVar("_T")
+_Path = Union[os.PathLike, str]
+_DictOrStr = Union[dict, str]
+_CorrespFn = Callable[["Distribution", Any, _Path], None]
+_Correspondence = Union[str, _CorrespFn]
 
 _logger = logging.getLogger(__name__)
 
 
-def apply(dist: Distribution, config: dict, filename: StrPath) -> Distribution:
+def apply(dist: "Distribution", config: dict, filename: _Path) -> "Distribution":
     """Apply configuration dict read with :func:`read_configuration`"""
 
     if not config:
@@ -58,7 +48,6 @@ def apply(dist: Distribution, config: dict, filename: StrPath) -> Distribution:
     os.chdir(root_dir)
     try:
         dist._finalize_requires()
-        dist._finalize_license_expression()
         dist._finalize_license_files()
     finally:
         os.chdir(current_directory)
@@ -66,12 +55,11 @@ def apply(dist: Distribution, config: dict, filename: StrPath) -> Distribution:
     return dist
 
 
-def _apply_project_table(dist: Distribution, config: dict, root_dir: StrPath):
-    orig_config = config.get("project", {})
-    if not orig_config:
+def _apply_project_table(dist: "Distribution", config: dict, root_dir: _Path):
+    project_table = config.get("project", {}).copy()
+    if not project_table:
         return  # short-circuit
 
-    project_table = {k: _static.attempt_conversion(v) for k, v in orig_config.items()}
     _handle_missing_dynamic(dist, project_table)
     _unify_entry_points(project_table)
 
@@ -84,57 +72,35 @@ def _apply_project_table(dist: Distribution, config: dict, root_dir: StrPath):
             _set_config(dist, corresp, value)
 
 
-def _apply_tool_table(dist: Distribution, config: dict, filename: StrPath):
+def _apply_tool_table(dist: "Distribution", config: dict, filename: _Path):
     tool_table = config.get("tool", {}).get("setuptools", {})
     if not tool_table:
         return  # short-circuit
 
-    if "license-files" in tool_table:
-        if "license-files" in config.get("project", {}):
-            # https://github.com/pypa/setuptools/pull/4837#discussion_r2004983349
-            raise InvalidConfigError(
-                "'project.license-files' is defined already. "
-                "Remove 'tool.setuptools.license-files'."
-            )
-
-        pypa_guides = "guides/writing-pyproject-toml/#license-files"
-        SetuptoolsDeprecationWarning.emit(
-            "'tool.setuptools.license-files' is deprecated in favor of "
-            "'project.license-files' (available on setuptools>=77.0.0).",
-            see_url=f"https://packaging.python.org/en/latest/{pypa_guides}",
-            due_date=(2026, 2, 18),  # Warning introduced on 2025-02-18
-        )
-
     for field, value in tool_table.items():
         norm_key = json_compatible_key(field)
 
-        if norm_key in TOOL_TABLE_REMOVALS:
-            suggestion = cleandoc(TOOL_TABLE_REMOVALS[norm_key])
-            msg = f"""
-            The parameter `tool.setuptools.{field}` was long deprecated
-            and has been removed from `pyproject.toml`.
-            """
-            raise RemovedConfigError("\n".join([cleandoc(msg), suggestion]))
+        if norm_key in TOOL_TABLE_DEPRECATIONS:
+            suggestion = TOOL_TABLE_DEPRECATIONS[norm_key]
+            msg = f"The parameter `{norm_key}` is deprecated, {suggestion}"
+            warnings.warn(msg, SetuptoolsDeprecationWarning)
 
         norm_key = TOOL_TABLE_RENAMES.get(norm_key, norm_key)
-        corresp = TOOL_TABLE_CORRESPONDENCE.get(norm_key, norm_key)
-        if callable(corresp):
-            corresp(dist, value)
-        else:
-            _set_config(dist, corresp, value)
+        _set_config(dist, norm_key, value)
 
     _copy_command_options(config, dist, filename)
 
 
-def _handle_missing_dynamic(dist: Distribution, project_table: dict):
+def _handle_missing_dynamic(dist: "Distribution", project_table: dict):
     """Be temporarily forgiving with ``dynamic`` fields not listed in ``dynamic``"""
+    # TODO: Set fields back to `None` once the feature stabilizes
     dynamic = set(project_table.get("dynamic", []))
     for field, getter in _PREVIOUSLY_DEFINED.items():
         if not (field in project_table or field in dynamic):
             value = getter(dist)
             if value:
-                _MissingDynamic.emit(field=field, value=value)
-                project_table[field] = _RESET_PREVIOUSLY_DEFINED.get(field)
+                msg = _WouldIgnoreField.message(field, value)
+                warnings.warn(msg, _WouldIgnoreField)
 
 
 def json_compatible_key(key: str) -> str:
@@ -142,15 +108,14 @@ def json_compatible_key(key: str) -> str:
     return key.lower().replace("-", "_")
 
 
-def _set_config(dist: Distribution, field: str, value: Any):
-    val = _PREPROCESS.get(field, _noop)(dist, value)
+def _set_config(dist: "Distribution", field: str, value: Any):
     setter = getattr(dist.metadata, f"set_{field}", None)
     if setter:
-        setter(val)
+        setter(value)
     elif hasattr(dist.metadata, field) or field in SETUPTOOLS_PATCHES:
-        setattr(dist.metadata, field, val)
+        setattr(dist.metadata, field, value)
     else:
-        setattr(dist, field, val)
+        setattr(dist, field, value)
 
 
 _CONTENT_TYPES = {
@@ -160,72 +125,44 @@ _CONTENT_TYPES = {
 }
 
 
-def _guess_content_type(file: str) -> str | None:
+def _guess_content_type(file: str) -> Optional[str]:
     _, ext = os.path.splitext(file.lower())
     if not ext:
         return None
 
     if ext in _CONTENT_TYPES:
-        return _static.Str(_CONTENT_TYPES[ext])
+        return _CONTENT_TYPES[ext]
 
     valid = ", ".join(f"{k} ({v})" for k, v in _CONTENT_TYPES.items())
     msg = f"only the following file extensions are recognized: {valid}."
     raise ValueError(f"Undefined content type for {file}, {msg}")
 
 
-def _long_description(
-    dist: Distribution, val: _ProjectReadmeValue, root_dir: StrPath | None
-):
+def _long_description(dist: "Distribution", val: _DictOrStr, root_dir: _Path):
     from setuptools.config import expand
 
-    file: str | tuple[()]
     if isinstance(val, str):
-        file = val
-        text = expand.read_files(file, root_dir)
-        ctype = _guess_content_type(file)
+        text = expand.read_files(val, root_dir)
+        ctype = _guess_content_type(val)
     else:
-        file = val.get("file") or ()
-        text = val.get("text") or expand.read_files(file, root_dir)
+        text = val.get("text") or expand.read_files(val.get("file", []), root_dir)
         ctype = val["content-type"]
 
-    # XXX: Is it completely safe to assume static?
-    _set_config(dist, "long_description", _static.Str(text))
-
+    _set_config(dist, "long_description", text)
     if ctype:
-        _set_config(dist, "long_description_content_type", _static.Str(ctype))
-
-    if file:
-        dist._referenced_files.add(file)
+        _set_config(dist, "long_description_content_type", ctype)
 
 
-def _license(dist: Distribution, val: str | dict, root_dir: StrPath | None):
+def _license(dist: "Distribution", val: dict, root_dir: _Path):
     from setuptools.config import expand
 
-    if isinstance(val, str):
-        if getattr(dist.metadata, "license", None):
-            SetuptoolsWarning.emit("`license` overwritten by `pyproject.toml`")
-            dist.metadata.license = None
-        _set_config(dist, "license_expression", _static.Str(val))
+    if "file" in val:
+        _set_config(dist, "license", expand.read_files([val["file"]], root_dir))
     else:
-        pypa_guides = "guides/writing-pyproject-toml/#license"
-        SetuptoolsDeprecationWarning.emit(
-            "`project.license` as a TOML table is deprecated",
-            "Please use a simple string containing a SPDX expression for "
-            "`project.license`. You can also use `project.license-files`. "
-            "(Both options available on setuptools>=77.0.0).",
-            see_url=f"https://packaging.python.org/en/latest/{pypa_guides}",
-            due_date=(2026, 2, 18),  # Introduced on 2025-02-18
-        )
-        if "file" in val:
-            # XXX: Is it completely safe to assume static?
-            value = expand.read_files([val["file"]], root_dir)
-            _set_config(dist, "license", _static.Str(value))
-            dist._referenced_files.add(val["file"])
-        else:
-            _set_config(dist, "license", _static.Str(val["text"]))
+        _set_config(dist, "license", val["text"])
 
 
-def _people(dist: Distribution, val: list[dict], _root_dir: StrPath | None, kind: str):
+def _people(dist: "Distribution", val: List[dict], _root_dir: _Path, kind: str):
     field = []
     email_field = []
     for person in val:
@@ -238,70 +175,50 @@ def _people(dist: Distribution, val: list[dict], _root_dir: StrPath | None, kind
             email_field.append(str(addr))
 
     if field:
-        _set_config(dist, kind, _static.Str(", ".join(field)))
+        _set_config(dist, kind, ", ".join(field))
     if email_field:
-        _set_config(dist, f"{kind}_email", _static.Str(", ".join(email_field)))
+        _set_config(dist, f"{kind}_email", ", ".join(email_field))
 
 
-def _project_urls(dist: Distribution, val: dict, _root_dir: StrPath | None):
+def _project_urls(dist: "Distribution", val: dict, _root_dir):
     _set_config(dist, "project_urls", val)
 
 
-def _python_requires(dist: Distribution, val: str, _root_dir: StrPath | None):
-    _set_config(dist, "python_requires", _static.SpecifierSet(val))
+def _python_requires(dist: "Distribution", val: dict, _root_dir):
+    from setuptools.extern.packaging.specifiers import SpecifierSet
+
+    _set_config(dist, "python_requires", SpecifierSet(val))
 
 
-def _dependencies(dist: Distribution, val: list, _root_dir: StrPath | None):
+def _dependencies(dist: "Distribution", val: list, _root_dir):
     if getattr(dist, "install_requires", []):
         msg = "`install_requires` overwritten in `pyproject.toml` (dependencies)"
-        SetuptoolsWarning.emit(msg)
-    dist.install_requires = val
+        warnings.warn(msg)
+    _set_config(dist, "install_requires", val)
 
 
-def _optional_dependencies(dist: Distribution, val: dict, _root_dir: StrPath | None):
-    if getattr(dist, "extras_require", None):
-        msg = "`extras_require` overwritten in `pyproject.toml` (optional-dependencies)"
-        SetuptoolsWarning.emit(msg)
-    dist.extras_require = val
-
-
-def _ext_modules(dist: Distribution, val: list[dict]) -> list[Extension]:
-    existing = dist.ext_modules or []
-    args = ({k.replace("-", "_"): v for k, v in x.items()} for x in val)
-    new = [Extension(**kw) for kw in args]
-    return [*existing, *new]
-
-
-def _noop(_dist: Distribution, val: _T) -> _T:
-    return val
-
-
-def _identity(val: _T) -> _T:
-    return val
+def _optional_dependencies(dist: "Distribution", val: dict, _root_dir):
+    existing = getattr(dist, "extras_require", {})
+    _set_config(dist, "extras_require", {**existing, **val})
 
 
 def _unify_entry_points(project_table: dict):
     project = project_table
-    given = project.pop("entry-points", project.pop("entry_points", {}))
-    entry_points = dict(given)  # Avoid problems with static
+    entry_points = project.pop("entry-points", project.pop("entry_points", {}))
     renaming = {"scripts": "console_scripts", "gui_scripts": "gui_scripts"}
     for key, value in list(project.items()):  # eager to allow modifications
         norm_key = json_compatible_key(key)
-        if norm_key in renaming:
-            # Don't skip even if value is empty (reason: reset missing `dynamic`)
+        if norm_key in renaming and value:
             entry_points[renaming[norm_key]] = project.pop(key)
 
     if entry_points:
         project["entry-points"] = {
             name: [f"{k} = {v}" for k, v in group.items()]
             for name, group in entry_points.items()
-            if group  # now we can skip empty groups
         }
-        # Sometimes this will set `project["entry-points"] = {}`, and that is
-        # intentional (for resetting configurations that are missing `dynamic`).
 
 
-def _copy_command_options(pyproject: dict, dist: Distribution, filename: StrPath):
+def _copy_command_options(pyproject: dict, dist: "Distribution", filename: _Path):
     tool_table = pyproject.get("tool", {})
     cmdclass = tool_table.get("setuptools", {}).get("cmdclass", {})
     valid_options = _valid_command_options(cmdclass)
@@ -320,10 +237,9 @@ def _copy_command_options(pyproject: dict, dist: Distribution, filename: StrPath
                 _logger.warning(f"Command option {cmd}.{key} is not defined")
 
 
-def _valid_command_options(cmdclass: Mapping = EMPTY) -> dict[str, set[str]]:
-    from setuptools.dist import Distribution
-
+def _valid_command_options(cmdclass: Mapping = EMPTY) -> Dict[str, Set[str]]:
     from .._importlib import metadata
+    from setuptools.dist import Distribution
 
     valid_options = {"global": _normalise_cmd_options(Distribution.global_options)}
 
@@ -338,12 +254,7 @@ def _valid_command_options(cmdclass: Mapping = EMPTY) -> dict[str, set[str]]:
     return valid_options
 
 
-def _load_ep(ep: metadata.EntryPoint) -> tuple[str, type] | None:
-    if ep.value.startswith("wheel.bdist_wheel"):
-        # Ignore deprecated entrypoint from wheel and avoid warning pypa/wheel#631
-        # TODO: remove check when `bdist_wheel` has been fully removed from pypa/wheel
-        return None
-
+def _load_ep(ep: "metadata.EntryPoint") -> Optional[Tuple[str, Type]]:
     # Ignore all the errors
     try:
         return (ep.name, ep.load())
@@ -357,34 +268,10 @@ def _normalise_cmd_option_key(name: str) -> str:
     return json_compatible_key(name).strip("_=")
 
 
-def _normalise_cmd_options(desc: _OptionsList) -> set[str]:
+def _normalise_cmd_options(desc: List[Tuple[str, Optional[str], str]]) -> Set[str]:
     return {_normalise_cmd_option_key(fancy_option[0]) for fancy_option in desc}
 
 
-def _get_previous_entrypoints(dist: Distribution) -> dict[str, list]:
-    ignore = ("console_scripts", "gui_scripts")
-    value = getattr(dist, "entry_points", None) or {}
-    return {k: v for k, v in value.items() if k not in ignore}
-
-
-def _get_previous_scripts(dist: Distribution) -> list | None:
-    value = getattr(dist, "entry_points", None) or {}
-    return value.get("console_scripts")
-
-
-def _get_previous_gui_scripts(dist: Distribution) -> list | None:
-    value = getattr(dist, "entry_points", None) or {}
-    return value.get("gui_scripts")
-
-
-def _set_static_list_metadata(attr: str, dist: Distribution, val: list) -> None:
-    """Apply distutils metadata validation but preserve "static" behaviour"""
-    meta = dist.metadata
-    setter, getter = getattr(meta, f"set_{attr}"), getattr(meta, f"get_{attr}")
-    setter(val)
-    setattr(meta, attr, _static.List(getter()))
-
-
 def _attrgetter(attr):
     """
     Similar to ``operator.attrgetter`` but returns None if ``attr`` is not found
@@ -412,15 +299,13 @@ def _some_attrgetter(*items):
     >>> _some_attrgetter("d", "e", "f")(obj) is None
     True
     """
-
     def _acessor(obj):
         values = (_attrgetter(i)(obj) for i in items)
         return next((i for i in values if i is not None), None)
-
     return _acessor
 
 
-PYPROJECT_CORRESPONDENCE: dict[str, _Correspondence] = {
+PYPROJECT_CORRESPONDENCE: Dict[str, _Correspondence] = {
     "readme": _long_description,
     "license": _license,
     "authors": partial(_people, kind="author"),
@@ -432,31 +317,12 @@ PYPROJECT_CORRESPONDENCE: dict[str, _Correspondence] = {
 }
 
 TOOL_TABLE_RENAMES = {"script_files": "scripts"}
-TOOL_TABLE_REMOVALS = {
-    "namespace_packages": """
-        Please migrate to implicit native namespaces instead.
-        See https://packaging.python.org/en/latest/guides/packaging-namespace-packages/.
-        """,
-}
-TOOL_TABLE_CORRESPONDENCE = {
-    # Fields with corresponding core metadata need to be marked as static:
-    "obsoletes": partial(_set_static_list_metadata, "obsoletes"),
-    "provides": partial(_set_static_list_metadata, "provides"),
-    "platforms": partial(_set_static_list_metadata, "platforms"),
+TOOL_TABLE_DEPRECATIONS = {
+    "namespace_packages": "consider using implicit namespaces instead (PEP 420)."
 }
 
-SETUPTOOLS_PATCHES = {
-    "long_description_content_type",
-    "project_urls",
-    "provides_extras",
-    "license_file",
-    "license_files",
-    "license_expression",
-}
-
-_PREPROCESS = {
-    "ext_modules": _ext_modules,
-}
+SETUPTOOLS_PATCHES = {"long_description_content_type", "project_urls",
+                      "provides_extras", "license_file", "license_files"}
 
 _PREVIOUSLY_DEFINED = {
     "name": _attrgetter("metadata.name"),
@@ -464,63 +330,48 @@ _PREVIOUSLY_DEFINED = {
     "description": _attrgetter("metadata.description"),
     "readme": _attrgetter("metadata.long_description"),
     "requires-python": _some_attrgetter("python_requires", "metadata.python_requires"),
-    "license": _some_attrgetter("metadata.license_expression", "metadata.license"),
-    # XXX: `license-file` is currently not considered in the context of `dynamic`.
-    #      See TestPresetField.test_license_files_exempt_from_dynamic
+    "license": _attrgetter("metadata.license"),
     "authors": _some_attrgetter("metadata.author", "metadata.author_email"),
     "maintainers": _some_attrgetter("metadata.maintainer", "metadata.maintainer_email"),
     "keywords": _attrgetter("metadata.keywords"),
     "classifiers": _attrgetter("metadata.classifiers"),
     "urls": _attrgetter("metadata.project_urls"),
-    "entry-points": _get_previous_entrypoints,
-    "scripts": _get_previous_scripts,
-    "gui-scripts": _get_previous_gui_scripts,
-    "dependencies": _attrgetter("install_requires"),
-    "optional-dependencies": _attrgetter("extras_require"),
+    "entry-points": _attrgetter("entry_points"),
+    "dependencies": _some_attrgetter("_orig_install_requires", "install_requires"),
+    "optional-dependencies": _some_attrgetter("_orig_extras_require", "extras_require"),
 }
 
 
-_RESET_PREVIOUSLY_DEFINED: dict = {
-    # Fix improper setting: given in `setup.py`, but not listed in `dynamic`
-    # Use "immutable" data structures to avoid in-place modification.
-    # dict: pyproject name => value to which reset
-    "license": "",
-    # XXX: `license-file` is currently not considered in the context of `dynamic`.
-    #      See TestPresetField.test_license_files_exempt_from_dynamic
-    "authors": _static.EMPTY_LIST,
-    "maintainers": _static.EMPTY_LIST,
-    "keywords": _static.EMPTY_LIST,
-    "classifiers": _static.EMPTY_LIST,
-    "urls": _static.EMPTY_DICT,
-    "entry-points": _static.EMPTY_DICT,
-    "scripts": _static.EMPTY_DICT,
-    "gui-scripts": _static.EMPTY_DICT,
-    "dependencies": _static.EMPTY_LIST,
-    "optional-dependencies": _static.EMPTY_DICT,
-}
+class _WouldIgnoreField(UserWarning):
+    """Inform users that ``pyproject.toml`` would overwrite previous metadata."""
 
+    MESSAGE = """\
+    {field!r} defined outside of `pyproject.toml` would be ignored.
+    !!\n\n
+    ##########################################################################
+    # configuration would be ignored/result in error due to `pyproject.toml` #
+    ##########################################################################
 
-class _MissingDynamic(SetuptoolsWarning):
-    _SUMMARY = "`{field}` defined outside of `pyproject.toml` is ignored."
-
-    _DETAILS = """
     The following seems to be defined outside of `pyproject.toml`:
 
     `{field} = {value!r}`
 
     According to the spec (see the link below), however, setuptools CANNOT
-    consider this value unless `{field}` is listed as `dynamic`.
+    consider this value unless {field!r} is listed as `dynamic`.
 
-    https://packaging.python.org/en/latest/specifications/pyproject-toml/#declaring-project-metadata-the-project-table
+    https://packaging.python.org/en/latest/specifications/declaring-project-metadata/
 
-    To prevent this problem, you can list `{field}` under `dynamic` or alternatively
+    For the time being, `setuptools` will still consider the given value (as a
+    **transitional** measure), but please note that future releases of setuptools will
+    follow strictly the standard.
+
+    To prevent this warning, you can list {field!r} under `dynamic` or alternatively
     remove the `[project]` table from your file and rely entirely on other means of
     configuration.
+    \n\n!!
     """
-    # TODO: Consider removing this check in the future?
-    #       There is a trade-off here between improving "debug-ability" and the cost
-    #       of running/testing/maintaining these unnecessary checks...
 
     @classmethod
-    def details(cls, field: str, value: Any) -> str:
-        return cls._DETAILS.format(field=field, value=value)
+    def message(cls, field, value):
+        from inspect import cleandoc
+        return cleandoc(cls.MESSAGE.format(field=field, value=value))
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/NOTICE b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/NOTICE
deleted file mode 100644
index ac5464d..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/NOTICE
+++ /dev/null
@@ -1,438 +0,0 @@
-The code contained in this directory was automatically generated using the
-following command:
-
-    python -m validate_pyproject.pre_compile --output-dir=setuptools/config/_validate_pyproject --enable-plugins setuptools distutils --very-verbose -t setuptools=setuptools/config/setuptools.schema.json -t distutils=setuptools/config/distutils.schema.json
-
-Please avoid changing it manually.
-
-
-You can report issues or suggest changes directly to `validate-pyproject`
-(or to the relevant plugin repository)
-
-- https://github.com/abravalheri/validate-pyproject/issues
-
-
-***
-
-The following files include code from opensource projects
-(either as direct copies or modified versions):
-
-- `fastjsonschema_exceptions.py`:
-    - project: `fastjsonschema` - licensed under BSD-3-Clause
-      (https://github.com/horejsek/python-fastjsonschema)
-- `extra_validations.py` and `format.py`, `error_reporting.py`:
-    - project: `validate-pyproject` - licensed under MPL-2.0
-      (https://github.com/abravalheri/validate-pyproject)
-
-
-Additionally the following files are automatically generated by tools provided
-by the same projects:
-
-- `__init__.py`
-- `fastjsonschema_validations.py`
-
-The relevant copyright notes and licenses are included below.
-
-
-***
-
-`fastjsonschema`
-================
-
-Copyright (c) 2018, Michal Horejsek
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-  Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-***
-
-`validate-pyproject`
-====================
-
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
-     means each individual or legal entity that creates, contributes to the
-     creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
-     means the combination of the Contributions of others (if any) used by a
-     Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
-     means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
-     means Source Code Form to which the initial Contributor has attached the
-     notice in Exhibit A, the Executable Form of such Source Code Form, and
-     Modifications of such Source Code Form, in each case including portions
-     thereof.
-
-1.5. "Incompatible With Secondary Licenses"
-     means
-
-     a. that the initial Contributor has attached the notice described in
-        Exhibit B to the Covered Software; or
-
-     b. that the Covered Software was made available under the terms of
-        version 1.1 or earlier of the License, but not also under the terms of
-        a Secondary License.
-
-1.6. "Executable Form"
-
-     means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
-     means a work that combines Covered Software with other material, in a
-     separate file or files, that is not Covered Software.
-
-1.8. "License"
-
-     means this document.
-
-1.9. "Licensable"
-
-     means having the right to grant, to the maximum extent possible, whether
-     at the time of the initial grant or subsequently, any and all of the
-     rights conveyed by this License.
-
-1.10. "Modifications"
-
-     means any of the following:
-
-     a. any file in Source Code Form that results from an addition to,
-        deletion from, or modification of the contents of Covered Software; or
-
-     b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
-      means any patent claim(s), including without limitation, method,
-      process, and apparatus claims, in any patent Licensable by such
-      Contributor that would be infringed, but for the grant of the License,
-      by the making, using, selling, offering for sale, having made, import,
-      or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
-      means either the GNU General Public License, Version 2.0, the GNU Lesser
-      General Public License, Version 2.1, the GNU Affero General Public
-      License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
-      means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
-      means an individual or a legal entity exercising rights under this
-      License. For legal entities, "You" includes any entity that controls, is
-      controlled by, or is under common control with You. For purposes of this
-      definition, "control" means (a) the power, direct or indirect, to cause
-      the direction or management of such entity, whether by contract or
-      otherwise, or (b) ownership of more than fifty percent (50%) of the
-      outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-     Each Contributor hereby grants You a world-wide, royalty-free,
-     non-exclusive license:
-
-     a. under intellectual property rights (other than patent or trademark)
-        Licensable by such Contributor to use, reproduce, make available,
-        modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or
-        as part of a Larger Work; and
-
-     b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its
-        Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-     The licenses granted in Section 2.1 with respect to any Contribution
-     become effective for each Contribution on the date the Contributor first
-     distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-     The licenses granted in this Section 2 are the only rights granted under
-     this License. No additional rights or licenses will be implied from the
-     distribution or licensing of Covered Software under this License.
-     Notwithstanding Section 2.1(b) above, no patent license is granted by a
-     Contributor:
-
-     a. for any code that a Contributor has removed from Covered Software; or
-
-     b. for infringements caused by: (i) Your and any other third party's
-        modifications of Covered Software, or (ii) the combination of its
-        Contributions with other software (except as part of its Contributor
-        Version); or
-
-     c. under Patent Claims infringed by Covered Software in the absence of
-        its Contributions.
-
-     This License does not grant any rights in the trademarks, service marks,
-     or logos of any Contributor (except as may be necessary to comply with
-     the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-     No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this
-     License (see Section 10.2) or under the terms of a Secondary License (if
-     permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-     Each Contributor represents that the Contributor believes its
-     Contributions are its original creation(s) or it has sufficient rights to
-     grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-     This License is not intended to limit any rights You have under
-     applicable copyright doctrines of fair use, fair dealing, or other
-     equivalents.
-
-2.7. Conditions
-
-     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
-     Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-     All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under
-     the terms of this License. You must inform recipients that the Source
-     Code Form of the Covered Software is governed by the terms of this
-     License, and how they can obtain a copy of this License. You may not
-     attempt to alter or restrict the recipients' rights in the Source Code
-     Form.
-
-3.2. Distribution of Executable Form
-
-     If You distribute Covered Software in Executable Form then:
-
-     a. such Covered Software must also be made available in Source Code Form,
-        as described in Section 3.1, and You must inform recipients of the
-        Executable Form how they can obtain a copy of such Source Code Form by
-        reasonable means in a timely manner, at a charge no more than the cost
-        of distribution to the recipient; and
-
-     b. You may distribute such Executable Form under the terms of this
-        License, or sublicense it under different terms, provided that the
-        license for the Executable Form does not attempt to limit or alter the
-        recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-     You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for
-     the Covered Software. If the Larger Work is a combination of Covered
-     Software with a work governed by one or more Secondary Licenses, and the
-     Covered Software is not Incompatible With Secondary Licenses, this
-     License permits You to additionally distribute such Covered Software
-     under the terms of such Secondary License(s), so that the recipient of
-     the Larger Work may, at their option, further distribute the Covered
-     Software under the terms of either this License or such Secondary
-     License(s).
-
-3.4. Notices
-
-     You may not remove or alter the substance of any license notices
-     (including copyright notices, patent notices, disclaimers of warranty, or
-     limitations of liability) contained within the Source Code Form of the
-     Covered Software, except that You may alter any license notices to the
-     extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-     You may choose to offer, and to charge a fee for, warranty, support,
-     indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on
-     behalf of any Contributor. You must make it absolutely clear that any
-     such warranty, support, indemnity, or liability obligation is offered by
-     You alone, and You hereby agree to indemnify every Contributor for any
-     liability incurred by such Contributor as a result of warranty, support,
-     indemnity or liability terms You offer. You may include additional
-     disclaimers of warranty and limitations of liability specific to any
-     jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-   If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute,
-   judicial order, or regulation then You must: (a) comply with the terms of
-   this License to the maximum extent possible; and (b) describe the
-   limitations and the code they affect. Such description must be placed in a
-   text file included with all distributions of the Covered Software under
-   this License. Except to the extent prohibited by statute or regulation,
-   such description must be sufficiently detailed for a recipient of ordinary
-   skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
-     fail to comply with any of its terms. However, if You become compliant,
-     then the rights granted under this License from a particular Contributor
-     are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing
-     basis, if such Contributor fails to notify You of the non-compliance by
-     some reasonable means prior to 60 days after You have come back into
-     compliance. Moreover, Your grants from a particular Contributor are
-     reinstated on an ongoing basis if such Contributor notifies You of the
-     non-compliance by some reasonable means, this is the first time You have
-     received notice of non-compliance with this License from such
-     Contributor, and You become compliant prior to 30 days after Your receipt
-     of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions,
-     counter-claims, and cross-claims) alleging that a Contributor Version
-     directly or indirectly infringes any patent, then the rights granted to
-     You by any and all Contributors for the Covered Software under Section
-     2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
-     license agreements (excluding distributors and resellers) which have been
-     validly granted by You or Your distributors under this License prior to
-     termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-   Covered Software is provided under this License on an "as is" basis,
-   without warranty of any kind, either expressed, implied, or statutory,
-   including, without limitation, warranties that the Covered Software is free
-   of defects, merchantable, fit for a particular purpose or non-infringing.
-   The entire risk as to the quality and performance of the Covered Software
-   is with You. Should any Covered Software prove defective in any respect,
-   You (not any Contributor) assume the cost of any necessary servicing,
-   repair, or correction. This disclaimer of warranty constitutes an essential
-   part of this License. No use of  any Covered Software is authorized under
-   this License except under this disclaimer.
-
-7. Limitation of Liability
-
-   Under no circumstances and under no legal theory, whether tort (including
-   negligence), contract, or otherwise, shall any Contributor, or anyone who
-   distributes Covered Software as permitted above, be liable to You for any
-   direct, indirect, special, incidental, or consequential damages of any
-   character including, without limitation, damages for lost profits, loss of
-   goodwill, work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses, even if such party shall have been
-   informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from
-   such party's negligence to the extent applicable law prohibits such
-   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   incidental or consequential damages, so this exclusion and limitation may
-   not apply to You.
-
-8. Litigation
-
-   Any litigation relating to this License may be brought only in the courts
-   of a jurisdiction where the defendant maintains its principal place of
-   business and such litigation shall be governed by laws of that
-   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   in this Section shall prevent a party's ability to bring cross-claims or
-   counter-claims.
-
-9. Miscellaneous
-
-   This License represents the complete agreement concerning the subject
-   matter hereof. If any provision of this License is held to be
-   unenforceable, such provision shall be reformed only to the extent
-   necessary to make it enforceable. Any law or regulation which provides that
-   the language of a contract shall be construed against the drafter shall not
-   be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
-      Mozilla Foundation is the license steward. Except as provided in Section
-      10.3, no one other than the license steward has the right to modify or
-      publish new versions of this License. Each version will be given a
-      distinguishing version number.
-
-10.2. Effect of New Versions
-
-      You may distribute the Covered Software under the terms of the version
-      of the License under which You originally received the Covered Software,
-      or under the terms of any subsequent version published by the license
-      steward.
-
-10.3. Modified Versions
-
-      If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a
-      modified version of this License if you rename the license and remove
-      any references to the name of the license steward (except to note that
-      such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
-      Licenses If You choose to distribute Source Code Form that is
-      Incompatible With Secondary Licenses under the terms of this version of
-      the License, the notice described in Exhibit B of this License must be
-      attached.
-
-Exhibit A - Source Code Form License Notice
-
-      This Source Code Form is subject to the
-      terms of the Mozilla Public License, v.
-      2.0. If a copy of the MPL was not
-      distributed with this file, You can
-      obtain one at
-      https://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
-      This Source Code Form is "Incompatible
-      With Secondary Licenses", as defined by
-      the Mozilla Public License, v. 2.0.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__init__.py
index 4f612bd..dbe6cb4 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__init__.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__init__.py
@@ -30,5 +30,5 @@ def validate(data: Any) -> bool:
     """
     with detailed_errors():
         _validate(data, custom_formats=FORMAT_FUNCTIONS)
-        reduce(lambda acc, fn: fn(acc), EXTRA_VALIDATIONS, data)
+    reduce(lambda acc, fn: fn(acc), EXTRA_VALIDATIONS, data)
     return True
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/__init__.cpython-311.pyc
index 6ebea7f..d9605c6 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/__init__.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/error_reporting.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/error_reporting.cpython-311.pyc
index c56632b..70a2c0b 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/error_reporting.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/error_reporting.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/extra_validations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/extra_validations.cpython-311.pyc
index d0f2733..42e0852 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/extra_validations.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/extra_validations.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_exceptions.cpython-311.pyc
index ac5bece..5ce7322 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_exceptions.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_validations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_validations.cpython-311.pyc
index 8b68a81..4b44fd4 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_validations.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/fastjsonschema_validations.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/formats.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/formats.cpython-311.pyc
index 58b15cb..af3d57c 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/formats.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/__pycache__/formats.cpython-311.pyc differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/error_reporting.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/error_reporting.py
index 3591231..f78e483 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/error_reporting.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/error_reporting.py
@@ -3,21 +3,12 @@ import json
 import logging
 import os
 import re
-import typing
 from contextlib import contextmanager
 from textwrap import indent, wrap
-from typing import Any, Dict, Generator, Iterator, List, Optional, Sequence, Union
+from typing import Any, Dict, Iterator, List, Optional, Sequence, Union, cast
 
 from .fastjsonschema_exceptions import JsonSchemaValueException
 
-if typing.TYPE_CHECKING:
-    import sys
-
-    if sys.version_info < (3, 11):
-        from typing_extensions import Self
-    else:
-        from typing import Self
-
 _logger = logging.getLogger(__name__)
 
 _MESSAGE_REPLACEMENTS = {
@@ -33,7 +24,7 @@ _SKIP_DETAILS = (
     "must not be there",
 )
 
-_NEED_DETAILS = {"anyOf", "oneOf", "allOf", "contains", "propertyNames", "not", "items"}
+_NEED_DETAILS = {"anyOf", "oneOf", "anyOf", "contains", "propertyNames", "not", "items"}
 
 _CAMEL_CASE_SPLITTER = re.compile(r"\W+|([A-Z][^A-Z\W]*)")
 _IDENTIFIER = re.compile(r"^[\w_]+$", re.I)
@@ -45,11 +36,6 @@ _TOML_JARGON = {
     "property names": "keys",
 }
 
-_FORMATS_HELP = """
-For more details about `format` see
-https://validate-pyproject.readthedocs.io/en/latest/api/validate_pyproject.formats.html
-"""
-
 
 class ValidationError(JsonSchemaValueException):
     """Report violations of a given JSON schema.
@@ -73,7 +59,7 @@ class ValidationError(JsonSchemaValueException):
     _original_message = ""
 
     @classmethod
-    def _from_jsonschema(cls, ex: JsonSchemaValueException) -> "Self":
+    def _from_jsonschema(cls, ex: JsonSchemaValueException):
         formatter = _ErrorFormatting(ex)
         obj = cls(str(formatter), ex.value, formatter.name, ex.definition, ex.rule)
         debug_code = os.getenv("JSONSCHEMA_DEBUG_CODE_GENERATION", "false").lower()
@@ -86,7 +72,7 @@ class ValidationError(JsonSchemaValueException):
 
 
 @contextmanager
-def detailed_errors() -> Generator[None, None, None]:
+def detailed_errors():
     try:
         yield
     except JsonSchemaValueException as ex:
@@ -97,7 +83,7 @@ class _ErrorFormatting:
     def __init__(self, ex: JsonSchemaValueException):
         self.ex = ex
         self.name = f"`{self._simplify_name(ex.name)}`"
-        self._original_message: str = self.ex.message.replace(ex.name, self.name)
+        self._original_message = self.ex.message.replace(ex.name, self.name)
         self._summary = ""
         self._details = ""
 
@@ -121,12 +107,11 @@ class _ErrorFormatting:
 
         return self._details
 
-    @staticmethod
-    def _simplify_name(name: str) -> str:
+    def _simplify_name(self, name):
         x = len("data.")
         return name[x:] if name.startswith("data.") else name
 
-    def _expand_summary(self) -> str:
+    def _expand_summary(self):
         msg = self._original_message
 
         for bad, repl in _MESSAGE_REPLACEMENTS.items():
@@ -144,9 +129,8 @@ class _ErrorFormatting:
 
     def _expand_details(self) -> str:
         optional = []
-        definition = self.ex.definition or {}
-        desc_lines = definition.pop("$$description", [])
-        desc = definition.pop("description", None) or " ".join(desc_lines)
+        desc_lines = self.ex.definition.pop("$$description", [])
+        desc = self.ex.definition.pop("description", None) or " ".join(desc_lines)
         if desc:
             description = "\n".join(
                 wrap(
@@ -158,20 +142,18 @@ class _ErrorFormatting:
                 )
             )
             optional.append(f"DESCRIPTION:\n{description}")
-        schema = json.dumps(definition, indent=4)
+        schema = json.dumps(self.ex.definition, indent=4)
         value = json.dumps(self.ex.value, indent=4)
         defaults = [
             f"GIVEN VALUE:\n{indent(value, '    ')}",
             f"OFFENDING RULE: {self.ex.rule!r}",
             f"DEFINITION:\n{indent(schema, '    ')}",
         ]
-        msg = "\n\n".join(optional + defaults)
-        epilog = f"\n{_FORMATS_HELP}" if "format" in msg.lower() else ""
-        return msg + epilog
+        return "\n\n".join(optional + defaults)
 
 
 class _SummaryWriter:
-    _IGNORE = frozenset(("description", "default", "title", "examples"))
+    _IGNORE = {"description", "default", "title", "examples"}
 
     def __init__(self, jargon: Optional[Dict[str, str]] = None):
         self.jargon: Dict[str, str] = jargon or {}
@@ -260,9 +242,7 @@ class _SummaryWriter:
         key = path[-1]
         return any(key.startswith(k) for k in "$_") or key in self._IGNORE
 
-    def _filter_unecessary(
-        self, schema: Dict[str, Any], path: Sequence[str]
-    ) -> Dict[str, Any]:
+    def _filter_unecessary(self, schema: dict, path: Sequence[str]):
         return {
             key: value
             for key, value in schema.items()
@@ -291,7 +271,7 @@ class _SummaryWriter:
             self(v, item_prefix, _path=[*path, f"[{i}]"]) for i, v in enumerate(schemas)
         )
 
-    def _is_property(self, path: Sequence[str]) -> bool:
+    def _is_property(self, path: Sequence[str]):
         """Check if the given path can correspond to an arbitrarily named property"""
         counter = 0
         for key in path[-2::-1]:
@@ -316,7 +296,9 @@ class _SummaryWriter:
     def _value(self, value: Any, path: Sequence[str]) -> str:
         if path[-1] == "type" and not self._is_property(path):
             type_ = self._jargon(value)
-            return f"[{', '.join(type_)}]" if isinstance(type_, list) else type_
+            return (
+                f"[{', '.join(type_)}]" if isinstance(value, list) else cast(str, type_)
+            )
         return repr(value)
 
     def _inline_attrs(self, schema: dict, path: Sequence[str]) -> Iterator[str]:
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/extra_validations.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/extra_validations.py
index 789411d..4130a42 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/extra_validations.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/extra_validations.py
@@ -3,7 +3,6 @@ difficult to express as a JSON Schema (or that are not supported by the current
 JSON Schema library).
 """
 
-from inspect import cleandoc
 from typing import Mapping, TypeVar
 
 from .error_reporting import ValidationError
@@ -12,23 +11,11 @@ T = TypeVar("T", bound=Mapping)
 
 
 class RedefiningStaticFieldAsDynamic(ValidationError):
-    _DESC = """According to PEP 621:
+    """According to PEP 621:
 
     Build back-ends MUST raise an error if the metadata specifies a field
     statically as well as being listed in dynamic.
     """
-    __doc__ = _DESC
-    _URL = (
-        "https://packaging.python.org/en/latest/specifications/"
-        "pyproject-toml/#dynamic"
-    )
-
-
-class IncludedDependencyGroupMustExist(ValidationError):
-    _DESC = """An included dependency group must exist and must not be cyclic.
-    """
-    __doc__ = _DESC
-    _URL = "https://peps.python.org/pep-0735/"
 
 
 def validate_project_dynamic(pyproject: T) -> T:
@@ -37,46 +24,13 @@ def validate_project_dynamic(pyproject: T) -> T:
 
     for field in dynamic:
         if field in project_table:
-            raise RedefiningStaticFieldAsDynamic(
-                message=f"You cannot provide a value for `project.{field}` and "
-                "list it under `project.dynamic` at the same time",
-                value={
-                    field: project_table[field],
-                    "...": " # ...",
-                    "dynamic": dynamic,
-                },
-                name=f"data.project.{field}",
-                definition={
-                    "description": cleandoc(RedefiningStaticFieldAsDynamic._DESC),
-                    "see": RedefiningStaticFieldAsDynamic._URL,
-                },
-                rule="PEP 621",
-            )
+            msg = f"You cannot provide a value for `project.{field}` and "
+            msg += "list it under `project.dynamic` at the same time"
+            name = f"data.project.{field}"
+            value = {field: project_table[field], "...": " # ...", "dynamic": dynamic}
+            raise RedefiningStaticFieldAsDynamic(msg, value, name, rule="PEP 621")
 
     return pyproject
 
 
-def validate_include_depenency(pyproject: T) -> T:
-    dependency_groups = pyproject.get("dependency-groups", {})
-    for key, value in dependency_groups.items():
-        for each in value:
-            if (
-                isinstance(each, dict)
-                and (include_group := each.get("include-group"))
-                and include_group not in dependency_groups
-            ):
-                raise IncludedDependencyGroupMustExist(
-                    message=f"The included dependency group {include_group} doesn't exist",
-                    value=each,
-                    name=f"data.dependency_groups.{key}",
-                    definition={
-                        "description": cleandoc(IncludedDependencyGroupMustExist._DESC),
-                        "see": IncludedDependencyGroupMustExist._URL,
-                    },
-                    rule="PEP 735",
-                )
-    # TODO: check for `include-group` cycles (can be conditional to graphlib)
-    return pyproject
-
-
-EXTRA_VALIDATIONS = (validate_project_dynamic, validate_include_depenency)
+EXTRA_VALIDATIONS = (validate_project_dynamic,)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_validations.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
index c69368a..ad5ee31 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/fastjsonschema_validations.py
@@ -1,5 +1,5 @@
 # noqa
-# ruff: noqa
+# type: ignore
 # flake8: noqa
 # pylint: skip-file
 # mypy: ignore-errors
@@ -10,14 +10,12 @@
 # *** PLEASE DO NOT MODIFY DIRECTLY: Automatically generated code *** 
 
 
-VERSION = "2.20.0"
-from decimal import Decimal
+VERSION = "2.15.3"
 import re
 from .fastjsonschema_exceptions import JsonSchemaValueException
 
 
 REGEX_PATTERNS = {
-    '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$': re.compile('^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])\\Z'),
     '^.*$': re.compile('^.*$'),
     '.+': re.compile('.+'),
     '^.+$': re.compile('^.+$'),
@@ -32,7 +30,7 @@ def validate(data, custom_formats={}, name_prefix=None):
 
 def validate_https___packaging_python_org_en_latest_specifications_declaring_build_dependencies(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-build-dependencies/', 'title': 'Data structure for ``pyproject.toml`` files', '$$description': ['File format containing build-time configurations for the Python ecosystem. ', ':pep:`517` initially defined a build-system independent format for source trees', 'which was complemented by :pep:`518` to provide a way of specifying dependencies ', 'for building Python projects.', 'Please notice the ``project`` table (as initially defined in  :pep:`621`) is not included', 'in this schema and should be considered separately.'], 'type': 'object', 'additionalProperties': False, 'properties': {'build-system': {'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, 'tool': {'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/deprecated/distutils/configfile.html', 'title': '``tool.distutils`` table', '$$description': ['**EXPERIMENTAL** (NOT OFFICIALLY SUPPORTED): Use ``tool.distutils``', 'subtables to configure arguments for ``distutils`` commands.', 'Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` commands via `distutils configuration files', '`_.', 'See also `the old Python docs _`.'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html', 'title': '``tool.setuptools`` table', '$$description': ['``setuptools``-specific configurations that can be set by users that require', 'customization.', 'These configurations are completely optional and probably can be skipped when', 'creating simple packages. They are equivalent to some of the `Keywords', '`_', 'used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.', 'It considers only ``setuptools`` `parameters', '`_', 'that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``', 'and ``setup_requires`` (incompatible with modern workflows/standards).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, 'script-files': {'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$ref': '#/definitions/package-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$ref': '#/definitions/package-name'}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'ext-modules': {'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$ref': '#/definitions/ext-module'}}, 'data-files': {'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive-for-dependencies'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive-for-dependencies'}}}, 'readme': {'type': 'object', 'anyOf': [{'$ref': '#/definitions/file-directive'}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'$ref': '#/definitions/file-directive/properties/file'}}, 'additionalProperties': False}], 'required': ['file']}}}}, 'definitions': {'package-name': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, 'ext-module': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, 'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'file-directive-for-dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}, 'dependency-groups': {'type': 'object', 'description': 'Dependency groups following PEP 735', 'additionalProperties': False, 'patternProperties': {'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$': {'type': 'array', 'items': {'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}}}}}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-build-dependencies/', 'title': 'Data structure for ``pyproject.toml`` files', '$$description': ['File format containing build-time configurations for the Python ecosystem. ', ':pep:`517` initially defined a build-system independent format for source trees', 'which was complemented by :pep:`518` to provide a way of specifying dependencies ', 'for building Python projects.', 'Please notice the ``project`` table (as initially defined in  :pep:`621`) is not included', 'in this schema and should be considered separately.'], 'type': 'object', 'additionalProperties': False, 'properties': {'build-system': {'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, 'tool': {'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://docs.python.org/3/install/', 'title': '``tool.distutils`` table', '$$description': ['Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` scripts via `distutils configuration files', '`_.', '``tool.distutils`` subtables could be used with the same purpose', '(NOT CURRENTLY IMPLEMENTED).'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://setuptools.pypa.io/en/latest/references/keywords.html', 'title': '``tool.setuptools`` table', '$$description': ['Please notice for the time being the ``setuptools`` project does not specify', 'a way of configuring builds via ``pyproject.toml``.', 'Therefore this schema should be taken just as a *"thought experiment"* on how', 'this *might be done*, by following the principles established in', '`ini2toml `_.', 'It considers only ``setuptools`` `parameters', '`_', 'that can currently be configured via ``setup.cfg`` and are not covered by :pep:`621`', 'but intentionally excludes ``dependency_links`` and ``setup_requires``.', 'NOTE: ``scripts`` was renamed to ``script-files`` to avoid confusion with', 'entry-point based scripts (defined in :pep:`621`).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, 'script-files': {'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'data-files': {'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive'}}}, 'readme': {'anyOf': [{'$ref': '#/definitions/file-directive'}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}}, 'definitions': {'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
         data_keys = set(data.keys())
@@ -43,9 +41,9 @@ def validate_https___packaging_python_org_en_latest_specifications_declaring_bui
                 raise JsonSchemaValueException("" + (name_prefix or "data") + ".build-system must be object", value=data__buildsystem, name="" + (name_prefix or "data") + ".build-system", definition={'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, rule='type')
             data__buildsystem_is_dict = isinstance(data__buildsystem, dict)
             if data__buildsystem_is_dict:
-                data__buildsystem__missing_keys = set(['requires']) - data__buildsystem.keys()
-                if data__buildsystem__missing_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".build-system must contain " + (str(sorted(data__buildsystem__missing_keys)) + " properties"), value=data__buildsystem, name="" + (name_prefix or "data") + ".build-system", definition={'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, rule='required')
+                data__buildsystem_len = len(data__buildsystem)
+                if not all(prop in data__buildsystem for prop in ['requires']):
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".build-system must contain ['requires'] properties", value=data__buildsystem, name="" + (name_prefix or "data") + ".build-system", definition={'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, rule='required')
                 data__buildsystem_keys = set(data__buildsystem.keys())
                 if "requires" in data__buildsystem_keys:
                     data__buildsystem_keys.remove("requires")
@@ -82,81 +80,30 @@ def validate_https___packaging_python_org_en_latest_specifications_declaring_bui
         if "project" in data_keys:
             data_keys.remove("project")
             data__project = data["project"]
-            validate_https___packaging_python_org_en_latest_specifications_pyproject_toml(data__project, custom_formats, (name_prefix or "data") + ".project")
+            validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata(data__project, custom_formats, (name_prefix or "data") + ".project")
         if "tool" in data_keys:
             data_keys.remove("tool")
             data__tool = data["tool"]
             if not isinstance(data__tool, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".tool must be object", value=data__tool, name="" + (name_prefix or "data") + ".tool", definition={'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/deprecated/distutils/configfile.html', 'title': '``tool.distutils`` table', '$$description': ['**EXPERIMENTAL** (NOT OFFICIALLY SUPPORTED): Use ``tool.distutils``', 'subtables to configure arguments for ``distutils`` commands.', 'Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` commands via `distutils configuration files', '`_.', 'See also `the old Python docs _`.'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html', 'title': '``tool.setuptools`` table', '$$description': ['``setuptools``-specific configurations that can be set by users that require', 'customization.', 'These configurations are completely optional and probably can be skipped when', 'creating simple packages. They are equivalent to some of the `Keywords', '`_', 'used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.', 'It considers only ``setuptools`` `parameters', '`_', 'that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``', 'and ``setup_requires`` (incompatible with modern workflows/standards).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, 'script-files': {'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$ref': '#/definitions/package-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$ref': '#/definitions/package-name'}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'ext-modules': {'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$ref': '#/definitions/ext-module'}}, 'data-files': {'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive-for-dependencies'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive-for-dependencies'}}}, 'readme': {'type': 'object', 'anyOf': [{'$ref': '#/definitions/file-directive'}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'$ref': '#/definitions/file-directive/properties/file'}}, 'additionalProperties': False}], 'required': ['file']}}}}, 'definitions': {'package-name': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, 'ext-module': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, 'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'file-directive-for-dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".tool must be object", value=data__tool, name="" + (name_prefix or "data") + ".tool", definition={'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://docs.python.org/3/install/', 'title': '``tool.distutils`` table', '$$description': ['Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` scripts via `distutils configuration files', '`_.', '``tool.distutils`` subtables could be used with the same purpose', '(NOT CURRENTLY IMPLEMENTED).'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://setuptools.pypa.io/en/latest/references/keywords.html', 'title': '``tool.setuptools`` table', '$$description': ['Please notice for the time being the ``setuptools`` project does not specify', 'a way of configuring builds via ``pyproject.toml``.', 'Therefore this schema should be taken just as a *"thought experiment"* on how', 'this *might be done*, by following the principles established in', '`ini2toml `_.', 'It considers only ``setuptools`` `parameters', '`_', 'that can currently be configured via ``setup.cfg`` and are not covered by :pep:`621`', 'but intentionally excludes ``dependency_links`` and ``setup_requires``.', 'NOTE: ``scripts`` was renamed to ``script-files`` to avoid confusion with', 'entry-point based scripts (defined in :pep:`621`).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, 'script-files': {'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'data-files': {'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive'}}}, 'readme': {'anyOf': [{'$ref': '#/definitions/file-directive'}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}}, 'definitions': {'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}, rule='type')
             data__tool_is_dict = isinstance(data__tool, dict)
             if data__tool_is_dict:
                 data__tool_keys = set(data__tool.keys())
                 if "distutils" in data__tool_keys:
                     data__tool_keys.remove("distutils")
                     data__tool__distutils = data__tool["distutils"]
-                    validate_https___setuptools_pypa_io_en_latest_deprecated_distutils_configfile_html(data__tool__distutils, custom_formats, (name_prefix or "data") + ".tool.distutils")
+                    validate_https___docs_python_org_3_install(data__tool__distutils, custom_formats, (name_prefix or "data") + ".tool.distutils")
                 if "setuptools" in data__tool_keys:
                     data__tool_keys.remove("setuptools")
                     data__tool__setuptools = data__tool["setuptools"]
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html(data__tool__setuptools, custom_formats, (name_prefix or "data") + ".tool.setuptools")
-        if "dependency-groups" in data_keys:
-            data_keys.remove("dependency-groups")
-            data__dependencygroups = data["dependency-groups"]
-            if not isinstance(data__dependencygroups, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups must be object", value=data__dependencygroups, name="" + (name_prefix or "data") + ".dependency-groups", definition={'type': 'object', 'description': 'Dependency groups following PEP 735', 'additionalProperties': False, 'patternProperties': {'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$': {'type': 'array', 'items': {'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}}}}, rule='type')
-            data__dependencygroups_is_dict = isinstance(data__dependencygroups, dict)
-            if data__dependencygroups_is_dict:
-                data__dependencygroups_keys = set(data__dependencygroups.keys())
-                for data__dependencygroups_key, data__dependencygroups_val in data__dependencygroups.items():
-                    if REGEX_PATTERNS['^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'].search(data__dependencygroups_key):
-                        if data__dependencygroups_key in data__dependencygroups_keys:
-                            data__dependencygroups_keys.remove(data__dependencygroups_key)
-                        if not isinstance(data__dependencygroups_val, (list, tuple)):
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}".format(**locals()) + " must be array", value=data__dependencygroups_val, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}".format(**locals()) + "", definition={'type': 'array', 'items': {'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}}, rule='type')
-                        data__dependencygroups_val_is_list = isinstance(data__dependencygroups_val, (list, tuple))
-                        if data__dependencygroups_val_is_list:
-                            data__dependencygroups_val_len = len(data__dependencygroups_val)
-                            for data__dependencygroups_val_x, data__dependencygroups_val_item in enumerate(data__dependencygroups_val):
-                                data__dependencygroups_val_item_one_of_count1 = 0
-                                if data__dependencygroups_val_item_one_of_count1 < 2:
-                                    try:
-                                        if not isinstance(data__dependencygroups_val_item, (str)):
-                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + " must be string", value=data__dependencygroups_val_item, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + "", definition={'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, rule='type')
-                                        if isinstance(data__dependencygroups_val_item, str):
-                                            if not custom_formats["pep508"](data__dependencygroups_val_item):
-                                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + " must be pep508", value=data__dependencygroups_val_item, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + "", definition={'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, rule='format')
-                                        data__dependencygroups_val_item_one_of_count1 += 1
-                                    except JsonSchemaValueException: pass
-                                if data__dependencygroups_val_item_one_of_count1 < 2:
-                                    try:
-                                        if not isinstance(data__dependencygroups_val_item, (dict)):
-                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + " must be object", value=data__dependencygroups_val_item, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + "", definition={'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}, rule='type')
-                                        data__dependencygroups_val_item_is_dict = isinstance(data__dependencygroups_val_item, dict)
-                                        if data__dependencygroups_val_item_is_dict:
-                                            data__dependencygroups_val_item_keys = set(data__dependencygroups_val_item.keys())
-                                            if "include-group" in data__dependencygroups_val_item_keys:
-                                                data__dependencygroups_val_item_keys.remove("include-group")
-                                                data__dependencygroups_val_item__includegroup = data__dependencygroups_val_item["include-group"]
-                                                if not isinstance(data__dependencygroups_val_item__includegroup, (str)):
-                                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}].include-group".format(**locals()) + " must be string", value=data__dependencygroups_val_item__includegroup, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}].include-group".format(**locals()) + "", definition={'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}, rule='type')
-                                                if isinstance(data__dependencygroups_val_item__includegroup, str):
-                                                    if not REGEX_PATTERNS['^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'].search(data__dependencygroups_val_item__includegroup):
-                                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}].include-group".format(**locals()) + " must match pattern ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$", value=data__dependencygroups_val_item__includegroup, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}].include-group".format(**locals()) + "", definition={'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}, rule='pattern')
-                                            if data__dependencygroups_val_item_keys:
-                                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + " must not contain "+str(data__dependencygroups_val_item_keys)+" properties", value=data__dependencygroups_val_item, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + "", definition={'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}, rule='additionalProperties')
-                                        data__dependencygroups_val_item_one_of_count1 += 1
-                                    except JsonSchemaValueException: pass
-                                if data__dependencygroups_val_item_one_of_count1 != 1:
-                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + " must be valid exactly by one definition" + (" (" + str(data__dependencygroups_val_item_one_of_count1) + " matches found)"), value=data__dependencygroups_val_item, name="" + (name_prefix or "data") + ".dependency-groups.{data__dependencygroups_key}[{data__dependencygroups_val_x}]".format(**locals()) + "", definition={'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}, rule='oneOf')
-                if data__dependencygroups_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dependency-groups must not contain "+str(data__dependencygroups_keys)+" properties", value=data__dependencygroups, name="" + (name_prefix or "data") + ".dependency-groups", definition={'type': 'object', 'description': 'Dependency groups following PEP 735', 'additionalProperties': False, 'patternProperties': {'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$': {'type': 'array', 'items': {'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}}}}, rule='additionalProperties')
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html(data__tool__setuptools, custom_formats, (name_prefix or "data") + ".tool.setuptools")
         if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-build-dependencies/', 'title': 'Data structure for ``pyproject.toml`` files', '$$description': ['File format containing build-time configurations for the Python ecosystem. ', ':pep:`517` initially defined a build-system independent format for source trees', 'which was complemented by :pep:`518` to provide a way of specifying dependencies ', 'for building Python projects.', 'Please notice the ``project`` table (as initially defined in  :pep:`621`) is not included', 'in this schema and should be considered separately.'], 'type': 'object', 'additionalProperties': False, 'properties': {'build-system': {'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, 'tool': {'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/deprecated/distutils/configfile.html', 'title': '``tool.distutils`` table', '$$description': ['**EXPERIMENTAL** (NOT OFFICIALLY SUPPORTED): Use ``tool.distutils``', 'subtables to configure arguments for ``distutils`` commands.', 'Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` commands via `distutils configuration files', '`_.', 'See also `the old Python docs _`.'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html', 'title': '``tool.setuptools`` table', '$$description': ['``setuptools``-specific configurations that can be set by users that require', 'customization.', 'These configurations are completely optional and probably can be skipped when', 'creating simple packages. They are equivalent to some of the `Keywords', '`_', 'used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.', 'It considers only ``setuptools`` `parameters', '`_', 'that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``', 'and ``setup_requires`` (incompatible with modern workflows/standards).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, 'script-files': {'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$ref': '#/definitions/package-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$ref': '#/definitions/package-name'}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'ext-modules': {'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$ref': '#/definitions/ext-module'}}, 'data-files': {'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive-for-dependencies'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive-for-dependencies'}}}, 'readme': {'type': 'object', 'anyOf': [{'$ref': '#/definitions/file-directive'}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'$ref': '#/definitions/file-directive/properties/file'}}, 'additionalProperties': False}], 'required': ['file']}}}}, 'definitions': {'package-name': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, 'ext-module': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, 'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'file-directive-for-dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}, 'dependency-groups': {'type': 'object', 'description': 'Dependency groups following PEP 735', 'additionalProperties': False, 'patternProperties': {'^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$': {'type': 'array', 'items': {'oneOf': [{'type': 'string', 'description': 'Python package specifiers following PEP 508', 'format': 'pep508'}, {'type': 'object', 'additionalProperties': False, 'properties': {'include-group': {'description': 'Another dependency group to include in this one', 'type': 'string', 'pattern': '^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9])$'}}}]}}}}}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, rule='additionalProperties')
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-build-dependencies/', 'title': 'Data structure for ``pyproject.toml`` files', '$$description': ['File format containing build-time configurations for the Python ecosystem. ', ':pep:`517` initially defined a build-system independent format for source trees', 'which was complemented by :pep:`518` to provide a way of specifying dependencies ', 'for building Python projects.', 'Please notice the ``project`` table (as initially defined in  :pep:`621`) is not included', 'in this schema and should be considered separately.'], 'type': 'object', 'additionalProperties': False, 'properties': {'build-system': {'type': 'object', 'description': 'Table used to store build-related data', 'additionalProperties': False, 'properties': {'requires': {'type': 'array', '$$description': ['List of dependencies in the :pep:`508` format required to execute the build', 'system. Please notice that the resulting dependency graph', '**MUST NOT contain cycles**'], 'items': {'type': 'string'}}, 'build-backend': {'type': 'string', 'description': 'Python object that will be used to perform the build according to :pep:`517`', 'format': 'pep517-backend-reference'}, 'backend-path': {'type': 'array', '$$description': ['List of directories to be prepended to ``sys.path`` when loading the', 'back-end, and running its hooks'], 'items': {'type': 'string', '$comment': 'Should be a path (TODO: enforce it with format?)'}}}, 'required': ['requires']}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, 'tool': {'type': 'object', 'properties': {'distutils': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://docs.python.org/3/install/', 'title': '``tool.distutils`` table', '$$description': ['Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` scripts via `distutils configuration files', '`_.', '``tool.distutils`` subtables could be used with the same purpose', '(NOT CURRENTLY IMPLEMENTED).'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, 'setuptools': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://setuptools.pypa.io/en/latest/references/keywords.html', 'title': '``tool.setuptools`` table', '$$description': ['Please notice for the time being the ``setuptools`` project does not specify', 'a way of configuring builds via ``pyproject.toml``.', 'Therefore this schema should be taken just as a *"thought experiment"* on how', 'this *might be done*, by following the principles established in', '`ini2toml `_.', 'It considers only ``setuptools`` `parameters', '`_', 'that can currently be configured via ``setup.cfg`` and are not covered by :pep:`621`', 'but intentionally excludes ``dependency_links`` and ``setup_requires``.', 'NOTE: ``scripts`` was renamed to ``script-files`` to avoid confusion with', 'entry-point based scripts (defined in :pep:`621`).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, 'script-files': {'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$ref': '#/definitions/find-directive'}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'data-files': {'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'$ref': '#/definitions/attr-directive'}, {'$ref': '#/definitions/file-directive'}]}, 'classifiers': {'$ref': '#/definitions/file-directive'}, 'description': {'$ref': '#/definitions/file-directive'}, 'dependencies': {'$ref': '#/definitions/file-directive'}, 'entry-points': {'$ref': '#/definitions/file-directive'}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$ref': '#/definitions/file-directive'}}}, 'readme': {'anyOf': [{'$ref': '#/definitions/file-directive'}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}}, 'definitions': {'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}}}}, 'project': {'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$ref': '#/definitions/author'}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create command-line wrappers for the given', '`entry points `_.']}, 'gui-scripts': {'$ref': '#/definitions/entry-point-group', '$$description': ['Instruct the installer to create GUI wrappers for the given', '`entry points `_.', 'The difference between ``scripts`` and ``gui-scripts`` is only relevant in', 'Windows.']}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$ref': '#/definitions/entry-point-group'}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$ref': '#/definitions/dependency'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$ref': '#/definitions/dependency'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, rule='additionalProperties')
     return data
 
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html(data, custom_formats={}, name_prefix=None):
+def validate_https___setuptools_pypa_io_en_latest_references_keywords_html(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html', 'title': '``tool.setuptools`` table', '$$description': ['``setuptools``-specific configurations that can be set by users that require', 'customization.', 'These configurations are completely optional and probably can be skipped when', 'creating simple packages. They are equivalent to some of the `Keywords', '`_', 'used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.', 'It considers only ``setuptools`` `parameters', '`_', 'that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``', 'and ``setup_requires`` (incompatible with modern workflows/standards).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, 'script-files': {'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'ext-modules': {'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}}, 'data-files': {'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, 'readme': {'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}}}}, 'definitions': {'package-name': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, 'ext-module': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, 'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'file-directive-for-dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://setuptools.pypa.io/en/latest/references/keywords.html', 'title': '``tool.setuptools`` table', '$$description': ['Please notice for the time being the ``setuptools`` project does not specify', 'a way of configuring builds via ``pyproject.toml``.', 'Therefore this schema should be taken just as a *"thought experiment"* on how', 'this *might be done*, by following the principles established in', '`ini2toml `_.', 'It considers only ``setuptools`` `parameters', '`_', 'that can currently be configured via ``setup.cfg`` and are not covered by :pep:`621`', 'but intentionally excludes ``dependency_links`` and ``setup_requires``.', 'NOTE: ``scripts`` was renamed to ``script-files`` to avoid confusion with', 'entry-point based scripts (defined in :pep:`621`).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, 'script-files': {'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'data-files': {'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, 'readme': {'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}}, 'definitions': {'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
         data_keys = set(data.keys())
@@ -203,12 +150,12 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
             data_keys.remove("zip-safe")
             data__zipsafe = data["zip-safe"]
             if not isinstance(data__zipsafe, (bool)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".zip-safe must be boolean", value=data__zipsafe, name="" + (name_prefix or "data") + ".zip-safe", definition={'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".zip-safe must be boolean", value=data__zipsafe, name="" + (name_prefix or "data") + ".zip-safe", definition={'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, rule='type')
         if "script-files" in data_keys:
             data_keys.remove("script-files")
             data__scriptfiles = data["script-files"]
             if not isinstance(data__scriptfiles, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".script-files must be array", value=data__scriptfiles, name="" + (name_prefix or "data") + ".script-files", definition={'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".script-files must be array", value=data__scriptfiles, name="" + (name_prefix or "data") + ".script-files", definition={'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, rule='type')
             data__scriptfiles_is_list = isinstance(data__scriptfiles, (list, tuple))
             if data__scriptfiles_is_list:
                 data__scriptfiles_len = len(data__scriptfiles)
@@ -219,7 +166,7 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
             data_keys.remove("eager-resources")
             data__eagerresources = data["eager-resources"]
             if not isinstance(data__eagerresources, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".eager-resources must be array", value=data__eagerresources, name="" + (name_prefix or "data") + ".eager-resources", definition={'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".eager-resources must be array", value=data__eagerresources, name="" + (name_prefix or "data") + ".eager-resources", definition={'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, rule='type')
             data__eagerresources_is_list = isinstance(data__eagerresources, (list, tuple))
             if data__eagerresources_is_list:
                 data__eagerresources_len = len(data__eagerresources)
@@ -229,30 +176,34 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
         if "packages" in data_keys:
             data_keys.remove("packages")
             data__packages = data["packages"]
-            data__packages_one_of_count2 = 0
-            if data__packages_one_of_count2 < 2:
+            data__packages_one_of_count1 = 0
+            if data__packages_one_of_count1 < 2:
                 try:
                     if not isinstance(data__packages, (list, tuple)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages must be array", value=data__packages, name="" + (name_prefix or "data") + ".packages", definition={'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}}, rule='type')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages must be array", value=data__packages, name="" + (name_prefix or "data") + ".packages", definition={'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, rule='type')
                     data__packages_is_list = isinstance(data__packages, (list, tuple))
                     if data__packages_is_list:
                         data__packages_len = len(data__packages)
                         for data__packages_x, data__packages_item in enumerate(data__packages):
-                            validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_package_name(data__packages_item, custom_formats, (name_prefix or "data") + ".packages[{data__packages_x}]".format(**locals()))
-                    data__packages_one_of_count2 += 1
+                            if not isinstance(data__packages_item, (str)):
+                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages[{data__packages_x}]".format(**locals()) + " must be string", value=data__packages_item, name="" + (name_prefix or "data") + ".packages[{data__packages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='type')
+                            if isinstance(data__packages_item, str):
+                                if not custom_formats["python-module-name"](data__packages_item):
+                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages[{data__packages_x}]".format(**locals()) + " must be python-module-name", value=data__packages_item, name="" + (name_prefix or "data") + ".packages[{data__packages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='format')
+                    data__packages_one_of_count1 += 1
                 except JsonSchemaValueException: pass
-            if data__packages_one_of_count2 < 2:
+            if data__packages_one_of_count1 < 2:
                 try:
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_find_directive(data__packages, custom_formats, (name_prefix or "data") + ".packages")
-                    data__packages_one_of_count2 += 1
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_find_directive(data__packages, custom_formats, (name_prefix or "data") + ".packages")
+                    data__packages_one_of_count1 += 1
                 except JsonSchemaValueException: pass
-            if data__packages_one_of_count2 != 1:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages must be valid exactly by one definition" + (" (" + str(data__packages_one_of_count2) + " matches found)"), value=data__packages, name="" + (name_prefix or "data") + ".packages", definition={'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, rule='oneOf')
+            if data__packages_one_of_count1 != 1:
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".packages must be valid exactly by one definition" + (" (" + str(data__packages_one_of_count1) + " matches found)"), value=data__packages, name="" + (name_prefix or "data") + ".packages", definition={'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, rule='oneOf')
         if "package-dir" in data_keys:
             data_keys.remove("package-dir")
             data__packagedir = data["package-dir"]
             if not isinstance(data__packagedir, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be object", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be object", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='type')
             data__packagedir_is_dict = isinstance(data__packagedir, dict)
             if data__packagedir_is_dict:
                 data__packagedir_keys = set(data__packagedir.keys())
@@ -263,35 +214,37 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                         if not isinstance(data__packagedir_val, (str)):
                             raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir.{data__packagedir_key}".format(**locals()) + " must be string", value=data__packagedir_val, name="" + (name_prefix or "data") + ".package-dir.{data__packagedir_key}".format(**locals()) + "", definition={'type': 'string'}, rule='type')
                 if data__packagedir_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must not contain "+str(data__packagedir_keys)+" properties", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='additionalProperties')
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must not contain "+str(data__packagedir_keys)+" properties", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='additionalProperties')
                 data__packagedir_len = len(data__packagedir)
                 if data__packagedir_len != 0:
                     data__packagedir_property_names = True
                     for data__packagedir_key in data__packagedir:
                         try:
-                            data__packagedir_key_any_of_count3 = 0
-                            if not data__packagedir_key_any_of_count3:
+                            data__packagedir_key_one_of_count2 = 0
+                            if data__packagedir_key_one_of_count2 < 2:
+                                try:
+                                    if isinstance(data__packagedir_key, str):
+                                        if not custom_formats["python-module-name"](data__packagedir_key):
+                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be python-module-name", value=data__packagedir_key, name="" + (name_prefix or "data") + ".package-dir", definition={'format': 'python-module-name'}, rule='format')
+                                    data__packagedir_key_one_of_count2 += 1
+                                except JsonSchemaValueException: pass
+                            if data__packagedir_key_one_of_count2 < 2:
                                 try:
                                     if data__packagedir_key != "":
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be same as const definition: ", value=data__packagedir_key, name="" + (name_prefix or "data") + ".package-dir", definition={'const': ''}, rule='const')
-                                    data__packagedir_key_any_of_count3 += 1
+                                    data__packagedir_key_one_of_count2 += 1
                                 except JsonSchemaValueException: pass
-                            if not data__packagedir_key_any_of_count3:
-                                try:
-                                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_package_name(data__packagedir_key, custom_formats, (name_prefix or "data") + ".package-dir")
-                                    data__packagedir_key_any_of_count3 += 1
-                                except JsonSchemaValueException: pass
-                            if not data__packagedir_key_any_of_count3:
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir cannot be validated by any definition", value=data__packagedir_key, name="" + (name_prefix or "data") + ".package-dir", definition={'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, rule='anyOf')
+                            if data__packagedir_key_one_of_count2 != 1:
+                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be valid exactly by one definition" + (" (" + str(data__packagedir_key_one_of_count2) + " matches found)"), value=data__packagedir_key, name="" + (name_prefix or "data") + ".package-dir", definition={'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, rule='oneOf')
                         except JsonSchemaValueException:
                             data__packagedir_property_names = False
                     if not data__packagedir_property_names:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be named by propertyName definition", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='propertyNames')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-dir must be named by propertyName definition", value=data__packagedir, name="" + (name_prefix or "data") + ".package-dir", definition={'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, rule='propertyNames')
         if "package-data" in data_keys:
             data_keys.remove("package-data")
             data__packagedata = data["package-data"]
             if not isinstance(data__packagedata, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be object", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be object", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
             data__packagedata_is_dict = isinstance(data__packagedata, dict)
             if data__packagedata_is_dict:
                 data__packagedata_keys = set(data__packagedata.keys())
@@ -308,34 +261,32 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                                 if not isinstance(data__packagedata_val_item, (str)):
                                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data.{data__packagedata_key}[{data__packagedata_val_x}]".format(**locals()) + " must be string", value=data__packagedata_val_item, name="" + (name_prefix or "data") + ".package-data.{data__packagedata_key}[{data__packagedata_val_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
                 if data__packagedata_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must not contain "+str(data__packagedata_keys)+" properties", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='additionalProperties')
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must not contain "+str(data__packagedata_keys)+" properties", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='additionalProperties')
                 data__packagedata_len = len(data__packagedata)
                 if data__packagedata_len != 0:
                     data__packagedata_property_names = True
                     for data__packagedata_key in data__packagedata:
                         try:
-                            data__packagedata_key_any_of_count4 = 0
-                            if not data__packagedata_key_any_of_count4:
+                            data__packagedata_key_one_of_count3 = 0
+                            if data__packagedata_key_one_of_count3 < 2:
                                 try:
-                                    if not isinstance(data__packagedata_key, (str)):
-                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be string", value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'type': 'string', 'format': 'python-module-name'}, rule='type')
                                     if isinstance(data__packagedata_key, str):
                                         if not custom_formats["python-module-name"](data__packagedata_key):
-                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be python-module-name", value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'type': 'string', 'format': 'python-module-name'}, rule='format')
-                                    data__packagedata_key_any_of_count4 += 1
+                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be python-module-name", value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'format': 'python-module-name'}, rule='format')
+                                    data__packagedata_key_one_of_count3 += 1
                                 except JsonSchemaValueException: pass
-                            if not data__packagedata_key_any_of_count4:
+                            if data__packagedata_key_one_of_count3 < 2:
                                 try:
                                     if data__packagedata_key != "*":
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be same as const definition: *", value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'const': '*'}, rule='const')
-                                    data__packagedata_key_any_of_count4 += 1
+                                    data__packagedata_key_one_of_count3 += 1
                                 except JsonSchemaValueException: pass
-                            if not data__packagedata_key_any_of_count4:
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data cannot be validated by any definition", value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, rule='anyOf')
+                            if data__packagedata_key_one_of_count3 != 1:
+                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be valid exactly by one definition" + (" (" + str(data__packagedata_key_one_of_count3) + " matches found)"), value=data__packagedata_key, name="" + (name_prefix or "data") + ".package-data", definition={'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, rule='oneOf')
                         except JsonSchemaValueException:
                             data__packagedata_property_names = False
                     if not data__packagedata_property_names:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be named by propertyName definition", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='propertyNames')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".package-data must be named by propertyName definition", value=data__packagedata, name="" + (name_prefix or "data") + ".package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='propertyNames')
         if "include-package-data" in data_keys:
             data_keys.remove("include-package-data")
             data__includepackagedata = data["include-package-data"]
@@ -345,7 +296,7 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
             data_keys.remove("exclude-package-data")
             data__excludepackagedata = data["exclude-package-data"]
             if not isinstance(data__excludepackagedata, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be object", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be object", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
             data__excludepackagedata_is_dict = isinstance(data__excludepackagedata, dict)
             if data__excludepackagedata_is_dict:
                 data__excludepackagedata_keys = set(data__excludepackagedata.keys())
@@ -362,77 +313,65 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                                 if not isinstance(data__excludepackagedata_val_item, (str)):
                                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data.{data__excludepackagedata_key}[{data__excludepackagedata_val_x}]".format(**locals()) + " must be string", value=data__excludepackagedata_val_item, name="" + (name_prefix or "data") + ".exclude-package-data.{data__excludepackagedata_key}[{data__excludepackagedata_val_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
                 if data__excludepackagedata_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must not contain "+str(data__excludepackagedata_keys)+" properties", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='additionalProperties')
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must not contain "+str(data__excludepackagedata_keys)+" properties", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='additionalProperties')
                 data__excludepackagedata_len = len(data__excludepackagedata)
                 if data__excludepackagedata_len != 0:
                     data__excludepackagedata_property_names = True
                     for data__excludepackagedata_key in data__excludepackagedata:
                         try:
-                            data__excludepackagedata_key_any_of_count5 = 0
-                            if not data__excludepackagedata_key_any_of_count5:
+                            data__excludepackagedata_key_one_of_count4 = 0
+                            if data__excludepackagedata_key_one_of_count4 < 2:
                                 try:
-                                    if not isinstance(data__excludepackagedata_key, (str)):
-                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be string", value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'type': 'string', 'format': 'python-module-name'}, rule='type')
                                     if isinstance(data__excludepackagedata_key, str):
                                         if not custom_formats["python-module-name"](data__excludepackagedata_key):
-                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be python-module-name", value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'type': 'string', 'format': 'python-module-name'}, rule='format')
-                                    data__excludepackagedata_key_any_of_count5 += 1
+                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be python-module-name", value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'format': 'python-module-name'}, rule='format')
+                                    data__excludepackagedata_key_one_of_count4 += 1
                                 except JsonSchemaValueException: pass
-                            if not data__excludepackagedata_key_any_of_count5:
+                            if data__excludepackagedata_key_one_of_count4 < 2:
                                 try:
                                     if data__excludepackagedata_key != "*":
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be same as const definition: *", value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'const': '*'}, rule='const')
-                                    data__excludepackagedata_key_any_of_count5 += 1
+                                    data__excludepackagedata_key_one_of_count4 += 1
                                 except JsonSchemaValueException: pass
-                            if not data__excludepackagedata_key_any_of_count5:
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data cannot be validated by any definition", value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, rule='anyOf')
+                            if data__excludepackagedata_key_one_of_count4 != 1:
+                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be valid exactly by one definition" + (" (" + str(data__excludepackagedata_key_one_of_count4) + " matches found)"), value=data__excludepackagedata_key, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, rule='oneOf')
                         except JsonSchemaValueException:
                             data__excludepackagedata_property_names = False
                     if not data__excludepackagedata_property_names:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be named by propertyName definition", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='propertyNames')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".exclude-package-data must be named by propertyName definition", value=data__excludepackagedata, name="" + (name_prefix or "data") + ".exclude-package-data", definition={'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='propertyNames')
         if "namespace-packages" in data_keys:
             data_keys.remove("namespace-packages")
             data__namespacepackages = data["namespace-packages"]
             if not isinstance(data__namespacepackages, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages must be array", value=data__namespacepackages, name="" + (name_prefix or "data") + ".namespace-packages", definition={'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages must be array", value=data__namespacepackages, name="" + (name_prefix or "data") + ".namespace-packages", definition={'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, rule='type')
             data__namespacepackages_is_list = isinstance(data__namespacepackages, (list, tuple))
             if data__namespacepackages_is_list:
                 data__namespacepackages_len = len(data__namespacepackages)
                 for data__namespacepackages_x, data__namespacepackages_item in enumerate(data__namespacepackages):
                     if not isinstance(data__namespacepackages_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + " must be string", value=data__namespacepackages_item, name="" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='type')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + " must be string", value=data__namespacepackages_item, name="" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='type')
                     if isinstance(data__namespacepackages_item, str):
-                        if not custom_formats["python-module-name-relaxed"](data__namespacepackages_item):
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + " must be python-module-name-relaxed", value=data__namespacepackages_item, name="" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='format')
+                        if not custom_formats["python-module-name"](data__namespacepackages_item):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + " must be python-module-name", value=data__namespacepackages_item, name="" + (name_prefix or "data") + ".namespace-packages[{data__namespacepackages_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='format')
         if "py-modules" in data_keys:
             data_keys.remove("py-modules")
             data__pymodules = data["py-modules"]
             if not isinstance(data__pymodules, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules must be array", value=data__pymodules, name="" + (name_prefix or "data") + ".py-modules", definition={'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules must be array", value=data__pymodules, name="" + (name_prefix or "data") + ".py-modules", definition={'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, rule='type')
             data__pymodules_is_list = isinstance(data__pymodules, (list, tuple))
             if data__pymodules_is_list:
                 data__pymodules_len = len(data__pymodules)
                 for data__pymodules_x, data__pymodules_item in enumerate(data__pymodules):
                     if not isinstance(data__pymodules_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + " must be string", value=data__pymodules_item, name="" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='type')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + " must be string", value=data__pymodules_item, name="" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='type')
                     if isinstance(data__pymodules_item, str):
-                        if not custom_formats["python-module-name-relaxed"](data__pymodules_item):
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + " must be python-module-name-relaxed", value=data__pymodules_item, name="" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='format')
-        if "ext-modules" in data_keys:
-            data_keys.remove("ext-modules")
-            data__extmodules = data["ext-modules"]
-            if not isinstance(data__extmodules, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".ext-modules must be array", value=data__extmodules, name="" + (name_prefix or "data") + ".ext-modules", definition={'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}}, rule='type')
-            data__extmodules_is_list = isinstance(data__extmodules, (list, tuple))
-            if data__extmodules_is_list:
-                data__extmodules_len = len(data__extmodules)
-                for data__extmodules_x, data__extmodules_item in enumerate(data__extmodules):
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_ext_module(data__extmodules_item, custom_formats, (name_prefix or "data") + ".ext-modules[{data__extmodules_x}]".format(**locals()))
+                        if not custom_formats["python-module-name"](data__pymodules_item):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + " must be python-module-name", value=data__pymodules_item, name="" + (name_prefix or "data") + ".py-modules[{data__pymodules_x}]".format(**locals()) + "", definition={'type': 'string', 'format': 'python-module-name'}, rule='format')
         if "data-files" in data_keys:
             data_keys.remove("data-files")
             data__datafiles = data["data-files"]
             if not isinstance(data__datafiles, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".data-files must be object", value=data__datafiles, name="" + (name_prefix or "data") + ".data-files", definition={'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".data-files must be object", value=data__datafiles, name="" + (name_prefix or "data") + ".data-files", definition={'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, rule='type')
             data__datafiles_is_dict = isinstance(data__datafiles, dict)
             if data__datafiles_is_dict:
                 data__datafiles_keys = set(data__datafiles.keys())
@@ -469,58 +408,59 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
             data_keys.remove("license-files")
             data__licensefiles = data["license-files"]
             if not isinstance(data__licensefiles, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".license-files must be array", value=data__licensefiles, name="" + (name_prefix or "data") + ".license-files", definition={'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".license-files must be array", value=data__licensefiles, name="" + (name_prefix or "data") + ".license-files", definition={'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, rule='type')
             data__licensefiles_is_list = isinstance(data__licensefiles, (list, tuple))
             if data__licensefiles_is_list:
                 data__licensefiles_len = len(data__licensefiles)
                 for data__licensefiles_x, data__licensefiles_item in enumerate(data__licensefiles):
                     if not isinstance(data__licensefiles_item, (str)):
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".license-files[{data__licensefiles_x}]".format(**locals()) + " must be string", value=data__licensefiles_item, name="" + (name_prefix or "data") + ".license-files[{data__licensefiles_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
+        else: data["license-files"] = ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*']
         if "dynamic" in data_keys:
             data_keys.remove("dynamic")
             data__dynamic = data["dynamic"]
             if not isinstance(data__dynamic, (dict)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be object", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, 'readme': {'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be object", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, 'readme': {'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}, rule='type')
             data__dynamic_is_dict = isinstance(data__dynamic, dict)
             if data__dynamic_is_dict:
                 data__dynamic_keys = set(data__dynamic.keys())
                 if "version" in data__dynamic_keys:
                     data__dynamic_keys.remove("version")
                     data__dynamic__version = data__dynamic["version"]
-                    data__dynamic__version_one_of_count6 = 0
-                    if data__dynamic__version_one_of_count6 < 2:
+                    data__dynamic__version_one_of_count5 = 0
+                    if data__dynamic__version_one_of_count5 < 2:
                         try:
-                            validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_attr_directive(data__dynamic__version, custom_formats, (name_prefix or "data") + ".dynamic.version")
-                            data__dynamic__version_one_of_count6 += 1
+                            validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_attr_directive(data__dynamic__version, custom_formats, (name_prefix or "data") + ".dynamic.version")
+                            data__dynamic__version_one_of_count5 += 1
                         except JsonSchemaValueException: pass
-                    if data__dynamic__version_one_of_count6 < 2:
+                    if data__dynamic__version_one_of_count5 < 2:
                         try:
-                            validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data__dynamic__version, custom_formats, (name_prefix or "data") + ".dynamic.version")
-                            data__dynamic__version_one_of_count6 += 1
+                            validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__version, custom_formats, (name_prefix or "data") + ".dynamic.version")
+                            data__dynamic__version_one_of_count5 += 1
                         except JsonSchemaValueException: pass
-                    if data__dynamic__version_one_of_count6 != 1:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.version must be valid exactly by one definition" + (" (" + str(data__dynamic__version_one_of_count6) + " matches found)"), value=data__dynamic__version, name="" + (name_prefix or "data") + ".dynamic.version", definition={'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, rule='oneOf')
+                    if data__dynamic__version_one_of_count5 != 1:
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.version must be valid exactly by one definition" + (" (" + str(data__dynamic__version_one_of_count5) + " matches found)"), value=data__dynamic__version, name="" + (name_prefix or "data") + ".dynamic.version", definition={'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, rule='oneOf')
                 if "classifiers" in data__dynamic_keys:
                     data__dynamic_keys.remove("classifiers")
                     data__dynamic__classifiers = data__dynamic["classifiers"]
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data__dynamic__classifiers, custom_formats, (name_prefix or "data") + ".dynamic.classifiers")
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__classifiers, custom_formats, (name_prefix or "data") + ".dynamic.classifiers")
                 if "description" in data__dynamic_keys:
                     data__dynamic_keys.remove("description")
                     data__dynamic__description = data__dynamic["description"]
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data__dynamic__description, custom_formats, (name_prefix or "data") + ".dynamic.description")
-                if "entry-points" in data__dynamic_keys:
-                    data__dynamic_keys.remove("entry-points")
-                    data__dynamic__entrypoints = data__dynamic["entry-points"]
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data__dynamic__entrypoints, custom_formats, (name_prefix or "data") + ".dynamic.entry-points")
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__description, custom_formats, (name_prefix or "data") + ".dynamic.description")
                 if "dependencies" in data__dynamic_keys:
                     data__dynamic_keys.remove("dependencies")
                     data__dynamic__dependencies = data__dynamic["dependencies"]
-                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive_for_dependencies(data__dynamic__dependencies, custom_formats, (name_prefix or "data") + ".dynamic.dependencies")
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__dependencies, custom_formats, (name_prefix or "data") + ".dynamic.dependencies")
+                if "entry-points" in data__dynamic_keys:
+                    data__dynamic_keys.remove("entry-points")
+                    data__dynamic__entrypoints = data__dynamic["entry-points"]
+                    validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__entrypoints, custom_formats, (name_prefix or "data") + ".dynamic.entry-points")
                 if "optional-dependencies" in data__dynamic_keys:
                     data__dynamic_keys.remove("optional-dependencies")
                     data__dynamic__optionaldependencies = data__dynamic["optional-dependencies"]
                     if not isinstance(data__dynamic__optionaldependencies, (dict)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be object", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, rule='type')
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be object", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, rule='type')
                     data__dynamic__optionaldependencies_is_dict = isinstance(data__dynamic__optionaldependencies, dict)
                     if data__dynamic__optionaldependencies_is_dict:
                         data__dynamic__optionaldependencies_keys = set(data__dynamic__optionaldependencies.keys())
@@ -528,38 +468,32 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                             if REGEX_PATTERNS['.+'].search(data__dynamic__optionaldependencies_key):
                                 if data__dynamic__optionaldependencies_key in data__dynamic__optionaldependencies_keys:
                                     data__dynamic__optionaldependencies_keys.remove(data__dynamic__optionaldependencies_key)
-                                validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive_for_dependencies(data__dynamic__optionaldependencies_val, custom_formats, (name_prefix or "data") + ".dynamic.optional-dependencies.{data__dynamic__optionaldependencies_key}".format(**locals()))
+                                validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__optionaldependencies_val, custom_formats, (name_prefix or "data") + ".dynamic.optional-dependencies.{data__dynamic__optionaldependencies_key}")
                         if data__dynamic__optionaldependencies_keys:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must not contain "+str(data__dynamic__optionaldependencies_keys)+" properties", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, rule='additionalProperties')
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must not contain "+str(data__dynamic__optionaldependencies_keys)+" properties", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, rule='additionalProperties')
                         data__dynamic__optionaldependencies_len = len(data__dynamic__optionaldependencies)
                         if data__dynamic__optionaldependencies_len != 0:
                             data__dynamic__optionaldependencies_property_names = True
                             for data__dynamic__optionaldependencies_key in data__dynamic__optionaldependencies:
                                 try:
-                                    if not isinstance(data__dynamic__optionaldependencies_key, (str)):
-                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be string", value=data__dynamic__optionaldependencies_key, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'string', 'format': 'pep508-identifier'}, rule='type')
                                     if isinstance(data__dynamic__optionaldependencies_key, str):
-                                        if not custom_formats["pep508-identifier"](data__dynamic__optionaldependencies_key):
-                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be pep508-identifier", value=data__dynamic__optionaldependencies_key, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'string', 'format': 'pep508-identifier'}, rule='format')
+                                        if not custom_formats["python-identifier"](data__dynamic__optionaldependencies_key):
+                                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be python-identifier", value=data__dynamic__optionaldependencies_key, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'format': 'python-identifier'}, rule='format')
                                 except JsonSchemaValueException:
                                     data__dynamic__optionaldependencies_property_names = False
                             if not data__dynamic__optionaldependencies_property_names:
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be named by propertyName definition", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, rule='propertyNames')
+                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.optional-dependencies must be named by propertyName definition", value=data__dynamic__optionaldependencies, name="" + (name_prefix or "data") + ".dynamic.optional-dependencies", definition={'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, rule='propertyNames')
                 if "readme" in data__dynamic_keys:
                     data__dynamic_keys.remove("readme")
                     data__dynamic__readme = data__dynamic["readme"]
-                    if not isinstance(data__dynamic__readme, (dict)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme must be object", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}, rule='type')
-                    data__dynamic__readme_any_of_count7 = 0
-                    if not data__dynamic__readme_any_of_count7:
+                    data__dynamic__readme_any_of_count6 = 0
+                    if not data__dynamic__readme_any_of_count6:
                         try:
-                            validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data__dynamic__readme, custom_formats, (name_prefix or "data") + ".dynamic.readme")
-                            data__dynamic__readme_any_of_count7 += 1
+                            validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data__dynamic__readme, custom_formats, (name_prefix or "data") + ".dynamic.readme")
+                            data__dynamic__readme_any_of_count6 += 1
                         except JsonSchemaValueException: pass
-                    if not data__dynamic__readme_any_of_count7:
+                    if not data__dynamic__readme_any_of_count6:
                         try:
-                            if not isinstance(data__dynamic__readme, (dict)):
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme must be object", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}, rule='type')
                             data__dynamic__readme_is_dict = isinstance(data__dynamic__readme, dict)
                             if data__dynamic__readme_is_dict:
                                 data__dynamic__readme_keys = set(data__dynamic__readme.keys())
@@ -568,75 +502,41 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                                     data__dynamic__readme__contenttype = data__dynamic__readme["content-type"]
                                     if not isinstance(data__dynamic__readme__contenttype, (str)):
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme.content-type must be string", value=data__dynamic__readme__contenttype, name="" + (name_prefix or "data") + ".dynamic.readme.content-type", definition={'type': 'string'}, rule='type')
-                                if "file" in data__dynamic__readme_keys:
-                                    data__dynamic__readme_keys.remove("file")
-                                    data__dynamic__readme__file = data__dynamic__readme["file"]
-                                    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive_properties_file(data__dynamic__readme__file, custom_formats, (name_prefix or "data") + ".dynamic.readme.file")
-                                if data__dynamic__readme_keys:
-                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme must not contain "+str(data__dynamic__readme_keys)+" properties", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}, rule='additionalProperties')
-                            data__dynamic__readme_any_of_count7 += 1
+                            data__dynamic__readme_any_of_count6 += 1
                         except JsonSchemaValueException: pass
-                    if not data__dynamic__readme_any_of_count7:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme cannot be validated by any definition", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}, rule='anyOf')
+                    if not data__dynamic__readme_any_of_count6:
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme cannot be validated by any definition", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}, rule='anyOf')
                     data__dynamic__readme_is_dict = isinstance(data__dynamic__readme, dict)
                     if data__dynamic__readme_is_dict:
-                        data__dynamic__readme__missing_keys = set(['file']) - data__dynamic__readme.keys()
-                        if data__dynamic__readme__missing_keys:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme must contain " + (str(sorted(data__dynamic__readme__missing_keys)) + " properties"), value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}, rule='required')
+                        data__dynamic__readme_len = len(data__dynamic__readme)
+                        if not all(prop in data__dynamic__readme for prop in ['file']):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic.readme must contain ['file'] properties", value=data__dynamic__readme, name="" + (name_prefix or "data") + ".dynamic.readme", definition={'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}, rule='required')
                 if data__dynamic_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must not contain "+str(data__dynamic_keys)+" properties", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, 'readme': {'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}}}, rule='additionalProperties')
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must not contain "+str(data__dynamic_keys)+" properties", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, 'readme': {'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}, rule='additionalProperties')
         if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html', 'title': '``tool.setuptools`` table', '$$description': ['``setuptools``-specific configurations that can be set by users that require', 'customization.', 'These configurations are completely optional and probably can be skipped when', 'creating simple packages. They are equivalent to some of the `Keywords', '`_', 'used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.', 'It considers only ``setuptools`` `parameters', '`_', 'that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``', 'and ``setup_requires`` (incompatible with modern workflows/standards).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'$$description': ['Whether the project can be safely installed and run from a zip file.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'boolean'}, 'script-files': {'$$description': ['Legacy way of defining scripts (entry-points are preferred).', 'Equivalent to the ``script`` keyword in ``setup.py``', '(it was renamed to avoid confusion with entry-point based ``project.scripts``', 'defined in :pep:`621`).', '**DISCOURAGED**: generic script wrappers are tricky and may not work properly.', 'Whenever possible, please use ``project.scripts`` instead.'], 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.', '**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and', '``setup.py install`` in the context of ``eggs`` (**DEPRECATED**).'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'const': ''}, {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'anyOf': [{'type': 'string', 'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html', 'description': '**DEPRECATED**: use implicit namespaces instead (:pep:`420`).'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name-relaxed'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'ext-modules': {'description': 'Extension modules to be compiled by setuptools', 'type': 'array', 'items': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}}, 'data-files': {'$$description': ['``dict``-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', '**DISCOURAGED**: please notice this might not work as expected with wheels.', 'Whenever possible, consider using data files inside the package directories', '(or create a new namespace package that only contains data files).', 'See `data files support', '`_.'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['**PROVISIONAL**: list of glob patterns for all license files being distributed.', '(likely to become standard with :pep:`639`).', "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.', 'Also ensure to set ``project.dynamic`` accordingly.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'type': 'string', 'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$ref': '#/definitions/file-directive'}]}}}, 'readme': {'type': 'object', 'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'type': 'object', 'properties': {'content-type': {'type': 'string'}, 'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'additionalProperties': False}], 'required': ['file']}}}}, 'definitions': {'package-name': {'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, 'ext-module': {'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, 'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'file-directive-for-dependencies': {'title': "'file:' directive for dependencies", 'allOf': [{'$$description': ['**BETA**: subset of the ``requirements.txt`` format', 'without ``pip`` flags and options', '(one :pep:`508`-compliant string per line,', 'lines that are blank or start with ``#`` are excluded).', 'See `dynamic metadata', '`_.']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}, rule='additionalProperties')
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://setuptools.pypa.io/en/latest/references/keywords.html', 'title': '``tool.setuptools`` table', '$$description': ['Please notice for the time being the ``setuptools`` project does not specify', 'a way of configuring builds via ``pyproject.toml``.', 'Therefore this schema should be taken just as a *"thought experiment"* on how', 'this *might be done*, by following the principles established in', '`ini2toml `_.', 'It considers only ``setuptools`` `parameters', '`_', 'that can currently be configured via ``setup.cfg`` and are not covered by :pep:`621`', 'but intentionally excludes ``dependency_links`` and ``setup_requires``.', 'NOTE: ``scripts`` was renamed to ``script-files`` to avoid confusion with', 'entry-point based scripts (defined in :pep:`621`).'], 'type': 'object', 'additionalProperties': False, 'properties': {'platforms': {'type': 'array', 'items': {'type': 'string'}}, 'provides': {'$$description': ['Package and virtual package names contained within this package', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'obsoletes': {'$$description': ['Packages which this package renders obsolete', '**(not supported by pip)**'], 'type': 'array', 'items': {'type': 'string', 'format': 'pep508-identifier'}}, 'zip-safe': {'description': 'Whether the project can be safely installed and run from a zip file.', 'type': 'boolean'}, 'script-files': {'description': 'Legacy way of defining scripts (entry-points are preferred).', 'type': 'array', 'items': {'type': 'string'}, '$comment': 'TODO: is this field deprecated/should be removed?'}, 'eager-resources': {'$$description': ['Resources that should be extracted together, if any of them is needed,', 'or if any C extensions included in the project are imported.'], 'type': 'array', 'items': {'type': 'string'}}, 'packages': {'$$description': ['Packages that should be included in the distribution.', 'It can be given either as a list of package identifiers', 'or as a ``dict``-like structure with a single key ``find``', 'which corresponds to a dynamic call to', '``setuptools.config.expand.find_packages`` function.', 'The ``find`` key is associated with a nested ``dict``-like structure that can', 'contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,', 'mimicking the keyword arguments of the associated function.'], 'oneOf': [{'title': 'Array of Python package identifiers', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}}, {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}]}, 'package-dir': {'$$description': [':class:`dict`-like structure mapping from package names to directories where their', 'code can be found.', 'The empty string (as key) means that all packages are contained inside', 'the given directory will be included in the distribution.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': ''}]}, 'patternProperties': {'^.*$': {'type': 'string'}}}, 'package-data': {'$$description': ['Mapping from package names to lists of glob patterns.', 'Usually this option is not needed when using ``include-package-data = true``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'include-package-data': {'$$description': ['Automatically include any data files inside the package directories', 'that are specified by ``MANIFEST.in``', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'boolean'}, 'exclude-package-data': {'$$description': ['Mapping from package names to lists of glob patterns that should be excluded', 'For more information on how to include data files, check ``setuptools`` `docs', '`_.'], 'type': 'object', 'additionalProperties': False, 'propertyNames': {'oneOf': [{'format': 'python-module-name'}, {'const': '*'}]}, 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'namespace-packages': {'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'https://setuptools.pypa.io/en/latest/userguide/package_discovery.html'}, 'py-modules': {'description': 'Modules that setuptools will manipulate', 'type': 'array', 'items': {'type': 'string', 'format': 'python-module-name'}, '$comment': 'TODO: clarify the relationship with ``packages``'}, 'data-files': {'$$description': ['**DEPRECATED**: dict-like structure where each key represents a directory and', 'the value is a list of glob patterns that should be installed in them.', "Please notice this don't work with wheels. See `data files support", '`_'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'array', 'items': {'type': 'string'}}}}, 'cmdclass': {'$$description': ['Mapping of distutils-style command names to ``setuptools.Command`` subclasses', 'which in turn should be represented by strings with a qualified class name', '(i.e., "dotted" form with module), e.g.::\n\n', '    cmdclass = {mycmd = "pkg.subpkg.module.CommandClass"}\n\n', 'The command class should be a directly defined at the top-level of the', 'containing module (no class nesting).'], 'type': 'object', 'patternProperties': {'^.*$': {'type': 'string', 'format': 'python-qualified-identifier'}}}, 'license-files': {'type': 'array', 'items': {'type': 'string'}, '$$description': ['PROVISIONAL: List of glob patterns for all license files being distributed.', '(might become standard with PEP 639).'], 'default': ['LICEN[CS]E*', ' COPYING*', ' NOTICE*', 'AUTHORS*'], '$comment': 'TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?'}, 'dynamic': {'type': 'object', 'description': 'Instructions for loading :pep:`621`-related metadata dynamically', 'additionalProperties': False, 'properties': {'version': {'$$description': ['A version dynamically loaded via either the ``attr:`` or ``file:``', 'directives. Please make sure the given file or attribute respects :pep:`440`.'], 'oneOf': [{'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}]}, 'classifiers': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'description': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'dependencies': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'entry-points': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'optional-dependencies': {'type': 'object', 'propertyNames': {'format': 'python-identifier'}, 'additionalProperties': False, 'patternProperties': {'.+': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}}}, 'readme': {'anyOf': [{'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, {'properties': {'content-type': {'type': 'string'}}}], 'required': ['file']}}}}, 'definitions': {'file-directive': {'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, 'attr-directive': {'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, 'find-directive': {'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}}}, rule='additionalProperties')
     return data
 
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive_properties_file(data, custom_formats={}, name_prefix=None):
-    data_one_of_count8 = 0
-    if data_one_of_count8 < 2:
-        try:
-            if not isinstance(data, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must be string", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'string'}, rule='type')
-            data_one_of_count8 += 1
-        except JsonSchemaValueException: pass
-    if data_one_of_count8 < 2:
-        try:
-            if not isinstance(data, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must be array", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data_is_list = isinstance(data, (list, tuple))
-            if data_is_list:
-                data_len = len(data)
-                for data_x, data_item in enumerate(data):
-                    if not isinstance(data_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + "[{data_x}]".format(**locals()) + " must be string", value=data_item, name="" + (name_prefix or "data") + "[{data_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-            data_one_of_count8 += 1
-        except JsonSchemaValueException: pass
-    if data_one_of_count8 != 1:
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be valid exactly by one definition" + (" (" + str(data_one_of_count8) + " matches found)"), value=data, name="" + (name_prefix or "data") + "", definition={'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}, rule='oneOf')
-    return data
-
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive_for_dependencies(data, custom_formats={}, name_prefix=None):
-    validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data, custom_formats, (name_prefix or "data") + "")
-    return data
-
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_file_directive(data, custom_formats={}, name_prefix=None):
+def validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_file_directive(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
         raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
-        data__missing_keys = set(['file']) - data.keys()
-        if data__missing_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, rule='required')
+        data_len = len(data)
+        if not all(prop in data for prop in ['file']):
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain ['file'] properties", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, rule='required')
         data_keys = set(data.keys())
         if "file" in data_keys:
             data_keys.remove("file")
             data__file = data["file"]
-            data__file_one_of_count9 = 0
-            if data__file_one_of_count9 < 2:
+            data__file_one_of_count7 = 0
+            if data__file_one_of_count7 < 2:
                 try:
                     if not isinstance(data__file, (str)):
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".file must be string", value=data__file, name="" + (name_prefix or "data") + ".file", definition={'type': 'string'}, rule='type')
-                    data__file_one_of_count9 += 1
+                    data__file_one_of_count7 += 1
                 except JsonSchemaValueException: pass
-            if data__file_one_of_count9 < 2:
+            if data__file_one_of_count7 < 2:
                 try:
                     if not isinstance(data__file, (list, tuple)):
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".file must be array", value=data__file, name="" + (name_prefix or "data") + ".file", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
@@ -646,241 +546,33 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
                         for data__file_x, data__file_item in enumerate(data__file):
                             if not isinstance(data__file_item, (str)):
                                 raise JsonSchemaValueException("" + (name_prefix or "data") + ".file[{data__file_x}]".format(**locals()) + " must be string", value=data__file_item, name="" + (name_prefix or "data") + ".file[{data__file_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-                    data__file_one_of_count9 += 1
+                    data__file_one_of_count7 += 1
                 except JsonSchemaValueException: pass
-            if data__file_one_of_count9 != 1:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".file must be valid exactly by one definition" + (" (" + str(data__file_one_of_count9) + " matches found)"), value=data__file, name="" + (name_prefix or "data") + ".file", definition={'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}, rule='oneOf')
+            if data__file_one_of_count7 != 1:
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".file must be valid exactly by one definition" + (" (" + str(data__file_one_of_count7) + " matches found)"), value=data__file, name="" + (name_prefix or "data") + ".file", definition={'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}, rule='oneOf')
         if data_keys:
             raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/file-directive', 'title': "'file:' directive", 'description': 'Value is read from a file (or list of files and then concatenated)', 'type': 'object', 'additionalProperties': False, 'properties': {'file': {'oneOf': [{'type': 'string'}, {'type': 'array', 'items': {'type': 'string'}}]}}, 'required': ['file']}, rule='additionalProperties')
     return data
 
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_attr_directive(data, custom_formats={}, name_prefix=None):
+def validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_attr_directive(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
-        data__missing_keys = set(['attr']) - data.keys()
-        if data__missing_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, rule='required')
+        data_len = len(data)
+        if not all(prop in data for prop in ['attr']):
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain ['attr'] properties", value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, rule='required')
         data_keys = set(data.keys())
         if "attr" in data_keys:
             data_keys.remove("attr")
             data__attr = data["attr"]
             if not isinstance(data__attr, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".attr must be string", value=data__attr, name="" + (name_prefix or "data") + ".attr", definition={'type': 'string', 'format': 'python-qualified-identifier'}, rule='type')
-            if isinstance(data__attr, str):
-                if not custom_formats["python-qualified-identifier"](data__attr):
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".attr must be python-qualified-identifier", value=data__attr, name="" + (name_prefix or "data") + ".attr", definition={'type': 'string', 'format': 'python-qualified-identifier'}, rule='format')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".attr must be string", value=data__attr, name="" + (name_prefix or "data") + ".attr", definition={'type': 'string'}, rule='type')
         if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string', 'format': 'python-qualified-identifier'}}, 'required': ['attr']}, rule='additionalProperties')
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'title': "'attr:' directive", '$id': '#/definitions/attr-directive', '$$description': ['Value is read from a module attribute. Supports callables and iterables;', 'unsupported types are cast via ``str()``'], 'type': 'object', 'additionalProperties': False, 'properties': {'attr': {'type': 'string'}}, 'required': ['attr']}, rule='additionalProperties')
     return data
 
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_ext_module(data, custom_formats={}, name_prefix=None):
-    if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, rule='type')
-    data_is_dict = isinstance(data, dict)
-    if data_is_dict:
-        data__missing_keys = set(['name', 'sources']) - data.keys()
-        if data__missing_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, rule='required')
-        data_keys = set(data.keys())
-        if "name" in data_keys:
-            data_keys.remove("name")
-            data__name = data["name"]
-            if not isinstance(data__name, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".name must be string", value=data__name, name="" + (name_prefix or "data") + ".name", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='type')
-            if isinstance(data__name, str):
-                if not custom_formats["python-module-name-relaxed"](data__name):
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".name must be python-module-name-relaxed", value=data__name, name="" + (name_prefix or "data") + ".name", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='format')
-        if "sources" in data_keys:
-            data_keys.remove("sources")
-            data__sources = data["sources"]
-            if not isinstance(data__sources, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".sources must be array", value=data__sources, name="" + (name_prefix or "data") + ".sources", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__sources_is_list = isinstance(data__sources, (list, tuple))
-            if data__sources_is_list:
-                data__sources_len = len(data__sources)
-                for data__sources_x, data__sources_item in enumerate(data__sources):
-                    if not isinstance(data__sources_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".sources[{data__sources_x}]".format(**locals()) + " must be string", value=data__sources_item, name="" + (name_prefix or "data") + ".sources[{data__sources_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "include-dirs" in data_keys:
-            data_keys.remove("include-dirs")
-            data__includedirs = data["include-dirs"]
-            if not isinstance(data__includedirs, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".include-dirs must be array", value=data__includedirs, name="" + (name_prefix or "data") + ".include-dirs", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__includedirs_is_list = isinstance(data__includedirs, (list, tuple))
-            if data__includedirs_is_list:
-                data__includedirs_len = len(data__includedirs)
-                for data__includedirs_x, data__includedirs_item in enumerate(data__includedirs):
-                    if not isinstance(data__includedirs_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".include-dirs[{data__includedirs_x}]".format(**locals()) + " must be string", value=data__includedirs_item, name="" + (name_prefix or "data") + ".include-dirs[{data__includedirs_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "define-macros" in data_keys:
-            data_keys.remove("define-macros")
-            data__definemacros = data["define-macros"]
-            if not isinstance(data__definemacros, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros must be array", value=data__definemacros, name="" + (name_prefix or "data") + ".define-macros", definition={'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, rule='type')
-            data__definemacros_is_list = isinstance(data__definemacros, (list, tuple))
-            if data__definemacros_is_list:
-                data__definemacros_len = len(data__definemacros)
-                for data__definemacros_x, data__definemacros_item in enumerate(data__definemacros):
-                    if not isinstance(data__definemacros_item, (list, tuple)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}]".format(**locals()) + " must be array", value=data__definemacros_item, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}]".format(**locals()) + "", definition={'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}, rule='type')
-                    data__definemacros_item_is_list = isinstance(data__definemacros_item, (list, tuple))
-                    if data__definemacros_item_is_list:
-                        data__definemacros_item_len = len(data__definemacros_item)
-                        if data__definemacros_item_len > 0:
-                            data__definemacros_item__0 = data__definemacros_item[0]
-                            if not isinstance(data__definemacros_item__0, (str)):
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][0]".format(**locals()) + " must be string", value=data__definemacros_item__0, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][0]".format(**locals()) + "", definition={'description': 'macro name', 'type': 'string'}, rule='type')
-                        if data__definemacros_item_len > 1:
-                            data__definemacros_item__1 = data__definemacros_item[1]
-                            data__definemacros_item__1_one_of_count10 = 0
-                            if data__definemacros_item__1_one_of_count10 < 2:
-                                try:
-                                    if not isinstance(data__definemacros_item__1, (str)):
-                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + " must be string", value=data__definemacros_item__1, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-                                    data__definemacros_item__1_one_of_count10 += 1
-                                except JsonSchemaValueException: pass
-                            if data__definemacros_item__1_one_of_count10 < 2:
-                                try:
-                                    if not isinstance(data__definemacros_item__1, (NoneType)):
-                                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + " must be null", value=data__definemacros_item__1, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + "", definition={'type': 'null'}, rule='type')
-                                    data__definemacros_item__1_one_of_count10 += 1
-                                except JsonSchemaValueException: pass
-                            if data__definemacros_item__1_one_of_count10 != 1:
-                                raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + " must be valid exactly by one definition" + (" (" + str(data__definemacros_item__1_one_of_count10) + " matches found)"), value=data__definemacros_item__1, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}][1]".format(**locals()) + "", definition={'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}, rule='oneOf')
-                        if data__definemacros_item_len > 2:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}]".format(**locals()) + " must contain only specified items", value=data__definemacros_item, name="" + (name_prefix or "data") + ".define-macros[{data__definemacros_x}]".format(**locals()) + "", definition={'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}, rule='items')
-        if "undef-macros" in data_keys:
-            data_keys.remove("undef-macros")
-            data__undefmacros = data["undef-macros"]
-            if not isinstance(data__undefmacros, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".undef-macros must be array", value=data__undefmacros, name="" + (name_prefix or "data") + ".undef-macros", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__undefmacros_is_list = isinstance(data__undefmacros, (list, tuple))
-            if data__undefmacros_is_list:
-                data__undefmacros_len = len(data__undefmacros)
-                for data__undefmacros_x, data__undefmacros_item in enumerate(data__undefmacros):
-                    if not isinstance(data__undefmacros_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".undef-macros[{data__undefmacros_x}]".format(**locals()) + " must be string", value=data__undefmacros_item, name="" + (name_prefix or "data") + ".undef-macros[{data__undefmacros_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "library-dirs" in data_keys:
-            data_keys.remove("library-dirs")
-            data__librarydirs = data["library-dirs"]
-            if not isinstance(data__librarydirs, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".library-dirs must be array", value=data__librarydirs, name="" + (name_prefix or "data") + ".library-dirs", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__librarydirs_is_list = isinstance(data__librarydirs, (list, tuple))
-            if data__librarydirs_is_list:
-                data__librarydirs_len = len(data__librarydirs)
-                for data__librarydirs_x, data__librarydirs_item in enumerate(data__librarydirs):
-                    if not isinstance(data__librarydirs_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".library-dirs[{data__librarydirs_x}]".format(**locals()) + " must be string", value=data__librarydirs_item, name="" + (name_prefix or "data") + ".library-dirs[{data__librarydirs_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "libraries" in data_keys:
-            data_keys.remove("libraries")
-            data__libraries = data["libraries"]
-            if not isinstance(data__libraries, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".libraries must be array", value=data__libraries, name="" + (name_prefix or "data") + ".libraries", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__libraries_is_list = isinstance(data__libraries, (list, tuple))
-            if data__libraries_is_list:
-                data__libraries_len = len(data__libraries)
-                for data__libraries_x, data__libraries_item in enumerate(data__libraries):
-                    if not isinstance(data__libraries_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".libraries[{data__libraries_x}]".format(**locals()) + " must be string", value=data__libraries_item, name="" + (name_prefix or "data") + ".libraries[{data__libraries_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "runtime-library-dirs" in data_keys:
-            data_keys.remove("runtime-library-dirs")
-            data__runtimelibrarydirs = data["runtime-library-dirs"]
-            if not isinstance(data__runtimelibrarydirs, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".runtime-library-dirs must be array", value=data__runtimelibrarydirs, name="" + (name_prefix or "data") + ".runtime-library-dirs", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__runtimelibrarydirs_is_list = isinstance(data__runtimelibrarydirs, (list, tuple))
-            if data__runtimelibrarydirs_is_list:
-                data__runtimelibrarydirs_len = len(data__runtimelibrarydirs)
-                for data__runtimelibrarydirs_x, data__runtimelibrarydirs_item in enumerate(data__runtimelibrarydirs):
-                    if not isinstance(data__runtimelibrarydirs_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".runtime-library-dirs[{data__runtimelibrarydirs_x}]".format(**locals()) + " must be string", value=data__runtimelibrarydirs_item, name="" + (name_prefix or "data") + ".runtime-library-dirs[{data__runtimelibrarydirs_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "extra-objects" in data_keys:
-            data_keys.remove("extra-objects")
-            data__extraobjects = data["extra-objects"]
-            if not isinstance(data__extraobjects, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-objects must be array", value=data__extraobjects, name="" + (name_prefix or "data") + ".extra-objects", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__extraobjects_is_list = isinstance(data__extraobjects, (list, tuple))
-            if data__extraobjects_is_list:
-                data__extraobjects_len = len(data__extraobjects)
-                for data__extraobjects_x, data__extraobjects_item in enumerate(data__extraobjects):
-                    if not isinstance(data__extraobjects_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-objects[{data__extraobjects_x}]".format(**locals()) + " must be string", value=data__extraobjects_item, name="" + (name_prefix or "data") + ".extra-objects[{data__extraobjects_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "extra-compile-args" in data_keys:
-            data_keys.remove("extra-compile-args")
-            data__extracompileargs = data["extra-compile-args"]
-            if not isinstance(data__extracompileargs, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-compile-args must be array", value=data__extracompileargs, name="" + (name_prefix or "data") + ".extra-compile-args", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__extracompileargs_is_list = isinstance(data__extracompileargs, (list, tuple))
-            if data__extracompileargs_is_list:
-                data__extracompileargs_len = len(data__extracompileargs)
-                for data__extracompileargs_x, data__extracompileargs_item in enumerate(data__extracompileargs):
-                    if not isinstance(data__extracompileargs_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-compile-args[{data__extracompileargs_x}]".format(**locals()) + " must be string", value=data__extracompileargs_item, name="" + (name_prefix or "data") + ".extra-compile-args[{data__extracompileargs_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "extra-link-args" in data_keys:
-            data_keys.remove("extra-link-args")
-            data__extralinkargs = data["extra-link-args"]
-            if not isinstance(data__extralinkargs, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-link-args must be array", value=data__extralinkargs, name="" + (name_prefix or "data") + ".extra-link-args", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__extralinkargs_is_list = isinstance(data__extralinkargs, (list, tuple))
-            if data__extralinkargs_is_list:
-                data__extralinkargs_len = len(data__extralinkargs)
-                for data__extralinkargs_x, data__extralinkargs_item in enumerate(data__extralinkargs):
-                    if not isinstance(data__extralinkargs_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".extra-link-args[{data__extralinkargs_x}]".format(**locals()) + " must be string", value=data__extralinkargs_item, name="" + (name_prefix or "data") + ".extra-link-args[{data__extralinkargs_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "export-symbols" in data_keys:
-            data_keys.remove("export-symbols")
-            data__exportsymbols = data["export-symbols"]
-            if not isinstance(data__exportsymbols, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".export-symbols must be array", value=data__exportsymbols, name="" + (name_prefix or "data") + ".export-symbols", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__exportsymbols_is_list = isinstance(data__exportsymbols, (list, tuple))
-            if data__exportsymbols_is_list:
-                data__exportsymbols_len = len(data__exportsymbols)
-                for data__exportsymbols_x, data__exportsymbols_item in enumerate(data__exportsymbols):
-                    if not isinstance(data__exportsymbols_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".export-symbols[{data__exportsymbols_x}]".format(**locals()) + " must be string", value=data__exportsymbols_item, name="" + (name_prefix or "data") + ".export-symbols[{data__exportsymbols_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "swig-opts" in data_keys:
-            data_keys.remove("swig-opts")
-            data__swigopts = data["swig-opts"]
-            if not isinstance(data__swigopts, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".swig-opts must be array", value=data__swigopts, name="" + (name_prefix or "data") + ".swig-opts", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__swigopts_is_list = isinstance(data__swigopts, (list, tuple))
-            if data__swigopts_is_list:
-                data__swigopts_len = len(data__swigopts)
-                for data__swigopts_x, data__swigopts_item in enumerate(data__swigopts):
-                    if not isinstance(data__swigopts_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".swig-opts[{data__swigopts_x}]".format(**locals()) + " must be string", value=data__swigopts_item, name="" + (name_prefix or "data") + ".swig-opts[{data__swigopts_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "depends" in data_keys:
-            data_keys.remove("depends")
-            data__depends = data["depends"]
-            if not isinstance(data__depends, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".depends must be array", value=data__depends, name="" + (name_prefix or "data") + ".depends", definition={'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__depends_is_list = isinstance(data__depends, (list, tuple))
-            if data__depends_is_list:
-                data__depends_len = len(data__depends)
-                for data__depends_x, data__depends_item in enumerate(data__depends):
-                    if not isinstance(data__depends_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".depends[{data__depends_x}]".format(**locals()) + " must be string", value=data__depends_item, name="" + (name_prefix or "data") + ".depends[{data__depends_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
-        if "language" in data_keys:
-            data_keys.remove("language")
-            data__language = data["language"]
-            if not isinstance(data__language, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".language must be string", value=data__language, name="" + (name_prefix or "data") + ".language", definition={'type': 'string'}, rule='type')
-        if "optional" in data_keys:
-            data_keys.remove("optional")
-            data__optional = data["optional"]
-            if not isinstance(data__optional, (bool)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".optional must be boolean", value=data__optional, name="" + (name_prefix or "data") + ".optional", definition={'type': 'boolean'}, rule='type')
-        if "py-limited-api" in data_keys:
-            data_keys.remove("py-limited-api")
-            data__pylimitedapi = data["py-limited-api"]
-            if not isinstance(data__pylimitedapi, (bool)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".py-limited-api must be boolean", value=data__pylimitedapi, name="" + (name_prefix or "data") + ".py-limited-api", definition={'type': 'boolean'}, rule='type')
-        if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/ext-module', 'title': 'Extension module', 'description': 'Parameters to construct a :class:`setuptools.Extension` object', 'type': 'object', 'required': ['name', 'sources'], 'additionalProperties': False, 'properties': {'name': {'type': 'string', 'format': 'python-module-name-relaxed'}, 'sources': {'type': 'array', 'items': {'type': 'string'}}, 'include-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'define-macros': {'type': 'array', 'items': {'type': 'array', 'items': [{'description': 'macro name', 'type': 'string'}, {'description': 'macro value', 'oneOf': [{'type': 'string'}, {'type': 'null'}]}], 'additionalItems': False}}, 'undef-macros': {'type': 'array', 'items': {'type': 'string'}}, 'library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'libraries': {'type': 'array', 'items': {'type': 'string'}}, 'runtime-library-dirs': {'type': 'array', 'items': {'type': 'string'}}, 'extra-objects': {'type': 'array', 'items': {'type': 'string'}}, 'extra-compile-args': {'type': 'array', 'items': {'type': 'string'}}, 'extra-link-args': {'type': 'array', 'items': {'type': 'string'}}, 'export-symbols': {'type': 'array', 'items': {'type': 'string'}}, 'swig-opts': {'type': 'array', 'items': {'type': 'string'}}, 'depends': {'type': 'array', 'items': {'type': 'string'}}, 'language': {'type': 'string'}, 'optional': {'type': 'boolean'}, 'py-limited-api': {'type': 'boolean'}}}, rule='additionalProperties')
-    return data
-
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_find_directive(data, custom_formats={}, name_prefix=None):
+def validate_https___setuptools_pypa_io_en_latest_references_keywords_html__definitions_find_directive(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
         raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}, rule='type')
     data_is_dict = isinstance(data, dict)
@@ -938,35 +630,9 @@ def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_htm
             raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/find-directive', 'title': "'find:' directive", 'type': 'object', 'additionalProperties': False, 'properties': {'find': {'type': 'object', '$$description': ['Dynamic `package discovery', '`_.'], 'additionalProperties': False, 'properties': {'where': {'description': 'Directories to be searched for packages (Unix-style relative path)', 'type': 'array', 'items': {'type': 'string'}}, 'exclude': {'type': 'array', '$$description': ['Exclude packages that match the values listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'include': {'type': 'array', '$$description': ['Restrict the found packages to just the ones listed in this field.', "Can container shell-style wildcards (e.g. ``'pkg.*'``)"], 'items': {'type': 'string'}}, 'namespaces': {'type': 'boolean', '$$description': ['When ``True``, directories without a ``__init__.py`` file will also', 'be scanned for :pep:`420`-style implicit namespaces']}}}}}, rule='additionalProperties')
     return data
 
-def validate_https___setuptools_pypa_io_en_latest_userguide_pyproject_config_html__definitions_package_name(data, custom_formats={}, name_prefix=None):
-    if not isinstance(data, (str)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be string", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, rule='type')
-    data_any_of_count11 = 0
-    if not data_any_of_count11:
-        try:
-            if not isinstance(data, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must be string", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='type')
-            if isinstance(data, str):
-                if not custom_formats["python-module-name-relaxed"](data):
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + " must be python-module-name-relaxed", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'string', 'format': 'python-module-name-relaxed'}, rule='format')
-            data_any_of_count11 += 1
-        except JsonSchemaValueException: pass
-    if not data_any_of_count11:
-        try:
-            if not isinstance(data, (str)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must be string", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'string', 'format': 'pep561-stub-name'}, rule='type')
-            if isinstance(data, str):
-                if not custom_formats["pep561-stub-name"](data):
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + " must be pep561-stub-name", value=data, name="" + (name_prefix or "data") + "", definition={'type': 'string', 'format': 'pep561-stub-name'}, rule='format')
-            data_any_of_count11 += 1
-        except JsonSchemaValueException: pass
-    if not data_any_of_count11:
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " cannot be validated by any definition", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/package-name', 'title': 'Valid package name', 'description': 'Valid package name (importable or :pep:`561`).', 'type': 'string', 'anyOf': [{'type': 'string', 'format': 'python-module-name-relaxed'}, {'type': 'string', 'format': 'pep561-stub-name'}]}, rule='anyOf')
-    return data
-
-def validate_https___setuptools_pypa_io_en_latest_deprecated_distutils_configfile_html(data, custom_formats={}, name_prefix=None):
+def validate_https___docs_python_org_3_install(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://setuptools.pypa.io/en/latest/deprecated/distutils/configfile.html', 'title': '``tool.distutils`` table', '$$description': ['**EXPERIMENTAL** (NOT OFFICIALLY SUPPORTED): Use ``tool.distutils``', 'subtables to configure arguments for ``distutils`` commands.', 'Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` commands via `distutils configuration files', '`_.', 'See also `the old Python docs _`.'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://docs.python.org/3/install/', 'title': '``tool.distutils`` table', '$$description': ['Originally, ``distutils`` allowed developers to configure arguments for', '``setup.py`` scripts via `distutils configuration files', '`_.', '``tool.distutils`` subtables could be used with the same purpose', '(NOT CURRENTLY IMPLEMENTED).'], 'type': 'object', 'properties': {'global': {'type': 'object', 'description': 'Global options applied to all ``distutils`` commands'}}, 'patternProperties': {'.+': {'type': 'object'}}, '$comment': 'TODO: Is there a practical way of making this schema more specific?'}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
         data_keys = set(data.keys())
@@ -983,65 +649,14 @@ def validate_https___setuptools_pypa_io_en_latest_deprecated_distutils_configfil
                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".{data_key}".format(**locals()) + " must be object", value=data_val, name="" + (name_prefix or "data") + ".{data_key}".format(**locals()) + "", definition={'type': 'object'}, rule='type')
     return data
 
-def validate_https___packaging_python_org_en_latest_specifications_pyproject_toml(data, custom_formats={}, name_prefix=None):
+def validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='type')
-    try:
-        try:
-            data_is_dict = isinstance(data, dict)
-            if data_is_dict:
-                data__missing_keys = set(['dynamic']) - data.keys()
-                if data__missing_keys:
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, rule='required')
-                data_keys = set(data.keys())
-                if "dynamic" in data_keys:
-                    data_keys.remove("dynamic")
-                    data__dynamic = data["dynamic"]
-                    data__dynamic_is_list = isinstance(data__dynamic, (list, tuple))
-                    if data__dynamic_is_list:
-                        data__dynamic_contains = False
-                        for data__dynamic_key in data__dynamic:
-                            try:
-                                if data__dynamic_key != "version":
-                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be same as const definition: version", value=data__dynamic_key, name="" + (name_prefix or "data") + ".dynamic", definition={'const': 'version'}, rule='const')
-                                data__dynamic_contains = True
-                                break
-                            except JsonSchemaValueException: pass
-                        if not data__dynamic_contains:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must contain one of contains definition", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}, rule='contains')
-        except JsonSchemaValueException: pass
-        else:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must NOT match a disallowed definition", value=data, name="" + (name_prefix or "data") + "", definition={'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, rule='not')
-    except JsonSchemaValueException:
-        pass
-    else:
-        data_is_dict = isinstance(data, dict)
-        if data_is_dict:
-            data__missing_keys = set(['version']) - data.keys()
-            if data__missing_keys:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, rule='required')
-    try:
-        data_is_dict = isinstance(data, dict)
-        if data_is_dict:
-            data__missing_keys = set(['license-files']) - data.keys()
-            if data__missing_keys:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'required': ['license-files']}, rule='required')
-    except JsonSchemaValueException:
-        pass
-    else:
-        data_is_dict = isinstance(data, dict)
-        if data_is_dict:
-            data_keys = set(data.keys())
-            if "license" in data_keys:
-                data_keys.remove("license")
-                data__license = data["license"]
-                if not isinstance(data__license, (str)):
-                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be string", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'string'}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
-        data__missing_keys = set(['name']) - data.keys()
-        if data__missing_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain " + (str(sorted(data__missing_keys)) + " properties"), value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='required')
+        data_len = len(data)
+        if not all(prop in data for prop in ['name']):
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain ['name'] properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='required')
         data_keys = set(data.keys())
         if "name" in data_keys:
             data_keys.remove("name")
@@ -1067,65 +682,65 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
         if "readme" in data_keys:
             data_keys.remove("readme")
             data__readme = data["readme"]
-            data__readme_one_of_count12 = 0
-            if data__readme_one_of_count12 < 2:
+            data__readme_one_of_count8 = 0
+            if data__readme_one_of_count8 < 2:
                 try:
                     if not isinstance(data__readme, (str)):
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must be string", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, rule='type')
-                    data__readme_one_of_count12 += 1
+                    data__readme_one_of_count8 += 1
                 except JsonSchemaValueException: pass
-            if data__readme_one_of_count12 < 2:
+            if data__readme_one_of_count8 < 2:
                 try:
                     if not isinstance(data__readme, (dict)):
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must be object", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}, rule='type')
-                    data__readme_any_of_count13 = 0
-                    if not data__readme_any_of_count13:
+                    data__readme_any_of_count9 = 0
+                    if not data__readme_any_of_count9:
                         try:
                             data__readme_is_dict = isinstance(data__readme, dict)
                             if data__readme_is_dict:
-                                data__readme__missing_keys = set(['file']) - data__readme.keys()
-                                if data__readme__missing_keys:
-                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain " + (str(sorted(data__readme__missing_keys)) + " properties"), value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, rule='required')
+                                data__readme_len = len(data__readme)
+                                if not all(prop in data__readme for prop in ['file']):
+                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain ['file'] properties", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, rule='required')
                                 data__readme_keys = set(data__readme.keys())
                                 if "file" in data__readme_keys:
                                     data__readme_keys.remove("file")
                                     data__readme__file = data__readme["file"]
                                     if not isinstance(data__readme__file, (str)):
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme.file must be string", value=data__readme__file, name="" + (name_prefix or "data") + ".readme.file", definition={'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}, rule='type')
-                            data__readme_any_of_count13 += 1
+                            data__readme_any_of_count9 += 1
                         except JsonSchemaValueException: pass
-                    if not data__readme_any_of_count13:
+                    if not data__readme_any_of_count9:
                         try:
                             data__readme_is_dict = isinstance(data__readme, dict)
                             if data__readme_is_dict:
-                                data__readme__missing_keys = set(['text']) - data__readme.keys()
-                                if data__readme__missing_keys:
-                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain " + (str(sorted(data__readme__missing_keys)) + " properties"), value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}, rule='required')
+                                data__readme_len = len(data__readme)
+                                if not all(prop in data__readme for prop in ['text']):
+                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain ['text'] properties", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}, rule='required')
                                 data__readme_keys = set(data__readme.keys())
                                 if "text" in data__readme_keys:
                                     data__readme_keys.remove("text")
                                     data__readme__text = data__readme["text"]
                                     if not isinstance(data__readme__text, (str)):
                                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme.text must be string", value=data__readme__text, name="" + (name_prefix or "data") + ".readme.text", definition={'type': 'string', 'description': 'Full text describing the project.'}, rule='type')
-                            data__readme_any_of_count13 += 1
+                            data__readme_any_of_count9 += 1
                         except JsonSchemaValueException: pass
-                    if not data__readme_any_of_count13:
+                    if not data__readme_any_of_count9:
                         raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme cannot be validated by any definition", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, rule='anyOf')
                     data__readme_is_dict = isinstance(data__readme, dict)
                     if data__readme_is_dict:
-                        data__readme__missing_keys = set(['content-type']) - data__readme.keys()
-                        if data__readme__missing_keys:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain " + (str(sorted(data__readme__missing_keys)) + " properties"), value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}, rule='required')
+                        data__readme_len = len(data__readme)
+                        if not all(prop in data__readme for prop in ['content-type']):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must contain ['content-type'] properties", value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}, rule='required')
                         data__readme_keys = set(data__readme.keys())
                         if "content-type" in data__readme_keys:
                             data__readme_keys.remove("content-type")
                             data__readme__contenttype = data__readme["content-type"]
                             if not isinstance(data__readme__contenttype, (str)):
                                 raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme.content-type must be string", value=data__readme__contenttype, name="" + (name_prefix or "data") + ".readme.content-type", definition={'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}, rule='type')
-                    data__readme_one_of_count12 += 1
+                    data__readme_one_of_count8 += 1
                 except JsonSchemaValueException: pass
-            if data__readme_one_of_count12 != 1:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must be valid exactly by one definition" + (" (" + str(data__readme_one_of_count12) + " matches found)"), value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, rule='oneOf')
+            if data__readme_one_of_count8 != 1:
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".readme must be valid exactly by one definition" + (" (" + str(data__readme_one_of_count8) + " matches found)"), value=data__readme, name="" + (name_prefix or "data") + ".readme", definition={'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, rule='oneOf')
         if "requires-python" in data_keys:
             data_keys.remove("requires-python")
             data__requirespython = data["requires-python"]
@@ -1137,83 +752,59 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
         if "license" in data_keys:
             data_keys.remove("license")
             data__license = data["license"]
-            data__license_one_of_count14 = 0
-            if data__license_one_of_count14 < 2:
+            data__license_one_of_count10 = 0
+            if data__license_one_of_count10 < 2:
                 try:
-                    if not isinstance(data__license, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be string", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, rule='type')
-                    if isinstance(data__license, str):
-                        if not custom_formats["SPDX"](data__license):
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be SPDX", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, rule='format')
-                    data__license_one_of_count14 += 1
-                except JsonSchemaValueException: pass
-            if data__license_one_of_count14 < 2:
-                try:
-                    if not isinstance(data__license, (dict)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be object", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, rule='type')
                     data__license_is_dict = isinstance(data__license, dict)
                     if data__license_is_dict:
-                        data__license__missing_keys = set(['file']) - data__license.keys()
-                        if data__license__missing_keys:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must contain " + (str(sorted(data__license__missing_keys)) + " properties"), value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, rule='required')
+                        data__license_len = len(data__license)
+                        if not all(prop in data__license for prop in ['file']):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must contain ['file'] properties", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, rule='required')
                         data__license_keys = set(data__license.keys())
                         if "file" in data__license_keys:
                             data__license_keys.remove("file")
                             data__license__file = data__license["file"]
                             if not isinstance(data__license__file, (str)):
                                 raise JsonSchemaValueException("" + (name_prefix or "data") + ".license.file must be string", value=data__license__file, name="" + (name_prefix or "data") + ".license.file", definition={'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}, rule='type')
-                    data__license_one_of_count14 += 1
+                    data__license_one_of_count10 += 1
                 except JsonSchemaValueException: pass
-            if data__license_one_of_count14 < 2:
+            if data__license_one_of_count10 < 2:
                 try:
-                    if not isinstance(data__license, (dict)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be object", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}, rule='type')
                     data__license_is_dict = isinstance(data__license, dict)
                     if data__license_is_dict:
-                        data__license__missing_keys = set(['text']) - data__license.keys()
-                        if data__license__missing_keys:
-                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must contain " + (str(sorted(data__license__missing_keys)) + " properties"), value=data__license, name="" + (name_prefix or "data") + ".license", definition={'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}, rule='required')
+                        data__license_len = len(data__license)
+                        if not all(prop in data__license for prop in ['text']):
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must contain ['text'] properties", value=data__license, name="" + (name_prefix or "data") + ".license", definition={'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}, rule='required')
                         data__license_keys = set(data__license.keys())
                         if "text" in data__license_keys:
                             data__license_keys.remove("text")
                             data__license__text = data__license["text"]
                             if not isinstance(data__license__text, (str)):
                                 raise JsonSchemaValueException("" + (name_prefix or "data") + ".license.text must be string", value=data__license__text, name="" + (name_prefix or "data") + ".license.text", definition={'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}, rule='type')
-                    data__license_one_of_count14 += 1
+                    data__license_one_of_count10 += 1
                 except JsonSchemaValueException: pass
-            if data__license_one_of_count14 != 1:
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be valid exactly by one definition" + (" (" + str(data__license_one_of_count14) + " matches found)"), value=data__license, name="" + (name_prefix or "data") + ".license", definition={'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, rule='oneOf')
-        if "license-files" in data_keys:
-            data_keys.remove("license-files")
-            data__licensefiles = data["license-files"]
-            if not isinstance(data__licensefiles, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".license-files must be array", value=data__licensefiles, name="" + (name_prefix or "data") + ".license-files", definition={'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, rule='type')
-            data__licensefiles_is_list = isinstance(data__licensefiles, (list, tuple))
-            if data__licensefiles_is_list:
-                data__licensefiles_len = len(data__licensefiles)
-                for data__licensefiles_x, data__licensefiles_item in enumerate(data__licensefiles):
-                    if not isinstance(data__licensefiles_item, (str)):
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".license-files[{data__licensefiles_x}]".format(**locals()) + " must be string", value=data__licensefiles_item, name="" + (name_prefix or "data") + ".license-files[{data__licensefiles_x}]".format(**locals()) + "", definition={'type': 'string'}, rule='type')
+            if data__license_one_of_count10 != 1:
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".license must be valid exactly by one definition" + (" (" + str(data__license_one_of_count10) + " matches found)"), value=data__license, name="" + (name_prefix or "data") + ".license", definition={'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, rule='oneOf')
         if "authors" in data_keys:
             data_keys.remove("authors")
             data__authors = data["authors"]
             if not isinstance(data__authors, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".authors must be array", value=data__authors, name="" + (name_prefix or "data") + ".authors", definition={'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".authors must be array", value=data__authors, name="" + (name_prefix or "data") + ".authors", definition={'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, rule='type')
             data__authors_is_list = isinstance(data__authors, (list, tuple))
             if data__authors_is_list:
                 data__authors_len = len(data__authors)
                 for data__authors_x, data__authors_item in enumerate(data__authors):
-                    validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_author(data__authors_item, custom_formats, (name_prefix or "data") + ".authors[{data__authors_x}]".format(**locals()))
+                    validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_author(data__authors_item, custom_formats, (name_prefix or "data") + ".authors[{data__authors_x}]")
         if "maintainers" in data_keys:
             data_keys.remove("maintainers")
             data__maintainers = data["maintainers"]
             if not isinstance(data__maintainers, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".maintainers must be array", value=data__maintainers, name="" + (name_prefix or "data") + ".maintainers", definition={'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".maintainers must be array", value=data__maintainers, name="" + (name_prefix or "data") + ".maintainers", definition={'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, rule='type')
             data__maintainers_is_list = isinstance(data__maintainers, (list, tuple))
             if data__maintainers_is_list:
                 data__maintainers_len = len(data__maintainers)
                 for data__maintainers_x, data__maintainers_item in enumerate(data__maintainers):
-                    validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_author(data__maintainers_item, custom_formats, (name_prefix or "data") + ".maintainers[{data__maintainers_x}]".format(**locals()))
+                    validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_author(data__maintainers_item, custom_formats, (name_prefix or "data") + ".maintainers[{data__maintainers_x}]")
         if "keywords" in data_keys:
             data_keys.remove("keywords")
             data__keywords = data["keywords"]
@@ -1261,11 +852,11 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
         if "scripts" in data_keys:
             data_keys.remove("scripts")
             data__scripts = data["scripts"]
-            validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_entry_point_group(data__scripts, custom_formats, (name_prefix or "data") + ".scripts")
+            validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_entry_point_group(data__scripts, custom_formats, (name_prefix or "data") + ".scripts")
         if "gui-scripts" in data_keys:
             data_keys.remove("gui-scripts")
             data__guiscripts = data["gui-scripts"]
-            validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_entry_point_group(data__guiscripts, custom_formats, (name_prefix or "data") + ".gui-scripts")
+            validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_entry_point_group(data__guiscripts, custom_formats, (name_prefix or "data") + ".gui-scripts")
         if "entry-points" in data_keys:
             data_keys.remove("entry-points")
             data__entrypoints = data["entry-points"]
@@ -1276,7 +867,7 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
                     if REGEX_PATTERNS['^.+$'].search(data__entrypoints_key):
                         if data__entrypoints_key in data__entrypoints_keys:
                             data__entrypoints_keys.remove(data__entrypoints_key)
-                        validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_entry_point_group(data__entrypoints_val, custom_formats, (name_prefix or "data") + ".entry-points.{data__entrypoints_key}".format(**locals()))
+                        validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_entry_point_group(data__entrypoints_val, custom_formats, (name_prefix or "data") + ".entry-points.{data__entrypoints_key}")
                 if data__entrypoints_keys:
                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".entry-points must not contain "+str(data__entrypoints_keys)+" properties", value=data__entrypoints, name="" + (name_prefix or "data") + ".entry-points", definition={'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, rule='additionalProperties')
                 data__entrypoints_len = len(data__entrypoints)
@@ -1300,7 +891,7 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
             if data__dependencies_is_list:
                 data__dependencies_len = len(data__dependencies)
                 for data__dependencies_x, data__dependencies_item in enumerate(data__dependencies):
-                    validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_dependency(data__dependencies_item, custom_formats, (name_prefix or "data") + ".dependencies[{data__dependencies_x}]".format(**locals()))
+                    validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_dependency(data__dependencies_item, custom_formats, (name_prefix or "data") + ".dependencies[{data__dependencies_x}]")
         if "optional-dependencies" in data_keys:
             data_keys.remove("optional-dependencies")
             data__optionaldependencies = data["optional-dependencies"]
@@ -1319,7 +910,7 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
                         if data__optionaldependencies_val_is_list:
                             data__optionaldependencies_val_len = len(data__optionaldependencies_val)
                             for data__optionaldependencies_val_x, data__optionaldependencies_val_item in enumerate(data__optionaldependencies_val):
-                                validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_dependency(data__optionaldependencies_val_item, custom_formats, (name_prefix or "data") + ".optional-dependencies.{data__optionaldependencies_key}[{data__optionaldependencies_val_x}]".format(**locals()))
+                                validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_dependency(data__optionaldependencies_val_item, custom_formats, (name_prefix or "data") + ".optional-dependencies.{data__optionaldependencies_key}[{data__optionaldependencies_val_x}]")
                 if data__optionaldependencies_keys:
                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".optional-dependencies must not contain "+str(data__optionaldependencies_keys)+" properties", value=data__optionaldependencies, name="" + (name_prefix or "data") + ".optional-dependencies", definition={'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, rule='additionalProperties')
                 data__optionaldependencies_len = len(data__optionaldependencies)
@@ -1338,18 +929,52 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
             data_keys.remove("dynamic")
             data__dynamic = data["dynamic"]
             if not isinstance(data__dynamic, (list, tuple)):
-                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be array", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}, rule='type')
+                raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be array", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}, rule='type')
             data__dynamic_is_list = isinstance(data__dynamic, (list, tuple))
             if data__dynamic_is_list:
                 data__dynamic_len = len(data__dynamic)
                 for data__dynamic_x, data__dynamic_item in enumerate(data__dynamic):
-                    if data__dynamic_item not in ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']:
-                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic[{data__dynamic_x}]".format(**locals()) + " must be one of ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']", value=data__dynamic_item, name="" + (name_prefix or "data") + ".dynamic[{data__dynamic_x}]".format(**locals()) + "", definition={'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}, rule='enum')
+                    if data__dynamic_item not in ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']:
+                        raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic[{data__dynamic_x}]".format(**locals()) + " must be one of ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']", value=data__dynamic_item, name="" + (name_prefix or "data") + ".dynamic[{data__dynamic_x}]".format(**locals()) + "", definition={'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}, rule='enum')
         if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema#', '$id': 'https://packaging.python.org/en/latest/specifications/pyproject-toml/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'type': 'string', 'description': 'An SPDX license identifier', 'format': 'SPDX'}, {'type': 'object', 'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'type': 'object', 'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'license-files': {'description': 'Paths or globs to paths of license files', 'type': 'array', 'items': {'type': 'string'}}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'license-files', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'allOf': [{'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}}, {'if': {'required': ['license-files']}, 'then': {'properties': {'license': {'type': 'string'}}}}], 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='additionalProperties')
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$schema': 'http://json-schema.org/draft-07/schema', '$id': 'https://packaging.python.org/en/latest/specifications/declaring-project-metadata/', 'title': 'Package metadata stored in the ``project`` table', '$$description': ['Data structure for the **project** table inside ``pyproject.toml``', '(as initially defined in :pep:`621`)'], 'type': 'object', 'properties': {'name': {'type': 'string', 'description': 'The name (primary identifier) of the project. MUST be statically defined.', 'format': 'pep508-identifier'}, 'version': {'type': 'string', 'description': 'The version of the project as supported by :pep:`440`.', 'format': 'pep440'}, 'description': {'type': 'string', '$$description': ['The `summary description of the project', '`_']}, 'readme': {'$$description': ['`Full/detailed description of the project in the form of a README', '`_', "with meaning similar to the one defined in `core metadata's Description", '`_'], 'oneOf': [{'type': 'string', '$$description': ['Relative path to a text file (UTF-8) containing the full description', 'of the project. If the file path ends in case-insensitive ``.md`` or', '``.rst`` suffixes, then the content-type is respectively', '``text/markdown`` or ``text/x-rst``']}, {'type': 'object', 'allOf': [{'anyOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to a text file containing the full description', 'of the project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', 'description': 'Full text describing the project.'}}, 'required': ['text']}]}, {'properties': {'content-type': {'type': 'string', '$$description': ['Content-type (:rfc:`1341`) of the full description', '(e.g. ``text/markdown``). The ``charset`` parameter is assumed', 'UTF-8 when not present.'], '$comment': 'TODO: add regex pattern or format?'}}, 'required': ['content-type']}]}]}, 'requires-python': {'type': 'string', 'format': 'pep508-versionspec', '$$description': ['`The Python version requirements of the project', '`_.']}, 'license': {'description': '`Project license `_.', 'oneOf': [{'properties': {'file': {'type': 'string', '$$description': ['Relative path to the file (UTF-8) which contains the license for the', 'project.']}}, 'required': ['file']}, {'properties': {'text': {'type': 'string', '$$description': ['The license of the project whose meaning is that of the', '`License field from the core metadata', '`_.']}}, 'required': ['text']}]}, 'authors': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'authors' of the project.", 'The exact meaning is open to interpretation (e.g. original or primary authors,', 'current maintainers, or owners of the package).']}, 'maintainers': {'type': 'array', 'items': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, '$$description': ["The people or organizations considered to be the 'maintainers' of the project.", 'Similarly to ``authors``, the exact meaning is open to interpretation.']}, 'keywords': {'type': 'array', 'items': {'type': 'string'}, 'description': 'List of keywords to assist searching for the distribution in a larger catalog.'}, 'classifiers': {'type': 'array', 'items': {'type': 'string', 'format': 'trove-classifier', 'description': '`PyPI classifier `_.'}, '$$description': ['`Trove classifiers `_', 'which apply to the project.']}, 'urls': {'type': 'object', 'description': 'URLs associated with the project in the form ``label => value``.', 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', 'format': 'url'}}}, 'scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'gui-scripts': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'entry-points': {'$$description': ['Instruct the installer to expose the given modules/functions via', '``entry-point`` discovery mechanism (useful for plugins).', 'More information available in the `Python packaging guide', '`_.'], 'propertyNames': {'format': 'python-entrypoint-group'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}}}, 'dependencies': {'type': 'array', 'description': 'Project (mandatory) dependencies.', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}, 'optional-dependencies': {'type': 'object', 'description': 'Optional dependency for the project', 'propertyNames': {'format': 'pep508-identifier'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'array', 'items': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}}, 'dynamic': {'type': 'array', '$$description': ['Specifies which fields are intentionally unspecified and expected to be', 'dynamically provided by build tools'], 'items': {'enum': ['version', 'description', 'readme', 'requires-python', 'license', 'authors', 'maintainers', 'keywords', 'classifiers', 'urls', 'scripts', 'gui-scripts', 'entry-points', 'dependencies', 'optional-dependencies']}}}, 'required': ['name'], 'additionalProperties': False, 'if': {'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, 'then': {'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, 'definitions': {'author': {'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, 'entry-point-group': {'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, 'dependency': {'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}}}, rule='additionalProperties')
+    try:
+        try:
+            data_is_dict = isinstance(data, dict)
+            if data_is_dict:
+                data_len = len(data)
+                if not all(prop in data for prop in ['dynamic']):
+                    raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain ['dynamic'] properties", value=data, name="" + (name_prefix or "data") + "", definition={'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, rule='required')
+                data_keys = set(data.keys())
+                if "dynamic" in data_keys:
+                    data_keys.remove("dynamic")
+                    data__dynamic = data["dynamic"]
+                    data__dynamic_is_list = isinstance(data__dynamic, (list, tuple))
+                    if data__dynamic_is_list:
+                        data__dynamic_contains = False
+                        for data__dynamic_key in data__dynamic:
+                            try:
+                                if data__dynamic_key != "version":
+                                    raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must be same as const definition: version", value=data__dynamic_key, name="" + (name_prefix or "data") + ".dynamic", definition={'const': 'version'}, rule='const')
+                                data__dynamic_contains = True
+                                break
+                            except JsonSchemaValueException: pass
+                        if not data__dynamic_contains:
+                            raise JsonSchemaValueException("" + (name_prefix or "data") + ".dynamic must contain one of contains definition", value=data__dynamic, name="" + (name_prefix or "data") + ".dynamic", definition={'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}, rule='contains')
+        except JsonSchemaValueException: pass
+        else:
+            raise JsonSchemaValueException("" + (name_prefix or "data") + " must NOT match a disallowed definition", value=data, name="" + (name_prefix or "data") + "", definition={'not': {'required': ['dynamic'], 'properties': {'dynamic': {'contains': {'const': 'version'}, '$$description': ['version is listed in ``dynamic``']}}}, '$$comment': ['According to :pep:`621`:', '    If the core metadata specification lists a field as "Required", then', '    the metadata MUST specify the field statically or list it in dynamic', 'In turn, `core metadata`_ defines:', '    The required fields are: Metadata-Version, Name, Version.', '    All the other fields are optional.', 'Since ``Metadata-Version`` is defined by the build back-end, ``name`` and', '``version`` are the only mandatory information in ``pyproject.toml``.', '.. _core metadata: https://packaging.python.org/specifications/core-metadata/']}, rule='not')
+    except JsonSchemaValueException:
+        pass
+    else:
+        data_is_dict = isinstance(data, dict)
+        if data_is_dict:
+            data_len = len(data)
+            if not all(prop in data for prop in ['version']):
+                raise JsonSchemaValueException("" + (name_prefix or "data") + " must contain ['version'] properties", value=data, name="" + (name_prefix or "data") + "", definition={'required': ['version'], '$$description': ['version should be statically defined in the ``version`` field']}, rule='required')
     return data
 
-def validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_dependency(data, custom_formats={}, name_prefix=None):
+def validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_dependency(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (str)):
         raise JsonSchemaValueException("" + (name_prefix or "data") + " must be string", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}, rule='type')
     if isinstance(data, str):
@@ -1357,7 +982,7 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
             raise JsonSchemaValueException("" + (name_prefix or "data") + " must be pep508", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/dependency', 'title': 'Dependency', 'type': 'string', 'description': 'Project dependency specification according to PEP 508', 'format': 'pep508'}, rule='format')
     return data
 
-def validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_entry_point_group(data, custom_formats={}, name_prefix=None):
+def validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_entry_point_group(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
         raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, rule='type')
     data_is_dict = isinstance(data, dict)
@@ -1388,9 +1013,9 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
                 raise JsonSchemaValueException("" + (name_prefix or "data") + " must be named by propertyName definition", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/entry-point-group', 'title': 'Entry-points', 'type': 'object', '$$description': ['Entry-points are grouped together to indicate what sort of capabilities they', 'provide.', 'See the `packaging guides', '`_', 'and `setuptools docs', '`_', 'for more information.'], 'propertyNames': {'format': 'python-entrypoint-name'}, 'additionalProperties': False, 'patternProperties': {'^.+$': {'type': 'string', '$$description': ['Reference to a Python object. It is either in the form', '``importable.module``, or ``importable.module:object.attr``.'], 'format': 'python-entrypoint-reference', '$comment': 'https://packaging.python.org/specifications/entry-points/'}}}, rule='propertyNames')
     return data
 
-def validate_https___packaging_python_org_en_latest_specifications_pyproject_toml___definitions_author(data, custom_formats={}, name_prefix=None):
+def validate_https___packaging_python_org_en_latest_specifications_declaring_project_metadata___definitions_author(data, custom_formats={}, name_prefix=None):
     if not isinstance(data, (dict)):
-        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, rule='type')
+        raise JsonSchemaValueException("" + (name_prefix or "data") + " must be object", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://www.python.org/dev/peps/pep-0621/#authors-maintainers', 'type': 'object', 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, rule='type')
     data_is_dict = isinstance(data, dict)
     if data_is_dict:
         data_keys = set(data.keys())
@@ -1407,6 +1032,4 @@ def validate_https___packaging_python_org_en_latest_specifications_pyproject_tom
             if isinstance(data__email, str):
                 if not REGEX_PATTERNS["idn-email_re_pattern"].match(data__email):
                     raise JsonSchemaValueException("" + (name_prefix or "data") + ".email must be idn-email", value=data__email, name="" + (name_prefix or "data") + ".email", definition={'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}, rule='format')
-        if data_keys:
-            raise JsonSchemaValueException("" + (name_prefix or "data") + " must not contain "+str(data_keys)+" properties", value=data, name="" + (name_prefix or "data") + "", definition={'$id': '#/definitions/author', 'title': 'Author or Maintainer', '$comment': 'https://peps.python.org/pep-0621/#authors-maintainers', 'type': 'object', 'additionalProperties': False, 'properties': {'name': {'type': 'string', '$$description': ['MUST be a valid email name, i.e. whatever can be put as a name, before an', 'email, in :rfc:`822`.']}, 'email': {'type': 'string', 'format': 'idn-email', 'description': 'MUST be a valid email address'}}}, rule='additionalProperties')
-    return data
+    return data
\ No newline at end of file
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/formats.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/formats.py
index 1cf4a46..638ac11 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/formats.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/_validate_pyproject/formats.py
@@ -1,13 +1,3 @@
-"""
-The functions in this module are used to validate schemas with the
-`format JSON Schema keyword
-`_.
-
-The correspondence is given by replacing the ``_`` character in the name of the
-function with a ``-`` to obtain the format name and vice versa.
-"""
-
-import builtins
 import logging
 import os
 import re
@@ -15,9 +5,6 @@ import string
 import typing
 from itertools import chain as _chain
 
-if typing.TYPE_CHECKING:
-    from typing_extensions import Literal
-
 _logger = logging.getLogger(__name__)
 
 # -------------------------------------------------------------------------------------
@@ -30,7 +17,7 @@ VERSION_PATTERN = r"""
         (?P[0-9]+(?:\.[0-9]+)*)                  # release segment
         (?P
                                          # pre-release
             [-_\.]?
-            (?Palpha|a|beta|b|preview|pre|c|rc)
+            (?P(a|b|c|rc|alpha|beta|pre|preview))
             [-_\.]?
             (?P[0-9]+)?
         )?
@@ -58,9 +45,6 @@ VERSION_REGEX = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.X | re.I)
 
 
 def pep440(version: str) -> bool:
-    """See :ref:`PyPA's version specification `
-    (initially introduced in :pep:`440`).
-    """
     return VERSION_REGEX.match(version) is not None
 
 
@@ -72,9 +56,6 @@ PEP508_IDENTIFIER_REGEX = re.compile(f"^{PEP508_IDENTIFIER_PATTERN}$", re.I)
 
 
 def pep508_identifier(name: str) -> bool:
-    """See :ref:`PyPA's name specification `
-    (initially introduced in :pep:`508#names`).
-    """
     return PEP508_IDENTIFIER_REGEX.match(name) is not None
 
 
@@ -83,14 +64,9 @@ try:
         from packaging import requirements as _req
     except ImportError:  # pragma: no cover
         # let's try setuptools vendored version
-        from setuptools._vendor.packaging import (  # type: ignore[no-redef]
-            requirements as _req,
-        )
+        from setuptools._vendor.packaging import requirements as _req  # type: ignore
 
     def pep508(value: str) -> bool:
-        """See :ref:`PyPA's dependency specifiers `
-        (initially introduced in :pep:`508`).
-        """
         try:
             _req.Requirement(value)
             return True
@@ -109,17 +85,14 @@ except ImportError:  # pragma: no cover
 
 
 def pep508_versionspec(value: str) -> bool:
-    """Expression that can be used to specify/lock versions (including ranges)
-    See ``versionspec`` in :ref:`PyPA's dependency specifiers
-    ` (initially introduced in :pep:`508`).
-    """
+    """Expression that can be used to specify/lock versions (including ranges)"""
     if any(c in value for c in (";", "]", "@")):
         # In PEP 508:
         # conditional markers, extras and URL specs are not included in the
         # versionspec
         return False
     # Let's pretend we have a dependency called `requirement` with the given
-    # version spec, then we can reuse the pep508 function for validation:
+    # version spec, then we can re-use the pep508 function for validation:
     return pep508(f"requirement{value}")
 
 
@@ -128,11 +101,6 @@ def pep508_versionspec(value: str) -> bool:
 
 
 def pep517_backend_reference(value: str) -> bool:
-    """See PyPA's specification for defining build-backend references
-    introduced in :pep:`517#source-trees`.
-
-    This is similar to an entry-point reference (e.g., ``package.module:object``).
-    """
     module, _, obj = value.partition(":")
     identifiers = (i.strip() for i in _chain(module.split("."), obj.split(".")))
     return all(python_identifier(i) for i in identifiers if i)
@@ -149,10 +117,10 @@ def _download_classifiers() -> str:
 
     url = "https://pypi.org/pypi?:action=list_classifiers"
     context = ssl.create_default_context()
-    with urlopen(url, context=context) as response:  # noqa: S310 (audit URLs)
+    with urlopen(url, context=context) as response:
         headers = Message()
         headers["content_type"] = response.getheader("content-type", "text/plain")
-        return response.read().decode(headers.get_param("charset", "utf-8"))  # type: ignore[no-any-return]
+        return response.read().decode(headers.get_param("charset", "utf-8"))
 
 
 class _TroveClassifier:
@@ -163,19 +131,14 @@ class _TroveClassifier:
     option (classifiers will be validated anyway during the upload to PyPI).
     """
 
-    downloaded: typing.Union[None, "Literal[False]", typing.Set[str]]
-    """
-    None => not cached yet
-    False => unavailable
-    set => cached values
-    """
-
-    def __init__(self) -> None:
-        self.downloaded = None
+    def __init__(self):
+        self.downloaded: typing.Union[None, False, typing.Set[str]] = None
         self._skip_download = False
+        # None => not cached yet
+        # False => cache not available
         self.__name__ = "trove_classifier"  # Emulate a public function
 
-    def _disable_download(self) -> None:
+    def _disable_download(self):
         # This is a private API. Only setuptools has the consent of using it.
         self._skip_download = True
 
@@ -212,37 +175,17 @@ try:
     from trove_classifiers import classifiers as _trove_classifiers
 
     def trove_classifier(value: str) -> bool:
-        """See https://pypi.org/classifiers/"""
         return value in _trove_classifiers or value.lower().startswith("private ::")
 
 except ImportError:  # pragma: no cover
     trove_classifier = _TroveClassifier()
 
 
-# -------------------------------------------------------------------------------------
-# Stub packages - PEP 561
-
-
-def pep561_stub_name(value: str) -> bool:
-    """Name of a directory containing type stubs.
-    It must follow the name scheme ``-stubs`` as defined in
-    :pep:`561#stub-only-packages`.
-    """
-    top, *children = value.split(".")
-    if not top.endswith("-stubs"):
-        return False
-    return python_module_name(".".join([top[: -len("-stubs")], *children]))
-
-
 # -------------------------------------------------------------------------------------
 # Non-PEP related
 
 
 def url(value: str) -> bool:
-    """Valid URL (validation uses :obj:`urllib.parse`).
-    For maximum compatibility please make sure to include a ``scheme`` prefix
-    in your URL (e.g. ``http://``).
-    """
     from urllib.parse import urlparse
 
     try:
@@ -271,59 +214,24 @@ ENTRYPOINT_GROUP_REGEX = re.compile(f"^{ENTRYPOINT_GROUP_PATTERN}$", re.I)
 
 
 def python_identifier(value: str) -> bool:
-    """Can be used as identifier in Python.
-    (Validation uses :obj:`str.isidentifier`).
-    """
     return value.isidentifier()
 
 
 def python_qualified_identifier(value: str) -> bool:
-    """
-    Python "dotted identifier", i.e. a sequence of :obj:`python_identifier`
-    concatenated with ``"."`` (e.g.: ``package.module.submodule``).
-    """
     if value.startswith(".") or value.endswith("."):
         return False
     return all(python_identifier(m) for m in value.split("."))
 
 
 def python_module_name(value: str) -> bool:
-    """Module name that can be used in an ``import``-statement in Python.
-    See :obj:`python_qualified_identifier`.
-    """
     return python_qualified_identifier(value)
 
 
-def python_module_name_relaxed(value: str) -> bool:
-    """Similar to :obj:`python_module_name`, but relaxed to also accept
-    dash characters (``-``) and cover special cases like ``pip-run``.
-
-    It is recommended, however, that beginners avoid dash characters,
-    as they require advanced knowledge about Python internals.
-
-    The following are disallowed:
-
-    * names starting/ending in dashes,
-    * names ending in ``-stubs`` (potentially collide with :obj:`pep561_stub_name`).
-    """
-    if value.startswith("-") or value.endswith("-"):
-        return False
-    if value.endswith("-stubs"):
-        return False  # Avoid collision with PEP 561
-    return python_module_name(value.replace("-", "_"))
-
-
 def python_entrypoint_group(value: str) -> bool:
-    """See ``Data model > group`` in the :ref:`PyPA's entry-points specification
-    `.
-    """
     return ENTRYPOINT_GROUP_REGEX.match(value) is not None
 
 
 def python_entrypoint_name(value: str) -> bool:
-    """See ``Data model > name`` in the :ref:`PyPA's entry-points specification
-    `.
-    """
     if not ENTRYPOINT_REGEX.match(value):
         return False
     if not RECOMMEDED_ENTRYPOINT_REGEX.match(value):
@@ -334,13 +242,6 @@ def python_entrypoint_name(value: str) -> bool:
 
 
 def python_entrypoint_reference(value: str) -> bool:
-    """Reference to a Python object using in the format::
-
-        importable.module:object.attr
-
-    See ``Data model >object reference`` in the :ref:`PyPA's entry-points specification
-    `.
-    """
     module, _, rest = value.partition(":")
     if "[" in rest:
         obj, _, extras_ = rest.partition("[")
@@ -354,49 +255,5 @@ def python_entrypoint_reference(value: str) -> bool:
         obj = rest
 
     module_parts = module.split(".")
-    identifiers = _chain(module_parts, obj.split(".")) if rest else iter(module_parts)
+    identifiers = _chain(module_parts, obj.split(".")) if rest else module_parts
     return all(python_identifier(i.strip()) for i in identifiers)
-
-
-def uint8(value: builtins.int) -> bool:
-    r"""Unsigned 8-bit integer (:math:`0 \leq x < 2^8`)"""
-    return 0 <= value < 2**8
-
-
-def uint16(value: builtins.int) -> bool:
-    r"""Unsigned 16-bit integer (:math:`0 \leq x < 2^{16}`)"""
-    return 0 <= value < 2**16
-
-
-def uint(value: builtins.int) -> bool:
-    r"""Unsigned 64-bit integer (:math:`0 \leq x < 2^{64}`)"""
-    return 0 <= value < 2**64
-
-
-def int(value: builtins.int) -> bool:
-    r"""Signed 64-bit integer (:math:`-2^{63} \leq x < 2^{63}`)"""
-    return -(2**63) <= value < 2**63
-
-
-try:
-    from packaging import licenses as _licenses
-
-    def SPDX(value: str) -> bool:
-        """See :ref:`PyPA's License-Expression specification
-        ` (added in :pep:`639`).
-        """
-        try:
-            _licenses.canonicalize_license_expression(value)
-            return True
-        except _licenses.InvalidLicenseExpression:
-            return False
-
-except ImportError:  # pragma: no cover
-    _logger.warning(
-        "Could not find an up-to-date installation of `packaging`. "
-        "License expressions might not be validated. "
-        "To enforce validation, please install `packaging>=24.2`."
-    )
-
-    def SPDX(value: str) -> bool:
-        return True
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/distutils.schema.json b/server/.venv/lib/python3.11/site-packages/setuptools/config/distutils.schema.json
deleted file mode 100644
index 93cd2e8..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/distutils.schema.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-
-  "$id": "https://setuptools.pypa.io/en/latest/deprecated/distutils/configfile.html",
-  "title": "``tool.distutils`` table",
-  "$$description": [
-    "**EXPERIMENTAL** (NOT OFFICIALLY SUPPORTED): Use ``tool.distutils``",
-    "subtables to configure arguments for ``distutils`` commands.",
-    "Originally, ``distutils`` allowed developers to configure arguments for",
-    "``setup.py`` commands via `distutils configuration files",
-    "`_.",
-    "See also `the old Python docs _`."
-  ],
-
-  "type": "object",
-  "properties": {
-    "global": {
-      "type": "object",
-      "description": "Global options applied to all ``distutils`` commands"
-    }
-  },
-  "patternProperties": {
-    ".+": {"type": "object"}
-  },
-  "$comment": "TODO: Is there a practical way of making this schema more specific?"
-}
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/expand.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/expand.py
index 531f965..c8db2c4 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/expand.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/expand.py
@@ -17,55 +17,65 @@ functions among several configuration file formats.
 
 **PRIVATE MODULE**: API reserved for setuptools internal usage only.
 """
-
-from __future__ import annotations
-
 import ast
 import importlib
+import io
 import os
 import pathlib
 import sys
-from collections.abc import Iterable, Iterator, Mapping
-from configparser import ConfigParser
+import warnings
 from glob import iglob
-from importlib.machinery import ModuleSpec, all_suffixes
+from configparser import ConfigParser
+from importlib.machinery import ModuleSpec
 from itertools import chain
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    Optional,
+    Tuple,
+    TypeVar,
+    Union,
+    cast
+)
 from pathlib import Path
-from types import ModuleType, TracebackType
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
-
-from .. import _static
-from .._path import StrPath, same_path as _same_path
-from ..discovery import find_package_path
-from ..warnings import SetuptoolsWarning
+from types import ModuleType
 
 from distutils.errors import DistutilsOptionError
 
+from .._path import same_path as _same_path
+
 if TYPE_CHECKING:
-    from typing_extensions import Self
-
-    from setuptools.dist import Distribution
+    from setuptools.dist import Distribution  # noqa
+    from setuptools.discovery import ConfigDiscovery  # noqa
+    from distutils.dist import DistributionMetadata  # noqa
 
+chain_iter = chain.from_iterable
+_Path = Union[str, os.PathLike]
 _K = TypeVar("_K")
-_V_co = TypeVar("_V_co", covariant=True)
+_V = TypeVar("_V", covariant=True)
 
 
 class StaticModule:
     """Proxy to a module object that avoids executing arbitrary code."""
 
-    def __init__(self, name: str, spec: ModuleSpec) -> None:
-        module = ast.parse(pathlib.Path(spec.origin).read_bytes())  # type: ignore[arg-type] # Let it raise an error on None
+    def __init__(self, name: str, spec: ModuleSpec):
+        module = ast.parse(pathlib.Path(spec.origin).read_bytes())
         vars(self).update(locals())
         del self.self
 
-    def _find_assignments(self) -> Iterator[tuple[ast.AST, ast.AST]]:
+    def _find_assignments(self) -> Iterator[Tuple[ast.AST, ast.AST]]:
         for statement in self.module.body:
             if isinstance(statement, ast.Assign):
                 yield from ((target, statement.value) for target in statement.targets)
             elif isinstance(statement, ast.AnnAssign) and statement.value:
                 yield (statement.target, statement.value)
 
-    def __getattr__(self, attr: str):
+    def __getattr__(self, attr):
         """Attempt to load an attribute "statically", via :func:`ast.literal_eval`."""
         try:
             return next(
@@ -78,8 +88,8 @@ class StaticModule:
 
 
 def glob_relative(
-    patterns: Iterable[str], root_dir: StrPath | None = None
-) -> list[str]:
+    patterns: Iterable[str], root_dir: Optional[_Path] = None
+) -> List[str]:
     """Expand the list of glob patterns, but preserving relative paths.
 
     :param list[str] patterns: List of glob patterns
@@ -91,16 +101,14 @@ def glob_relative(
     expanded_values = []
     root_dir = root_dir or os.getcwd()
     for value in patterns:
+
         # Has globby characters?
         if any(char in value for char in glob_characters):
             # then expand the glob pattern while keeping paths *relative*:
             glob_path = os.path.abspath(os.path.join(root_dir, value))
-            expanded_values.extend(
-                sorted(
-                    os.path.relpath(path, root_dir).replace(os.sep, "/")
-                    for path in iglob(glob_path, recursive=True)
-                )
-            )
+            expanded_values.extend(sorted(
+                os.path.relpath(path, root_dir).replace(os.sep, "/")
+                for path in iglob(glob_path, recursive=True)))
 
         else:
             # take the value as-is
@@ -110,16 +118,14 @@ def glob_relative(
     return expanded_values
 
 
-def read_files(
-    filepaths: StrPath | Iterable[StrPath], root_dir: StrPath | None = None
-) -> str:
+def read_files(filepaths: Union[str, bytes, Iterable[_Path]], root_dir=None) -> str:
     """Return the content of the files concatenated using ``\n`` as str
 
     This function is sandboxed and won't reach anything outside ``root_dir``
 
     (By default ``root_dir`` is the current directory).
     """
-    from more_itertools import always_iterable
+    from setuptools.extern.more_itertools import always_iterable
 
     root_dir = os.path.abspath(root_dir or os.getcwd())
     _filepaths = (os.path.join(root_dir, path) for path in always_iterable(filepaths))
@@ -130,20 +136,20 @@ def read_files(
     )
 
 
-def _filter_existing_files(filepaths: Iterable[StrPath]) -> Iterator[StrPath]:
+def _filter_existing_files(filepaths: Iterable[_Path]) -> Iterator[_Path]:
     for path in filepaths:
         if os.path.isfile(path):
             yield path
         else:
-            SetuptoolsWarning.emit(f"File {path!r} cannot be found")
+            warnings.warn(f"File {path!r} cannot be found")
 
 
-def _read_file(filepath: bytes | StrPath) -> str:
-    with open(filepath, encoding='utf-8') as f:
+def _read_file(filepath: Union[bytes, _Path]) -> str:
+    with io.open(filepath, encoding='utf-8') as f:
         return f.read()
 
 
-def _assert_local(filepath: StrPath, root_dir: str):
+def _assert_local(filepath: _Path, root_dir: str):
     if Path(os.path.abspath(root_dir)) not in Path(os.path.abspath(filepath)).parents:
         msg = f"Cannot access {filepath!r} (or anything outside {root_dir!r})"
         raise DistutilsOptionError(msg)
@@ -153,9 +159,9 @@ def _assert_local(filepath: StrPath, root_dir: str):
 
 def read_attr(
     attr_desc: str,
-    package_dir: Mapping[str, str] | None = None,
-    root_dir: StrPath | None = None,
-) -> Any:
+    package_dir: Optional[Mapping[str, str]] = None,
+    root_dir: Optional[_Path] = None
+):
     """Reads the value of an attribute from a module.
 
     This function will try to read the attributed statically first
@@ -178,20 +184,18 @@ def read_attr(
     attr_name = attrs_path.pop()
     module_name = '.'.join(attrs_path)
     module_name = module_name or '__init__'
-    path = _find_module(module_name, package_dir, root_dir)
+    _parent_path, path, module_name = _find_module(module_name, package_dir, root_dir)
     spec = _find_spec(module_name, path)
 
     try:
-        value = getattr(StaticModule(module_name, spec), attr_name)
-        # XXX: Is marking as static contents coming from modules too optimistic?
-        return _static.attempt_conversion(value)
+        return getattr(StaticModule(module_name, spec), attr_name)
     except Exception:
         # fallback to evaluate module
         module = _load_spec(spec, module_name)
         return getattr(module, attr_name)
 
 
-def _find_spec(module_name: str, module_path: StrPath | None) -> ModuleSpec:
+def _find_spec(module_name: str, module_path: Optional[_Path]) -> ModuleSpec:
     spec = importlib.util.spec_from_file_location(module_name, module_path)
     spec = spec or importlib.util.find_spec(module_name)
 
@@ -207,38 +211,48 @@ def _load_spec(spec: ModuleSpec, module_name: str) -> ModuleType:
         return sys.modules[name]
     module = importlib.util.module_from_spec(spec)
     sys.modules[name] = module  # cache (it also ensures `==` works on loaded items)
-    assert spec.loader is not None
-    spec.loader.exec_module(module)
+    spec.loader.exec_module(module)  # type: ignore
     return module
 
 
 def _find_module(
-    module_name: str, package_dir: Mapping[str, str] | None, root_dir: StrPath
-) -> str | None:
-    """Find the path to the module named ``module_name``,
-    considering the ``package_dir`` in the build configuration and ``root_dir``.
-
-    >>> tmp = getfixture('tmpdir')
-    >>> _ = tmp.ensure("a/b/c.py")
-    >>> _ = tmp.ensure("a/b/d/__init__.py")
-    >>> r = lambda x: x.replace(str(tmp), "tmp").replace(os.sep, "/")
-    >>> r(_find_module("a.b.c", None, tmp))
-    'tmp/a/b/c.py'
-    >>> r(_find_module("f.g.h", {"": "1", "f": "2", "f.g": "3", "f.g.h": "a/b/d"}, tmp))
-    'tmp/a/b/d/__init__.py'
+    module_name: str, package_dir: Optional[Mapping[str, str]], root_dir: _Path
+) -> Tuple[_Path, Optional[str], str]:
+    """Given a module (that could normally be imported by ``module_name``
+    after the build is complete), find the path to the parent directory where
+    it is contained and the canonical name that could be used to import it
+    considering the ``package_dir`` in the build configuration and ``root_dir``
     """
-    path_start = find_package_path(module_name, package_dir or {}, root_dir)
-    candidates = chain.from_iterable(
-        (f"{path_start}{ext}", os.path.join(path_start, f"__init__{ext}"))
-        for ext in all_suffixes()
+    parent_path = root_dir
+    module_parts = module_name.split('.')
+    if package_dir:
+        if module_parts[0] in package_dir:
+            # A custom path was specified for the module we want to import
+            custom_path = package_dir[module_parts[0]]
+            parts = custom_path.rsplit('/', 1)
+            if len(parts) > 1:
+                parent_path = os.path.join(root_dir, parts[0])
+                parent_module = parts[1]
+            else:
+                parent_module = custom_path
+            module_name = ".".join([parent_module, *module_parts[1:]])
+        elif '' in package_dir:
+            # A custom parent directory was specified for all root modules
+            parent_path = os.path.join(root_dir, package_dir[''])
+
+    path_start = os.path.join(parent_path, *module_name.split("."))
+    candidates = chain(
+        (f"{path_start}.py", os.path.join(path_start, "__init__.py")),
+        iglob(f"{path_start}.*")
     )
-    return next((x for x in candidates if os.path.isfile(x)), None)
+    module_path = next((x for x in candidates if os.path.isfile(x)), None)
+    return parent_path, module_path, module_name
 
 
 def resolve_class(
     qualified_class_name: str,
-    package_dir: Mapping[str, str] | None = None,
-    root_dir: StrPath | None = None,
+    package_dir: Optional[Mapping[str, str]] = None,
+    root_dir: Optional[_Path] = None
 ) -> Callable:
     """Given a qualified class name, return the associated class object"""
     root_dir = root_dir or os.getcwd()
@@ -246,16 +260,16 @@ def resolve_class(
     class_name = qualified_class_name[idx + 1 :]
     pkg_name = qualified_class_name[:idx]
 
-    path = _find_module(pkg_name, package_dir, root_dir)
-    module = _load_spec(_find_spec(pkg_name, path), pkg_name)
+    _parent_path, path, module_name = _find_module(pkg_name, package_dir, root_dir)
+    module = _load_spec(_find_spec(module_name, path), module_name)
     return getattr(module, class_name)
 
 
 def cmdclass(
-    values: dict[str, str],
-    package_dir: Mapping[str, str] | None = None,
-    root_dir: StrPath | None = None,
-) -> dict[str, Callable]:
+    values: Dict[str, str],
+    package_dir: Optional[Mapping[str, str]] = None,
+    root_dir: Optional[_Path] = None
+) -> Dict[str, Callable]:
     """Given a dictionary mapping command names to strings for qualified class
     names, apply :func:`resolve_class` to the dict values.
     """
@@ -265,10 +279,10 @@ def cmdclass(
 def find_packages(
     *,
     namespaces=True,
-    fill_package_dir: dict[str, str] | None = None,
-    root_dir: StrPath | None = None,
-    **kwargs,
-) -> list[str]:
+    fill_package_dir: Optional[Dict[str, str]] = None,
+    root_dir: Optional[_Path] = None,
+    **kwargs
+) -> List[str]:
     """Works similarly to :func:`setuptools.find_packages`, but with all
     arguments given as keyword arguments. Moreover, ``where`` can be given
     as a list (the results will be simply concatenated).
@@ -286,19 +300,17 @@ def find_packages(
 
     :rtype: list
     """
-    from more_itertools import always_iterable, unique_everseen
-
     from setuptools.discovery import construct_package_dir
+    from setuptools.extern.more_itertools import unique_everseen, always_iterable
 
-    # check "not namespaces" first due to python/mypy#6232
-    if not namespaces:
-        from setuptools.discovery import PackageFinder
-    else:
+    if namespaces:
         from setuptools.discovery import PEP420PackageFinder as PackageFinder
+    else:
+        from setuptools.discovery import PackageFinder  # type: ignore
 
     root_dir = root_dir or os.curdir
     where = kwargs.pop('where', ['.'])
-    packages: list[str] = []
+    packages: List[str] = []
     fill_package_dir = {} if fill_package_dir is None else fill_package_dir
     search = list(unique_everseen(always_iterable(where)))
 
@@ -310,29 +322,35 @@ def find_packages(
         pkgs = PackageFinder.find(package_path, **kwargs)
         packages.extend(pkgs)
         if pkgs and not (
-            fill_package_dir.get("") == path or os.path.samefile(package_path, root_dir)
+            fill_package_dir.get("") == path
+            or os.path.samefile(package_path, root_dir)
         ):
             fill_package_dir.update(construct_package_dir(pkgs, path))
 
     return packages
 
 
-def _nest_path(parent: StrPath, path: StrPath) -> str:
+def _nest_path(parent: _Path, path: _Path) -> str:
     path = parent if path in {".", ""} else os.path.join(parent, path)
     return os.path.normpath(path)
 
 
-def version(value: Callable | Iterable[str | int] | str) -> str:
+def version(value: Union[Callable, Iterable[Union[str, int]], str]) -> str:
     """When getting the version directly from an attribute,
     it should be normalised to string.
     """
-    _value = value() if callable(value) else value
+    if callable(value):
+        value = value()
 
-    if isinstance(_value, str):
-        return _value
-    if hasattr(_value, '__iter__'):
-        return '.'.join(map(str, _value))
-    return f'{_value}'
+    value = cast(Iterable[Union[str, int]], value)
+
+    if not isinstance(value, str):
+        if hasattr(value, '__iter__'):
+            value = '.'.join(map(str, value))
+        else:
+            value = '%s' % value
+
+    return value
 
 
 def canonic_package_data(package_data: dict) -> dict:
@@ -342,8 +360,8 @@ def canonic_package_data(package_data: dict) -> dict:
 
 
 def canonic_data_files(
-    data_files: list | dict, root_dir: StrPath | None = None
-) -> list[tuple[str, list[str]]]:
+    data_files: Union[list, dict], root_dir: Optional[_Path] = None
+) -> List[Tuple[str, List[str]]]:
     """For compatibility with ``setup.py``, ``data_files`` should be a list
     of pairs instead of a dict.
 
@@ -358,17 +376,14 @@ def canonic_data_files(
     ]
 
 
-def entry_points(
-    text: str, text_source: str = "entry-points"
-) -> dict[str, dict[str, str]]:
+def entry_points(text: str, text_source="entry-points") -> Dict[str, dict]:
     """Given the contents of entry-points file,
     process it into a 2-level dictionary (``dict[str, dict[str, str]]``).
     The first level keys are entry-point groups, the second level keys are
     entry-point names, and the second level values are references to objects
     (that correspond to the entry-point value).
     """
-    # Using undocumented behaviour, see python/typeshed#12700
-    parser = ConfigParser(default_section=None, delimiters=("=",))  # type: ignore[call-overload]
+    parser = ConfigParser(default_section=None, delimiters=("=",))  # type: ignore
     parser.optionxform = str  # case sensitive
     parser.read_string(text, text_source)
     groups = {k: dict(v.items()) for k, v in parser.items()}
@@ -386,7 +401,7 @@ class EnsurePackagesDiscovered:
     and those might not have been processed yet.
     """
 
-    def __init__(self, distribution: Distribution) -> None:
+    def __init__(self, distribution: "Distribution"):
         self._dist = distribution
         self._called = False
 
@@ -396,15 +411,10 @@ class EnsurePackagesDiscovered:
             self._called = True
             self._dist.set_defaults(name=False)  # Skip name, we can still be parsing
 
-    def __enter__(self) -> Self:
+    def __enter__(self):
         return self
 
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback: TracebackType | None,
-    ):
+    def __exit__(self, _exc_type, _exc_value, _traceback):
         if self._called:
             self._dist.set_defaults.analyse_name()  # Now we can set a default name
 
@@ -419,7 +429,7 @@ class EnsurePackagesDiscovered:
         return LazyMappingProxy(self._get_package_dir)
 
 
-class LazyMappingProxy(Mapping[_K, _V_co]):
+class LazyMappingProxy(Mapping[_K, _V]):
     """Mapping proxy that delays resolving the target object, until really needed.
 
     >>> def obtain_mapping():
@@ -433,16 +443,16 @@ class LazyMappingProxy(Mapping[_K, _V_co]):
     'other value'
     """
 
-    def __init__(self, obtain_mapping_value: Callable[[], Mapping[_K, _V_co]]) -> None:
+    def __init__(self, obtain_mapping_value: Callable[[], Mapping[_K, _V]]):
         self._obtain = obtain_mapping_value
-        self._value: Mapping[_K, _V_co] | None = None
+        self._value: Optional[Mapping[_K, _V]] = None
 
-    def _target(self) -> Mapping[_K, _V_co]:
+    def _target(self) -> Mapping[_K, _V]:
         if self._value is None:
             self._value = self._obtain()
         return self._value
 
-    def __getitem__(self, key: _K) -> _V_co:
+    def __getitem__(self, key: _K) -> _V:
         return self._target()[key]
 
     def __len__(self) -> int:
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/pyprojecttoml.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/pyprojecttoml.py
index fd6c596..d995f0b 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/pyprojecttoml.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/pyprojecttoml.py
@@ -2,51 +2,41 @@
 Load setuptools configuration from ``pyproject.toml`` files.
 
 **PRIVATE MODULE**: API reserved for setuptools internal usage only.
-
-To read project metadata, consider using
-``build.util.project_wheel_metadata`` (https://pypi.org/project/build/).
-For simple scenarios, you can also try parsing the file directly
-with the help of ``tomllib`` or ``tomli``.
 """
-
-from __future__ import annotations
-
 import logging
 import os
-from collections.abc import Mapping
+import warnings
 from contextlib import contextmanager
 from functools import partial
-from types import TracebackType
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Callable, Dict, Optional, Mapping, Union
+
+from setuptools.errors import FileError, OptionError
 
-from .._path import StrPath
-from ..errors import FileError, InvalidConfigError
-from ..warnings import SetuptoolsWarning
 from . import expand as _expand
-from ._apply_pyprojecttoml import _PREVIOUSLY_DEFINED, _MissingDynamic, apply as _apply
+from ._apply_pyprojecttoml import apply as _apply
+from ._apply_pyprojecttoml import _PREVIOUSLY_DEFINED, _WouldIgnoreField
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
-
-    from setuptools.dist import Distribution
+    from setuptools.dist import Distribution  # noqa
 
+_Path = Union[str, os.PathLike]
 _logger = logging.getLogger(__name__)
 
 
-def load_file(filepath: StrPath) -> dict:
-    from ..compat.py310 import tomllib
+def load_file(filepath: _Path) -> dict:
+    from setuptools.extern import tomli  # type: ignore
 
     with open(filepath, "rb") as file:
-        return tomllib.load(file)
+        return tomli.load(file)
 
 
-def validate(config: dict, filepath: StrPath) -> bool:
+def validate(config: dict, filepath: _Path) -> bool:
     from . import _validate_pyproject as validator
 
     trove_classifier = validator.FORMAT_FUNCTIONS.get("trove-classifier")
     if hasattr(trove_classifier, "_disable_download"):
-        # Improve reproducibility by default. See abravalheri/validate-pyproject#31
-        trove_classifier._disable_download()  # type: ignore[union-attr]
+        # Improve reproducibility by default. See issue 31 for validate-pyproject.
+        trove_classifier._disable_download()  # type: ignore
 
     try:
         return validator.validate(config)
@@ -62,10 +52,10 @@ def validate(config: dict, filepath: StrPath) -> bool:
 
 
 def apply_configuration(
-    dist: Distribution,
-    filepath: StrPath,
-    ignore_option_errors: bool = False,
-) -> Distribution:
+    dist: "Distribution",
+    filepath: _Path,
+    ignore_option_errors=False,
+) -> "Distribution":
     """Apply the configuration from a ``pyproject.toml`` file into an existing
     distribution object.
     """
@@ -74,11 +64,11 @@ def apply_configuration(
 
 
 def read_configuration(
-    filepath: StrPath,
-    expand: bool = True,
-    ignore_option_errors: bool = False,
-    dist: Distribution | None = None,
-) -> dict[str, Any]:
+    filepath: _Path,
+    expand=True,
+    ignore_option_errors=False,
+    dist: Optional["Distribution"] = None,
+):
     """Read given configuration file and returns options from it as a dict.
 
     :param str|unicode filepath: Path to configuration file in the ``pyproject.toml``
@@ -94,8 +84,8 @@ def read_configuration(
 
     :param Distribution|None: Distribution object to which the configuration refers.
         If not given a dummy object will be created and discarded after the
-        configuration is read. This is used for auto-discovery of packages and in the
-        case a dynamic configuration (e.g. ``attr`` or ``cmdclass``) is expanded.
+        configuration is read. This is used for auto-discovery of packages in the case
+        a dynamic configuration (e.g. ``attr`` or ``cmdclass``) is expanded.
         When ``expand=False`` this object is simply ignored.
 
     :rtype: dict
@@ -112,18 +102,17 @@ def read_configuration(
     if not asdict or not (project_table or setuptools_table):
         return {}  # User is not using pyproject to configure setuptools
 
-    if "setuptools" in asdict.get("tools", {}):
-        # let the user know they probably have a typo in their metadata
-        _ToolsTypoInMetadata.emit()
-
-    if "distutils" in tool_table:
-        _ExperimentalConfiguration.emit(subject="[tool.distutils]")
+    if setuptools_table:
+        # TODO: Remove the following once the feature stabilizes:
+        msg = "Support for `[tool.setuptools]` in `pyproject.toml` is still *beta*."
+        warnings.warn(msg, _BetaConfiguration)
 
     # There is an overall sense in the community that making include_package_data=True
     # the default would be an improvement.
     # `ini2toml` backfills include_package_data=False when nothing is explicitly given,
     # therefore setting a default here is backwards compatible.
-    if dist and dist.include_package_data is not None:
+    orig_setuptools_table = setuptools_table.copy()
+    if dist and getattr(dist, "include_package_data") is not None:
         setuptools_table.setdefault("include-package-data", dist.include_package_data)
     else:
         setuptools_table.setdefault("include-package-data", True)
@@ -131,13 +120,20 @@ def read_configuration(
     asdict["tool"] = tool_table
     tool_table["setuptools"] = setuptools_table
 
-    if "ext-modules" in setuptools_table:
-        _ExperimentalConfiguration.emit(subject="[tool.setuptools.ext-modules]")
-
-    with _ignore_errors(ignore_option_errors):
+    try:
         # Don't complain about unrelated errors (e.g. tools not using the "tool" table)
         subset = {"project": project_table, "tool": {"setuptools": setuptools_table}}
         validate(subset, filepath)
+    except Exception as ex:
+        # TODO: Remove the following once the feature stabilizes:
+        if _skip_bad_config(project_table, orig_setuptools_table, dist):
+            return {}
+        # TODO: After the previous statement is removed the try/except can be replaced
+        # by the _ignore_errors context manager.
+        if ignore_option_errors:
+            _logger.debug(f"ignored error: {ex.__class__.__name__} - {ex}")
+        else:
+            raise  # re-raise exception
 
     if expand:
         root_dir = os.path.dirname(filepath)
@@ -146,11 +142,41 @@ def read_configuration(
     return asdict
 
 
+def _skip_bad_config(
+    project_cfg: dict, setuptools_cfg: dict, dist: Optional["Distribution"]
+) -> bool:
+    """Be temporarily forgiving with invalid ``pyproject.toml``"""
+    # See pypa/setuptools#3199 and pypa/cibuildwheel#1064
+
+    if dist is None or (
+        dist.metadata.name is None
+        and dist.metadata.version is None
+        and dist.install_requires is None
+    ):
+        # It seems that the build is not getting any configuration from other places
+        return False
+
+    if setuptools_cfg:
+        # If `[tool.setuptools]` is set, then `pyproject.toml` config is intentional
+        return False
+
+    given_config = set(project_cfg.keys())
+    popular_subset = {"name", "version", "python_requires", "requires-python"}
+    if given_config <= popular_subset:
+        # It seems that the docs in cibuildtool has been inadvertently encouraging users
+        # to create `pyproject.toml` files that are not compliant with the standards.
+        # Let's be forgiving for the time being.
+        warnings.warn(_InvalidFile.message(), _InvalidFile, stacklevel=2)
+        return True
+
+    return False
+
+
 def expand_configuration(
     config: dict,
-    root_dir: StrPath | None = None,
+    root_dir: Optional[_Path] = None,
     ignore_option_errors: bool = False,
-    dist: Distribution | None = None,
+    dist: Optional["Distribution"] = None,
 ) -> dict:
     """Given a configuration with unresolved fields (e.g. dynamic, cmdclass, ...)
     find their final values.
@@ -173,10 +199,10 @@ class _ConfigExpander:
     def __init__(
         self,
         config: dict,
-        root_dir: StrPath | None = None,
+        root_dir: Optional[_Path] = None,
         ignore_option_errors: bool = False,
-        dist: Distribution | None = None,
-    ) -> None:
+        dist: Optional["Distribution"] = None,
+    ):
         self.config = config
         self.root_dir = root_dir or os.getcwd()
         self.project_cfg = config.get("project", {})
@@ -185,9 +211,8 @@ class _ConfigExpander:
         self.dynamic_cfg = self.setuptools_cfg.get("dynamic", {})
         self.ignore_option_errors = ignore_option_errors
         self._dist = dist
-        self._referenced_files = set[str]()
 
-    def _ensure_dist(self) -> Distribution:
+    def _ensure_dist(self) -> "Distribution":
         from setuptools.dist import Distribution
 
         attrs = {"src_root": self.root_dir, "name": self.project_cfg.get("name", None)}
@@ -216,7 +241,6 @@ class _ConfigExpander:
             self._expand_cmdclass(package_dir)
             self._expand_all_dynamic(dist, package_dir)
 
-        dist._referenced_files.update(self._referenced_files)
         return self.config
 
     def _expand_packages(self):
@@ -240,7 +264,7 @@ class _ConfigExpander:
         cmdclass = partial(_expand.cmdclass, package_dir=package_dir, root_dir=root_dir)
         self._process_field(self.setuptools_cfg, "cmdclass", cmdclass)
 
-    def _expand_all_dynamic(self, dist: Distribution, package_dir: Mapping[str, str]):
+    def _expand_all_dynamic(self, dist: "Distribution", package_dir: Mapping[str, str]):
         special = (  # need special handling
             "version",
             "readme",
@@ -270,7 +294,7 @@ class _ConfigExpander:
         updates = {k: v for k, v in obtained_dynamic.items() if v is not None}
         self.project_cfg.update(updates)
 
-    def _ensure_previously_set(self, dist: Distribution, field: str):
+    def _ensure_previously_set(self, dist: "Distribution", field: str):
         previous = _PREVIOUSLY_DEFINED[field](dist)
         if previous is None and not self.ignore_option_errors:
             msg = (
@@ -278,24 +302,21 @@ class _ConfigExpander:
                 "Some dynamic fields need to be specified via `tool.setuptools.dynamic`"
                 "\nothers must be specified via the equivalent attribute in `setup.py`."
             )
-            raise InvalidConfigError(msg)
+            raise OptionError(msg)
 
     def _expand_directive(
         self, specifier: str, directive, package_dir: Mapping[str, str]
     ):
-        from more_itertools import always_iterable
-
         with _ignore_errors(self.ignore_option_errors):
             root_dir = self.root_dir
             if "file" in directive:
-                self._referenced_files.update(always_iterable(directive["file"]))
                 return _expand.read_files(directive["file"], root_dir)
             if "attr" in directive:
                 return _expand.read_attr(directive["attr"], package_dir, root_dir)
             raise ValueError(f"invalid `{specifier}`: {directive!r}")
         return None
 
-    def _obtain(self, dist: Distribution, field: str, package_dir: Mapping[str, str]):
+    def _obtain(self, dist: "Distribution", field: str, package_dir: Mapping[str, str]):
         if field in self.dynamic_cfg:
             return self._expand_directive(
                 f"tool.setuptools.dynamic.{field}",
@@ -305,33 +326,29 @@ class _ConfigExpander:
         self._ensure_previously_set(dist, field)
         return None
 
-    def _obtain_version(self, dist: Distribution, package_dir: Mapping[str, str]):
+    def _obtain_version(self, dist: "Distribution", package_dir: Mapping[str, str]):
         # Since plugins can set version, let's silently skip if it cannot be obtained
         if "version" in self.dynamic and "version" in self.dynamic_cfg:
-            return _expand.version(
-                # We already do an early check for the presence of "version"
-                self._obtain(dist, "version", package_dir)  # pyright: ignore[reportArgumentType]
-            )
+            return _expand.version(self._obtain(dist, "version", package_dir))
         return None
 
-    def _obtain_readme(self, dist: Distribution) -> dict[str, str] | None:
+    def _obtain_readme(self, dist: "Distribution") -> Optional[Dict[str, str]]:
         if "readme" not in self.dynamic:
             return None
 
         dynamic_cfg = self.dynamic_cfg
         if "readme" in dynamic_cfg:
             return {
-                # We already do an early check for the presence of "readme"
                 "text": self._obtain(dist, "readme", {}),
                 "content-type": dynamic_cfg["readme"].get("content-type", "text/x-rst"),
-            }  # pyright: ignore[reportReturnType]
+            }
 
         self._ensure_previously_set(dist, "readme")
         return None
 
     def _obtain_entry_points(
-        self, dist: Distribution, package_dir: Mapping[str, str]
-    ) -> dict[str, dict[str, Any]] | None:
+        self, dist: "Distribution", package_dir: Mapping[str, str]
+    ) -> Optional[Dict[str, dict]]:
         fields = ("entry-points", "scripts", "gui-scripts")
         if not any(field in self.dynamic for field in fields):
             return None
@@ -341,14 +358,16 @@ class _ConfigExpander:
             return None
 
         groups = _expand.entry_points(text)
-        # Any is str | dict[str, str], but causes variance issues
-        expanded: dict[str, dict[str, Any]] = {"entry-points": groups}
+        expanded = {"entry-points": groups}
 
         def _set_scripts(field: str, group: str):
             if group in groups:
                 value = groups.pop(group)
                 if field not in self.dynamic:
-                    raise InvalidConfigError(_MissingDynamic.details(field, value))
+                    msg = _WouldIgnoreField.message(field, value)
+                    warnings.warn(msg, _WouldIgnoreField)
+                # TODO: Don't set field when support for pyproject.toml stabilizes
+                #       instead raise an error as specified in PEP 621
                 expanded[field] = value
 
         _set_scripts("scripts", "console_scripts")
@@ -356,34 +375,32 @@ class _ConfigExpander:
 
         return expanded
 
-    def _obtain_classifiers(self, dist: Distribution):
+    def _obtain_classifiers(self, dist: "Distribution"):
         if "classifiers" in self.dynamic:
             value = self._obtain(dist, "classifiers", {})
             if value:
                 return value.splitlines()
         return None
 
-    def _obtain_dependencies(self, dist: Distribution):
+    def _obtain_dependencies(self, dist: "Distribution"):
         if "dependencies" in self.dynamic:
             value = self._obtain(dist, "dependencies", {})
             if value:
                 return _parse_requirements_list(value)
         return None
 
-    def _obtain_optional_dependencies(self, dist: Distribution):
+    def _obtain_optional_dependencies(self, dist: "Distribution"):
         if "optional-dependencies" not in self.dynamic:
             return None
         if "optional-dependencies" in self.dynamic_cfg:
             optional_dependencies_map = self.dynamic_cfg["optional-dependencies"]
             assert isinstance(optional_dependencies_map, dict)
             return {
-                group: _parse_requirements_list(
-                    self._expand_directive(
-                        f"tool.setuptools.dynamic.optional-dependencies.{group}",
-                        directive,
-                        {},
-                    )
-                )
+                group: _parse_requirements_list(self._expand_directive(
+                    f"tool.setuptools.dynamic.optional-dependencies.{group}",
+                    directive,
+                    {},
+                ))
                 for group, directive in optional_dependencies_map.items()
             }
         self._ensure_previously_set(dist, "optional-dependencies")
@@ -412,18 +429,18 @@ def _ignore_errors(ignore_option_errors: bool):
 
 class _EnsurePackagesDiscovered(_expand.EnsurePackagesDiscovered):
     def __init__(
-        self, distribution: Distribution, project_cfg: dict, setuptools_cfg: dict
-    ) -> None:
+        self, distribution: "Distribution", project_cfg: dict, setuptools_cfg: dict
+    ):
         super().__init__(distribution)
         self._project_cfg = project_cfg
         self._setuptools_cfg = setuptools_cfg
 
-    def __enter__(self) -> Self:
+    def __enter__(self):
         """When entering the context, the values of ``packages``, ``py_modules`` and
         ``package_dir`` that are missing in ``dist`` are copied from ``setuptools_cfg``.
         """
         dist, cfg = self._dist, self._setuptools_cfg
-        package_dir: dict[str, str] = cfg.setdefault("package-dir", {})
+        package_dir: Dict[str, str] = cfg.setdefault("package-dir", {})
         package_dir.update(dist.package_dir or {})
         dist.package_dir = package_dir  # needs to be the same object
 
@@ -440,12 +457,7 @@ class _EnsurePackagesDiscovered(_expand.EnsurePackagesDiscovered):
 
         return super().__enter__()
 
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback: TracebackType | None,
-    ) -> None:
+    def __exit__(self, exc_type, exc_value, traceback):
         """When exiting the context, if values of ``packages``, ``py_modules`` and
         ``package_dir`` are missing in ``setuptools_cfg``, copy from ``dist``.
         """
@@ -455,14 +467,27 @@ class _EnsurePackagesDiscovered(_expand.EnsurePackagesDiscovered):
         return super().__exit__(exc_type, exc_value, traceback)
 
 
-class _ExperimentalConfiguration(SetuptoolsWarning):
-    _SUMMARY = (
-        "`{subject}` in `pyproject.toml` is still *experimental* "
-        "and likely to change in future releases."
-    )
+class _BetaConfiguration(UserWarning):
+    """Explicitly inform users that some `pyproject.toml` configuration is *beta*"""
 
 
-class _ToolsTypoInMetadata(SetuptoolsWarning):
-    _SUMMARY = (
-        "Ignoring [tools.setuptools] in pyproject.toml, did you mean [tool.setuptools]?"
-    )
+class _InvalidFile(UserWarning):
+    """The given `pyproject.toml` file is invalid and would be ignored.
+    !!\n\n
+    ############################
+    # Invalid `pyproject.toml` #
+    ############################
+
+    Any configurations in `pyproject.toml` will be ignored.
+    Please note that future releases of setuptools will halt the build process
+    if an invalid file is given.
+
+    To prevent setuptools from considering `pyproject.toml` please
+    DO NOT include the `[project]` or `[tool.setuptools]` tables in your file.
+    \n\n!!
+    """
+
+    @classmethod
+    def message(cls):
+        from inspect import cleandoc
+        return cleandoc(cls.__doc__)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/setupcfg.py b/server/.venv/lib/python3.11/site-packages/setuptools/config/setupcfg.py
index 633aa9d..c2a974d 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/setupcfg.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/config/setupcfg.py
@@ -2,53 +2,45 @@
 Load setuptools configuration from ``setup.cfg`` files.
 
 **API will be made private in the future**
-
-To read project metadata, consider using
-``build.util.project_wheel_metadata`` (https://pypi.org/project/build/).
-For simple scenarios, you can also try parsing the file directly
-with the help of ``configparser``.
 """
-
-from __future__ import annotations
+import os
 
 import contextlib
 import functools
-import os
+import warnings
 from collections import defaultdict
-from collections.abc import Iterable, Iterator
-from functools import partial, wraps
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generic, TypeVar, cast
+from functools import partial
+from functools import wraps
+from typing import (TYPE_CHECKING, Callable, Any, Dict, Generic, Iterable, List,
+                    Optional, Tuple, TypeVar, Union)
 
-from packaging.markers import default_environment as marker_env
-from packaging.requirements import InvalidRequirement, Requirement
-from packaging.version import InvalidVersion, Version
+from distutils.errors import DistutilsOptionError, DistutilsFileError
+from setuptools.extern.packaging.requirements import Requirement, InvalidRequirement
+from setuptools.extern.packaging.version import Version, InvalidVersion
+from setuptools.extern.packaging.specifiers import SpecifierSet
+from setuptools._deprecation_warning import SetuptoolsDeprecationWarning
 
-from .. import _static
-from .._path import StrPath
-from ..errors import FileError, OptionError
-from ..warnings import SetuptoolsDeprecationWarning
 from . import expand
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from setuptools.dist import Distribution  # noqa
+    from distutils.dist import DistributionMetadata  # noqa
 
-    from setuptools.dist import Distribution
-
-    from distutils.dist import DistributionMetadata
-
-SingleCommandOptions: TypeAlias = dict[str, tuple[str, Any]]
+_Path = Union[str, os.PathLike]
+SingleCommandOptions = Dict["str", Tuple["str", Any]]
 """Dict that associate the name of the options of a particular command to a
 tuple. The first element of the tuple indicates the origin of the option value
 (e.g. the name of the configuration file where it was read from),
 while the second element of the tuple is the option value itself
 """
-AllCommandOptions: TypeAlias = dict[str, SingleCommandOptions]
-"""cmd name => its options"""
-Target = TypeVar("Target", "Distribution", "DistributionMetadata")
+AllCommandOptions = Dict["str", SingleCommandOptions]  # cmd name => its options
+Target = TypeVar("Target", bound=Union["Distribution", "DistributionMetadata"])
 
 
 def read_configuration(
-    filepath: StrPath, find_others: bool = False, ignore_option_errors: bool = False
+    filepath: _Path,
+    find_others=False,
+    ignore_option_errors=False
 ) -> dict:
     """Read given configuration file and returns options from it as a dict.
 
@@ -73,7 +65,7 @@ def read_configuration(
     return configuration_to_dict(handlers)
 
 
-def apply_configuration(dist: Distribution, filepath: StrPath) -> Distribution:
+def apply_configuration(dist: "Distribution", filepath: _Path) -> "Distribution":
     """Apply the configuration from a ``setup.cfg`` file into an existing
     distribution object.
     """
@@ -83,26 +75,24 @@ def apply_configuration(dist: Distribution, filepath: StrPath) -> Distribution:
 
 
 def _apply(
-    dist: Distribution,
-    filepath: StrPath,
-    other_files: Iterable[StrPath] = (),
+    dist: "Distribution", filepath: _Path,
+    other_files: Iterable[_Path] = (),
     ignore_option_errors: bool = False,
-) -> tuple[ConfigMetadataHandler, ConfigOptionsHandler]:
+) -> Tuple["ConfigHandler", ...]:
     """Read configuration from ``filepath`` and applies to the ``dist`` object."""
     from setuptools.dist import _Distribution
 
     filepath = os.path.abspath(filepath)
 
     if not os.path.isfile(filepath):
-        raise FileError(f'Configuration file {filepath} does not exist.')
+        raise DistutilsFileError('Configuration file %s does not exist.' % filepath)
 
     current_directory = os.getcwd()
     os.chdir(os.path.dirname(filepath))
     filenames = [*other_files, filepath]
 
     try:
-        # TODO: Temporary cast until mypy 1.12 is released with upstream fixes from typeshed
-        _Distribution.parse_config_files(dist, filenames=cast(list[str], filenames))
+        _Distribution.parse_config_files(dist, filenames=filenames)
         handlers = parse_configuration(
             dist, dist.command_options, ignore_option_errors=ignore_option_errors
         )
@@ -113,26 +103,22 @@ def _apply(
     return handlers
 
 
-def _get_option(target_obj: Distribution | DistributionMetadata, key: str):
+def _get_option(target_obj: Target, key: str):
     """
     Given a target object and option key, get that option from
     the target object, either through a get_{key} method or
     from an attribute directly.
     """
-    getter_name = f'get_{key}'
+    getter_name = 'get_{key}'.format(**locals())
     by_attribute = functools.partial(getattr, target_obj, key)
     getter = getattr(target_obj, getter_name, by_attribute)
     return getter()
 
 
-def configuration_to_dict(
-    handlers: Iterable[
-        ConfigHandler[Distribution] | ConfigHandler[DistributionMetadata]
-    ],
-) -> dict:
+def configuration_to_dict(handlers: Tuple["ConfigHandler", ...]) -> dict:
     """Returns configuration data gathered by given handlers as a dict.
 
-    :param Iterable[ConfigHandler] handlers: Handlers list,
+    :param list[ConfigHandler] handlers: Handlers list,
         usually from parse_configuration()
 
     :rtype: dict
@@ -148,10 +134,10 @@ def configuration_to_dict(
 
 
 def parse_configuration(
-    distribution: Distribution,
+    distribution: "Distribution",
     command_options: AllCommandOptions,
-    ignore_option_errors: bool = False,
-) -> tuple[ConfigMetadataHandler, ConfigOptionsHandler]:
+    ignore_option_errors=False
+) -> Tuple["ConfigMetadataHandler", "ConfigOptionsHandler"]:
     """Performs additional parsing of configuration options
     for a distribution.
 
@@ -186,9 +172,6 @@ def parse_configuration(
             distribution.src_root,
         )
         meta.parse()
-        distribution._referenced_files.update(
-            options._referenced_files, meta._referenced_files
-        )
 
     return meta, options
 
@@ -213,16 +196,17 @@ def _warn_accidental_env_marker_misconfig(label: str, orig_value: str, parsed: l
     if "\n" in orig_value or len(parsed) != 2:
         return
 
-    markers = marker_env().keys()
-
-    try:
-        req = Requirement(parsed[1])
-        if req.name in markers:
-            _AmbiguousMarker.emit(field=label, req=parsed[1])
-    except InvalidRequirement as ex:
-        if any(parsed[1].startswith(marker) for marker in markers):
-            msg = _AmbiguousMarker.message(field=label, req=parsed[1])
-            raise InvalidRequirement(msg) from ex
+    with contextlib.suppress(InvalidRequirement):
+        original_requirements_str = ";".join(parsed)
+        req = Requirement(original_requirements_str)
+        if req.marker is not None:
+            msg = (
+                f"One of the parsed requirements in `{label}` "
+                f"looks like a valid environment marker: '{parsed[1]}'\n"
+                "Make sure that the config is correct and check "
+                "https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#opt-2"  # noqa: E501
+            )
+            warnings.warn(msg, UserWarning)
 
 
 class ConfigHandler(Generic[Target]):
@@ -234,7 +218,7 @@ class ConfigHandler(Generic[Target]):
 
     """
 
-    aliases: ClassVar[dict[str, str]] = {}
+    aliases: Dict[str, str] = {}
     """Options aliases.
     For compatibility with various packages. E.g.: d2to1 and pbr.
     Note: `-` in keys is replaced with `_` by config parser.
@@ -247,57 +231,65 @@ class ConfigHandler(Generic[Target]):
         options: AllCommandOptions,
         ignore_option_errors,
         ensure_discovered: expand.EnsurePackagesDiscovered,
-    ) -> None:
-        self.ignore_option_errors = ignore_option_errors
-        self.target_obj: Target = target_obj
-        self.sections = dict(self._section_options(options))
-        self.set_options: list[str] = []
-        self.ensure_discovered = ensure_discovered
-        self._referenced_files = set[str]()
-        """After parsing configurations, this property will enumerate
-        all files referenced by the "file:" directive. Private API for setuptools only.
-        """
+    ):
+        sections: AllCommandOptions = {}
 
-    @classmethod
-    def _section_options(
-        cls, options: AllCommandOptions
-    ) -> Iterator[tuple[str, SingleCommandOptions]]:
-        for full_name, value in options.items():
-            pre, _sep, name = full_name.partition(cls.section_prefix)
-            if pre:
+        section_prefix = self.section_prefix
+        for section_name, section_options in options.items():
+            if not section_name.startswith(section_prefix):
                 continue
-            yield name.lstrip('.'), value
+
+            section_name = section_name.replace(section_prefix, '').strip('.')
+            sections[section_name] = section_options
+
+        self.ignore_option_errors = ignore_option_errors
+        self.target_obj = target_obj
+        self.sections = sections
+        self.set_options: List[str] = []
+        self.ensure_discovered = ensure_discovered
 
     @property
     def parsers(self):
         """Metadata item name to parser function mapping."""
         raise NotImplementedError(
-            f'{self.__class__.__name__} must provide .parsers property'
+            '%s must provide .parsers property' % self.__class__.__name__
         )
 
-    def __setitem__(self, option_name, value) -> None:
+    def __setitem__(self, option_name, value):
+        unknown = tuple()
         target_obj = self.target_obj
 
         # Translate alias into real name.
         option_name = self.aliases.get(option_name, option_name)
 
-        try:
-            current_value = getattr(target_obj, option_name)
-        except AttributeError as e:
-            raise KeyError(option_name) from e
+        current_value = getattr(target_obj, option_name, unknown)
+
+        if current_value is unknown:
+            raise KeyError(option_name)
 
         if current_value:
             # Already inhabited. Skipping.
             return
 
-        try:
-            parsed = self.parsers.get(option_name, lambda x: x)(value)
-        except (Exception,) * self.ignore_option_errors:
+        skip_option = False
+        parser = self.parsers.get(option_name)
+        if parser:
+            try:
+                value = parser(value)
+
+            except Exception:
+                skip_option = True
+                if not self.ignore_option_errors:
+                    raise
+
+        if skip_option:
             return
 
-        simple_setter = functools.partial(target_obj.__setattr__, option_name)
-        setter = getattr(target_obj, f"set_{option_name}", simple_setter)
-        setter(parsed)
+        setter = getattr(target_obj, 'set_%s' % option_name, None)
+        if setter is None:
+            setattr(target_obj, option_name, value)
+        else:
+            setter(value)
 
         self.set_options.append(option_name)
 
@@ -333,7 +325,9 @@ class ConfigHandler(Generic[Target]):
         for line in cls._parse_list(value):
             key, sep, val = line.partition(separator)
             if sep != separator:
-                raise OptionError(f"Unable to parse option value to dict: {value}")
+                raise DistutilsOptionError(
+                    'Unable to parse option value to dict: %s' % value
+                )
             result[key.strip()] = val.strip()
 
         return result
@@ -364,14 +358,15 @@ class ConfigHandler(Generic[Target]):
             exclude_directive = 'file:'
             if value.startswith(exclude_directive):
                 raise ValueError(
-                    f'Only strings are accepted for the {key} field, '
-                    'files are not accepted'
+                    'Only strings are accepted for the {0} field, '
+                    'files are not accepted'.format(key)
                 )
-            return _static.Str(value)
+            return value
 
         return parser
 
-    def _parse_file(self, value, root_dir: StrPath | None):
+    @classmethod
+    def _parse_file(cls, value, root_dir: _Path):
         """Represents value as a string, allowing including text
         from nearest files using `file:` directive.
 
@@ -390,15 +385,13 @@ class ConfigHandler(Generic[Target]):
             return value
 
         if not value.startswith(include_directive):
-            return _static.Str(value)
+            return value
 
         spec = value[len(include_directive) :]
-        filepaths = [path.strip() for path in spec.split(',')]
-        self._referenced_files.update(filepaths)
-        # XXX: Is marking as static contents coming from files too optimistic?
-        return _static.Str(expand.read_files(filepaths, root_dir))
+        filepaths = (path.strip() for path in spec.split(','))
+        return expand.read_files(filepaths, root_dir)
 
-    def _parse_attr(self, value, package_dir, root_dir: StrPath):
+    def _parse_attr(self, value, package_dir, root_dir: _Path):
         """Represents value as a module attribute.
 
         Examples:
@@ -410,7 +403,7 @@ class ConfigHandler(Generic[Target]):
         """
         attr_directive = 'attr:'
         if not value.startswith(attr_directive):
-            return _static.Str(value)
+            return value
 
         attr_desc = value.replace(attr_directive, '')
 
@@ -466,58 +459,60 @@ class ConfigHandler(Generic[Target]):
         parser = (lambda _, v: values_parser(v)) if values_parser else (lambda _, v: v)
         return cls._parse_section_to_dict_with_key(section_options, parser)
 
-    def parse_section(self, section_options) -> None:
+    def parse_section(self, section_options):
         """Parses configuration file section.
 
         :param dict section_options:
         """
-        for name, (_, value) in section_options.items():
+        for (name, (_, value)) in section_options.items():
             with contextlib.suppress(KeyError):
                 # Keep silent for a new option may appear anytime.
                 self[name] = value
 
-    def parse(self) -> None:
+    def parse(self):
         """Parses configuration file items from one
         or more related sections.
 
         """
         for section_name, section_options in self.sections.items():
+
             method_postfix = ''
             if section_name:  # [section.option] variant
-                method_postfix = f"_{section_name}"
+                method_postfix = '_%s' % section_name
 
-            section_parser_method: Callable | None = getattr(
+            section_parser_method: Optional[Callable] = getattr(
                 self,
                 # Dots in section names are translated into dunderscores.
-                f'parse_section{method_postfix}'.replace('.', '__'),
+                ('parse_section%s' % method_postfix).replace('.', '__'),
                 None,
             )
 
             if section_parser_method is None:
-                raise OptionError(
-                    "Unsupported distribution option section: "
-                    f"[{self.section_prefix}.{section_name}]"
+                raise DistutilsOptionError(
+                    'Unsupported distribution option section: [%s.%s]'
+                    % (self.section_prefix, section_name)
                 )
 
             section_parser_method(section_options)
 
-    def _deprecated_config_handler(self, func, msg, **kw):
+    def _deprecated_config_handler(self, func, msg, warning_class):
         """this function will wrap around parameters that are deprecated
 
         :param msg: deprecation message
+        :param warning_class: class of warning exception to be raised
         :param func: function to be wrapped around
         """
 
         @wraps(func)
         def config_handler(*args, **kwargs):
-            kw.setdefault("stacklevel", 2)
-            _DeprecatedConfig.emit("Deprecated config in `setup.cfg`", msg, **kw)
+            warnings.warn(msg, warning_class)
             return func(*args, **kwargs)
 
         return config_handler
 
 
 class ConfigMetadataHandler(ConfigHandler["DistributionMetadata"]):
+
     section_prefix = 'metadata'
 
     aliases = {
@@ -535,13 +530,13 @@ class ConfigMetadataHandler(ConfigHandler["DistributionMetadata"]):
 
     def __init__(
         self,
-        target_obj: DistributionMetadata,
+        target_obj: "DistributionMetadata",
         options: AllCommandOptions,
         ignore_option_errors: bool,
         ensure_discovered: expand.EnsurePackagesDiscovered,
-        package_dir: dict | None = None,
-        root_dir: StrPath | None = os.curdir,
-    ) -> None:
+        package_dir: Optional[dict] = None,
+        root_dir: _Path = os.curdir
+    ):
         super().__init__(target_obj, options, ignore_option_errors, ensure_discovered)
         self.package_dir = package_dir
         self.root_dir = root_dir
@@ -549,29 +544,35 @@ class ConfigMetadataHandler(ConfigHandler["DistributionMetadata"]):
     @property
     def parsers(self):
         """Metadata item name to parser function mapping."""
-        parse_list_static = self._get_parser_compound(self._parse_list, _static.List)
-        parse_dict_static = self._get_parser_compound(self._parse_dict, _static.Dict)
+        parse_list = self._parse_list
         parse_file = partial(self._parse_file, root_dir=self.root_dir)
+        parse_dict = self._parse_dict
         exclude_files_parser = self._exclude_files_parser
 
         return {
-            'author': _static.Str,
-            'author_email': _static.Str,
-            'maintainer': _static.Str,
-            'maintainer_email': _static.Str,
-            'platforms': parse_list_static,
-            'keywords': parse_list_static,
-            'provides': parse_list_static,
-            'obsoletes': parse_list_static,
-            'classifiers': self._get_parser_compound(parse_file, parse_list_static),
+            'platforms': parse_list,
+            'keywords': parse_list,
+            'provides': parse_list,
+            'requires': self._deprecated_config_handler(
+                parse_list,
+                "The requires parameter is deprecated, please use "
+                "install_requires for runtime dependencies.",
+                SetuptoolsDeprecationWarning,
+            ),
+            'obsoletes': parse_list,
+            'classifiers': self._get_parser_compound(parse_file, parse_list),
             'license': exclude_files_parser('license'),
-            'license_files': parse_list_static,
+            'license_file': self._deprecated_config_handler(
+                exclude_files_parser('license_file'),
+                "The license_file parameter is deprecated, "
+                "use license_files instead.",
+                SetuptoolsDeprecationWarning,
+            ),
+            'license_files': parse_list,
             'description': parse_file,
             'long_description': parse_file,
-            'long_description_content_type': _static.Str,
-            'version': self._parse_version,  # Cannot be marked as dynamic
-            'url': _static.Str,
-            'project_urls': parse_dict_static,
+            'version': self._parse_version,
+            'project_urls': parse_dict,
         }
 
     def _parse_version(self, value):
@@ -589,11 +590,12 @@ class ConfigMetadataHandler(ConfigHandler["DistributionMetadata"]):
             # accidentally include newlines and other unintended content
             try:
                 Version(version)
-            except InvalidVersion as e:
-                raise OptionError(
-                    f'Version loaded from {value} does not '
-                    f'comply with PEP 440: {version}'
-                ) from e
+            except InvalidVersion:
+                tmpl = (
+                    'Version loaded from {value} does not '
+                    'comply with PEP 440: {version}'
+                )
+                raise DistutilsOptionError(tmpl.format(**locals()))
 
             return version
 
@@ -601,18 +603,19 @@ class ConfigMetadataHandler(ConfigHandler["DistributionMetadata"]):
 
 
 class ConfigOptionsHandler(ConfigHandler["Distribution"]):
+
     section_prefix = 'options'
 
     def __init__(
         self,
-        target_obj: Distribution,
+        target_obj: "Distribution",
         options: AllCommandOptions,
         ignore_option_errors: bool,
         ensure_discovered: expand.EnsurePackagesDiscovered,
-    ) -> None:
+    ):
         super().__init__(target_obj, options, ignore_option_errors, ensure_discovered)
         self.root_dir = target_obj.src_root
-        self.package_dir: dict[str, str] = {}  # To be filled by `find_packages`
+        self.package_dir: Dict[str, str] = {}  # To be filled by `find_packages`
 
     @classmethod
     def _parse_list_semicolon(cls, value):
@@ -627,20 +630,20 @@ class ConfigOptionsHandler(ConfigHandler["Distribution"]):
         _warn_accidental_env_marker_misconfig(label, value, parsed)
         # Filter it to only include lines that are not comments. `parse_list`
         # will have stripped each line and filtered out empties.
-        return _static.List(line for line in parsed if not line.startswith("#"))
-        # ^-- Use `_static.List` to mark a non-`Dynamic` Core Metadata
+        return [line for line in parsed if not line.startswith("#")]
 
     @property
     def parsers(self):
         """Metadata item name to parser function mapping."""
         parse_list = self._parse_list
         parse_bool = self._parse_bool
+        parse_dict = self._parse_dict
         parse_cmdclass = self._parse_cmdclass
 
         return {
             'zip_safe': parse_bool,
             'include_package_data': parse_bool,
-            'package_dir': self._parse_dict,
+            'package_dir': parse_dict,
             'scripts': parse_list,
             'eager_resources': parse_list,
             'dependency_links': parse_list,
@@ -648,16 +651,17 @@ class ConfigOptionsHandler(ConfigHandler["Distribution"]):
                 parse_list,
                 "The namespace_packages parameter is deprecated, "
                 "consider using implicit namespaces instead (PEP 420).",
-                # TODO: define due date, see setuptools.dist:check_nsp.
+                SetuptoolsDeprecationWarning,
             ),
-            'install_requires': partial(  # Core Metadata
+            'install_requires': partial(
                 self._parse_requirements_list, "install_requires"
             ),
             'setup_requires': self._parse_list_semicolon,
+            'tests_require': self._parse_list_semicolon,
             'packages': self._parse_packages,
             'entry_points': self._parse_file_in_root,
             'py_modules': parse_list,
-            'python_requires': _static.SpecifierSet,  # Core Metadata
+            'python_requires': SpecifierSet,
             'cmdclass': parse_cmdclass,
         }
 
@@ -700,7 +704,10 @@ class ConfigOptionsHandler(ConfigHandler["Distribution"]):
         section_data = self._parse_section_to_dict(section_options, self._parse_list)
 
         valid_keys = ['where', 'include', 'exclude']
-        find_kwargs = {k: v for k, v in section_data.items() if k in valid_keys and v}
+
+        find_kwargs = dict(
+            [(k, v) for k, v in section_data.items() if k in valid_keys and v]
+        )
 
         where = find_kwargs.get('where')
         if where is not None:
@@ -708,7 +715,7 @@ class ConfigOptionsHandler(ConfigHandler["Distribution"]):
 
         return find_kwargs
 
-    def parse_section_entry_points(self, section_options) -> None:
+    def parse_section_entry_points(self, section_options):
         """Parses `entry_points` configuration file section.
 
         :param dict section_options:
@@ -720,61 +727,36 @@ class ConfigOptionsHandler(ConfigHandler["Distribution"]):
         package_data = self._parse_section_to_dict(section_options, self._parse_list)
         return expand.canonic_package_data(package_data)
 
-    def parse_section_package_data(self, section_options) -> None:
+    def parse_section_package_data(self, section_options):
         """Parses `package_data` configuration file section.
 
         :param dict section_options:
         """
         self['package_data'] = self._parse_package_data(section_options)
 
-    def parse_section_exclude_package_data(self, section_options) -> None:
+    def parse_section_exclude_package_data(self, section_options):
         """Parses `exclude_package_data` configuration file section.
 
         :param dict section_options:
         """
         self['exclude_package_data'] = self._parse_package_data(section_options)
 
-    def parse_section_extras_require(self, section_options) -> None:  # Core Metadata
+    def parse_section_extras_require(self, section_options):
         """Parses `extras_require` configuration file section.
 
         :param dict section_options:
         """
         parsed = self._parse_section_to_dict_with_key(
             section_options,
-            lambda k, v: self._parse_requirements_list(f"extras_require[{k}]", v),
+            lambda k, v: self._parse_requirements_list(f"extras_require[{k}]", v)
         )
 
-        self['extras_require'] = _static.Dict(parsed)
-        # ^-- Use `_static.Dict` to mark a non-`Dynamic` Core Metadata
+        self['extras_require'] = parsed
 
-    def parse_section_data_files(self, section_options) -> None:
+    def parse_section_data_files(self, section_options):
         """Parses `data_files` configuration file section.
 
         :param dict section_options:
         """
         parsed = self._parse_section_to_dict(section_options, self._parse_list)
         self['data_files'] = expand.canonic_data_files(parsed, self.root_dir)
-
-
-class _AmbiguousMarker(SetuptoolsDeprecationWarning):
-    _SUMMARY = "Ambiguous requirement marker."
-    _DETAILS = """
-    One of the parsed requirements in `{field}` looks like a valid environment marker:
-
-        {req!r}
-
-    Please make sure that the configuration file is correct.
-    You can use dangling lines to avoid this problem.
-    """
-    _SEE_DOCS = "userguide/declarative_config.html#opt-2"
-    # TODO: should we include due_date here? Initially introduced in 6 Aug 2022.
-    # Does this make sense with latest version of packaging?
-
-    @classmethod
-    def message(cls, **kw):
-        docs = f"https://setuptools.pypa.io/en/latest/{cls._SEE_DOCS}"
-        return cls._format(cls._SUMMARY, cls._DETAILS, see_url=docs, format_args=kw)
-
-
-class _DeprecatedConfig(SetuptoolsDeprecationWarning):
-    _SEE_DOCS = "userguide/declarative_config.html"
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/config/setuptools.schema.json b/server/.venv/lib/python3.11/site-packages/setuptools/config/setuptools.schema.json
deleted file mode 100644
index ec887b3..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/config/setuptools.schema.json
+++ /dev/null
@@ -1,433 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-
-  "$id": "https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html",
-  "title": "``tool.setuptools`` table",
-  "$$description": [
-    "``setuptools``-specific configurations that can be set by users that require",
-    "customization.",
-    "These configurations are completely optional and probably can be skipped when",
-    "creating simple packages. They are equivalent to some of the `Keywords",
-    "`_",
-    "used by the ``setup.py`` file, and can be set via the ``tool.setuptools`` table.",
-    "It considers only ``setuptools`` `parameters",
-    "`_",
-    "that are not covered by :pep:`621`; and intentionally excludes ``dependency_links``",
-    "and ``setup_requires`` (incompatible with modern workflows/standards)."
-  ],
-
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "platforms": {
-      "type": "array",
-      "items": {"type": "string"}
-    },
-    "provides": {
-      "$$description": [
-        "Package and virtual package names contained within this package",
-        "**(not supported by pip)**"
-      ],
-      "type": "array",
-      "items": {"type": "string", "format": "pep508-identifier"}
-    },
-    "obsoletes": {
-      "$$description": [
-        "Packages which this package renders obsolete",
-        "**(not supported by pip)**"
-      ],
-      "type": "array",
-      "items": {"type": "string", "format": "pep508-identifier"}
-    },
-    "zip-safe": {
-      "$$description": [
-        "Whether the project can be safely installed and run from a zip file.",
-        "**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and",
-        "``setup.py install`` in the context of ``eggs`` (**DEPRECATED**)."
-      ],
-      "type": "boolean"
-    },
-    "script-files": {
-      "$$description": [
-        "Legacy way of defining scripts (entry-points are preferred).",
-        "Equivalent to the ``script`` keyword in ``setup.py``",
-        "(it was renamed to avoid confusion with entry-point based ``project.scripts``",
-        "defined in :pep:`621`).",
-        "**DISCOURAGED**: generic script wrappers are tricky and may not work properly.",
-        "Whenever possible, please use ``project.scripts`` instead."
-      ],
-      "type": "array",
-      "items": {"type": "string"},
-      "$comment": "TODO: is this field deprecated/should be removed?"
-    },
-    "eager-resources": {
-      "$$description": [
-        "Resources that should be extracted together, if any of them is needed,",
-        "or if any C extensions included in the project are imported.",
-        "**OBSOLETE**: only relevant for ``pkg_resources``, ``easy_install`` and",
-        "``setup.py install`` in the context of ``eggs`` (**DEPRECATED**)."
-      ],
-      "type": "array",
-      "items": {"type": "string"}
-    },
-    "packages": {
-      "$$description": [
-        "Packages that should be included in the distribution.",
-        "It can be given either as a list of package identifiers",
-        "or as a ``dict``-like structure with a single key ``find``",
-        "which corresponds to a dynamic call to",
-        "``setuptools.config.expand.find_packages`` function.",
-        "The ``find`` key is associated with a nested ``dict``-like structure that can",
-        "contain ``where``, ``include``, ``exclude`` and ``namespaces`` keys,",
-        "mimicking the keyword arguments of the associated function."
-      ],
-      "oneOf": [
-        {
-          "title": "Array of Python package identifiers",
-          "type": "array",
-          "items": {"$ref": "#/definitions/package-name"}
-        },
-        {"$ref": "#/definitions/find-directive"}
-      ]
-    },
-    "package-dir": {
-      "$$description": [
-        ":class:`dict`-like structure mapping from package names to directories where their",
-        "code can be found.",
-        "The empty string (as key) means that all packages are contained inside",
-        "the given directory will be included in the distribution."
-      ],
-      "type": "object",
-      "additionalProperties": false,
-      "propertyNames": {
-        "anyOf": [{"const": ""}, {"$ref": "#/definitions/package-name"}]
-      },
-      "patternProperties": {
-        "^.*$": {"type": "string" }
-      }
-    },
-    "package-data": {
-      "$$description": [
-        "Mapping from package names to lists of glob patterns.",
-        "Usually this option is not needed when using ``include-package-data = true``",
-        "For more information on how to include data files, check ``setuptools`` `docs",
-        "`_."
-      ],
-      "type": "object",
-      "additionalProperties": false,
-      "propertyNames": {
-        "anyOf": [{"type": "string", "format": "python-module-name"}, {"const": "*"}]
-      },
-      "patternProperties": {
-        "^.*$": {"type": "array", "items": {"type": "string"}}
-      }
-    },
-    "include-package-data": {
-      "$$description": [
-        "Automatically include any data files inside the package directories",
-        "that are specified by ``MANIFEST.in``",
-        "For more information on how to include data files, check ``setuptools`` `docs",
-        "`_."
-      ],
-      "type": "boolean"
-    },
-    "exclude-package-data": {
-      "$$description": [
-        "Mapping from package names to lists of glob patterns that should be excluded",
-        "For more information on how to include data files, check ``setuptools`` `docs",
-        "`_."
-      ],
-      "type": "object",
-      "additionalProperties": false,
-      "propertyNames": {
-        "anyOf": [{"type": "string", "format": "python-module-name"}, {"const": "*"}]
-      },
-      "patternProperties": {
-          "^.*$": {"type": "array", "items": {"type": "string"}}
-      }
-    },
-    "namespace-packages": {
-      "type": "array",
-      "items": {"type": "string", "format": "python-module-name-relaxed"},
-      "$comment": "https://setuptools.pypa.io/en/latest/userguide/package_discovery.html",
-      "description": "**DEPRECATED**: use implicit namespaces instead (:pep:`420`)."
-    },
-    "py-modules": {
-      "description": "Modules that setuptools will manipulate",
-      "type": "array",
-      "items": {"type": "string", "format": "python-module-name-relaxed"},
-      "$comment": "TODO: clarify the relationship with ``packages``"
-    },
-    "ext-modules": {
-      "description": "Extension modules to be compiled by setuptools",
-      "type": "array",
-      "items": {"$ref": "#/definitions/ext-module"}
-    },
-    "data-files": {
-      "$$description": [
-        "``dict``-like structure where each key represents a directory and",
-        "the value is a list of glob patterns that should be installed in them.",
-        "**DISCOURAGED**: please notice this might not work as expected with wheels.",
-        "Whenever possible, consider using data files inside the package directories",
-        "(or create a new namespace package that only contains data files).",
-        "See `data files support",
-        "`_."
-      ],
-      "type": "object",
-      "patternProperties": {
-          "^.*$": {"type": "array", "items": {"type": "string"}}
-      }
-    },
-    "cmdclass": {
-      "$$description": [
-        "Mapping of distutils-style command names to ``setuptools.Command`` subclasses",
-        "which in turn should be represented by strings with a qualified class name",
-        "(i.e., \"dotted\" form with module), e.g.::\n\n",
-        "    cmdclass = {mycmd = \"pkg.subpkg.module.CommandClass\"}\n\n",
-        "The command class should be a directly defined at the top-level of the",
-        "containing module (no class nesting)."
-      ],
-      "type": "object",
-      "patternProperties": {
-          "^.*$": {"type": "string", "format": "python-qualified-identifier"}
-      }
-    },
-    "license-files": {
-      "type": "array",
-      "items": {"type": "string"},
-      "$$description": [
-        "**PROVISIONAL**: list of glob patterns for all license files being distributed.",
-        "(likely to become standard with :pep:`639`).",
-        "By default: ``['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']``"
-      ],
-      "$comment": "TODO: revise if PEP 639 is accepted. Probably ``project.license-files``?"
-    },
-    "dynamic": {
-      "type": "object",
-      "description": "Instructions for loading :pep:`621`-related metadata dynamically",
-      "additionalProperties": false,
-      "properties": {
-        "version": {
-          "$$description": [
-            "A version dynamically loaded via either the ``attr:`` or ``file:``",
-            "directives. Please make sure the given file or attribute respects :pep:`440`.",
-            "Also ensure to set ``project.dynamic`` accordingly."
-          ],
-          "oneOf": [
-            {"$ref": "#/definitions/attr-directive"},
-            {"$ref": "#/definitions/file-directive"}
-          ]
-        },
-        "classifiers": {"$ref": "#/definitions/file-directive"},
-        "description": {"$ref": "#/definitions/file-directive"},
-        "entry-points": {"$ref": "#/definitions/file-directive"},
-        "dependencies": {"$ref": "#/definitions/file-directive-for-dependencies"},
-        "optional-dependencies": {
-          "type": "object",
-          "propertyNames": {"type": "string", "format": "pep508-identifier"},
-          "additionalProperties": false,
-          "patternProperties": {
-            ".+": {"$ref": "#/definitions/file-directive-for-dependencies"}
-          }
-        },
-        "readme": {
-          "type": "object",
-          "anyOf": [
-            {"$ref": "#/definitions/file-directive"},
-            {
-              "type": "object",
-              "properties": {
-                "content-type": {"type": "string"},
-                "file": { "$ref": "#/definitions/file-directive/properties/file" }
-              },
-              "additionalProperties": false}
-          ],
-          "required": ["file"]
-        }
-      }
-    }
-  },
-
-  "definitions": {
-    "package-name": {
-      "$id": "#/definitions/package-name",
-      "title": "Valid package name",
-      "description": "Valid package name (importable or :pep:`561`).",
-      "type": "string",
-      "anyOf": [
-        {"type": "string", "format": "python-module-name-relaxed"},
-        {"type": "string", "format": "pep561-stub-name"}
-      ]
-    },
-    "ext-module": {
-      "$id": "#/definitions/ext-module",
-      "title": "Extension module",
-      "description": "Parameters to construct a :class:`setuptools.Extension` object",
-      "type": "object",
-      "required": ["name", "sources"],
-      "additionalProperties": false,
-      "properties": {
-        "name": {
-          "type": "string",
-          "format": "python-module-name-relaxed"
-        },
-        "sources": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "include-dirs":{
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "define-macros": {
-          "type": "array",
-          "items": {
-            "type": "array",
-            "items": [
-              {"description": "macro name", "type": "string"},
-              {"description": "macro value", "oneOf": [{"type": "string"}, {"type": "null"}]}
-            ],
-            "additionalItems": false
-          }
-        },
-        "undef-macros": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "library-dirs": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "libraries": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "runtime-library-dirs": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "extra-objects": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "extra-compile-args": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "extra-link-args": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "export-symbols": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "swig-opts": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "depends": {
-          "type": "array",
-          "items": {"type": "string"}
-        },
-        "language": {"type": "string"},
-        "optional": {"type": "boolean"},
-        "py-limited-api": {"type": "boolean"}
-      }
-    },
-    "file-directive": {
-      "$id": "#/definitions/file-directive",
-      "title": "'file:' directive",
-      "description":
-        "Value is read from a file (or list of files and then concatenated)",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "file": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        }
-      },
-      "required": ["file"]
-    },
-    "file-directive-for-dependencies": {
-      "title": "'file:' directive for dependencies",
-      "allOf": [
-        {
-          "$$description": [
-            "**BETA**: subset of the ``requirements.txt`` format",
-            "without ``pip`` flags and options",
-            "(one :pep:`508`-compliant string per line,",
-            "lines that are blank or start with ``#`` are excluded).",
-            "See `dynamic metadata",
-            "`_."
-          ]
-        },
-        {"$ref": "#/definitions/file-directive"}
-      ]
-    },
-    "attr-directive": {
-      "title": "'attr:' directive",
-      "$id": "#/definitions/attr-directive",
-      "$$description": [
-        "Value is read from a module attribute. Supports callables and iterables;",
-        "unsupported types are cast via ``str()``"
-      ],
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "attr": {"type": "string", "format": "python-qualified-identifier"}
-      },
-      "required": ["attr"]
-    },
-    "find-directive": {
-      "$id": "#/definitions/find-directive",
-      "title": "'find:' directive",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "find": {
-          "type": "object",
-          "$$description": [
-            "Dynamic `package discovery",
-            "`_."
-          ],
-          "additionalProperties": false,
-          "properties": {
-            "where": {
-              "description":
-                "Directories to be searched for packages (Unix-style relative path)",
-              "type": "array",
-              "items": {"type": "string"}
-            },
-            "exclude": {
-              "type": "array",
-              "$$description": [
-                "Exclude packages that match the values listed in this field.",
-                "Can container shell-style wildcards (e.g. ``'pkg.*'``)"
-              ],
-              "items": {"type": "string"}
-            },
-            "include": {
-              "type": "array",
-              "$$description": [
-                "Restrict the found packages to just the ones listed in this field.",
-                "Can container shell-style wildcards (e.g. ``'pkg.*'``)"
-              ],
-              "items": {"type": "string"}
-            },
-            "namespaces": {
-              "type": "boolean",
-              "$$description": [
-                "When ``True``, directories without a ``__init__.py`` file will also",
-                "be scanned for :pep:`420`-style implicit namespaces"
-              ]
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/depends.py b/server/.venv/lib/python3.11/site-packages/setuptools/depends.py
index e5223b7..adffd12 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/depends.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/depends.py
@@ -1,36 +1,28 @@
-from __future__ import annotations
-
+import sys
+import marshal
 import contextlib
 import dis
-import marshal
-import sys
-from types import CodeType
-from typing import Any, Literal, TypeVar
 
-from packaging.version import Version
+from setuptools.extern.packaging import version
 
+from ._imp import find_module, PY_COMPILED, PY_FROZEN, PY_SOURCE
 from . import _imp
-from ._imp import PY_COMPILED, PY_FROZEN, PY_SOURCE, find_module
 
-_T = TypeVar("_T")
 
-__all__ = ['Require', 'find_module']
+__all__ = [
+    'Require', 'find_module', 'get_module_constant', 'extract_constant'
+]
 
 
 class Require:
     """A prerequisite to building or installing a distribution"""
 
     def __init__(
-        self,
-        name,
-        requested_version,
-        module,
-        homepage: str = '',
-        attribute=None,
-        format=None,
-    ) -> None:
+            self, name, requested_version, module, homepage='',
+            attribute=None, format=None):
+
         if format is None and requested_version is not None:
-            format = Version
+            format = version.Version
 
         if format is not None:
             requested_version = format(requested_version)
@@ -43,21 +35,15 @@ class Require:
     def full_name(self):
         """Return full package/distribution name, w/version"""
         if self.requested_version is not None:
-            return f'{self.name}-{self.requested_version}'
+            return '%s-%s' % (self.name, self.requested_version)
         return self.name
 
     def version_ok(self, version):
         """Is 'version' sufficiently up-to-date?"""
-        return (
-            self.attribute is None
-            or self.format is None
-            or str(version) != "unknown"
-            and self.format(version) >= self.requested_version
-        )
+        return self.attribute is None or self.format is None or \
+            str(version) != "unknown" and self.format(version) >= self.requested_version
 
-    def get_version(
-        self, paths=None, default: _T | Literal["unknown"] = "unknown"
-    ) -> _T | Literal["unknown"] | None | Any:
+    def get_version(self, paths=None, default="unknown"):
         """Get version number of installed module, 'None', or 'default'
 
         Search 'paths' for module.  If not found, return 'None'.  If found,
@@ -70,12 +56,12 @@ class Require:
 
         if self.attribute is None:
             try:
-                f, _p, _i = find_module(self.module, paths)
+                f, p, i = find_module(self.module, paths)
+                if f:
+                    f.close()
+                return default
             except ImportError:
                 return None
-            if f:
-                f.close()
-            return default
 
         v = get_module_constant(self.module, self.attribute, default, paths)
 
@@ -101,85 +87,90 @@ def maybe_close(f):
     def empty():
         yield
         return
-
     if not f:
         return empty()
 
     return contextlib.closing(f)
 
 
-# Some objects are not available on some platforms.
-# XXX it'd be better to test assertions about bytecode instead.
-if not sys.platform.startswith('java') and sys.platform != 'cli':
+def get_module_constant(module, symbol, default=-1, paths=None):
+    """Find 'module' by searching 'paths', and extract 'symbol'
 
-    def get_module_constant(
-        module, symbol, default: _T | int = -1, paths=None
-    ) -> _T | int | None | Any:
-        """Find 'module' by searching 'paths', and extract 'symbol'
-
-        Return 'None' if 'module' does not exist on 'paths', or it does not define
-        'symbol'.  If the module defines 'symbol' as a constant, return the
-        constant.  Otherwise, return 'default'."""
-
-        try:
-            f, path, (_suffix, _mode, kind) = info = find_module(module, paths)
-        except ImportError:
-            # Module doesn't exist
-            return None
-
-        with maybe_close(f):
-            if kind == PY_COMPILED:
-                f.read(8)  # skip magic & date
-                code = marshal.load(f)
-            elif kind == PY_FROZEN:
-                code = _imp.get_frozen_object(module, paths)
-            elif kind == PY_SOURCE:
-                code = compile(f.read(), path, 'exec')
-            else:
-                # Not something we can parse; we'll have to import it.  :(
-                imported = _imp.get_module(module, paths, info)
-                return getattr(imported, symbol, None)
-
-        return extract_constant(code, symbol, default)
-
-    def extract_constant(
-        code: CodeType, symbol: str, default: _T | int = -1
-    ) -> _T | int | None | Any:
-        """Extract the constant value of 'symbol' from 'code'
-
-        If the name 'symbol' is bound to a constant value by the Python code
-        object 'code', return that value.  If 'symbol' is bound to an expression,
-        return 'default'.  Otherwise, return 'None'.
-
-        Return value is based on the first assignment to 'symbol'.  'symbol' must
-        be a global, or at least a non-"fast" local in the code block.  That is,
-        only 'STORE_NAME' and 'STORE_GLOBAL' opcodes are checked, and 'symbol'
-        must be present in 'code.co_names'.
-        """
-        if symbol not in code.co_names:
-            # name's not there, can't possibly be an assignment
-            return None
-
-        name_idx = list(code.co_names).index(symbol)
-
-        STORE_NAME = dis.opmap['STORE_NAME']
-        STORE_GLOBAL = dis.opmap['STORE_GLOBAL']
-        LOAD_CONST = dis.opmap['LOAD_CONST']
-
-        const = default
-
-        for byte_code in dis.Bytecode(code):
-            op = byte_code.opcode
-            arg = byte_code.arg
-
-            if op == LOAD_CONST:
-                assert arg is not None
-                const = code.co_consts[arg]
-            elif arg == name_idx and (op == STORE_NAME or op == STORE_GLOBAL):
-                return const
-            else:
-                const = default
+    Return 'None' if 'module' does not exist on 'paths', or it does not define
+    'symbol'.  If the module defines 'symbol' as a constant, return the
+    constant.  Otherwise, return 'default'."""
 
+    try:
+        f, path, (suffix, mode, kind) = info = find_module(module, paths)
+    except ImportError:
+        # Module doesn't exist
         return None
 
-    __all__ += ['get_module_constant', 'extract_constant']
+    with maybe_close(f):
+        if kind == PY_COMPILED:
+            f.read(8)  # skip magic & date
+            code = marshal.load(f)
+        elif kind == PY_FROZEN:
+            code = _imp.get_frozen_object(module, paths)
+        elif kind == PY_SOURCE:
+            code = compile(f.read(), path, 'exec')
+        else:
+            # Not something we can parse; we'll have to import it.  :(
+            imported = _imp.get_module(module, paths, info)
+            return getattr(imported, symbol, None)
+
+    return extract_constant(code, symbol, default)
+
+
+def extract_constant(code, symbol, default=-1):
+    """Extract the constant value of 'symbol' from 'code'
+
+    If the name 'symbol' is bound to a constant value by the Python code
+    object 'code', return that value.  If 'symbol' is bound to an expression,
+    return 'default'.  Otherwise, return 'None'.
+
+    Return value is based on the first assignment to 'symbol'.  'symbol' must
+    be a global, or at least a non-"fast" local in the code block.  That is,
+    only 'STORE_NAME' and 'STORE_GLOBAL' opcodes are checked, and 'symbol'
+    must be present in 'code.co_names'.
+    """
+    if symbol not in code.co_names:
+        # name's not there, can't possibly be an assignment
+        return None
+
+    name_idx = list(code.co_names).index(symbol)
+
+    STORE_NAME = 90
+    STORE_GLOBAL = 97
+    LOAD_CONST = 100
+
+    const = default
+
+    for byte_code in dis.Bytecode(code):
+        op = byte_code.opcode
+        arg = byte_code.arg
+
+        if op == LOAD_CONST:
+            const = code.co_consts[arg]
+        elif arg == name_idx and (op == STORE_NAME or op == STORE_GLOBAL):
+            return const
+        else:
+            const = default
+
+
+def _update_globals():
+    """
+    Patch the globals to remove the objects not available on some platforms.
+
+    XXX it'd be better to test assertions about bytecode instead.
+    """
+
+    if not sys.platform.startswith('java') and sys.platform != 'cli':
+        return
+    incompatible = 'extract_constant', 'get_module_constant'
+    for name in incompatible:
+        del globals()[name]
+        __all__.remove(name)
+
+
+_update_globals()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/discovery.py b/server/.venv/lib/python3.11/site-packages/setuptools/discovery.py
index c888399..98fc2a7 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/discovery.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/discovery.py
@@ -37,63 +37,57 @@ For the purposes of this module, the following nomenclature is used:
 
 """
 
-from __future__ import annotations
-
 import itertools
 import os
-from collections.abc import Iterable, Iterator, Mapping
 from fnmatch import fnmatchcase
 from glob import glob
 from pathlib import Path
-from typing import TYPE_CHECKING, ClassVar
+from typing import (
+    TYPE_CHECKING,
+    Callable,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    Optional,
+    Tuple,
+    Union
+)
 
 import _distutils_hack.override  # noqa: F401
 
-from ._path import StrPath
-
 from distutils import log
 from distutils.util import convert_path
 
-if TYPE_CHECKING:
-    from setuptools import Distribution
+_Path = Union[str, os.PathLike]
+_Filter = Callable[[str], bool]
+StrIter = Iterator[str]
 
 chain_iter = itertools.chain.from_iterable
 
+if TYPE_CHECKING:
+    from setuptools import Distribution  # noqa
 
-def _valid_name(path: StrPath) -> bool:
+
+def _valid_name(path: _Path) -> bool:
     # Ignore invalid names that cannot be imported directly
     return os.path.basename(path).isidentifier()
 
 
-class _Filter:
-    """
-    Given a list of patterns, create a callable that will be true only if
-    the input matches at least one of the patterns.
-    """
-
-    def __init__(self, *patterns: str) -> None:
-        self._patterns = dict.fromkeys(patterns)
-
-    def __call__(self, item: str) -> bool:
-        return any(fnmatchcase(item, pat) for pat in self._patterns)
-
-    def __contains__(self, item: str) -> bool:
-        return item in self._patterns
-
-
 class _Finder:
     """Base class that exposes functionality for module/package finders"""
 
-    ALWAYS_EXCLUDE: ClassVar[tuple[str, ...]] = ()
-    DEFAULT_EXCLUDE: ClassVar[tuple[str, ...]] = ()
+    ALWAYS_EXCLUDE: Tuple[str, ...] = ()
+    DEFAULT_EXCLUDE: Tuple[str, ...] = ()
 
     @classmethod
     def find(
         cls,
-        where: StrPath = '.',
+        where: _Path = '.',
         exclude: Iterable[str] = (),
-        include: Iterable[str] = ('*',),
-    ) -> list[str]:
+        include: Iterable[str] = ('*',)
+    ) -> List[str]:
         """Return a list of all Python items (packages or modules, depending on
         the finder implementation) found within directory 'where'.
 
@@ -117,17 +111,23 @@ class _Finder:
         return list(
             cls._find_iter(
                 convert_path(str(where)),
-                _Filter(*cls.ALWAYS_EXCLUDE, *exclude),
-                _Filter(*include),
+                cls._build_filter(*cls.ALWAYS_EXCLUDE, *exclude),
+                cls._build_filter(*include),
             )
         )
 
     @classmethod
-    def _find_iter(
-        cls, where: StrPath, exclude: _Filter, include: _Filter
-    ) -> Iterator[str]:
+    def _find_iter(cls, where: _Path, exclude: _Filter, include: _Filter) -> StrIter:
         raise NotImplementedError
 
+    @staticmethod
+    def _build_filter(*patterns: str) -> _Filter:
+        """
+        Given a list of patterns, return a callable that will be true only if
+        the input matches at least one of the patterns.
+        """
+        return lambda name: any(fnmatchcase(name, pat) for pat in patterns)
+
 
 class PackageFinder(_Finder):
     """
@@ -137,9 +137,7 @@ class PackageFinder(_Finder):
     ALWAYS_EXCLUDE = ("ez_setup", "*__pycache__")
 
     @classmethod
-    def _find_iter(
-        cls, where: StrPath, exclude: _Filter, include: _Filter
-    ) -> Iterator[str]:
+    def _find_iter(cls, where: _Path, exclude: _Filter, include: _Filter) -> StrIter:
         """
         All the packages found in 'where' that pass the 'include' filter, but
         not the 'exclude' filter.
@@ -162,23 +160,19 @@ class PackageFinder(_Finder):
                 if include(package) and not exclude(package):
                     yield package
 
-                # Early pruning if there is nothing else to be scanned
-                if f"{package}*" in exclude or f"{package}.*" in exclude:
-                    continue
-
                 # Keep searching subdirectories, as there may be more packages
                 # down there, even if the parent was excluded.
                 dirs.append(dir)
 
     @staticmethod
-    def _looks_like_package(path: StrPath, _package_name: str) -> bool:
+    def _looks_like_package(path: _Path, _package_name: str) -> bool:
         """Does a directory look like a package?"""
         return os.path.isfile(os.path.join(path, '__init__.py'))
 
 
 class PEP420PackageFinder(PackageFinder):
     @staticmethod
-    def _looks_like_package(_path: StrPath, _package_name: str) -> bool:
+    def _looks_like_package(_path: _Path, _package_name: str) -> bool:
         return True
 
 
@@ -188,9 +182,7 @@ class ModuleFinder(_Finder):
     """
 
     @classmethod
-    def _find_iter(
-        cls, where: StrPath, exclude: _Filter, include: _Filter
-    ) -> Iterator[str]:
+    def _find_iter(cls, where: _Path, exclude: _Filter, include: _Filter) -> StrIter:
         for file in glob(os.path.join(where, "*.py")):
             module, _ext = os.path.splitext(os.path.basename(file))
 
@@ -211,13 +203,11 @@ class FlatLayoutPackageFinder(PEP420PackageFinder):
     _EXCLUDE = (
         "ci",
         "bin",
-        "debian",
         "doc",
         "docs",
         "documentation",
         "manpages",
         "news",
-        "newsfragments",
         "changelog",
         "test",
         "tests",
@@ -244,7 +234,6 @@ class FlatLayoutPackageFinder(PEP420PackageFinder):
         "benchmarks",
         "exercise",
         "exercises",
-        "htmlcov",  # Coverage.py
         # ---- Hidden directories/Private packages ----
         "[._]*",
     )
@@ -253,7 +242,7 @@ class FlatLayoutPackageFinder(PEP420PackageFinder):
     """Reserved package names"""
 
     @staticmethod
-    def _looks_like_package(_path: StrPath, package_name: str) -> bool:
+    def _looks_like_package(_path: _Path, package_name: str) -> bool:
         names = package_name.split('.')
         # Consider PEP 561
         root_pkg_is_valid = names[0].isidentifier() or names[0].endswith("-stubs")
@@ -290,7 +279,7 @@ class FlatLayoutModuleFinder(ModuleFinder):
     """Reserved top-level module names"""
 
 
-def _find_packages_within(root_pkg: str, pkg_dir: StrPath) -> list[str]:
+def _find_packages_within(root_pkg: str, pkg_dir: _Path) -> List[str]:
     nested = PEP420PackageFinder.find(pkg_dir)
     return [root_pkg] + [".".join((root_pkg, n)) for n in nested]
 
@@ -300,7 +289,7 @@ class ConfigDiscovery:
     (from other metadata/options, the file system or conventions)
     """
 
-    def __init__(self, distribution: Distribution) -> None:
+    def __init__(self, distribution: "Distribution"):
         self.dist = distribution
         self._called = False
         self._disabled = False
@@ -323,19 +312,17 @@ class ConfigDiscovery:
         self._skip_ext_modules = True
 
     @property
-    def _root_dir(self) -> StrPath:
+    def _root_dir(self) -> _Path:
         # The best is to wait until `src_root` is set in dist, before using _root_dir.
         return self.dist.src_root or os.curdir
 
     @property
-    def _package_dir(self) -> dict[str, str]:
+    def _package_dir(self) -> Dict[str, str]:
         if self.dist.package_dir is None:
             return {}
         return self.dist.package_dir
 
-    def __call__(
-        self, force: bool = False, name: bool = True, ignore_ext_modules: bool = False
-    ):
+    def __call__(self, force=False, name=True, ignore_ext_modules=False):
         """Automatically discover missing configuration fields
         and modifies the given ``distribution`` object in-place.
 
@@ -364,8 +351,7 @@ class ConfigDiscovery:
             self.dist.packages is not None
             or self.dist.py_modules is not None
             or ext_modules
-            or hasattr(self.dist, "configuration")
-            and self.dist.configuration
+            or hasattr(self.dist, "configuration") and self.dist.configuration
             # ^ Some projects use numpy.distutils.misc_util.Configuration
         )
 
@@ -456,7 +442,7 @@ class ConfigDiscovery:
         self._ensure_no_accidental_inclusion(self.dist.py_modules, "modules")
         return bool(self.dist.py_modules)
 
-    def _ensure_no_accidental_inclusion(self, detected: list[str], kind: str):
+    def _ensure_no_accidental_inclusion(self, detected: List[str], kind: str):
         if len(detected) > 1:
             from inspect import cleandoc
 
@@ -479,13 +465,13 @@ class ConfigDiscovery:
             """
             raise PackageDiscoveryError(cleandoc(msg))
 
-    def analyse_name(self) -> None:
+    def analyse_name(self):
         """The packages/modules are the essential contribution of the author.
         Therefore the name of the distribution can be derived from them.
         """
         if self.dist.metadata.name or self.dist.name:
             # get_name() is not reliable (can return "UNKNOWN")
-            return
+            return None
 
         log.debug("No `name` configuration, performing automatic discovery")
 
@@ -496,7 +482,7 @@ class ConfigDiscovery:
         if name:
             self.dist.metadata.name = name
 
-    def _find_name_single_package_or_module(self) -> str | None:
+    def _find_name_single_package_or_module(self) -> Optional[str]:
         """Exactly one module or package"""
         for field in ('packages', 'py_modules'):
             items = getattr(self.dist, field, None) or []
@@ -506,7 +492,7 @@ class ConfigDiscovery:
 
         return None
 
-    def _find_name_from_packages(self) -> str | None:
+    def _find_name_from_packages(self) -> Optional[str]:
         """Try to find the root package that is not a PEP 420 namespace"""
         if not self.dist.packages:
             return None
@@ -523,7 +509,7 @@ class ConfigDiscovery:
         return None
 
 
-def remove_nested_packages(packages: list[str]) -> list[str]:
+def remove_nested_packages(packages: List[str]) -> List[str]:
     """Remove nested packages from a list of packages.
 
     >>> remove_nested_packages(["a", "a.b1", "a.b2", "a.b1.c1"])
@@ -541,7 +527,7 @@ def remove_nested_packages(packages: list[str]) -> list[str]:
     return top_level
 
 
-def remove_stubs(packages: list[str]) -> list[str]:
+def remove_stubs(packages: List[str]) -> List[str]:
     """Remove type stubs (:pep:`561`) from a list of packages.
 
     >>> remove_stubs(["a", "a.b", "a-stubs", "a-stubs.b.c", "b", "c-stubs"])
@@ -551,13 +537,13 @@ def remove_stubs(packages: list[str]) -> list[str]:
 
 
 def find_parent_package(
-    packages: list[str], package_dir: Mapping[str, str], root_dir: StrPath
-) -> str | None:
+    packages: List[str], package_dir: Mapping[str, str], root_dir: _Path
+) -> Optional[str]:
     """Find the parent package that is not a namespace."""
     packages = sorted(packages, key=len)
     common_ancestors = []
     for i, name in enumerate(packages):
-        if not all(n.startswith(f"{name}.") for n in packages[i + 1 :]):
+        if not all(n.startswith(f"{name}.") for n in packages[i+1:]):
             # Since packages are sorted by length, this condition is able
             # to find a list of all common ancestors.
             # When there is divergence (e.g. multiple root packages)
@@ -575,7 +561,7 @@ def find_parent_package(
 
 
 def find_package_path(
-    name: str, package_dir: Mapping[str, str], root_dir: StrPath
+    name: str, package_dir: Mapping[str, str], root_dir: _Path
 ) -> str:
     """Given a package name, return the path where it should be found on
     disk, considering the ``package_dir`` option.
@@ -608,7 +594,7 @@ def find_package_path(
     return os.path.join(root_dir, *parent.split("/"), *parts)
 
 
-def construct_package_dir(packages: list[str], package_path: StrPath) -> dict[str, str]:
+def construct_package_dir(packages: List[str], package_path: _Path) -> Dict[str, str]:
     parent_pkgs = remove_nested_packages(packages)
     prefix = Path(package_path).parts
     return {pkg: "/".join([*prefix, *pkg.split(".")]) for pkg in parent_pkgs}
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/dist.py b/server/.venv/lib/python3.11/site-packages/setuptools/dist.py
index 8d972cc..8242354 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/dist.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/dist.py
@@ -1,86 +1,240 @@
-from __future__ import annotations
-
-import functools
-import io
-import itertools
-import numbers
-import os
-import re
-import sys
-from collections.abc import Iterable, Iterator, MutableMapping, Sequence
-from glob import glob
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, Union
-
-from more_itertools import partition, unique_everseen
-from packaging.markers import InvalidMarker, Marker
-from packaging.specifiers import InvalidSpecifier, SpecifierSet
-from packaging.version import Version
-
-from . import (
-    _entry_points,
-    _reqs,
-    _static,
-    command as _,  # noqa: F401 # imported for side-effects
-)
-from ._importlib import metadata
-from ._normalization import _canonicalize_license_expression
-from ._path import StrPath
-from ._reqs import _StrOrIter
-from .config import pyprojecttoml, setupcfg
-from .discovery import ConfigDiscovery
-from .errors import InvalidConfigError
-from .monkey import get_unpatched
-from .warnings import InformationOnly, SetuptoolsDeprecationWarning
-
-import distutils.cmd
-import distutils.command
-import distutils.core
-import distutils.dist
-import distutils.log
-from distutils.debug import DEBUG
-from distutils.errors import DistutilsOptionError, DistutilsSetupError
-from distutils.fancy_getopt import translate_longopt
-from distutils.util import strtobool
-
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-
-    from pkg_resources import Distribution as _pkg_resources_Distribution
-
-
+# -*- coding: utf-8 -*-
 __all__ = ['Distribution']
 
-_sequence = tuple, list
-"""
-:meta private:
+import io
+import sys
+import re
+import os
+import warnings
+import numbers
+import distutils.log
+import distutils.core
+import distutils.cmd
+import distutils.dist
+import distutils.command
+from distutils.util import strtobool
+from distutils.debug import DEBUG
+from distutils.fancy_getopt import translate_longopt
+from glob import iglob
+import itertools
+import textwrap
+from typing import List, Optional, TYPE_CHECKING
+from pathlib import Path
 
-Supported iterable types that are known to be:
-- ordered (which `set` isn't)
-- not match a str (which `Sequence[str]` does)
-- not imply a nested type (like `dict`)
-for use with `isinstance`.
-"""
-_Sequence: TypeAlias = Union[tuple[str, ...], list[str]]
-# This is how stringifying _Sequence would look in Python 3.10
-_sequence_type_repr = "tuple[str, ...] | list[str]"
-_OrderedStrSequence: TypeAlias = Union[str, dict[str, Any], Sequence[str]]
-"""
-:meta private:
-Avoid single-use iterable. Disallow sets.
-A poor approximation of an OrderedSequence (dict doesn't match a Sequence).
-"""
+from collections import defaultdict
+from email import message_from_file
+
+from distutils.errors import DistutilsOptionError, DistutilsSetupError
+from distutils.util import rfc822_escape
+
+from setuptools.extern import packaging
+from setuptools.extern import ordered_set
+from setuptools.extern.more_itertools import unique_everseen, partition
+
+from ._importlib import metadata
+
+from . import SetuptoolsDeprecationWarning
+
+import setuptools
+import setuptools.command
+from setuptools import windows_support
+from setuptools.monkey import get_unpatched
+from setuptools.config import setupcfg, pyprojecttoml
+from setuptools.discovery import ConfigDiscovery
+
+import pkg_resources
+from setuptools.extern.packaging import version
+from . import _reqs
+from . import _entry_points
+
+if TYPE_CHECKING:
+    from email.message import Message
+
+__import__('setuptools.extern.packaging.specifiers')
+__import__('setuptools.extern.packaging.version')
 
 
-def __getattr__(name: str) -> Any:  # pragma: no cover
-    if name == "sequence":
-        SetuptoolsDeprecationWarning.emit(
-            "`setuptools.dist.sequence` is an internal implementation detail.",
-            "Please define your own `sequence = tuple, list` instead.",
-            due_date=(2025, 8, 28),  # Originally added on 2024-08-27
-        )
-        return _sequence
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+def _get_unpatched(cls):
+    warnings.warn("Do not call this function", DistDeprecationWarning)
+    return get_unpatched(cls)
+
+
+def get_metadata_version(self):
+    mv = getattr(self, 'metadata_version', None)
+    if mv is None:
+        mv = version.Version('2.1')
+        self.metadata_version = mv
+    return mv
+
+
+def rfc822_unescape(content: str) -> str:
+    """Reverse RFC-822 escaping by removing leading whitespaces from content."""
+    lines = content.splitlines()
+    if len(lines) == 1:
+        return lines[0].lstrip()
+    return '\n'.join((lines[0].lstrip(), textwrap.dedent('\n'.join(lines[1:]))))
+
+
+def _read_field_from_msg(msg: "Message", field: str) -> Optional[str]:
+    """Read Message header field."""
+    value = msg[field]
+    if value == 'UNKNOWN':
+        return None
+    return value
+
+
+def _read_field_unescaped_from_msg(msg: "Message", field: str) -> Optional[str]:
+    """Read Message header field and apply rfc822_unescape."""
+    value = _read_field_from_msg(msg, field)
+    if value is None:
+        return value
+    return rfc822_unescape(value)
+
+
+def _read_list_from_msg(msg: "Message", field: str) -> Optional[List[str]]:
+    """Read Message header field and return all results as list."""
+    values = msg.get_all(field, None)
+    if values == []:
+        return None
+    return values
+
+
+def _read_payload_from_msg(msg: "Message") -> Optional[str]:
+    value = msg.get_payload().strip()
+    if value == 'UNKNOWN' or not value:
+        return None
+    return value
+
+
+def read_pkg_file(self, file):
+    """Reads the metadata values from a file object."""
+    msg = message_from_file(file)
+
+    self.metadata_version = version.Version(msg['metadata-version'])
+    self.name = _read_field_from_msg(msg, 'name')
+    self.version = _read_field_from_msg(msg, 'version')
+    self.description = _read_field_from_msg(msg, 'summary')
+    # we are filling author only.
+    self.author = _read_field_from_msg(msg, 'author')
+    self.maintainer = None
+    self.author_email = _read_field_from_msg(msg, 'author-email')
+    self.maintainer_email = None
+    self.url = _read_field_from_msg(msg, 'home-page')
+    self.download_url = _read_field_from_msg(msg, 'download-url')
+    self.license = _read_field_unescaped_from_msg(msg, 'license')
+
+    self.long_description = _read_field_unescaped_from_msg(msg, 'description')
+    if (
+        self.long_description is None and
+        self.metadata_version >= version.Version('2.1')
+    ):
+        self.long_description = _read_payload_from_msg(msg)
+    self.description = _read_field_from_msg(msg, 'summary')
+
+    if 'keywords' in msg:
+        self.keywords = _read_field_from_msg(msg, 'keywords').split(',')
+
+    self.platforms = _read_list_from_msg(msg, 'platform')
+    self.classifiers = _read_list_from_msg(msg, 'classifier')
+
+    # PEP 314 - these fields only exist in 1.1
+    if self.metadata_version == version.Version('1.1'):
+        self.requires = _read_list_from_msg(msg, 'requires')
+        self.provides = _read_list_from_msg(msg, 'provides')
+        self.obsoletes = _read_list_from_msg(msg, 'obsoletes')
+    else:
+        self.requires = None
+        self.provides = None
+        self.obsoletes = None
+
+    self.license_files = _read_list_from_msg(msg, 'license-file')
+
+
+def single_line(val):
+    """
+    Quick and dirty validation for Summary pypa/setuptools#1390.
+    """
+    if '\n' in val:
+        # TODO: Replace with `raise ValueError("newlines not allowed")`
+        # after reviewing #2893.
+        warnings.warn("newlines not allowed and will break in the future")
+        val = val.strip().split('\n')[0]
+    return val
+
+
+# Based on Python 3.5 version
+def write_pkg_file(self, file):  # noqa: C901  # is too complex (14)  # FIXME
+    """Write the PKG-INFO format data to a file object."""
+    version = self.get_metadata_version()
+
+    def write_field(key, value):
+        file.write("%s: %s\n" % (key, value))
+
+    write_field('Metadata-Version', str(version))
+    write_field('Name', self.get_name())
+    write_field('Version', self.get_version())
+
+    summary = self.get_description()
+    if summary:
+        write_field('Summary', single_line(summary))
+
+    optional_fields = (
+        ('Home-page', 'url'),
+        ('Download-URL', 'download_url'),
+        ('Author', 'author'),
+        ('Author-email', 'author_email'),
+        ('Maintainer', 'maintainer'),
+        ('Maintainer-email', 'maintainer_email'),
+    )
+
+    for field, attr in optional_fields:
+        attr_val = getattr(self, attr, None)
+        if attr_val is not None:
+            write_field(field, attr_val)
+
+    license = self.get_license()
+    if license:
+        write_field('License', rfc822_escape(license))
+
+    for project_url in self.project_urls.items():
+        write_field('Project-URL', '%s, %s' % project_url)
+
+    keywords = ','.join(self.get_keywords())
+    if keywords:
+        write_field('Keywords', keywords)
+
+    platforms = self.get_platforms() or []
+    for platform in platforms:
+        write_field('Platform', platform)
+
+    self._write_list(file, 'Classifier', self.get_classifiers())
+
+    # PEP 314
+    self._write_list(file, 'Requires', self.get_requires())
+    self._write_list(file, 'Provides', self.get_provides())
+    self._write_list(file, 'Obsoletes', self.get_obsoletes())
+
+    # Setuptools specific for PEP 345
+    if hasattr(self, 'python_requires'):
+        write_field('Requires-Python', self.python_requires)
+
+    # PEP 566
+    if self.long_description_content_type:
+        write_field('Description-Content-Type', self.long_description_content_type)
+    if self.provides_extras:
+        for extra in self.provides_extras:
+            write_field('Provides-Extra', extra)
+
+    self._write_list(file, 'License-File', self.license_files or [])
+
+    long_description = self.get_long_description()
+    if long_description:
+        file.write("\n%s" % long_description)
+        if not long_description.endswith("\n"):
+            file.write("\n")
+
+
+sequence = tuple, list
 
 
 def check_importable(dist, attr, value):
@@ -89,21 +243,21 @@ def check_importable(dist, attr, value):
         assert not ep.extras
     except (TypeError, ValueError, AttributeError, AssertionError) as e:
         raise DistutilsSetupError(
-            f"{attr!r} must be importable 'module:attrs' string (got {value!r})"
+            "%r must be importable 'module:attrs' string (got %r)" % (attr, value)
         ) from e
 
 
-def assert_string_list(dist, attr: str, value: _Sequence) -> None:
+def assert_string_list(dist, attr, value):
     """Verify that value is a string list"""
     try:
         # verify that value is a list or tuple to exclude unordered
         # or single-use iterables
-        assert isinstance(value, _sequence)
+        assert isinstance(value, (list, tuple))
         # verify that elements of value are strings
         assert ''.join(value) != value
     except (TypeError, ValueError, AttributeError, AssertionError) as e:
         raise DistutilsSetupError(
-            f"{attr!r} must be of type <{_sequence_type_repr}> (got {value!r})"
+            "%r must be a list of strings (got %r)" % (attr, value)
         ) from e
 
 
@@ -114,9 +268,10 @@ def check_nsp(dist, attr, value):
     for nsp in ns_packages:
         if not dist.has_contents_for(nsp):
             raise DistutilsSetupError(
-                f"Distribution contains no modules or packages for namespace package {nsp!r}"
+                "Distribution contains no modules or packages for "
+                + "namespace package %r" % nsp
             )
-        parent, _sep, _child = nsp.rpartition('.')
+        parent, sep, child = nsp.rpartition('.')
         if parent and parent not in ns_packages:
             distutils.log.warn(
                 "WARNING: %r is declared as a package namespace, but %r"
@@ -124,15 +279,11 @@ def check_nsp(dist, attr, value):
                 nsp,
                 parent,
             )
-        SetuptoolsDeprecationWarning.emit(
-            "The namespace_packages parameter is deprecated.",
-            "Please replace its usage with implicit namespaces (PEP 420).",
-            see_docs="references/keywords.html#keyword-namespace-packages",
-            # TODO: define due_date, it may break old packages that are no longer
-            # maintained (e.g. sphinxcontrib extensions) when installed from source.
-            # Warning officially introduced in May 2022, however the deprecation
-            # was mentioned much earlier in the docs (May 2020, see #2149).
+        msg = (
+            "The namespace_packages parameter is deprecated, "
+            "consider using implicit namespaces instead (PEP 420)."
         )
+        warnings.warn(msg, SetuptoolsDeprecationWarning)
 
 
 def check_extras(dist, attr, value):
@@ -148,57 +299,49 @@ def check_extras(dist, attr, value):
 
 
 def _check_extra(extra, reqs):
-    _name, _sep, marker = extra.partition(':')
-    try:
-        _check_marker(marker)
-    except InvalidMarker:
-        msg = f"Invalid environment marker: {marker} ({extra!r})"
-        raise DistutilsSetupError(msg) from None
+    name, sep, marker = extra.partition(':')
+    if marker and pkg_resources.invalid_marker(marker):
+        raise DistutilsSetupError("Invalid environment marker: " + marker)
     list(_reqs.parse(reqs))
 
 
-def _check_marker(marker):
-    if not marker:
-        return
-    m = Marker(marker)
-    m.evaluate()
-
-
 def assert_bool(dist, attr, value):
     """Verify that value is True, False, 0, or 1"""
     if bool(value) != value:
-        raise DistutilsSetupError(f"{attr!r} must be a boolean value (got {value!r})")
+        tmpl = "{attr!r} must be a boolean value (got {value!r})"
+        raise DistutilsSetupError(tmpl.format(attr=attr, value=value))
 
 
 def invalid_unless_false(dist, attr, value):
     if not value:
-        DistDeprecationWarning.emit(f"{attr} is ignored.")
-        # TODO: should there be a `due_date` here?
+        warnings.warn(f"{attr} is ignored.", DistDeprecationWarning)
         return
     raise DistutilsSetupError(f"{attr} is invalid.")
 
 
-def check_requirements(dist, attr: str, value: _OrderedStrSequence) -> None:
+def check_requirements(dist, attr, value):
     """Verify that install_requires is a valid requirements list"""
     try:
         list(_reqs.parse(value))
-        if isinstance(value, set):
+        if isinstance(value, (dict, set)):
             raise TypeError("Unordered types are not allowed")
     except (TypeError, ValueError) as error:
-        msg = (
-            f"{attr!r} must be a string or iterable of strings "
-            f"containing valid project/version requirement specifiers; {error}"
+        tmpl = (
+            "{attr!r} must be a string or list of strings "
+            "containing valid project/version requirement specifiers; {error}"
         )
-        raise DistutilsSetupError(msg) from error
+        raise DistutilsSetupError(tmpl.format(attr=attr, error=error)) from error
 
 
 def check_specifier(dist, attr, value):
     """Verify that value is a valid version specifier"""
     try:
-        SpecifierSet(value)
-    except (InvalidSpecifier, AttributeError) as error:
-        msg = f"{attr!r} must be a string containing valid version specifiers; {error}"
-        raise DistutilsSetupError(msg) from error
+        packaging.specifiers.SpecifierSet(value)
+    except (packaging.specifiers.InvalidSpecifier, AttributeError) as error:
+        tmpl = (
+            "{attr!r} must be a string " "containing valid version specifiers; {error}"
+        )
+        raise DistutilsSetupError(tmpl.format(attr=attr, error=error)) from error
 
 
 def check_entry_points(dist, attr, value):
@@ -209,19 +352,24 @@ def check_entry_points(dist, attr, value):
         raise DistutilsSetupError(e) from e
 
 
+def check_test_suite(dist, attr, value):
+    if not isinstance(value, str):
+        raise DistutilsSetupError("test_suite must be a string")
+
+
 def check_package_data(dist, attr, value):
     """Verify that value is a dictionary of package names to glob lists"""
     if not isinstance(value, dict):
         raise DistutilsSetupError(
-            f"{attr!r} must be a dictionary mapping package names to lists of "
-            "string wildcard patterns"
+            "{!r} must be a dictionary mapping package names to lists of "
+            "string wildcard patterns".format(attr)
         )
     for k, v in value.items():
         if not isinstance(k, str):
             raise DistutilsSetupError(
-                f"keys of {attr!r} dict must be strings (got {k!r})"
+                "keys of {!r} dict must be strings (got {!r})".format(attr, k)
             )
-        assert_string_list(dist, f'values of {attr!r} dict', v)
+        assert_string_list(dist, 'values of {!r} dict'.format(attr), v)
 
 
 def check_packages(dist, attr, value):
@@ -234,11 +382,7 @@ def check_packages(dist, attr, value):
             )
 
 
-if TYPE_CHECKING:
-    # Work around a mypy issue where type[T] can't be used as a base: https://github.com/python/mypy/issues/10962
-    from distutils.core import Distribution as _Distribution
-else:
-    _Distribution = get_unpatched(distutils.core.Distribution)
+_Distribution = get_unpatched(distutils.core.Distribution)
 
 
 class Distribution(_Distribution):
@@ -269,6 +413,12 @@ class Distribution(_Distribution):
         EasyInstall and requests one of your extras, the corresponding
         additional requirements will be installed if needed.
 
+     'test_suite' -- the name of a test suite to run for the 'test' command.
+        If the user runs 'python setup.py test', the package will be installed,
+        and the named test suite will be run.  The format is the same as
+        would be used on a 'unittest.py' command line.  That is, it is the
+        dotted name of an object to import and call to generate a test suite.
+
      'package_data' -- a dictionary mapping package names to lists of filenames
         or globs to use to find data files contained in the named packages.
         If the dictionary has filenames or globs listed under '""' (the empty
@@ -290,48 +440,60 @@ class Distribution(_Distribution):
     _DISTUTILS_UNSUPPORTED_METADATA = {
         'long_description_content_type': lambda: None,
         'project_urls': dict,
-        'provides_extras': dict,  # behaves like an ordered set
-        'license_expression': lambda: None,
+        'provides_extras': ordered_set.OrderedSet,
         'license_file': lambda: None,
         'license_files': lambda: None,
-        'install_requires': list,
-        'extras_require': dict,
     }
 
-    # Used by build_py, editable_wheel and install_lib commands for legacy namespaces
-    namespace_packages: list[str]  #: :meta private: DEPRECATED
+    _patched_dist = None
 
-    # Any: Dynamic assignment results in Incompatible types in assignment
-    def __init__(self, attrs: MutableMapping[str, Any] | None = None) -> None:
+    def patch_missing_pkg_info(self, attrs):
+        # Fake up a replacement for the data that would normally come from
+        # PKG-INFO, but which might not yet be built if this is a fresh
+        # checkout.
+        #
+        if not attrs or 'name' not in attrs or 'version' not in attrs:
+            return
+        key = pkg_resources.safe_name(str(attrs['name'])).lower()
+        dist = pkg_resources.working_set.by_key.get(key)
+        if dist is not None and not dist.has_metadata('PKG-INFO'):
+            dist._version = pkg_resources.safe_version(str(attrs['version']))
+            self._patched_dist = dist
+
+    def __init__(self, attrs=None):
         have_package_data = hasattr(self, "package_data")
         if not have_package_data:
-            self.package_data: dict[str, list[str]] = {}
+            self.package_data = {}
         attrs = attrs or {}
-        self.dist_files: list[tuple[str, str, str]] = []
-        self.include_package_data: bool | None = None
-        self.exclude_package_data: dict[str, list[str]] | None = None
+        self.dist_files = []
         # Filter-out setuptools' specific options.
-        self.src_root: str | None = attrs.pop("src_root", None)
-        self.dependency_links: list[str] = attrs.pop('dependency_links', [])
-        self.setup_requires: list[str] = attrs.pop('setup_requires', [])
+        self.src_root = attrs.pop("src_root", None)
+        self.patch_missing_pkg_info(attrs)
+        self.dependency_links = attrs.pop('dependency_links', [])
+        self.setup_requires = attrs.pop('setup_requires', [])
         for ep in metadata.entry_points(group='distutils.setup_keywords'):
             vars(self).setdefault(ep.name, None)
+        _Distribution.__init__(
+            self,
+            {
+                k: v
+                for k, v in attrs.items()
+                if k not in self._DISTUTILS_UNSUPPORTED_METADATA
+            },
+        )
 
-        metadata_only = set(self._DISTUTILS_UNSUPPORTED_METADATA)
-        metadata_only -= {"install_requires", "extras_require"}
-        dist_attrs = {k: v for k, v in attrs.items() if k not in metadata_only}
-        _Distribution.__init__(self, dist_attrs)
-
-        # Private API (setuptools-use only, not restricted to Distribution)
-        # Stores files that are referenced by the configuration and need to be in the
-        # sdist (e.g. `version = file: VERSION.txt`)
-        self._referenced_files = set[str]()
+        # Save the original dependencies before they are processed into the egg format
+        self._orig_extras_require = {}
+        self._orig_install_requires = []
+        self._tmp_extras_require = defaultdict(ordered_set.OrderedSet)
 
         self.set_defaults = ConfigDiscovery(self)
 
         self._set_metadata_defaults(attrs)
 
-        self.metadata.version = self._normalize_version(self.metadata.version)
+        self.metadata.version = self._normalize_version(
+            self._validate_version(self.metadata.version)
+        )
         self._finalize_requires()
 
     def _validate_metadata(self):
@@ -359,18 +521,33 @@ class Distribution(_Distribution):
 
     @staticmethod
     def _normalize_version(version):
-        from . import sic
+        if isinstance(version, setuptools.sic) or version is None:
+            return version
 
+        normalized = str(packaging.version.Version(version))
+        if version != normalized:
+            tmpl = "Normalizing '{version}' to '{normalized}'"
+            warnings.warn(tmpl.format(**locals()))
+            return normalized
+        return version
+
+    @staticmethod
+    def _validate_version(version):
         if isinstance(version, numbers.Number):
             # Some people apparently take "version number" too literally :)
             version = str(version)
-        elif isinstance(version, sic) or version is None:
-            return version
 
-        normalized = str(Version(version))
-        if version != normalized:
-            InformationOnly.emit(f"Normalizing '{version}' to '{normalized}'")
-            return normalized
+        if version is not None:
+            try:
+                packaging.version.Version(version)
+            except (packaging.version.InvalidVersion, TypeError):
+                warnings.warn(
+                    "The version specified (%r) is an invalid version, this "
+                    "may not work as expected with newer versions of "
+                    "setuptools, pip, and PyPI. Please see PEP 440 for more "
+                    "details." % version
+                )
+                return setuptools.sic(version)
         return version
 
     def _finalize_requires(self):
@@ -381,77 +558,88 @@ class Distribution(_Distribution):
         if getattr(self, 'python_requires', None):
             self.metadata.python_requires = self.python_requires
 
-        self._normalize_requires()
-        self.metadata.install_requires = self.install_requires
-        self.metadata.extras_require = self.extras_require
-
-        if self.extras_require:
+        if getattr(self, 'extras_require', None):
+            # Save original before it is messed by _convert_extras_requirements
+            self._orig_extras_require = self._orig_extras_require or self.extras_require
             for extra in self.extras_require.keys():
-                # Setuptools allows a weird ": syntax for extras
+                # Since this gets called multiple times at points where the
+                # keys have become 'converted' extras, ensure that we are only
+                # truly adding extras we haven't seen before here.
                 extra = extra.split(':')[0]
                 if extra:
-                    self.metadata.provides_extras.setdefault(extra)
+                    self.metadata.provides_extras.add(extra)
 
-    def _normalize_requires(self):
-        """Make sure requirement-related attributes exist and are normalized"""
-        install_requires = getattr(self, "install_requires", None) or []
-        extras_require = getattr(self, "extras_require", None) or {}
+        if getattr(self, 'install_requires', None) and not self._orig_install_requires:
+            # Save original before it is messed by _move_install_requirements_markers
+            self._orig_install_requires = self.install_requires
 
-        # Preserve the "static"-ness of values parsed from config files
-        list_ = _static.List if _static.is_static(install_requires) else list
-        self.install_requires = list_(map(str, _reqs.parse(install_requires)))
+        self._convert_extras_requirements()
+        self._move_install_requirements_markers()
 
-        dict_ = _static.Dict if _static.is_static(extras_require) else dict
-        self.extras_require = dict_(
-            (k, list(map(str, _reqs.parse(v or [])))) for k, v in extras_require.items()
+    def _convert_extras_requirements(self):
+        """
+        Convert requirements in `extras_require` of the form
+        `"extra": ["barbazquux; {marker}"]` to
+        `"extra:{marker}": ["barbazquux"]`.
+        """
+        spec_ext_reqs = getattr(self, 'extras_require', None) or {}
+        tmp = defaultdict(ordered_set.OrderedSet)
+        self._tmp_extras_require = getattr(self, '_tmp_extras_require', tmp)
+        for section, v in spec_ext_reqs.items():
+            # Do not strip empty sections.
+            self._tmp_extras_require[section]
+            for r in _reqs.parse(v):
+                suffix = self._suffix_for(r)
+                self._tmp_extras_require[section + suffix].append(r)
+
+    @staticmethod
+    def _suffix_for(req):
+        """
+        For a requirement, return the 'extras_require' suffix for
+        that requirement.
+        """
+        return ':' + str(req.marker) if req.marker else ''
+
+    def _move_install_requirements_markers(self):
+        """
+        Move requirements in `install_requires` that are using environment
+        markers `extras_require`.
+        """
+
+        # divide the install_requires into two sets, simple ones still
+        # handled by install_requires and more complex ones handled
+        # by extras_require.
+
+        def is_simple_req(req):
+            return not req.marker
+
+        spec_inst_reqs = getattr(self, 'install_requires', None) or ()
+        inst_reqs = list(_reqs.parse(spec_inst_reqs))
+        simple_reqs = filter(is_simple_req, inst_reqs)
+        complex_reqs = itertools.filterfalse(is_simple_req, inst_reqs)
+        self.install_requires = list(map(str, simple_reqs))
+
+        for r in complex_reqs:
+            self._tmp_extras_require[':' + str(r.marker)].append(r)
+        self.extras_require = dict(
+            # list(dict.fromkeys(...))  ensures a list of unique strings
+            (k, list(dict.fromkeys(str(r) for r in map(self._clean_req, v))))
+            for k, v in self._tmp_extras_require.items()
         )
 
-    def _finalize_license_expression(self) -> None:
+    def _clean_req(self, req):
         """
-        Normalize license and license_expression.
-        >>> dist = Distribution({"license_expression": _static.Str("mit aNd  gpl-3.0-OR-later")})
-        >>> _static.is_static(dist.metadata.license_expression)
-        True
-        >>> dist._finalize_license_expression()
-        >>> _static.is_static(dist.metadata.license_expression)  # preserve "static-ness"
-        True
-        >>> print(dist.metadata.license_expression)
-        MIT AND GPL-3.0-or-later
+        Given a Requirement, remove environment markers and return it.
         """
-        classifiers = self.metadata.get_classifiers()
-        license_classifiers = [cl for cl in classifiers if cl.startswith("License :: ")]
+        req.marker = None
+        return req
 
-        license_expr = self.metadata.license_expression
-        if license_expr:
-            str_ = _static.Str if _static.is_static(license_expr) else str
-            normalized = str_(_canonicalize_license_expression(license_expr))
-            if license_expr != normalized:
-                InformationOnly.emit(f"Normalizing '{license_expr}' to '{normalized}'")
-                self.metadata.license_expression = normalized
-            if license_classifiers:
-                raise InvalidConfigError(
-                    "License classifiers have been superseded by license expressions "
-                    "(see https://peps.python.org/pep-0639/). Please remove:\n\n"
-                    + "\n".join(license_classifiers),
-                )
-        elif license_classifiers:
-            pypa_guides = "guides/writing-pyproject-toml/#license"
-            SetuptoolsDeprecationWarning.emit(
-                "License classifiers are deprecated.",
-                "Please consider removing the following classifiers in favor of a "
-                "SPDX license expression:\n\n" + "\n".join(license_classifiers),
-                see_url=f"https://packaging.python.org/en/latest/{pypa_guides}",
-                # Warning introduced on 2025-02-17
-                # TODO: Should we add a due date? It may affect old/unmaintained
-                #       packages in the ecosystem and cause problems...
-            )
-
-    def _finalize_license_files(self) -> None:
+    def _finalize_license_files(self):
         """Compute names of all license files which should be included."""
-        license_files: list[str] | None = self.metadata.license_files
-        patterns = license_files or []
+        license_files: Optional[List[str]] = self.metadata.license_files
+        patterns: List[str] = license_files if license_files else []
 
-        license_file: str | None = self.metadata.license_file
+        license_file: Optional[str] = self.metadata.license_file
         if license_file and license_file not in patterns:
             patterns.append(license_file)
 
@@ -459,88 +647,26 @@ class Distribution(_Distribution):
             # Default patterns match the ones wheel uses
             # See https://wheel.readthedocs.io/en/stable/user_guide.html
             # -> 'Including license files in the generated wheel file'
-            patterns = ['LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*']
-            files = self._expand_patterns(patterns, enforce_match=False)
-        else:  # Patterns explicitly given by the user
-            files = self._expand_patterns(patterns, enforce_match=True)
+            patterns = ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*')
 
-        self.metadata.license_files = list(unique_everseen(files))
-
-    @classmethod
-    def _expand_patterns(
-        cls, patterns: list[str], enforce_match: bool = True
-    ) -> Iterator[str]:
-        """
-        >>> list(Distribution._expand_patterns(['LICENSE']))
-        ['LICENSE']
-        >>> list(Distribution._expand_patterns(['pyproject.toml', 'LIC*']))
-        ['pyproject.toml', 'LICENSE']
-        >>> list(Distribution._expand_patterns(['setuptools/**/pyprojecttoml.py']))
-        ['setuptools/config/pyprojecttoml.py']
-        """
-        return (
-            path.replace(os.sep, "/")
-            for pattern in patterns
-            for path in sorted(cls._find_pattern(pattern, enforce_match))
-            if not path.endswith('~') and os.path.isfile(path)
+        self.metadata.license_files = list(
+            unique_everseen(self._expand_patterns(patterns))
         )
 
     @staticmethod
-    def _find_pattern(pattern: str, enforce_match: bool = True) -> list[str]:
-        r"""
-        >>> Distribution._find_pattern("LICENSE")
-        ['LICENSE']
-        >>> Distribution._find_pattern("/LICENSE.MIT")
-        Traceback (most recent call last):
-        ...
-        setuptools.errors.InvalidConfigError: Pattern '/LICENSE.MIT' should be relative...
-        >>> Distribution._find_pattern("../LICENSE.MIT")
-        Traceback (most recent call last):
-        ...
-        setuptools.warnings.SetuptoolsDeprecationWarning: ...Pattern '../LICENSE.MIT' cannot contain '..'...
-        >>> Distribution._find_pattern("LICEN{CSE*")
-        Traceback (most recent call last):
-        ...
-        setuptools.warnings.SetuptoolsDeprecationWarning: ...Pattern 'LICEN{CSE*' contains invalid characters...
+    def _expand_patterns(patterns):
         """
-        pypa_guides = "specifications/glob-patterns/"
-        if ".." in pattern:
-            SetuptoolsDeprecationWarning.emit(
-                f"Pattern {pattern!r} cannot contain '..'",
-                """
-                Please ensure the files specified are contained by the root
-                of the Python package (normally marked by `pyproject.toml`).
-                """,
-                see_url=f"https://packaging.python.org/en/latest/{pypa_guides}",
-                due_date=(2026, 3, 20),  # Introduced in 2025-03-20
-                # Replace with InvalidConfigError after deprecation
-            )
-        if pattern.startswith((os.sep, "/")) or ":\\" in pattern:
-            raise InvalidConfigError(
-                f"Pattern {pattern!r} should be relative and must not start with '/'"
-            )
-        if re.match(r'^[\w\-\.\/\*\?\[\]]+$', pattern) is None:
-            SetuptoolsDeprecationWarning.emit(
-                "Please provide a valid glob pattern.",
-                "Pattern {pattern!r} contains invalid characters.",
-                pattern=pattern,
-                see_url=f"https://packaging.python.org/en/latest/{pypa_guides}",
-                due_date=(2026, 3, 20),  # Introduced in 2025-02-20
-            )
-
-        found = glob(pattern, recursive=True)
-
-        if enforce_match and not found:
-            SetuptoolsDeprecationWarning.emit(
-                "Cannot find any files for the given pattern.",
-                "Pattern {pattern!r} did not match any files.",
-                pattern=pattern,
-                due_date=(2026, 3, 20),  # Introduced in 2025-02-20
-                # PEP 639 requires us to error, but as a transition period
-                # we will only issue a warning to give people time to prepare.
-                # After the transition, this should raise an InvalidConfigError.
-            )
-        return found
+        >>> list(Distribution._expand_patterns(['LICENSE']))
+        ['LICENSE']
+        >>> list(Distribution._expand_patterns(['setup.cfg', 'LIC*']))
+        ['setup.cfg', 'LICENSE']
+        """
+        return (
+            path
+            for pattern in patterns
+            for path in sorted(iglob(pattern))
+            if not path.endswith('~') and os.path.isfile(path)
+        )
 
     # FIXME: 'Distribution._parse_config_files' is too complex (14)
     def _parse_config_files(self, filenames=None):  # noqa: C901
@@ -583,7 +709,7 @@ class Distribution(_Distribution):
         parser = ConfigParser()
         parser.optionxform = str
         for filename in filenames:
-            with open(filename, encoding='utf-8') as reader:
+            with io.open(filename, encoding='utf-8') as reader:
                 if DEBUG:
                     self.announce("  reading {filename}".format(**locals()))
                 parser.read_file(reader)
@@ -596,8 +722,8 @@ class Distribution(_Distribution):
                         continue
 
                     val = parser.get(section, opt)
-                    opt = self._enforce_underscore(opt, section)
-                    opt = self._enforce_option_lowercase(opt, section)
+                    opt = self.warn_dash_deprecation(opt, section)
+                    opt = self.make_option_lowercase(opt, section)
                     opt_dict[opt] = (filename, val)
 
             # Make the ConfigParser forget everything (so we retain
@@ -610,7 +736,7 @@ class Distribution(_Distribution):
         # If there was a "global" section in the config file, use it
         # to set Distribution options.
 
-        for opt, (src, val) in self.command_options['global'].items():
+        for (opt, (src, val)) in self.command_options['global'].items():
             alias = self.negative_opt.get(opt)
             if alias:
                 val = not strtobool(val)
@@ -622,63 +748,52 @@ class Distribution(_Distribution):
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
 
-    def _enforce_underscore(self, opt: str, section: str) -> str:
-        if "-" not in opt or self._skip_setupcfg_normalization(section):
+    def warn_dash_deprecation(self, opt, section):
+        if section in (
+            'options.extras_require',
+            'options.data_files',
+        ):
             return opt
 
         underscore_opt = opt.replace('-', '_')
-        affected = f"(Affected: {self.metadata.name})." if self.metadata.name else ""
-        SetuptoolsDeprecationWarning.emit(
-            f"Invalid dash-separated key {opt!r} in {section!r} (setup.cfg), "
-            f"please use the underscore name {underscore_opt!r} instead.",
-            f"""
-            Usage of dash-separated {opt!r} will not be supported in future
-            versions. Please use the underscore name {underscore_opt!r} instead.
-            {affected}
-            """,
-            see_docs="userguide/declarative_config.html",
-            due_date=(2026, 3, 3),
-            # Warning initially introduced in 3 Mar 2021
-        )
+        commands = list(itertools.chain(
+            distutils.command.__all__,
+            self._setuptools_commands(),
+        ))
+        if (
+            not section.startswith('options')
+            and section != 'metadata'
+            and section not in commands
+        ):
+            return underscore_opt
+
+        if '-' in opt:
+            warnings.warn(
+                "Usage of dash-separated '%s' will not be supported in future "
+                "versions. Please use the underscore name '%s' instead"
+                % (opt, underscore_opt)
+            )
         return underscore_opt
 
-    def _enforce_option_lowercase(self, opt: str, section: str) -> str:
-        if opt.islower() or self._skip_setupcfg_normalization(section):
+    def _setuptools_commands(self):
+        try:
+            return metadata.distribution('setuptools').entry_points.names
+        except metadata.PackageNotFoundError:
+            # during bootstrapping, distribution doesn't exist
+            return []
+
+    def make_option_lowercase(self, opt, section):
+        if section != 'metadata' or opt.islower():
             return opt
 
         lowercase_opt = opt.lower()
-        affected = f"(Affected: {self.metadata.name})." if self.metadata.name else ""
-        SetuptoolsDeprecationWarning.emit(
-            f"Invalid uppercase key {opt!r} in {section!r} (setup.cfg), "
-            f"please use lowercase {lowercase_opt!r} instead.",
-            f"""
-            Usage of uppercase key {opt!r} in {section!r} will not be supported in
-            future versions. Please use lowercase {lowercase_opt!r} instead.
-            {affected}
-            """,
-            see_docs="userguide/declarative_config.html",
-            due_date=(2026, 3, 3),
-            # Warning initially introduced in 6 Mar 2021
+        warnings.warn(
+            "Usage of uppercase key '%s' in '%s' will be deprecated in future "
+            "versions. Please use lowercase '%s' instead"
+            % (opt, section, lowercase_opt)
         )
         return lowercase_opt
 
-    def _skip_setupcfg_normalization(self, section: str) -> bool:
-        skip = (
-            'options.extras_require',
-            'options.data_files',
-            'options.entry_points',
-            'options.package_data',
-            'options.exclude_package_data',
-        )
-        return section in skip or not self._is_setuptools_section(section)
-
-    def _is_setuptools_section(self, section: str) -> bool:
-        return (
-            section == "metadata"
-            or section.startswith("options")
-            or section in _setuptools_commands()
-        )
-
     # FIXME: 'Distribution._set_command_options' is too complex (14)
     def _set_command_options(self, command_obj, option_dict=None):  # noqa: C901
         """
@@ -697,10 +812,10 @@ class Distribution(_Distribution):
             option_dict = self.get_option_dict(command_name)
 
         if DEBUG:
-            self.announce(f"  setting options for '{command_name}' command:")
-        for option, (source, value) in option_dict.items():
+            self.announce("  setting options for '%s' command:" % command_name)
+        for (option, (source, value)) in option_dict.items():
             if DEBUG:
-                self.announce(f"    {option} = {value} (from {source})")
+                self.announce("    %s = %s (from %s)" % (option, value, source))
             try:
                 bool_opts = [translate_longopt(o) for o in command_obj.boolean_options]
             except AttributeError:
@@ -720,12 +835,13 @@ class Distribution(_Distribution):
                     setattr(command_obj, option, value)
                 else:
                     raise DistutilsOptionError(
-                        f"error in {source}: command '{command_name}' has no such option '{option}'"
+                        "error in %s: command '%s' has no such option '%s'"
+                        % (source, command_name, option)
                     )
             except ValueError as e:
                 raise DistutilsOptionError(e) from e
 
-    def _get_project_config_files(self, filenames: Iterable[StrPath] | None):
+    def _get_project_config_files(self, filenames):
         """Add default file and split between INI and TOML"""
         tomlfiles = []
         standard_project_metadata = Path(self.src_root or os.curdir, "pyproject.toml")
@@ -737,11 +853,7 @@ class Distribution(_Distribution):
             tomlfiles = [standard_project_metadata]
         return filenames, tomlfiles
 
-    def parse_config_files(
-        self,
-        filenames: Iterable[StrPath] | None = None,
-        ignore_option_errors: bool = False,
-    ) -> None:
+    def parse_config_files(self, filenames=None, ignore_option_errors=False):
         """Parses configuration files from various levels
         and loads configuration.
         """
@@ -756,18 +868,20 @@ class Distribution(_Distribution):
             pyprojecttoml.apply_configuration(self, filename, ignore_option_errors)
 
         self._finalize_requires()
-        self._finalize_license_expression()
         self._finalize_license_files()
 
-    def fetch_build_eggs(
-        self, requires: _StrOrIter
-    ) -> list[_pkg_resources_Distribution]:
+    def fetch_build_eggs(self, requires):
         """Resolve pre-setup requirements"""
-        from .installer import _fetch_build_eggs
+        resolved_dists = pkg_resources.working_set.resolve(
+            _reqs.parse(requires),
+            installer=self.fetch_build_egg,
+            replace_conflicting=True,
+        )
+        for dist in resolved_dists:
+            pkg_resources.working_set.add(dist, replace=True)
+        return resolved_dists
 
-        return _fetch_build_eggs(self, requires)
-
-    def finalize_options(self) -> None:
+    def finalize_options(self):
         """
         Allow plugins to apply arbitrary operations to the
         distribution. Each hook may optionally define a 'order'
@@ -806,14 +920,12 @@ class Distribution(_Distribution):
                 ep.load()(self, ep.name, value)
 
     def get_egg_cache_dir(self):
-        from . import windows_support
-
         egg_cache_dir = os.path.join(os.curdir, '.eggs')
         if not os.path.exists(egg_cache_dir):
             os.mkdir(egg_cache_dir)
             windows_support.hide_file(egg_cache_dir)
             readme_txt_filename = os.path.join(egg_cache_dir, 'README.txt')
-            with open(readme_txt_filename, 'w', encoding="utf-8") as f:
+            with open(readme_txt_filename, 'w') as f:
                 f.write(
                     'This directory contains eggs that were downloaded '
                     'by setuptools to build, test, and run plug-ins.\n\n'
@@ -828,21 +940,15 @@ class Distribution(_Distribution):
 
     def fetch_build_egg(self, req):
         """Fetch an egg needed for building"""
-        from .installer import fetch_build_egg
+        from setuptools.installer import fetch_build_egg
 
         return fetch_build_egg(self, req)
 
-    def get_command_class(self, command: str) -> type[distutils.cmd.Command]:  # type: ignore[override] # Not doing complex overrides yet
+    def get_command_class(self, command):
         """Pluggable version of get_command_class()"""
         if command in self.cmdclass:
             return self.cmdclass[command]
 
-        # Special case bdist_wheel so it's never loaded from "wheel"
-        if command == 'bdist_wheel':
-            from .command.bdist_wheel import bdist_wheel
-
-            return bdist_wheel
-
         eps = metadata.entry_points(group='distutils.commands', name=command)
         for ep in eps:
             self.cmdclass[command] = cmdclass = ep.load()
@@ -864,7 +970,7 @@ class Distribution(_Distribution):
                 self.cmdclass[ep.name] = cmdclass
         return _Distribution.get_command_list(self)
 
-    def include(self, **attrs) -> None:
+    def include(self, **attrs):
         """Add items to distribution that are named in keyword arguments
 
         For example, 'dist.include(py_modules=["x"])' would add 'x' to
@@ -886,7 +992,7 @@ class Distribution(_Distribution):
             else:
                 self._include_misc(k, v)
 
-    def exclude_package(self, package: str) -> None:
+    def exclude_package(self, package):
         """Remove packages, modules, and extensions in named package"""
 
         pfx = package + '.'
@@ -907,7 +1013,7 @@ class Distribution(_Distribution):
                 if p.name != package and not p.name.startswith(pfx)
             ]
 
-    def has_contents_for(self, package: str) -> bool:
+    def has_contents_for(self, package):
         """Return true if 'exclude_package(package)' would do something"""
 
         pfx = package + '.'
@@ -916,47 +1022,43 @@ class Distribution(_Distribution):
             if p == package or p.startswith(pfx):
                 return True
 
-        return False
-
-    def _exclude_misc(self, name: str, value: _Sequence) -> None:
+    def _exclude_misc(self, name, value):
         """Handle 'exclude()' for list/tuple attrs without a special handler"""
-        if not isinstance(value, _sequence):
+        if not isinstance(value, sequence):
             raise DistutilsSetupError(
-                f"{name}: setting must be of type <{_sequence_type_repr}> (got {value!r})"
+                "%s: setting must be a list or tuple (%r)" % (name, value)
             )
         try:
             old = getattr(self, name)
         except AttributeError as e:
-            raise DistutilsSetupError(f"{name}: No such distribution setting") from e
-        if old is not None and not isinstance(old, _sequence):
+            raise DistutilsSetupError("%s: No such distribution setting" % name) from e
+        if old is not None and not isinstance(old, sequence):
             raise DistutilsSetupError(
                 name + ": this setting cannot be changed via include/exclude"
             )
         elif old:
             setattr(self, name, [item for item in old if item not in value])
 
-    def _include_misc(self, name: str, value: _Sequence) -> None:
+    def _include_misc(self, name, value):
         """Handle 'include()' for list/tuple attrs without a special handler"""
 
-        if not isinstance(value, _sequence):
-            raise DistutilsSetupError(
-                f"{name}: setting must be of type <{_sequence_type_repr}> (got {value!r})"
-            )
+        if not isinstance(value, sequence):
+            raise DistutilsSetupError("%s: setting must be a list (%r)" % (name, value))
         try:
             old = getattr(self, name)
         except AttributeError as e:
-            raise DistutilsSetupError(f"{name}: No such distribution setting") from e
+            raise DistutilsSetupError("%s: No such distribution setting" % name) from e
         if old is None:
             setattr(self, name, value)
-        elif not isinstance(old, _sequence):
+        elif not isinstance(old, sequence):
             raise DistutilsSetupError(
                 name + ": this setting cannot be changed via include/exclude"
             )
         else:
             new = [item for item in value if item not in old]
-            setattr(self, name, list(old) + new)
+            setattr(self, name, old + new)
 
-    def exclude(self, **attrs) -> None:
+    def exclude(self, **attrs):
         """Remove items from distribution that are named in keyword arguments
 
         For example, 'dist.exclude(py_modules=["x"])' would remove 'x' from
@@ -979,10 +1081,10 @@ class Distribution(_Distribution):
             else:
                 self._exclude_misc(k, v)
 
-    def _exclude_packages(self, packages: _Sequence) -> None:
-        if not isinstance(packages, _sequence):
+    def _exclude_packages(self, packages):
+        if not isinstance(packages, sequence):
             raise DistutilsSetupError(
-                f"packages: setting must be of type <{_sequence_type_repr}> (got {packages!r})"
+                "packages: setting must be a list or tuple (%r)" % (packages,)
             )
         list(map(self.exclude_package, packages))
 
@@ -995,7 +1097,7 @@ class Distribution(_Distribution):
         command = args[0]
         aliases = self.get_option_dict('aliases')
         while command in aliases:
-            _src, alias = aliases[command]
+            src, alias = aliases[command]
             del aliases[command]  # ensure each alias can expand only once!
             import shlex
 
@@ -1013,7 +1115,7 @@ class Distribution(_Distribution):
 
         return nargs
 
-    def get_cmdline_options(self) -> dict[str, dict[str, str | None]]:
+    def get_cmdline_options(self):
         """Return a '{cmd: {opt:val}}' map of all command-line options
 
         Option names are all long, but do not include the leading '--', and
@@ -1023,11 +1125,12 @@ class Distribution(_Distribution):
         Note that options provided by config files are intentionally excluded.
         """
 
-        d: dict[str, dict[str, str | None]] = {}
+        d = {}
 
         for cmd, opts in self.command_options.items():
-            val: str | None
+
             for opt, (src, val) in opts.items():
+
                 if src != "command line":
                     continue
 
@@ -1055,13 +1158,15 @@ class Distribution(_Distribution):
     def iter_distribution_names(self):
         """Yield all packages, modules, and extension names in distribution"""
 
-        yield from self.packages or ()
+        for pkg in self.packages or ():
+            yield pkg
 
-        yield from self.py_modules or ()
+        for module in self.py_modules or ():
+            yield module
 
         for ext in self.ext_modules or ():
             if isinstance(ext, tuple):
-                name, _buildinfo = ext
+                name, buildinfo = ext
             else:
                 name = ext.name
             if name.endswith('module'):
@@ -1090,13 +1195,21 @@ class Distribution(_Distribution):
 
         # Print metadata in UTF-8 no matter the platform
         encoding = sys.stdout.encoding
-        sys.stdout.reconfigure(encoding='utf-8')
+        errors = sys.stdout.errors
+        newline = sys.platform != 'win32' and '\n' or None
+        line_buffering = sys.stdout.line_buffering
+
+        sys.stdout = io.TextIOWrapper(
+            sys.stdout.detach(), 'utf-8', errors, newline, line_buffering
+        )
         try:
             return _Distribution.handle_display_options(self, option_order)
         finally:
-            sys.stdout.reconfigure(encoding=encoding)
+            sys.stdout = io.TextIOWrapper(
+                sys.stdout.detach(), encoding, errors, newline, line_buffering
+            )
 
-    def run_command(self, command) -> None:
+    def run_command(self, command):
         self.set_defaults()
         # Postpone defaults until all explicit configuration is considered
         # (setup() args, config files, command line and plugins)
@@ -1104,18 +1217,6 @@ class Distribution(_Distribution):
         super().run_command(command)
 
 
-@functools.cache
-def _setuptools_commands() -> set[str]:
-    try:
-        # Use older API for importlib.metadata compatibility
-        entry_points = metadata.distribution('setuptools').entry_points
-        eps: Iterable[str] = (ep.name for ep in entry_points)
-    except metadata.PackageNotFoundError:
-        # during bootstrapping, distribution doesn't exist
-        eps = []
-    return {*distutils.command.__all__, *eps}
-
-
 class DistDeprecationWarning(SetuptoolsDeprecationWarning):
     """Class for warning about deprecations in dist in
     setuptools. Not ignored by default, unlike DeprecationWarning."""
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/errors.py b/server/.venv/lib/python3.11/site-packages/setuptools/errors.py
index 990ecbf..ec7fb3b 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/errors.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/errors.py
@@ -3,10 +3,9 @@
 Provides exceptions used by setuptools modules.
 """
 
-from __future__ import annotations
-
 from distutils import errors as _distutils_errors
 
+
 # Re-export errors from distutils to facilitate the migration to PEP632
 
 ByteCompileError = _distutils_errors.DistutilsByteCompileError
@@ -30,15 +29,7 @@ UnknownFileError = _distutils_errors.UnknownFileError
 BaseError = _distutils_errors.DistutilsError
 
 
-class InvalidConfigError(OptionError):  # type: ignore[valid-type, misc] # distutils imports are `Any` on python 3.12+
-    """Error used for invalid configurations."""
-
-
-class RemovedConfigError(OptionError):  # type: ignore[valid-type, misc] # distutils imports are `Any` on python 3.12+
-    """Error used for configurations that were deprecated and removed."""
-
-
-class RemovedCommandError(BaseError, RuntimeError):  # type: ignore[valid-type, misc] # distutils imports are `Any` on python 3.12+
+class RemovedCommandError(BaseError, RuntimeError):
     """Error used for commands that have been removed in setuptools.
 
     Since ``setuptools`` is built on ``distutils``, simply removing a command
@@ -48,7 +39,7 @@ class RemovedCommandError(BaseError, RuntimeError):  # type: ignore[valid-type,
     """
 
 
-class PackageDiscoveryError(BaseError, RuntimeError):  # type: ignore[valid-type, misc] # distutils imports are `Any` on python 3.12+
+class PackageDiscoveryError(BaseError, RuntimeError):
     """Impossible to perform automatic discovery of packages and/or modules.
 
     The current project layout or given discovery options can lead to problems when
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/extension.py b/server/.venv/lib/python3.11/site-packages/setuptools/extension.py
index 76e03d9..58c023f 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/extension.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/extension.py
@@ -1,17 +1,11 @@
-from __future__ import annotations
-
-import functools
 import re
-from typing import TYPE_CHECKING
-
-from setuptools._path import StrPath
-
-from .monkey import get_unpatched
-
+import functools
 import distutils.core
 import distutils.errors
 import distutils.extension
 
+from .monkey import get_unpatched
+
 
 def _have_cython():
     """
@@ -21,18 +15,16 @@ def _have_cython():
     try:
         # from (cython_impl) import build_ext
         __import__(cython_impl, fromlist=['build_ext']).build_ext
+        return True
     except Exception:
-        return False
-    return True
+        pass
+    return False
 
 
 # for compatibility
 have_pyrex = _have_cython
-if TYPE_CHECKING:
-    # Work around a mypy issue where type[T] can't be used as a base: https://github.com/python/mypy/issues/10962
-    from distutils.core import Extension as _Extension
-else:
-    _Extension = get_unpatched(distutils.core.Extension)
+
+_Extension = get_unpatched(distutils.core.Extension)
 
 
 class Extension(_Extension):
@@ -52,7 +44,7 @@ class Extension(_Extension):
       the full name of the extension, including any packages -- ie.
       *not* a filename or pathname, but Python dotted name
 
-    :arg list[str|os.PathLike[str]] sources:
+    :arg list[str] sources:
       list of source filenames, relative to the distribution root
       (where the setup script lives), in Unix form (slash-separated)
       for portability.  Source files may be C, C++, SWIG (.i),
@@ -127,36 +119,15 @@ class Extension(_Extension):
     :keyword bool py_limited_api:
       opt-in flag for the usage of :doc:`Python's limited API `.
 
-    :raises setuptools.errors.PlatformError: if ``runtime_library_dirs`` is
+    :raises setuptools.errors.PlatformError: if 'runtime_library_dirs' is
       specified on Windows. (since v63)
     """
 
-    # These 4 are set and used in setuptools/command/build_ext.py
-    # The lack of a default value and risk of `AttributeError` is purposeful
-    # to avoid people forgetting to call finalize_options if they modify the extension list.
-    # See example/rationale in https://github.com/pypa/setuptools/issues/4529.
-    _full_name: str  #: Private API, internal use only.
-    _links_to_dynamic: bool  #: Private API, internal use only.
-    _needs_stub: bool  #: Private API, internal use only.
-    _file_name: str  #: Private API, internal use only.
-
-    def __init__(
-        self,
-        name: str,
-        sources: list[StrPath],
-        *args,
-        py_limited_api: bool = False,
-        **kw,
-    ) -> None:
+    def __init__(self, name, sources, *args, **kw):
         # The *args is needed for compatibility as calls may use positional
         # arguments. py_limited_api may be set only via keyword.
-        self.py_limited_api = py_limited_api
-        super().__init__(
-            name,
-            sources,  # type: ignore[arg-type] # Vendored version of setuptools supports PathLike
-            *args,
-            **kw,
-        )
+        self.py_limited_api = kw.pop("py_limited_api", False)
+        super().__init__(name, sources, *args, **kw)
 
     def _convert_pyx_sources_to_lang(self):
         """
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/glob.py b/server/.venv/lib/python3.11/site-packages/setuptools/glob.py
index 1dfff2c..87062b8 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/glob.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/glob.py
@@ -6,21 +6,14 @@ Changes include:
  * Hidden files are not ignored.
 """
 
-from __future__ import annotations
-
-import fnmatch
 import os
 import re
-from collections.abc import Iterable, Iterator
-from typing import TYPE_CHECKING, AnyStr, overload
-
-if TYPE_CHECKING:
-    from _typeshed import BytesPath, StrOrBytesPath, StrPath
+import fnmatch
 
 __all__ = ["glob", "iglob", "escape"]
 
 
-def glob(pathname: AnyStr, recursive: bool = False) -> list[AnyStr]:
+def glob(pathname, recursive=False):
     """Return a list of paths matching a pathname pattern.
 
     The pattern may contain simple shell-style wildcards a la
@@ -34,7 +27,7 @@ def glob(pathname: AnyStr, recursive: bool = False) -> list[AnyStr]:
     return list(iglob(pathname, recursive=recursive))
 
 
-def iglob(pathname: AnyStr, recursive: bool = False) -> Iterator[AnyStr]:
+def iglob(pathname, recursive=False):
     """Return an iterator which yields the paths matching a pathname pattern.
 
     The pattern may contain simple shell-style wildcards a la
@@ -52,7 +45,7 @@ def iglob(pathname: AnyStr, recursive: bool = False) -> Iterator[AnyStr]:
     return it
 
 
-def _iglob(pathname: AnyStr, recursive: bool) -> Iterator[AnyStr]:
+def _iglob(pathname, recursive):
     dirname, basename = os.path.split(pathname)
     glob_in_dir = glob2 if recursive and _isrecursive(basename) else glob1
 
@@ -73,7 +66,7 @@ def _iglob(pathname: AnyStr, recursive: bool) -> Iterator[AnyStr]:
     # drive or UNC path.  Prevent an infinite recursion if a drive or UNC path
     # contains magic characters (i.e. r'\\?\C:').
     if dirname != pathname and has_magic(dirname):
-        dirs: Iterable[AnyStr] = _iglob(dirname, recursive)
+        dirs = _iglob(dirname, recursive)
     else:
         dirs = [dirname]
     if not has_magic(basename):
@@ -88,11 +81,7 @@ def _iglob(pathname: AnyStr, recursive: bool) -> Iterator[AnyStr]:
 # takes a literal basename (so it only has to check for its existence).
 
 
-@overload
-def glob1(dirname: StrPath, pattern: str) -> list[str]: ...
-@overload
-def glob1(dirname: BytesPath, pattern: bytes) -> list[bytes]: ...
-def glob1(dirname: StrOrBytesPath, pattern: str | bytes) -> list[str] | list[bytes]:
+def glob1(dirname, pattern):
     if not dirname:
         if isinstance(pattern, bytes):
             dirname = os.curdir.encode('ASCII')
@@ -102,8 +91,7 @@ def glob1(dirname: StrOrBytesPath, pattern: str | bytes) -> list[str] | list[byt
         names = os.listdir(dirname)
     except OSError:
         return []
-    # mypy false-positives: str or bytes type possibility is always kept in sync
-    return fnmatch.filter(names, pattern)  # type: ignore[type-var, return-value]
+    return fnmatch.filter(names, pattern)
 
 
 def glob0(dirname, basename):
@@ -122,22 +110,15 @@ def glob0(dirname, basename):
 # directory.
 
 
-@overload
-def glob2(dirname: StrPath, pattern: str) -> Iterator[str]: ...
-@overload
-def glob2(dirname: BytesPath, pattern: bytes) -> Iterator[bytes]: ...
-def glob2(dirname: StrOrBytesPath, pattern: str | bytes) -> Iterator[str | bytes]:
+def glob2(dirname, pattern):
     assert _isrecursive(pattern)
     yield pattern[:0]
-    yield from _rlistdir(dirname)
+    for x in _rlistdir(dirname):
+        yield x
 
 
 # Recursively yields relative pathnames inside a literal directory.
-@overload
-def _rlistdir(dirname: StrPath) -> Iterator[str]: ...
-@overload
-def _rlistdir(dirname: BytesPath) -> Iterator[bytes]: ...
-def _rlistdir(dirname: StrOrBytesPath) -> Iterator[str | bytes]:
+def _rlistdir(dirname):
     if not dirname:
         if isinstance(dirname, bytes):
             dirname = os.curdir.encode('ASCII')
@@ -145,28 +126,28 @@ def _rlistdir(dirname: StrOrBytesPath) -> Iterator[str | bytes]:
             dirname = os.curdir
     try:
         names = os.listdir(dirname)
-    except OSError:
+    except os.error:
         return
     for x in names:
         yield x
-        # mypy false-positives: str or bytes type possibility is always kept in sync
-        path = os.path.join(dirname, x) if dirname else x  # type: ignore[arg-type]
+        path = os.path.join(dirname, x) if dirname else x
         for y in _rlistdir(path):
-            yield os.path.join(x, y)  # type: ignore[arg-type]
+            yield os.path.join(x, y)
 
 
 magic_check = re.compile('([*?[])')
 magic_check_bytes = re.compile(b'([*?[])')
 
 
-def has_magic(s: str | bytes) -> bool:
+def has_magic(s):
     if isinstance(s, bytes):
-        return magic_check_bytes.search(s) is not None
+        match = magic_check_bytes.search(s)
     else:
-        return magic_check.search(s) is not None
+        match = magic_check.search(s)
+    return match is not None
 
 
-def _isrecursive(pattern: str | bytes) -> bool:
+def _isrecursive(pattern):
     if isinstance(pattern, bytes):
         return pattern == b'**'
     else:
@@ -174,12 +155,13 @@ def _isrecursive(pattern: str | bytes) -> bool:
 
 
 def escape(pathname):
-    """Escape all special characters."""
+    """Escape all special characters.
+    """
     # Escaping is done by wrapping any of "*?[" between square brackets.
     # Metacharacters do not work in the drive part and shouldn't be escaped.
     drive, pathname = os.path.splitdrive(pathname)
     if isinstance(pathname, bytes):
-        pathname = magic_check_bytes.sub(rb'[\1]', pathname)
+        pathname = magic_check_bytes.sub(br'[\1]', pathname)
     else:
         pathname = magic_check.sub(r'[\1]', pathname)
     return drive + pathname
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/gui-32.exe b/server/.venv/lib/python3.11/site-packages/setuptools/gui-32.exe
index 1eb430c..f8d3509 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/gui-32.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/gui-32.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/gui-64.exe b/server/.venv/lib/python3.11/site-packages/setuptools/gui-64.exe
index 031cb77..330c51a 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/gui-64.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/gui-64.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/gui-arm64.exe b/server/.venv/lib/python3.11/site-packages/setuptools/gui-arm64.exe
index 1e00ffa..5730f11 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/gui-arm64.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/gui-arm64.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/gui.exe b/server/.venv/lib/python3.11/site-packages/setuptools/gui.exe
index 1eb430c..f8d3509 100644
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/gui.exe and b/server/.venv/lib/python3.11/site-packages/setuptools/gui.exe differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/installer.py b/server/.venv/lib/python3.11/site-packages/setuptools/installer.py
index 64bc2de..b7096df 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/installer.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/installer.py
@@ -1,22 +1,16 @@
-from __future__ import annotations
-
 import glob
 import os
 import subprocess
 import sys
 import tempfile
-from functools import partial
-
-from pkg_resources import Distribution
-
-from . import _reqs
-from ._reqs import _StrOrIter
-from .warnings import SetuptoolsDeprecationWarning
-from .wheel import Wheel
-
+import warnings
 from distutils import log
 from distutils.errors import DistutilsError
 
+import pkg_resources
+from setuptools.wheel import Wheel
+from ._deprecation_warning import SetuptoolsDeprecationWarning
+
 
 def _fixup_find_links(find_links):
     """Ensure find-links option end-up being a list of strings."""
@@ -26,34 +20,20 @@ def _fixup_find_links(find_links):
     return find_links
 
 
-def fetch_build_egg(dist, req):
+def fetch_build_egg(dist, req):  # noqa: C901  # is too complex (16)  # FIXME
     """Fetch an egg needed for building.
 
     Use pip/wheel to fetch/build a wheel."""
-    _DeprecatedInstaller.emit()
-    _warn_wheel_not_available(dist)
-    return _fetch_build_egg_no_warn(dist, req)
-
-
-def _fetch_build_eggs(dist, requires: _StrOrIter) -> list[Distribution]:
-    import pkg_resources  # Delay import to avoid unnecessary side-effects
-
-    _DeprecatedInstaller.emit(stacklevel=3)
-    _warn_wheel_not_available(dist)
-
-    resolved_dists = pkg_resources.working_set.resolve(
-        _reqs.parse(requires, pkg_resources.Requirement),  # required for compatibility
-        installer=partial(_fetch_build_egg_no_warn, dist),  # avoid warning twice
-        replace_conflicting=True,
+    warnings.warn(
+        "setuptools.installer is deprecated. Requirements should "
+        "be satisfied by a PEP 517 installer.",
+        SetuptoolsDeprecationWarning,
     )
-    for dist in resolved_dists:
-        pkg_resources.working_set.add(dist, replace=True)
-    return resolved_dists
-
-
-def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  # FIXME
-    import pkg_resources  # Delay import to avoid unnecessary side-effects
-
+    # Warn if wheel is not available
+    try:
+        pkg_resources.get_distribution('wheel')
+    except pkg_resources.DistributionNotFound:
+        dist.announce('WARNING: The wheel package is not available.', log.WARN)
     # Ignore environment markers; if supplied, it is required.
     req = strip_marker(req)
     # Take easy_install options into account, but do not override relevant
@@ -61,10 +41,8 @@ def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  #
     # take precedence.
     opts = dist.get_option_dict('easy_install')
     if 'allow_hosts' in opts:
-        raise DistutilsError(
-            'the `allow-hosts` option is not supported '
-            'when using pip to install requirements.'
-        )
+        raise DistutilsError('the `allow-hosts` option is not supported '
+                             'when using pip to install requirements.')
     quiet = 'PIP_QUIET' not in os.environ and 'PIP_VERBOSE' not in os.environ
     if 'PIP_INDEX_URL' in os.environ:
         index_url = None
@@ -73,7 +51,8 @@ def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  #
     else:
         index_url = None
     find_links = (
-        _fixup_find_links(opts['find_links'][1])[:] if 'find_links' in opts else []
+        _fixup_find_links(opts['find_links'][1])[:] if 'find_links' in opts
+        else []
     )
     if dist.dependency_links:
         find_links.extend(dist.dependency_links)
@@ -84,14 +63,10 @@ def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  #
             return egg_dist
     with tempfile.TemporaryDirectory() as tmpdir:
         cmd = [
-            sys.executable,
-            '-m',
-            'pip',
+            sys.executable, '-m', 'pip',
             '--disable-pip-version-check',
-            'wheel',
-            '--no-deps',
-            '-w',
-            tmpdir,
+            'wheel', '--no-deps',
+            '-w', tmpdir,
         ]
         if quiet:
             cmd.append('--quiet')
@@ -111,11 +86,10 @@ def _fetch_build_egg_no_warn(dist, req):  # noqa: C901  # is too complex (16)  #
         dist_location = os.path.join(eggs_dir, wheel.egg_name())
         wheel.install_as_egg(dist_location)
         dist_metadata = pkg_resources.PathMetadata(
-            dist_location, os.path.join(dist_location, 'EGG-INFO')
-        )
-        return pkg_resources.Distribution.from_filename(
-            dist_location, metadata=dist_metadata
-        )
+            dist_location, os.path.join(dist_location, 'EGG-INFO'))
+        dist = pkg_resources.Distribution.from_filename(
+            dist_location, metadata=dist_metadata)
+        return dist
 
 
 def strip_marker(req):
@@ -124,27 +98,7 @@ def strip_marker(req):
     calling pip with something like `babel; extra == "i18n"`, which
     would always be ignored.
     """
-    import pkg_resources  # Delay import to avoid unnecessary side-effects
-
     # create a copy to avoid mutating the input
     req = pkg_resources.Requirement.parse(str(req))
     req.marker = None
     return req
-
-
-def _warn_wheel_not_available(dist):
-    import pkg_resources  # Delay import to avoid unnecessary side-effects
-
-    try:
-        pkg_resources.get_distribution('wheel')
-    except pkg_resources.DistributionNotFound:
-        dist.announce('WARNING: The wheel package is not available.', log.WARN)
-
-
-class _DeprecatedInstaller(SetuptoolsDeprecationWarning):
-    _SUMMARY = "setuptools.installer and fetch_build_eggs are deprecated."
-    _DETAILS = """
-    Requirements should be satisfied by a PEP 517 installer.
-    If you are using pip, you can try `pip install --use-pep517`.
-    """
-    # _DUE_DATE not decided yet
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/launch.py b/server/.venv/lib/python3.11/site-packages/setuptools/launch.py
index 0d16264..0208fdf 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/launch.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/launch.py
@@ -6,11 +6,11 @@ setuptools is bootstrapped via import.
 # Note that setuptools gets imported implicitly by the
 # invocation of this script using python -m setuptools.launch
 
-import sys
 import tokenize
+import sys
 
 
-def run() -> None:
+def run():
     """
     Run the script in sys.argv[1] as if it had
     been invoked naturally.
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/logging.py b/server/.venv/lib/python3.11/site-packages/setuptools/logging.py
index 532da89..e99c1b9 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/logging.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/logging.py
@@ -1,17 +1,14 @@
-import inspect
-import logging
 import sys
-
-from . import monkey
-
+import logging
 import distutils.log
+from . import monkey
 
 
 def _not_warning(record):
     return record.levelno < logging.WARNING
 
 
-def configure() -> None:
+def configure():
     """
     Configure logging to emit warning and above to stderr
     and everything else to stdout. This behavior is provided
@@ -24,9 +21,8 @@ def configure() -> None:
     out_handler.addFilter(_not_warning)
     handlers = err_handler, out_handler
     logging.basicConfig(
-        format="{message}", style='{', handlers=handlers, level=logging.DEBUG
-    )
-    if inspect.ismodule(distutils.dist.log):
+        format="{message}", style='{', handlers=handlers, level=logging.DEBUG)
+    if hasattr(distutils.log, 'Log'):
         monkey.patch_func(set_threshold, distutils.log, 'set_threshold')
         # For some reason `distutils.log` module is getting cached in `distutils.dist`
         # and then loaded again when patched,
@@ -35,6 +31,6 @@ def configure() -> None:
         distutils.dist.log = distutils.log
 
 
-def set_threshold(level: int) -> int:
-    logging.root.setLevel(level * 10)
+def set_threshold(level):
+    logging.root.setLevel(level*10)
     return set_threshold.unpatched(level)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/modified.py b/server/.venv/lib/python3.11/site-packages/setuptools/modified.py
deleted file mode 100644
index 6ba02fa..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/modified.py
+++ /dev/null
@@ -1,18 +0,0 @@
-try:
-    # Ensure a DistutilsError raised by these methods is the same as distutils.errors.DistutilsError
-    from distutils._modified import (
-        newer,
-        newer_group,
-        newer_pairwise,
-        newer_pairwise_group,
-    )
-except ImportError:
-    # fallback for SETUPTOOLS_USE_DISTUTILS=stdlib, because _modified never existed in stdlib
-    from ._distutils._modified import (
-        newer,
-        newer_group,
-        newer_pairwise,
-        newer_pairwise_group,
-    )
-
-__all__ = ['newer', 'newer_pairwise', 'newer_group', 'newer_pairwise_group']
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/monkey.py b/server/.venv/lib/python3.11/site-packages/setuptools/monkey.py
index 6ad1aba..77a7adc 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/monkey.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/monkey.py
@@ -2,21 +2,17 @@
 Monkey patching of distutils.
 """
 
-from __future__ import annotations
-
-import inspect
-import platform
 import sys
-import types
-from typing import TypeVar, cast, overload
-
 import distutils.filelist
+import platform
+import types
+import functools
+from importlib import import_module
+import inspect
 
-_T = TypeVar("_T")
-_UnpatchT = TypeVar("_UnpatchT", type, types.FunctionType)
+import setuptools
 
-
-__all__: list[str] = []
+__all__ = []
 """
 Everything is private. Contact the project team
 if you think you need this functionality.
@@ -37,43 +33,52 @@ def _get_mro(cls):
     return inspect.getmro(cls)
 
 
-@overload
-def get_unpatched(item: _UnpatchT) -> _UnpatchT: ...
-@overload
-def get_unpatched(item: object) -> None: ...
-def get_unpatched(
-    item: type | types.FunctionType | object,
-) -> type | types.FunctionType | None:
-    if isinstance(item, type):
-        return get_unpatched_class(item)
-    if isinstance(item, types.FunctionType):
-        return get_unpatched_function(item)
-    return None
+def get_unpatched(item):
+    lookup = (
+        get_unpatched_class if isinstance(item, type) else
+        get_unpatched_function if isinstance(item, types.FunctionType) else
+        lambda item: None
+    )
+    return lookup(item)
 
 
-def get_unpatched_class(cls: type[_T]) -> type[_T]:
+def get_unpatched_class(cls):
     """Protect against re-patching the distutils if reloaded
 
     Also ensures that no other distutils extension monkeypatched the distutils
     first.
     """
     external_bases = (
-        cast(type[_T], cls)
+        cls
         for cls in _get_mro(cls)
         if not cls.__module__.startswith('setuptools')
     )
     base = next(external_bases)
     if not base.__module__.startswith('distutils'):
-        msg = f"distutils has already been patched by {cls!r}"
+        msg = "distutils has already been patched by %r" % cls
         raise AssertionError(msg)
     return base
 
 
 def patch_all():
-    import setuptools
-
     # we can't patch distutils.cmd, alas
-    distutils.core.Command = setuptools.Command  # type: ignore[misc,assignment] # monkeypatching
+    distutils.core.Command = setuptools.Command
+
+    has_issue_12885 = sys.version_info <= (3, 5, 3)
+
+    if has_issue_12885:
+        # fix findall bug in distutils (http://bugs.python.org/issue12885)
+        distutils.filelist.findall = setuptools.findall
+
+    needs_warehouse = (
+        (3, 4) < sys.version_info < (3, 4, 6)
+        or
+        (3, 5) < sys.version_info <= (3, 5, 3)
+    )
+
+    if needs_warehouse:
+        warehouse = 'https://upload.pypi.org/legacy/'
+        distutils.config.PyPIRCCommand.DEFAULT_REPOSITORY = warehouse
 
     _patch_distribution_metadata()
 
@@ -82,26 +87,20 @@ def patch_all():
         module.Distribution = setuptools.dist.Distribution
 
     # Install the patched Extension
-    distutils.core.Extension = setuptools.extension.Extension  # type: ignore[misc,assignment] # monkeypatching
-    distutils.extension.Extension = setuptools.extension.Extension  # type: ignore[misc,assignment] # monkeypatching
+    distutils.core.Extension = setuptools.extension.Extension
+    distutils.extension.Extension = setuptools.extension.Extension
     if 'distutils.command.build_ext' in sys.modules:
-        sys.modules[
-            'distutils.command.build_ext'
-        ].Extension = setuptools.extension.Extension
+        sys.modules['distutils.command.build_ext'].Extension = (
+            setuptools.extension.Extension
+        )
+
+    patch_for_msvc_specialized_compiler()
 
 
 def _patch_distribution_metadata():
-    from . import _core_metadata
-
     """Patch write_pkg_file and read_pkg_file for higher metadata standards"""
-    for attr in (
-        'write_pkg_info',
-        'write_pkg_file',
-        'read_pkg_file',
-        'get_metadata_version',
-        'get_fullname',
-    ):
-        new_val = getattr(_core_metadata, attr)
+    for attr in ('write_pkg_file', 'read_pkg_file', 'get_metadata_version'):
+        new_val = getattr(setuptools.dist, attr)
         setattr(distutils.dist.DistributionMetadata, attr, new_val)
 
 
@@ -123,4 +122,44 @@ def patch_func(replacement, target_mod, func_name):
 
 
 def get_unpatched_function(candidate):
-    return candidate.unpatched
+    return getattr(candidate, 'unpatched')
+
+
+def patch_for_msvc_specialized_compiler():
+    """
+    Patch functions in distutils to use standalone Microsoft Visual C++
+    compilers.
+    """
+    # import late to avoid circular imports on Python < 3.5
+    msvc = import_module('setuptools.msvc')
+
+    if platform.system() != 'Windows':
+        # Compilers only available on Microsoft Windows
+        return
+
+    def patch_params(mod_name, func_name):
+        """
+        Prepare the parameters for patch_func to patch indicated function.
+        """
+        repl_prefix = 'msvc14_'
+        repl_name = repl_prefix + func_name.lstrip('_')
+        repl = getattr(msvc, repl_name)
+        mod = import_module(mod_name)
+        if not hasattr(mod, func_name):
+            raise ImportError(func_name)
+        return repl, mod, func_name
+
+    # Python 3.5+
+    msvc14 = functools.partial(patch_params, 'distutils._msvccompiler')
+
+    try:
+        # Patch distutils._msvccompiler._get_vc_env
+        patch_func(*msvc14('_get_vc_env'))
+    except ImportError:
+        pass
+
+    try:
+        # Patch distutils._msvccompiler.gen_lib_options for Numpy
+        patch_func(*msvc14('gen_lib_options'))
+    except ImportError:
+        pass
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/msvc.py b/server/.venv/lib/python3.11/site-packages/setuptools/msvc.py
index 313a781..5d4d775 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/msvc.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/msvc.py
@@ -1,29 +1,32 @@
 """
-Environment info about Microsoft Compilers.
+Improved support for Microsoft Visual C++ compilers.
 
->>> getfixture('windows_only')
->>> ei = EnvironmentInfo('amd64')
+Known supported compilers:
+--------------------------
+Microsoft Visual C++ 14.X:
+    Microsoft Visual C++ Build Tools 2015 (x86, x64, arm)
+    Microsoft Visual Studio Build Tools 2017 (x86, x64, arm, arm64)
+    Microsoft Visual Studio Build Tools 2019 (x86, x64, arm, arm64)
+
+This may also support compilers shipped with compatible Visual Studio versions.
 """
 
-from __future__ import annotations
-
-import contextlib
-import itertools
 import json
-import os
-import os.path
+from io import open
+from os import listdir, pathsep
+from os.path import join, isfile, isdir, dirname
+import sys
+import contextlib
 import platform
-from typing import TYPE_CHECKING, TypedDict
-
-from more_itertools import unique_everseen
-
+import itertools
+import subprocess
 import distutils.errors
+from setuptools.extern.packaging.version import LegacyVersion
+from setuptools.extern.more_itertools import unique_everseen
 
-if TYPE_CHECKING:
-    from typing_extensions import LiteralString, NotRequired
+from .monkey import get_unpatched
 
-# https://github.com/python/mypy/issues/8166
-if not TYPE_CHECKING and platform.system() == 'Windows':
+if platform.system() == 'Windows':
     import winreg
     from os import environ
 else:
@@ -35,7 +38,233 @@ else:
         HKEY_LOCAL_MACHINE = None
         HKEY_CLASSES_ROOT = None
 
-    environ: dict[str, str] = dict()
+    environ = dict()
+
+
+def _msvc14_find_vc2015():
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    try:
+        key = winreg.OpenKey(
+            winreg.HKEY_LOCAL_MACHINE,
+            r"Software\Microsoft\VisualStudio\SxS\VC7",
+            0,
+            winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+        )
+    except OSError:
+        return None, None
+
+    best_version = 0
+    best_dir = None
+    with key:
+        for i in itertools.count():
+            try:
+                v, vc_dir, vt = winreg.EnumValue(key, i)
+            except OSError:
+                break
+            if v and vt == winreg.REG_SZ and isdir(vc_dir):
+                try:
+                    version = int(float(v))
+                except (ValueError, TypeError):
+                    continue
+                if version >= 14 and version > best_version:
+                    best_version, best_dir = version, vc_dir
+    return best_version, best_dir
+
+
+def _msvc14_find_vc2017():
+    """Python 3.8 "distutils/_msvccompiler.py" backport
+
+    Returns "15, path" based on the result of invoking vswhere.exe
+    If no install is found, returns "None, None"
+
+    The version is returned to avoid unnecessarily changing the function
+    result. It may be ignored when the path is not None.
+
+    If vswhere.exe is not available, by definition, VS 2017 is not
+    installed.
+    """
+    root = environ.get("ProgramFiles(x86)") or environ.get("ProgramFiles")
+    if not root:
+        return None, None
+
+    try:
+        path = subprocess.check_output([
+            join(root, "Microsoft Visual Studio", "Installer", "vswhere.exe"),
+            "-latest",
+            "-prerelease",
+            "-requiresAny",
+            "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+            "-requires", "Microsoft.VisualStudio.Workload.WDExpress",
+            "-property", "installationPath",
+            "-products", "*",
+        ]).decode(encoding="mbcs", errors="strict").strip()
+    except (subprocess.CalledProcessError, OSError, UnicodeDecodeError):
+        return None, None
+
+    path = join(path, "VC", "Auxiliary", "Build")
+    if isdir(path):
+        return 15, path
+
+    return None, None
+
+
+PLAT_SPEC_TO_RUNTIME = {
+    'x86': 'x86',
+    'x86_amd64': 'x64',
+    'x86_arm': 'arm',
+    'x86_arm64': 'arm64'
+}
+
+
+def _msvc14_find_vcvarsall(plat_spec):
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    _, best_dir = _msvc14_find_vc2017()
+    vcruntime = None
+
+    if plat_spec in PLAT_SPEC_TO_RUNTIME:
+        vcruntime_plat = PLAT_SPEC_TO_RUNTIME[plat_spec]
+    else:
+        vcruntime_plat = 'x64' if 'amd64' in plat_spec else 'x86'
+
+    if best_dir:
+        vcredist = join(best_dir, "..", "..", "redist", "MSVC", "**",
+                        vcruntime_plat, "Microsoft.VC14*.CRT",
+                        "vcruntime140.dll")
+        try:
+            import glob
+            vcruntime = glob.glob(vcredist, recursive=True)[-1]
+        except (ImportError, OSError, LookupError):
+            vcruntime = None
+
+    if not best_dir:
+        best_version, best_dir = _msvc14_find_vc2015()
+        if best_version:
+            vcruntime = join(best_dir, 'redist', vcruntime_plat,
+                             "Microsoft.VC140.CRT", "vcruntime140.dll")
+
+    if not best_dir:
+        return None, None
+
+    vcvarsall = join(best_dir, "vcvarsall.bat")
+    if not isfile(vcvarsall):
+        return None, None
+
+    if not vcruntime or not isfile(vcruntime):
+        vcruntime = None
+
+    return vcvarsall, vcruntime
+
+
+def _msvc14_get_vc_env(plat_spec):
+    """Python 3.8 "distutils/_msvccompiler.py" backport"""
+    if "DISTUTILS_USE_SDK" in environ:
+        return {
+            key.lower(): value
+            for key, value in environ.items()
+        }
+
+    vcvarsall, vcruntime = _msvc14_find_vcvarsall(plat_spec)
+    if not vcvarsall:
+        raise distutils.errors.DistutilsPlatformError(
+            "Unable to find vcvarsall.bat"
+        )
+
+    try:
+        out = subprocess.check_output(
+            'cmd /u /c "{}" {} && set'.format(vcvarsall, plat_spec),
+            stderr=subprocess.STDOUT,
+        ).decode('utf-16le', errors='replace')
+    except subprocess.CalledProcessError as exc:
+        raise distutils.errors.DistutilsPlatformError(
+            "Error executing {}".format(exc.cmd)
+        ) from exc
+
+    env = {
+        key.lower(): value
+        for key, _, value in
+        (line.partition('=') for line in out.splitlines())
+        if key and value
+    }
+
+    if vcruntime:
+        env['py_vcruntime_redist'] = vcruntime
+    return env
+
+
+def msvc14_get_vc_env(plat_spec):
+    """
+    Patched "distutils._msvccompiler._get_vc_env" for support extra
+    Microsoft Visual C++ 14.X compilers.
+
+    Set environment without use of "vcvarsall.bat".
+
+    Parameters
+    ----------
+    plat_spec: str
+        Target architecture.
+
+    Return
+    ------
+    dict
+        environment
+    """
+
+    # Always use backport from CPython 3.8
+    try:
+        return _msvc14_get_vc_env(plat_spec)
+    except distutils.errors.DistutilsPlatformError as exc:
+        _augment_exception(exc, 14.0)
+        raise
+
+
+def msvc14_gen_lib_options(*args, **kwargs):
+    """
+    Patched "distutils._msvccompiler.gen_lib_options" for fix
+    compatibility between "numpy.distutils" and "distutils._msvccompiler"
+    (for Numpy < 1.11.2)
+    """
+    if "numpy.distutils" in sys.modules:
+        import numpy as np
+        if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'):
+            return np.distutils.ccompiler.gen_lib_options(*args, **kwargs)
+    return get_unpatched(msvc14_gen_lib_options)(*args, **kwargs)
+
+
+def _augment_exception(exc, version, arch=''):
+    """
+    Add details to the exception message to help guide the user
+    as to what action will resolve it.
+    """
+    # Error if MSVC++ directory not found or environment not set
+    message = exc.args[0]
+
+    if "vcvarsall" in message.lower() or "visual c" in message.lower():
+        # Special error message if MSVC++ not installed
+        tmpl = 'Microsoft Visual C++ {version:0.1f} or greater is required.'
+        message = tmpl.format(**locals())
+        msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
+        if version == 9.0:
+            if arch.lower().find('ia64') > -1:
+                # For VC++ 9.0, if IA64 support is needed, redirect user
+                # to Windows SDK 7.0.
+                # Note: No download link available from Microsoft.
+                message += ' Get it with "Microsoft Windows SDK 7.0"'
+            else:
+                # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
+                # This redirection link is maintained by Microsoft.
+                # Contact vspython@microsoft.com if it needs updating.
+                message += ' Get it from http://aka.ms/vcpython27'
+        elif version == 10.0:
+            # For VC++ 10.0 Redirect user to Windows SDK 7.1
+            message += ' Get it with "Microsoft Windows SDK 7.1": '
+            message += msdownload % 8279
+        elif version >= 14.0:
+            # For VC++ 14.X Redirect user to latest Visual C++ Build Tools
+            message += (' Get it with "Microsoft C++ Build Tools": '
+                        r'https://visualstudio.microsoft.com'
+                        r'/visual-cpp-build-tools/')
+
+    exc.args = (message, )
 
 
 class PlatformInfo:
@@ -47,10 +276,9 @@ class PlatformInfo:
     arch: str
         Target architecture.
     """
-
     current_cpu = environ.get('processor_architecture', '').lower()
 
-    def __init__(self, arch) -> None:
+    def __init__(self, arch):
         self.arch = arch.lower().replace('x64', 'amd64')
 
     @property
@@ -63,7 +291,7 @@ class PlatformInfo:
         str
             Target CPU
         """
-        return self.arch[self.arch.find('_') + 1 :]
+        return self.arch[self.arch.find('_') + 1:]
 
     def target_is_x86(self):
         """
@@ -87,7 +315,7 @@ class PlatformInfo:
         """
         return self.current_cpu == 'x86'
 
-    def current_dir(self, hidex86=False, x64=False) -> str:
+    def current_dir(self, hidex86=False, x64=False):
         """
         Current platform specific subfolder.
 
@@ -104,14 +332,12 @@ class PlatformInfo:
             subfolder: '\target', or '' (see hidex86 parameter)
         """
         return (
-            ''
-            if (self.current_cpu == 'x86' and hidex86)
-            else r'\x64'
-            if (self.current_cpu == 'amd64' and x64)
-            else rf'\{self.current_cpu}'
+            '' if (self.current_cpu == 'x86' and hidex86) else
+            r'\x64' if (self.current_cpu == 'amd64' and x64) else
+            r'\%s' % self.current_cpu
         )
 
-    def target_dir(self, hidex86=False, x64=False) -> str:
+    def target_dir(self, hidex86=False, x64=False):
         r"""
         Target platform specific subfolder.
 
@@ -128,11 +354,9 @@ class PlatformInfo:
             subfolder: '\current', or '' (see hidex86 parameter)
         """
         return (
-            ''
-            if (self.target_cpu == 'x86' and hidex86)
-            else r'\x64'
-            if (self.target_cpu == 'amd64' and x64)
-            else rf'\{self.target_cpu}'
+            '' if (self.target_cpu == 'x86' and hidex86) else
+            r'\x64' if (self.target_cpu == 'amd64' and x64) else
+            r'\%s' % self.target_cpu
         )
 
     def cross_dir(self, forcex86=False):
@@ -153,9 +377,8 @@ class PlatformInfo:
         """
         current = 'x86' if forcex86 else self.current_cpu
         return (
-            ''
-            if self.target_cpu == current
-            else self.target_dir().replace('\\', f'\\{current}_')
+            '' if self.target_cpu == current else
+            self.target_dir().replace('\\', '\\%s_' % current)
         )
 
 
@@ -168,19 +391,16 @@ class RegistryInfo:
     platform_info: PlatformInfo
         "PlatformInfo" instance.
     """
+    HKEYS = (winreg.HKEY_USERS,
+             winreg.HKEY_CURRENT_USER,
+             winreg.HKEY_LOCAL_MACHINE,
+             winreg.HKEY_CLASSES_ROOT)
 
-    HKEYS = (
-        winreg.HKEY_USERS,
-        winreg.HKEY_CURRENT_USER,
-        winreg.HKEY_LOCAL_MACHINE,
-        winreg.HKEY_CLASSES_ROOT,
-    )
-
-    def __init__(self, platform_info) -> None:
+    def __init__(self, platform_info):
         self.pi = platform_info
 
     @property
-    def visualstudio(self) -> str:
+    def visualstudio(self):
         """
         Microsoft Visual Studio root registry key.
 
@@ -201,7 +421,7 @@ class RegistryInfo:
         str
             Registry key
         """
-        return os.path.join(self.visualstudio, 'SxS')
+        return join(self.visualstudio, 'SxS')
 
     @property
     def vc(self):
@@ -213,7 +433,7 @@ class RegistryInfo:
         str
             Registry key
         """
-        return os.path.join(self.sxs, 'VC7')
+        return join(self.sxs, 'VC7')
 
     @property
     def vs(self):
@@ -225,10 +445,10 @@ class RegistryInfo:
         str
             Registry key
         """
-        return os.path.join(self.sxs, 'VS7')
+        return join(self.sxs, 'VS7')
 
     @property
-    def vc_for_python(self) -> str:
+    def vc_for_python(self):
         """
         Microsoft Visual C++ for Python registry key.
 
@@ -240,7 +460,7 @@ class RegistryInfo:
         return r'DevDiv\VCForPython'
 
     @property
-    def microsoft_sdk(self) -> str:
+    def microsoft_sdk(self):
         """
         Microsoft SDK registry key.
 
@@ -261,7 +481,7 @@ class RegistryInfo:
         str
             Registry key
         """
-        return os.path.join(self.microsoft_sdk, 'Windows')
+        return join(self.microsoft_sdk, 'Windows')
 
     @property
     def netfx_sdk(self):
@@ -273,10 +493,10 @@ class RegistryInfo:
         str
             Registry key
         """
-        return os.path.join(self.microsoft_sdk, 'NETFXSDK')
+        return join(self.microsoft_sdk, 'NETFXSDK')
 
     @property
-    def windows_kits_roots(self) -> str:
+    def windows_kits_roots(self):
         """
         Microsoft Windows Kits Roots registry key.
 
@@ -304,7 +524,7 @@ class RegistryInfo:
             Registry key
         """
         node64 = '' if self.pi.current_is_x86() or x86 else 'Wow6432Node'
-        return os.path.join('Software', node64, 'Microsoft', key)
+        return join('Software', node64, 'Microsoft', key)
 
     def lookup(self, key, name):
         """
@@ -330,22 +550,21 @@ class RegistryInfo:
             bkey = None
             try:
                 bkey = openkey(hkey, ms(key), 0, key_read)
-            except OSError:
+            except (OSError, IOError):
                 if not self.pi.current_is_x86():
                     try:
                         bkey = openkey(hkey, ms(key, True), 0, key_read)
-                    except OSError:
+                    except (OSError, IOError):
                         continue
                 else:
                     continue
             try:
                 return winreg.QueryValueEx(bkey, name)[0]
-            except OSError:
+            except (OSError, IOError):
                 pass
             finally:
                 if bkey:
                     closekey(bkey)
-        return None
 
 
 class SystemInfo:
@@ -366,14 +585,15 @@ class SystemInfo:
     ProgramFiles = environ.get('ProgramFiles', '')
     ProgramFilesx86 = environ.get('ProgramFiles(x86)', ProgramFiles)
 
-    def __init__(self, registry_info, vc_ver=None) -> None:
+    def __init__(self, registry_info, vc_ver=None):
         self.ri = registry_info
         self.pi = self.ri.pi
 
         self.known_vs_paths = self.find_programdata_vs_vers()
 
         # Except for VS15+, VC version is aligned with VS version
-        self.vs_ver = self.vc_ver = vc_ver or self._find_latest_available_vs_ver()
+        self.vs_ver = self.vc_ver = (
+            vc_ver or self._find_latest_available_vs_ver())
 
     def _find_latest_available_vs_ver(self):
         """
@@ -388,8 +608,7 @@ class SystemInfo:
 
         if not (reg_vc_vers or self.known_vs_paths):
             raise distutils.errors.DistutilsPlatformError(
-                'No Microsoft Visual C++ version found'
-            )
+                'No Microsoft Visual C++ version found')
 
         vc_vers = set(reg_vc_vers)
         vc_vers.update(self.known_vs_paths)
@@ -410,7 +629,7 @@ class SystemInfo:
         for hkey, key in itertools.product(self.ri.HKEYS, vckeys):
             try:
                 bkey = winreg.OpenKey(hkey, ms(key), 0, winreg.KEY_READ)
-            except OSError:
+            except (OSError, IOError):
                 continue
             with bkey:
                 subkeys, values, _ = winreg.QueryInfoKey(bkey)
@@ -426,7 +645,7 @@ class SystemInfo:
                             vs_vers.append(ver)
         return sorted(vs_vers)
 
-    def find_programdata_vs_vers(self) -> dict[float, str]:
+    def find_programdata_vs_vers(self):
         r"""
         Find Visual studio 2017+ versions from information in
         "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances".
@@ -436,33 +655,33 @@ class SystemInfo:
         dict
             float version as key, path as value.
         """
-        vs_versions: dict[float, str] = {}
-        instances_dir = r'C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances'
+        vs_versions = {}
+        instances_dir = \
+            r'C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances'
 
         try:
-            hashed_names = os.listdir(instances_dir)
+            hashed_names = listdir(instances_dir)
 
-        except OSError:
+        except (OSError, IOError):
             # Directory not exists with all Visual Studio versions
             return vs_versions
 
         for name in hashed_names:
             try:
                 # Get VS installation path from "state.json" file
-                state_path = os.path.join(instances_dir, name, 'state.json')
+                state_path = join(instances_dir, name, 'state.json')
                 with open(state_path, 'rt', encoding='utf-8') as state_file:
                     state = json.load(state_file)
                 vs_path = state['installationPath']
 
                 # Raises OSError if this VS installation does not contain VC
-                os.listdir(os.path.join(vs_path, r'VC\Tools\MSVC'))
+                listdir(join(vs_path, r'VC\Tools\MSVC'))
 
                 # Store version and path
-                vs_versions[self._as_float_version(state['installationVersion'])] = (
-                    vs_path
-                )
+                vs_versions[self._as_float_version(
+                    state['installationVersion'])] = vs_path
 
-            except (OSError, KeyError):
+            except (OSError, IOError, KeyError):
                 # Skip if "state.json" file is missing or bad format
                 continue
 
@@ -496,12 +715,11 @@ class SystemInfo:
             path
         """
         # Default path
-        default = os.path.join(
-            self.ProgramFilesx86, f'Microsoft Visual Studio {self.vs_ver:0.1f}'
-        )
+        default = join(self.ProgramFilesx86,
+                       'Microsoft Visual Studio %0.1f' % self.vs_ver)
 
         # Try to get path from registry, if fail use default path
-        return self.ri.lookup(self.ri.vs, f'{self.vs_ver:0.1f}') or default
+        return self.ri.lookup(self.ri.vs, '%0.1f' % self.vs_ver) or default
 
     @property
     def VCInstallDir(self):
@@ -515,7 +733,7 @@ class SystemInfo:
         """
         path = self._guess_vc() or self._guess_vc_legacy()
 
-        if not os.path.isdir(path):
+        if not isdir(path):
             msg = 'Microsoft Visual C++ directory not found'
             raise distutils.errors.DistutilsPlatformError(msg)
 
@@ -540,15 +758,15 @@ class SystemInfo:
             # Else, search with path from registry
             vs_dir = self.VSInstallDir
 
-        guess_vc = os.path.join(vs_dir, r'VC\Tools\MSVC')
+        guess_vc = join(vs_dir, r'VC\Tools\MSVC')
 
         # Subdir with VC exact version as name
         try:
             # Update the VC version with real one instead of VS version
-            vc_ver = os.listdir(guess_vc)[-1]
+            vc_ver = listdir(guess_vc)[-1]
             self.vc_ver = self._as_float_version(vc_ver)
-            return os.path.join(guess_vc, vc_ver)
-        except (OSError, IndexError):
+            return join(guess_vc, vc_ver)
+        except (OSError, IOError, IndexError):
             return ''
 
     def _guess_vc_legacy(self):
@@ -560,21 +778,19 @@ class SystemInfo:
         str
             path
         """
-        default = os.path.join(
-            self.ProgramFilesx86,
-            rf'Microsoft Visual Studio {self.vs_ver:0.1f}\VC',
-        )
+        default = join(self.ProgramFilesx86,
+                       r'Microsoft Visual Studio %0.1f\VC' % self.vs_ver)
 
         # Try to get "VC++ for Python" path from registry as default path
-        reg_path = os.path.join(self.ri.vc_for_python, f'{self.vs_ver:0.1f}')
+        reg_path = join(self.ri.vc_for_python, '%0.1f' % self.vs_ver)
         python_vc = self.ri.lookup(reg_path, 'installdir')
-        default_vc = os.path.join(python_vc, 'VC') if python_vc else default
+        default_vc = join(python_vc, 'VC') if python_vc else default
 
         # Try to get path from registry, if fail use default path
-        return self.ri.lookup(self.ri.vc, f'{self.vs_ver:0.1f}') or default_vc
+        return self.ri.lookup(self.ri.vc, '%0.1f' % self.vs_ver) or default_vc
 
     @property
-    def WindowsSdkVersion(self) -> tuple[LiteralString, ...]:
+    def WindowsSdkVersion(self):
         """
         Microsoft Windows SDK versions for specified MSVC++ version.
 
@@ -593,7 +809,6 @@ class SystemInfo:
             return '8.1', '8.1a'
         elif self.vs_ver >= 14.0:
             return '10.0', '8.1'
-        return ()
 
     @property
     def WindowsSdkLastVersion(self):
@@ -605,10 +820,10 @@ class SystemInfo:
         str
             version
         """
-        return self._use_last_dir_name(os.path.join(self.WindowsSdkDir, 'lib'))
+        return self._use_last_dir_name(join(self.WindowsSdkDir, 'lib'))
 
-    @property
-    def WindowsSdkDir(self) -> str | None:  # noqa: C901  # is too complex (12)  # FIXME
+    @property  # noqa: C901
+    def WindowsSdkDir(self):  # noqa: C901  # is too complex (12)  # FIXME
         """
         Microsoft Windows SDK directory.
 
@@ -617,37 +832,37 @@ class SystemInfo:
         str
             path
         """
-        sdkdir: str | None = ''
+        sdkdir = ''
         for ver in self.WindowsSdkVersion:
             # Try to get it from registry
-            loc = os.path.join(self.ri.windows_sdk, f'v{ver}')
+            loc = join(self.ri.windows_sdk, 'v%s' % ver)
             sdkdir = self.ri.lookup(loc, 'installationfolder')
             if sdkdir:
                 break
-        if not sdkdir or not os.path.isdir(sdkdir):
+        if not sdkdir or not isdir(sdkdir):
             # Try to get "VC++ for Python" version from registry
-            path = os.path.join(self.ri.vc_for_python, f'{self.vc_ver:0.1f}')
+            path = join(self.ri.vc_for_python, '%0.1f' % self.vc_ver)
             install_base = self.ri.lookup(path, 'installdir')
             if install_base:
-                sdkdir = os.path.join(install_base, 'WinSDK')
-        if not sdkdir or not os.path.isdir(sdkdir):
+                sdkdir = join(install_base, 'WinSDK')
+        if not sdkdir or not isdir(sdkdir):
             # If fail, use default new path
             for ver in self.WindowsSdkVersion:
-                intver = ver[: ver.rfind('.')]
-                path = rf'Microsoft SDKs\Windows Kits\{intver}'
-                d = os.path.join(self.ProgramFiles, path)
-                if os.path.isdir(d):
+                intver = ver[:ver.rfind('.')]
+                path = r'Microsoft SDKs\Windows Kits\%s' % intver
+                d = join(self.ProgramFiles, path)
+                if isdir(d):
                     sdkdir = d
-        if not sdkdir or not os.path.isdir(sdkdir):
+        if not sdkdir or not isdir(sdkdir):
             # If fail, use default old path
             for ver in self.WindowsSdkVersion:
-                path = rf'Microsoft SDKs\Windows\v{ver}'
-                d = os.path.join(self.ProgramFiles, path)
-                if os.path.isdir(d):
+                path = r'Microsoft SDKs\Windows\v%s' % ver
+                d = join(self.ProgramFiles, path)
+                if isdir(d):
                     sdkdir = d
         if not sdkdir:
             # If fail, use Platform SDK
-            sdkdir = os.path.join(self.VCInstallDir, 'PlatformSDK')
+            sdkdir = join(self.VCInstallDir, 'PlatformSDK')
         return sdkdir
 
     @property
@@ -667,17 +882,17 @@ class SystemInfo:
         else:
             netfxver = 40
             hidex86 = True if self.vs_ver <= 12.0 else False
-            arch = self.pi.current_dir(x64=True, hidex86=hidex86).replace('\\', '-')
-        fx = f'WinSDK-NetFx{netfxver}Tools{arch}'
+            arch = self.pi.current_dir(x64=True, hidex86=hidex86)
+        fx = 'WinSDK-NetFx%dTools%s' % (netfxver, arch.replace('\\', '-'))
 
         # list all possibles registry paths
         regpaths = []
         if self.vs_ver >= 14.0:
             for ver in self.NetFxSdkVersion:
-                regpaths += [os.path.join(self.ri.netfx_sdk, ver, fx)]
+                regpaths += [join(self.ri.netfx_sdk, ver, fx)]
 
         for ver in self.WindowsSdkVersion:
-            regpaths += [os.path.join(self.ri.windows_sdk, f'v{ver}A', fx)]
+            regpaths += [join(self.ri.windows_sdk, 'v%sA' % ver, fx)]
 
         # Return installation folder from the more recent path
         for path in regpaths:
@@ -685,8 +900,6 @@ class SystemInfo:
             if execpath:
                 return execpath
 
-        return None
-
     @property
     def FSharpInstallDir(self):
         """
@@ -697,7 +910,7 @@ class SystemInfo:
         str
             path
         """
-        path = os.path.join(self.ri.visualstudio, rf'{self.vs_ver:0.1f}\Setup\F#')
+        path = join(self.ri.visualstudio, r'%0.1f\Setup\F#' % self.vs_ver)
         return self.ri.lookup(path, 'productdir') or ''
 
     @property
@@ -715,12 +928,11 @@ class SystemInfo:
 
         # Find path of the more recent Kit
         for ver in vers:
-            sdkdir = self.ri.lookup(self.ri.windows_kits_roots, f'kitsroot{ver}')
+            sdkdir = self.ri.lookup(self.ri.windows_kits_roots,
+                                    'kitsroot%s' % ver)
             if sdkdir:
                 return sdkdir or ''
 
-        return None
-
     @property
     def UniversalCRTSdkLastVersion(self):
         """
@@ -731,7 +943,7 @@ class SystemInfo:
         str
             version
         """
-        return self._use_last_dir_name(os.path.join(self.UniversalCRTSdkDir, 'lib'))
+        return self._use_last_dir_name(join(self.UniversalCRTSdkDir, 'lib'))
 
     @property
     def NetFxSdkVersion(self):
@@ -744,11 +956,10 @@ class SystemInfo:
             versions
         """
         # Set FxSdk versions for specified VS version
-        return (
-            ('4.7.2', '4.7.1', '4.7', '4.6.2', '4.6.1', '4.6', '4.5.2', '4.5.1', '4.5')
-            if self.vs_ver >= 14.0
-            else ()
-        )
+        return (('4.7.2', '4.7.1', '4.7',
+                 '4.6.2', '4.6.1', '4.6',
+                 '4.5.2', '4.5.1', '4.5')
+                if self.vs_ver >= 14.0 else ())
 
     @property
     def NetFxSdkDir(self):
@@ -762,7 +973,7 @@ class SystemInfo:
         """
         sdkdir = ''
         for ver in self.NetFxSdkVersion:
-            loc = os.path.join(self.ri.netfx_sdk, ver)
+            loc = join(self.ri.netfx_sdk, ver)
             sdkdir = self.ri.lookup(loc, 'kitsinstallationfolder')
             if sdkdir:
                 break
@@ -779,7 +990,7 @@ class SystemInfo:
             path
         """
         # Default path
-        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework')
+        guess_fw = join(self.WinDir, r'Microsoft.NET\Framework')
 
         # Try to get path from registry, if fail use default path
         return self.ri.lookup(self.ri.vc, 'frameworkdir32') or guess_fw
@@ -795,13 +1006,13 @@ class SystemInfo:
             path
         """
         # Default path
-        guess_fw = os.path.join(self.WinDir, r'Microsoft.NET\Framework64')
+        guess_fw = join(self.WinDir, r'Microsoft.NET\Framework64')
 
         # Try to get path from registry, if fail use default path
         return self.ri.lookup(self.ri.vc, 'frameworkdir64') or guess_fw
 
     @property
-    def FrameworkVersion32(self) -> tuple[str, ...]:
+    def FrameworkVersion32(self):
         """
         Microsoft .NET Framework 32bit versions.
 
@@ -813,7 +1024,7 @@ class SystemInfo:
         return self._find_dot_net_versions(32)
 
     @property
-    def FrameworkVersion64(self) -> tuple[str, ...]:
+    def FrameworkVersion64(self):
         """
         Microsoft .NET Framework 64bit versions.
 
@@ -824,7 +1035,7 @@ class SystemInfo:
         """
         return self._find_dot_net_versions(64)
 
-    def _find_dot_net_versions(self, bits) -> tuple[str, ...]:
+    def _find_dot_net_versions(self, bits):
         """
         Find Microsoft .NET Framework versions.
 
@@ -839,8 +1050,8 @@ class SystemInfo:
             versions
         """
         # Find actual .NET version in registry
-        reg_ver = self.ri.lookup(self.ri.vc, f'frameworkver{bits}')
-        dot_net_dir = getattr(self, f'FrameworkDir{bits}')
+        reg_ver = self.ri.lookup(self.ri.vc, 'frameworkver%d' % bits)
+        dot_net_dir = getattr(self, 'FrameworkDir%d' % bits)
         ver = reg_ver or self._use_last_dir_name(dot_net_dir, 'v') or ''
 
         # Set .NET versions for specified MSVC++ version
@@ -852,7 +1063,6 @@ class SystemInfo:
             return 'v3.5', 'v2.0.50727'
         elif self.vs_ver == 8.0:
             return 'v3.0', 'v2.0.50727'
-        return ()
 
     @staticmethod
     def _use_last_dir_name(path, prefix=''):
@@ -873,21 +1083,13 @@ class SystemInfo:
         """
         matching_dirs = (
             dir_name
-            for dir_name in reversed(os.listdir(path))
-            if os.path.isdir(os.path.join(path, dir_name))
-            and dir_name.startswith(prefix)
+            for dir_name in reversed(listdir(path))
+            if isdir(join(path, dir_name)) and
+            dir_name.startswith(prefix)
         )
         return next(matching_dirs, None) or ''
 
 
-class _EnvironmentDict(TypedDict):
-    include: str
-    lib: str
-    libpath: str
-    path: str
-    py_vcruntime_redist: NotRequired[str | None]
-
-
 class EnvironmentInfo:
     """
     Return environment variables for specified Microsoft Visual C++ version
@@ -912,7 +1114,7 @@ class EnvironmentInfo:
     # Variables and properties in this class use originals CamelCase variables
     # names from Microsoft source files for more easy comparison.
 
-    def __init__(self, arch, vc_ver=None, vc_min_ver=0) -> None:
+    def __init__(self, arch, vc_ver=None, vc_min_ver=0):
         self.pi = PlatformInfo(arch)
         self.ri = RegistryInfo(self.pi)
         self.si = SystemInfo(self.ri, vc_ver)
@@ -961,9 +1163,9 @@ class EnvironmentInfo:
             arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
             paths += [r'Common7\IDE\CommonExtensions\Microsoft\TestWindow']
             paths += [r'Team Tools\Performance Tools']
-            paths += [rf'Team Tools\Performance Tools{arch_subdir}']
+            paths += [r'Team Tools\Performance Tools%s' % arch_subdir]
 
-        return [os.path.join(self.si.VSInstallDir, path) for path in paths]
+        return [join(self.si.VSInstallDir, path) for path in paths]
 
     @property
     def VCIncludes(self):
@@ -975,10 +1177,8 @@ class EnvironmentInfo:
         list of str
             paths
         """
-        return [
-            os.path.join(self.si.VCInstallDir, 'Include'),
-            os.path.join(self.si.VCInstallDir, r'ATLMFC\Include'),
-        ]
+        return [join(self.si.VCInstallDir, 'Include'),
+                join(self.si.VCInstallDir, r'ATLMFC\Include')]
 
     @property
     def VCLibraries(self):
@@ -994,12 +1194,12 @@ class EnvironmentInfo:
             arch_subdir = self.pi.target_dir(x64=True)
         else:
             arch_subdir = self.pi.target_dir(hidex86=True)
-        paths = [f'Lib{arch_subdir}', rf'ATLMFC\Lib{arch_subdir}']
+        paths = ['Lib%s' % arch_subdir, r'ATLMFC\Lib%s' % arch_subdir]
 
         if self.vs_ver >= 14.0:
-            paths += [rf'Lib\store{arch_subdir}']
+            paths += [r'Lib\store%s' % arch_subdir]
 
-        return [os.path.join(self.si.VCInstallDir, path) for path in paths]
+        return [join(self.si.VCInstallDir, path) for path in paths]
 
     @property
     def VCStoreRefs(self):
@@ -1013,7 +1213,7 @@ class EnvironmentInfo:
         """
         if self.vs_ver < 14.0:
             return []
-        return [os.path.join(self.si.VCInstallDir, r'Lib\store\references')]
+        return [join(self.si.VCInstallDir, r'Lib\store\references')]
 
     @property
     def VCTools(self):
@@ -1024,45 +1224,31 @@ class EnvironmentInfo:
         ------
         list of str
             paths
-
-        When host CPU is ARM, the tools should be found for ARM.
-
-        >>> getfixture('windows_only')
-        >>> mp = getfixture('monkeypatch')
-        >>> mp.setattr(PlatformInfo, 'current_cpu', 'arm64')
-        >>> ei = EnvironmentInfo(arch='irrelevant')
-        >>> paths = ei.VCTools
-        >>> any('HostARM64' in path for path in paths)
-        True
         """
         si = self.si
-        tools = [os.path.join(si.VCInstallDir, 'VCPackages')]
+        tools = [join(si.VCInstallDir, 'VCPackages')]
 
         forcex86 = True if self.vs_ver <= 10.0 else False
         arch_subdir = self.pi.cross_dir(forcex86)
         if arch_subdir:
-            tools += [os.path.join(si.VCInstallDir, f'Bin{arch_subdir}')]
+            tools += [join(si.VCInstallDir, 'Bin%s' % arch_subdir)]
 
         if self.vs_ver == 14.0:
-            path = f'Bin{self.pi.current_dir(hidex86=True)}'
-            tools += [os.path.join(si.VCInstallDir, path)]
+            path = 'Bin%s' % self.pi.current_dir(hidex86=True)
+            tools += [join(si.VCInstallDir, path)]
 
         elif self.vs_ver >= 15.0:
-            host_id = self.pi.current_cpu.replace('amd64', 'x64').upper()
-            host_dir = os.path.join('bin', f'Host{host_id}%s')
-            tools += [
-                os.path.join(si.VCInstallDir, host_dir % self.pi.target_dir(x64=True))
-            ]
+            host_dir = (r'bin\HostX86%s' if self.pi.current_is_x86() else
+                        r'bin\HostX64%s')
+            tools += [join(
+                si.VCInstallDir, host_dir % self.pi.target_dir(x64=True))]
 
             if self.pi.current_cpu != self.pi.target_cpu:
-                tools += [
-                    os.path.join(
-                        si.VCInstallDir, host_dir % self.pi.current_dir(x64=True)
-                    )
-                ]
+                tools += [join(
+                    si.VCInstallDir, host_dir % self.pi.current_dir(x64=True))]
 
         else:
-            tools += [os.path.join(si.VCInstallDir, 'Bin')]
+            tools += [join(si.VCInstallDir, 'Bin')]
 
         return tools
 
@@ -1078,13 +1264,13 @@ class EnvironmentInfo:
         """
         if self.vs_ver <= 10.0:
             arch_subdir = self.pi.target_dir(hidex86=True, x64=True)
-            return [os.path.join(self.si.WindowsSdkDir, f'Lib{arch_subdir}')]
+            return [join(self.si.WindowsSdkDir, 'Lib%s' % arch_subdir)]
 
         else:
             arch_subdir = self.pi.target_dir(x64=True)
-            lib = os.path.join(self.si.WindowsSdkDir, 'lib')
+            lib = join(self.si.WindowsSdkDir, 'lib')
             libver = self._sdk_subdir
-            return [os.path.join(lib, f'{libver}um{arch_subdir}')]
+            return [join(lib, '%sum%s' % (libver, arch_subdir))]
 
     @property
     def OSIncludes(self):
@@ -1096,21 +1282,19 @@ class EnvironmentInfo:
         list of str
             paths
         """
-        include = os.path.join(self.si.WindowsSdkDir, 'include')
+        include = join(self.si.WindowsSdkDir, 'include')
 
         if self.vs_ver <= 10.0:
-            return [include, os.path.join(include, 'gl')]
+            return [include, join(include, 'gl')]
 
         else:
             if self.vs_ver >= 14.0:
                 sdkver = self._sdk_subdir
             else:
                 sdkver = ''
-            return [
-                os.path.join(include, f'{sdkver}shared'),
-                os.path.join(include, f'{sdkver}um'),
-                os.path.join(include, f'{sdkver}winrt'),
-            ]
+            return [join(include, '%sshared' % sdkver),
+                    join(include, '%sum' % sdkver),
+                    join(include, '%swinrt' % sdkver)]
 
     @property
     def OSLibpath(self):
@@ -1122,33 +1306,29 @@ class EnvironmentInfo:
         list of str
             paths
         """
-        ref = os.path.join(self.si.WindowsSdkDir, 'References')
+        ref = join(self.si.WindowsSdkDir, 'References')
         libpath = []
 
         if self.vs_ver <= 9.0:
             libpath += self.OSLibraries
 
         if self.vs_ver >= 11.0:
-            libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')]
+            libpath += [join(ref, r'CommonConfiguration\Neutral')]
 
         if self.vs_ver >= 14.0:
             libpath += [
                 ref,
-                os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                os.path.join(ref, 'Windows.Foundation.UniversalApiContract', '1.0.0.0'),
-                os.path.join(ref, 'Windows.Foundation.FoundationContract', '1.0.0.0'),
-                os.path.join(
-                    ref, 'Windows.Networking.Connectivity.WwanContract', '1.0.0.0'
-                ),
-                os.path.join(
-                    self.si.WindowsSdkDir,
-                    'ExtensionSDKs',
-                    'Microsoft.VCLibs',
-                    f'{self.vs_ver:0.1f}',
-                    'References',
-                    'CommonConfiguration',
-                    'neutral',
-                ),
+                join(self.si.WindowsSdkDir, 'UnionMetadata'),
+                join(
+                    ref, 'Windows.Foundation.UniversalApiContract', '1.0.0.0'),
+                join(ref, 'Windows.Foundation.FoundationContract', '1.0.0.0'),
+                join(
+                    ref, 'Windows.Networking.Connectivity.WwanContract',
+                    '1.0.0.0'),
+                join(
+                    self.si.WindowsSdkDir, 'ExtensionSDKs', 'Microsoft.VCLibs',
+                    '%0.1f' % self.vs_ver, 'References', 'CommonConfiguration',
+                    'neutral'),
             ]
         return libpath
 
@@ -1175,26 +1355,26 @@ class EnvironmentInfo:
         """
         if self.vs_ver < 15.0:
             bin_dir = 'Bin' if self.vs_ver <= 11.0 else r'Bin\x86'
-            yield os.path.join(self.si.WindowsSdkDir, bin_dir)
+            yield join(self.si.WindowsSdkDir, bin_dir)
 
         if not self.pi.current_is_x86():
             arch_subdir = self.pi.current_dir(x64=True)
-            path = f'Bin{arch_subdir}'
-            yield os.path.join(self.si.WindowsSdkDir, path)
+            path = 'Bin%s' % arch_subdir
+            yield join(self.si.WindowsSdkDir, path)
 
         if self.vs_ver in (10.0, 11.0):
             if self.pi.target_is_x86():
                 arch_subdir = ''
             else:
                 arch_subdir = self.pi.current_dir(hidex86=True, x64=True)
-            path = rf'Bin\NETFX 4.0 Tools{arch_subdir}'
-            yield os.path.join(self.si.WindowsSdkDir, path)
+            path = r'Bin\NETFX 4.0 Tools%s' % arch_subdir
+            yield join(self.si.WindowsSdkDir, path)
 
         elif self.vs_ver >= 15.0:
-            path = os.path.join(self.si.WindowsSdkDir, 'Bin')
+            path = join(self.si.WindowsSdkDir, 'Bin')
             arch_subdir = self.pi.current_dir(x64=True)
             sdkver = self.si.WindowsSdkLastVersion
-            yield os.path.join(path, f'{sdkver}{arch_subdir}')
+            yield join(path, '%s%s' % (sdkver, arch_subdir))
 
         if self.si.WindowsSDKExecutablePath:
             yield self.si.WindowsSDKExecutablePath
@@ -1210,7 +1390,7 @@ class EnvironmentInfo:
             subdir
         """
         ucrtver = self.si.WindowsSdkLastVersion
-        return (f'{ucrtver}\\') if ucrtver else ''
+        return ('%s\\' % ucrtver) if ucrtver else ''
 
     @property
     def SdkSetup(self):
@@ -1225,7 +1405,7 @@ class EnvironmentInfo:
         if self.vs_ver > 9.0:
             return []
 
-        return [os.path.join(self.si.WindowsSdkDir, 'Setup')]
+        return [join(self.si.WindowsSdkDir, 'Setup')]
 
     @property
     def FxTools(self):
@@ -1249,13 +1429,11 @@ class EnvironmentInfo:
 
         tools = []
         if include32:
-            tools += [
-                os.path.join(si.FrameworkDir32, ver) for ver in si.FrameworkVersion32
-            ]
+            tools += [join(si.FrameworkDir32, ver)
+                      for ver in si.FrameworkVersion32]
         if include64:
-            tools += [
-                os.path.join(si.FrameworkDir64, ver) for ver in si.FrameworkVersion64
-            ]
+            tools += [join(si.FrameworkDir64, ver)
+                      for ver in si.FrameworkVersion64]
         return tools
 
     @property
@@ -1272,7 +1450,7 @@ class EnvironmentInfo:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
-        return [os.path.join(self.si.NetFxSdkDir, rf'lib\um{arch_subdir}')]
+        return [join(self.si.NetFxSdkDir, r'lib\um%s' % arch_subdir)]
 
     @property
     def NetFxSDKIncludes(self):
@@ -1287,7 +1465,7 @@ class EnvironmentInfo:
         if self.vs_ver < 14.0 or not self.si.NetFxSdkDir:
             return []
 
-        return [os.path.join(self.si.NetFxSdkDir, r'include\um')]
+        return [join(self.si.NetFxSdkDir, r'include\um')]
 
     @property
     def VsTDb(self):
@@ -1299,7 +1477,7 @@ class EnvironmentInfo:
         list of str
             paths
         """
-        return [os.path.join(self.si.VSInstallDir, r'VSTSDB\Deploy')]
+        return [join(self.si.VSInstallDir, r'VSTSDB\Deploy')]
 
     @property
     def MSBuild(self):
@@ -1320,12 +1498,12 @@ class EnvironmentInfo:
             base_path = self.si.VSInstallDir
             arch_subdir = ''
 
-        path = rf'MSBuild\{self.vs_ver:0.1f}\bin{arch_subdir}'
-        build = [os.path.join(base_path, path)]
+        path = r'MSBuild\%0.1f\bin%s' % (self.vs_ver, arch_subdir)
+        build = [join(base_path, path)]
 
         if self.vs_ver >= 15.0:
             # Add Roslyn C# & Visual Basic Compiler
-            build += [os.path.join(base_path, path, 'Roslyn')]
+            build += [join(base_path, path, 'Roslyn')]
 
         return build
 
@@ -1342,7 +1520,7 @@ class EnvironmentInfo:
         if self.vs_ver < 11.0:
             return []
 
-        return [os.path.join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
+        return [join(self.si.ProgramFilesx86, 'HTML Help Workshop')]
 
     @property
     def UCRTLibraries(self):
@@ -1358,9 +1536,9 @@ class EnvironmentInfo:
             return []
 
         arch_subdir = self.pi.target_dir(x64=True)
-        lib = os.path.join(self.si.UniversalCRTSdkDir, 'lib')
+        lib = join(self.si.UniversalCRTSdkDir, 'lib')
         ucrtver = self._ucrt_subdir
-        return [os.path.join(lib, f'{ucrtver}ucrt{arch_subdir}')]
+        return [join(lib, '%sucrt%s' % (ucrtver, arch_subdir))]
 
     @property
     def UCRTIncludes(self):
@@ -1375,8 +1553,8 @@ class EnvironmentInfo:
         if self.vs_ver < 14.0:
             return []
 
-        include = os.path.join(self.si.UniversalCRTSdkDir, 'include')
-        return [os.path.join(include, f'{self._ucrt_subdir}ucrt')]
+        include = join(self.si.UniversalCRTSdkDir, 'include')
+        return [join(include, '%sucrt' % self._ucrt_subdir)]
 
     @property
     def _ucrt_subdir(self):
@@ -1389,7 +1567,7 @@ class EnvironmentInfo:
             subdir
         """
         ucrtver = self.si.UniversalCRTSdkLastVersion
-        return (f'{ucrtver}\\') if ucrtver else ''
+        return ('%s\\' % ucrtver) if ucrtver else ''
 
     @property
     def FSharp(self):
@@ -1407,41 +1585,41 @@ class EnvironmentInfo:
         return [self.si.FSharpInstallDir]
 
     @property
-    def VCRuntimeRedist(self) -> str | None:
+    def VCRuntimeRedist(self):
         """
         Microsoft Visual C++ runtime redistributable dll.
 
-        Returns the first suitable path found or None.
+        Return
+        ------
+        str
+            path
         """
-        vcruntime = f'vcruntime{self.vc_ver}0.dll'
+        vcruntime = 'vcruntime%d0.dll' % self.vc_ver
         arch_subdir = self.pi.target_dir(x64=True).strip('\\')
 
         # Installation prefixes candidates
         prefixes = []
         tools_path = self.si.VCInstallDir
-        redist_path = os.path.dirname(tools_path.replace(r'\Tools', r'\Redist'))
-        if os.path.isdir(redist_path):
+        redist_path = dirname(tools_path.replace(r'\Tools', r'\Redist'))
+        if isdir(redist_path):
             # Redist version may not be exactly the same as tools
-            redist_path = os.path.join(redist_path, os.listdir(redist_path)[-1])
-            prefixes += [redist_path, os.path.join(redist_path, 'onecore')]
+            redist_path = join(redist_path, listdir(redist_path)[-1])
+            prefixes += [redist_path, join(redist_path, 'onecore')]
 
-        prefixes += [os.path.join(tools_path, 'redist')]  # VS14 legacy path
+        prefixes += [join(tools_path, 'redist')]  # VS14 legacy path
 
         # CRT directory
-        crt_dirs = (
-            f'Microsoft.VC{self.vc_ver * 10}.CRT',
-            # Sometime store in directory with VS version instead of VC
-            f'Microsoft.VC{int(self.vs_ver) * 10}.CRT',
-        )
+        crt_dirs = ('Microsoft.VC%d.CRT' % (self.vc_ver * 10),
+                    # Sometime store in directory with VS version instead of VC
+                    'Microsoft.VC%d.CRT' % (int(self.vs_ver) * 10))
 
         # vcruntime path
-        candidate_paths = (
-            os.path.join(prefix, arch_subdir, crt_dir, vcruntime)
-            for (prefix, crt_dir) in itertools.product(prefixes, crt_dirs)
-        )
-        return next(filter(os.path.isfile, candidate_paths), None)  # type: ignore[arg-type] #python/mypy#12682
+        for prefix, crt_dir in itertools.product(prefixes, crt_dirs):
+            path = join(prefix, arch_subdir, crt_dir, vcruntime)
+            if isfile(path):
+                return path
 
-    def return_env(self, exists: bool = True) -> _EnvironmentDict:
+    def return_env(self, exists=True):
         """
         Return environment dict.
 
@@ -1455,50 +1633,39 @@ class EnvironmentInfo:
         dict
             environment
         """
-        env = _EnvironmentDict(
-            include=self._build_paths(
-                'include',
-                [
-                    self.VCIncludes,
-                    self.OSIncludes,
-                    self.UCRTIncludes,
-                    self.NetFxSDKIncludes,
-                ],
-                exists,
-            ),
-            lib=self._build_paths(
-                'lib',
-                [
-                    self.VCLibraries,
-                    self.OSLibraries,
-                    self.FxTools,
-                    self.UCRTLibraries,
-                    self.NetFxSDKLibraries,
-                ],
-                exists,
-            ),
-            libpath=self._build_paths(
-                'libpath',
-                [self.VCLibraries, self.FxTools, self.VCStoreRefs, self.OSLibpath],
-                exists,
-            ),
-            path=self._build_paths(
-                'path',
-                [
-                    self.VCTools,
-                    self.VSTools,
-                    self.VsTDb,
-                    self.SdkTools,
-                    self.SdkSetup,
-                    self.FxTools,
-                    self.MSBuild,
-                    self.HTMLHelpWorkshop,
-                    self.FSharp,
-                ],
-                exists,
-            ),
+        env = dict(
+            include=self._build_paths('include',
+                                      [self.VCIncludes,
+                                       self.OSIncludes,
+                                       self.UCRTIncludes,
+                                       self.NetFxSDKIncludes],
+                                      exists),
+            lib=self._build_paths('lib',
+                                  [self.VCLibraries,
+                                   self.OSLibraries,
+                                   self.FxTools,
+                                   self.UCRTLibraries,
+                                   self.NetFxSDKLibraries],
+                                  exists),
+            libpath=self._build_paths('libpath',
+                                      [self.VCLibraries,
+                                       self.FxTools,
+                                       self.VCStoreRefs,
+                                       self.OSLibpath],
+                                      exists),
+            path=self._build_paths('path',
+                                   [self.VCTools,
+                                    self.VSTools,
+                                    self.VsTDb,
+                                    self.SdkTools,
+                                    self.SdkSetup,
+                                    self.FxTools,
+                                    self.MSBuild,
+                                    self.HTMLHelpWorkshop,
+                                    self.FSharp],
+                                   exists),
         )
-        if self.vs_ver >= 14 and self.VCRuntimeRedist:
+        if self.vs_ver >= 14 and isfile(self.VCRuntimeRedist):
             env['py_vcruntime_redist'] = self.VCRuntimeRedist
         return env
 
@@ -1526,11 +1693,11 @@ class EnvironmentInfo:
         """
         # flatten spec_path_lists
         spec_paths = itertools.chain.from_iterable(spec_path_lists)
-        env_paths = environ.get(name, '').split(os.pathsep)
+        env_paths = environ.get(name, '').split(pathsep)
         paths = itertools.chain(spec_paths, env_paths)
-        extant_paths = list(filter(os.path.isdir, paths)) if exists else paths
+        extant_paths = list(filter(isdir, paths)) if exists else paths
         if not extant_paths:
-            msg = f"{name.upper()} environment variable is empty"
+            msg = "%s environment variable is empty" % name.upper()
             raise distutils.errors.DistutilsPlatformError(msg)
         unique_paths = unique_everseen(extant_paths)
-        return os.pathsep.join(unique_paths)
+        return pathsep.join(unique_paths)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/namespaces.py b/server/.venv/lib/python3.11/site-packages/setuptools/namespaces.py
index 85ea2eb..44939e1 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/namespaces.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/namespaces.py
@@ -1,21 +1,21 @@
-import itertools
 import os
-
-from .compat import py312
-
 from distutils import log
+import itertools
+
 
 flatten = itertools.chain.from_iterable
 
 
 class Installer:
+
     nspkg_ext = '-nspkg.pth'
 
-    def install_namespaces(self) -> None:
+    def install_namespaces(self):
         nsp = self._get_all_ns_packages()
         if not nsp:
             return
-        filename = self._get_nspkg_file()
+        filename, ext = os.path.splitext(self._get_target())
+        filename += self.nspkg_ext
         self.outputs.append(filename)
         log.info("Installing %s", filename)
         lines = map(self._gen_nspkg_line, nsp)
@@ -25,44 +25,45 @@ class Installer:
             list(lines)
             return
 
-        with open(filename, 'wt', encoding=py312.PTH_ENCODING) as f:
-            # Python<3.13 requires encoding="locale" instead of "utf-8"
-            # See: python/cpython#77102
+        with open(filename, 'wt') as f:
             f.writelines(lines)
 
-    def uninstall_namespaces(self) -> None:
-        filename = self._get_nspkg_file()
+    def uninstall_namespaces(self):
+        filename, ext = os.path.splitext(self._get_target())
+        filename += self.nspkg_ext
         if not os.path.exists(filename):
             return
         log.info("Removing %s", filename)
         os.remove(filename)
 
-    def _get_nspkg_file(self):
-        filename, _ = os.path.splitext(self._get_target())
-        return filename + self.nspkg_ext
-
     def _get_target(self):
         return self.target
 
     _nspkg_tmpl = (
         "import sys, types, os",
+        "has_mfs = sys.version_info > (3, 5)",
         "p = os.path.join(%(root)s, *%(pth)r)",
-        "importlib = __import__('importlib.util')",
-        "__import__('importlib.machinery')",
+        "importlib = has_mfs and __import__('importlib.util')",
+        "has_mfs and __import__('importlib.machinery')",
         (
-            "m = "
+            "m = has_mfs and "
             "sys.modules.setdefault(%(pkg)r, "
             "importlib.util.module_from_spec("
             "importlib.machinery.PathFinder.find_spec(%(pkg)r, "
             "[os.path.dirname(p)])))"
         ),
-        ("m = m or sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))"),
+        (
+            "m = m or "
+            "sys.modules.setdefault(%(pkg)r, types.ModuleType(%(pkg)r))"
+        ),
         "mp = (m or []) and m.__dict__.setdefault('__path__',[])",
         "(p not in mp) and mp.append(p)",
     )
     "lines for the namespace installer"
 
-    _nspkg_tmpl_multi = ('m and setattr(sys.modules[%(parent)r], %(child)r, m)',)
+    _nspkg_tmpl_multi = (
+        'm and setattr(sys.modules[%(parent)r], %(child)r, m)',
+    )
     "additional line(s) when a parent package is indicated"
 
     def _get_root(self):
@@ -80,7 +81,7 @@ class Installer:
     def _get_all_ns_packages(self):
         """Return sorted list of all package namespaces"""
         pkgs = self.distribution.namespace_packages or []
-        return sorted(set(flatten(map(self._pkg_names, pkgs))))
+        return sorted(flatten(map(self._pkg_names, pkgs)))
 
     @staticmethod
     def _pkg_names(pkg):
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/package_index.py b/server/.venv/lib/python3.11/site-packages/setuptools/package_index.py
index 3500c2d..14881d2 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/package_index.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/package_index.py
@@ -1,52 +1,34 @@
-"""PyPI and direct package downloading."""
-
-from __future__ import annotations
-
-import base64
-import configparser
-import hashlib
-import html
-import http.client
-import io
-import itertools
+"""PyPI and direct package downloading"""
+import sys
 import os
 import re
+import io
 import shutil
 import socket
-import subprocess
-import sys
-import urllib.error
+import base64
+import hashlib
+import itertools
+import warnings
+import configparser
+import html
+import http.client
 import urllib.parse
 import urllib.request
-from fnmatch import translate
+import urllib.error
 from functools import wraps
-from typing import NamedTuple
-
-from more_itertools import unique_everseen
 
 import setuptools
 from pkg_resources import (
-    BINARY_DIST,
-    CHECKOUT_DIST,
-    DEVELOP_DIST,
-    EGG_DIST,
-    SOURCE_DIST,
-    Distribution,
-    Environment,
-    Requirement,
-    find_distributions,
-    normalize_path,
-    parse_version,
-    safe_name,
-    safe_version,
-    to_filename,
+    CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
+    Environment, find_distributions, safe_name, safe_version,
+    to_filename, Requirement, DEVELOP_DIST, EGG_DIST, parse_version,
 )
-from setuptools.wheel import Wheel
-
-from .unicode_utils import _cfg_read_utf8_with_fallback, _read_utf8_with_fallback
-
 from distutils import log
 from distutils.errors import DistutilsError
+from fnmatch import translate
+from setuptools.wheel import Wheel
+from setuptools.extern.more_itertools import unique_everseen
+
 
 EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.+!]+)$')
 HREF = re.compile(r"""href\s*=\s*['"]?([^'"> ]+)""", re.I)
@@ -58,15 +40,15 @@ URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):', re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
 
 __all__ = [
-    'PackageIndex',
-    'distros_for_url',
-    'parse_bdist_wininst',
+    'PackageIndex', 'distros_for_url', 'parse_bdist_wininst',
     'interpret_distro_name',
 ]
 
 _SOCKET_TIMEOUT = 15
 
-user_agent = f"setuptools/{setuptools.__version__} Python-urllib/{sys.version_info.major}.{sys.version_info.minor}"
+_tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
+user_agent = _tmpl.format(
+    py_major='{}.{}'.format(*sys.version_info), setuptools=setuptools)
 
 
 def parse_requirement_arg(spec):
@@ -74,7 +56,7 @@ def parse_requirement_arg(spec):
         return Requirement.parse(spec)
     except ValueError as e:
         raise DistutilsError(
-            f"Not a URL, existing file, or requirement spec: {spec!r}"
+            "Not a URL, existing file, or requirement spec: %r" % (spec,)
         ) from e
 
 
@@ -104,7 +86,7 @@ def parse_bdist_wininst(name):
 
 def egg_info_for_url(url):
     parts = urllib.parse.urlparse(url)
-    _scheme, server, path, _parameters, _query, fragment = parts
+    scheme, server, path, parameters, query, fragment = parts
     base = urllib.parse.unquote(path.split('/')[-1])
     if server == 'sourceforge.net' and base == 'download':  # XXX Yuck
         base = urllib.parse.unquote(path.split('/')[-2])
@@ -116,13 +98,15 @@ def egg_info_for_url(url):
 def distros_for_url(url, metadata=None):
     """Yield egg or source distribution objects that might be found at a URL"""
     base, fragment = egg_info_for_url(url)
-    yield from distros_for_location(url, base, metadata)
+    for dist in distros_for_location(url, base, metadata):
+        yield dist
     if fragment:
         match = EGG_FRAGMENT.match(fragment)
         if match:
-            yield from interpret_distro_name(
+            for dist in interpret_distro_name(
                 url, match.group(1), metadata, precedence=CHECKOUT_DIST
-            )
+            ):
+                yield dist
 
 
 def distros_for_location(location, basename, metadata=None):
@@ -136,15 +120,13 @@ def distros_for_location(location, basename, metadata=None):
         wheel = Wheel(basename)
         if not wheel.is_compatible():
             return []
-        return [
-            Distribution(
-                location=location,
-                project_name=wheel.project_name,
-                version=wheel.version,
-                # Increase priority over eggs.
-                precedence=EGG_DIST + 1,
-            )
-        ]
+        return [Distribution(
+            location=location,
+            project_name=wheel.project_name,
+            version=wheel.version,
+            # Increase priority over eggs.
+            precedence=EGG_DIST + 1,
+        )]
     if basename.endswith('.exe'):
         win_base, py_ver, platform = parse_bdist_wininst(basename)
         if win_base is not None:
@@ -155,7 +137,7 @@ def distros_for_location(location, basename, metadata=None):
     #
     for ext in EXTENSIONS:
         if basename.endswith(ext):
-            basename = basename[: -len(ext)]
+            basename = basename[:-len(ext)]
             return interpret_distro_name(location, basename, metadata)
     return []  # no extension matched
 
@@ -168,37 +150,38 @@ def distros_for_filename(filename, metadata=None):
 
 
 def interpret_distro_name(
-    location, basename, metadata, py_version=None, precedence=SOURCE_DIST, platform=None
+        location, basename, metadata, py_version=None, precedence=SOURCE_DIST,
+        platform=None
 ):
-    """Generate the interpretation of a source distro name
+    """Generate alternative interpretations of a source distro name
 
     Note: if `location` is a filesystem filename, you should call
     ``pkg_resources.normalize_path()`` on it before passing it to this
     routine!
     """
+    # Generate alternative interpretations of a source distro name
+    # Because some packages are ambiguous as to name/versions split
+    # e.g. "adns-python-1.1.0", "egenix-mx-commercial", etc.
+    # So, we generate each possible interpretation (e.g. "adns, python-1.1.0"
+    # "adns-python, 1.1.0", and "adns-python-1.1.0, no version").  In practice,
+    # the spurious interpretations should be ignored, because in the event
+    # there's also an "adns" package, the spurious "python-1.1.0" version will
+    # compare lower than any numeric version number, and is therefore unlikely
+    # to match a request for it.  It's still a potential problem, though, and
+    # in the long run PyPI and the distutils should go for "safe" names and
+    # versions in distribution archive names (sdist and bdist).
 
     parts = basename.split('-')
     if not py_version and any(re.match(r'py\d\.\d$', p) for p in parts[2:]):
         # it is a bdist_dumb, not an sdist -- bail out
         return
 
-    # find the pivot (p) that splits the name from the version.
-    # infer the version as the first item that has a digit.
-    for p in range(len(parts)):
-        if parts[p][:1].isdigit():
-            break
-    else:
-        p = len(parts)
-
-    yield Distribution(
-        location,
-        metadata,
-        '-'.join(parts[:p]),
-        '-'.join(parts[p:]),
-        py_version=py_version,
-        precedence=precedence,
-        platform=platform,
-    )
+    for p in range(1, len(parts) + 1):
+        yield Distribution(
+            location, metadata, '-'.join(parts[:p]), '-'.join(parts[p:]),
+            py_version=py_version, precedence=precedence,
+            platform=platform
+        )
 
 
 def unique_values(func):
@@ -214,10 +197,8 @@ def unique_values(func):
     return wrapper
 
 
-REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", re.I)
-"""
-Regex for an HTML tag with 'rel="val"' attributes.
-"""
+REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I)
+# this line is here to fix emacs' cruddy broken syntax highlighting
 
 
 @unique_values
@@ -270,7 +251,7 @@ class HashChecker(ContentChecker):
         r'(?P[a-f0-9]+)'
     )
 
-    def __init__(self, hash_name, expected) -> None:
+    def __init__(self, hash_name, expected):
         self.hash_name = hash_name
         self.hash = hashlib.new(hash_name)
         self.expected = expected
@@ -301,21 +282,16 @@ class PackageIndex(Environment):
     """A distribution index that scans web pages for download URLs"""
 
     def __init__(
-        self,
-        index_url: str = "https://pypi.org/simple/",
-        hosts=('*',),
-        ca_bundle=None,
-        verify_ssl: bool = True,
-        *args,
-        **kw,
-    ) -> None:
+            self, index_url="https://pypi.org/simple/", hosts=('*',),
+            ca_bundle=None, verify_ssl=True, *args, **kw
+    ):
         super().__init__(*args, **kw)
-        self.index_url = index_url + "/"[: not index_url.endswith('/')]
-        self.scanned_urls: dict = {}
-        self.fetched_urls: dict = {}
-        self.package_pages: dict = {}
+        self.index_url = index_url + "/" [:not index_url.endswith('/')]
+        self.scanned_urls = {}
+        self.fetched_urls = {}
+        self.package_pages = {}
         self.allows = re.compile('|'.join(map(translate, hosts))).match
-        self.to_scan: list = []
+        self.to_scan = []
         self.opener = urllib.request.urlopen
 
     def add(self, dist):
@@ -323,11 +299,11 @@ class PackageIndex(Environment):
         try:
             parse_version(dist.version)
         except Exception:
-            return None
+            return
         return super().add(dist)
 
     # FIXME: 'PackageIndex.process_url' is too complex (14)
-    def process_url(self, url, retrieve: bool = False) -> None:  # noqa: C901
+    def process_url(self, url, retrieve=False):  # noqa: C901
         """Evaluate a URL as a possible download, and maybe retrieve it"""
         if url in self.scanned_urls and not retrieve:
             return
@@ -357,7 +333,7 @@ class PackageIndex(Environment):
         if f is None:
             return
         if isinstance(f, urllib.error.HTTPError) and f.code == 401:
-            self.info(f"Authentication error: {f.msg}")
+            self.info("Authentication error: %s" % f.msg)
         self.fetched_urls[f.url] = True
         if 'html' not in f.headers.get('content-type', '').lower():
             f.close()  # not html, we can't process it
@@ -380,7 +356,7 @@ class PackageIndex(Environment):
         if url.startswith(self.index_url) and getattr(f, 'code', None) != 404:
             page = self.process_index(url, page)
 
-    def process_filename(self, fn, nested: bool = False) -> None:
+    def process_filename(self, fn, nested=False):
         # process filenames or directories
         if not os.path.exists(fn):
             self.warn("Not found: %s", fn)
@@ -396,23 +372,20 @@ class PackageIndex(Environment):
             self.debug("Found: %s", fn)
             list(map(self.add, dists))
 
-    def url_ok(self, url, fatal: bool = False) -> bool:
+    def url_ok(self, url, fatal=False):
         s = URL_SCHEME(url)
         is_file = s and s.group(1).lower() == 'file'
         if is_file or self.allows(urllib.parse.urlparse(url)[1]):
             return True
         msg = (
             "\nNote: Bypassing %s (disallowed host; see "
-            "https://setuptools.pypa.io/en/latest/deprecated/"
-            "easy_install.html#restricting-downloads-with-allow-hosts for details).\n"
-        )
+            "http://bit.ly/2hrImnY for details).\n")
         if fatal:
             raise DistutilsError(msg % url)
         else:
             self.warn(msg, url)
-            return False
 
-    def scan_egg_links(self, search_path) -> None:
+    def scan_egg_links(self, search_path):
         dirs = filter(os.path.isdir, search_path)
         egg_links = (
             (path, entry)
@@ -422,16 +395,16 @@ class PackageIndex(Environment):
         )
         list(itertools.starmap(self.scan_egg_link, egg_links))
 
-    def scan_egg_link(self, path, entry) -> None:
-        content = _read_utf8_with_fallback(os.path.join(path, entry))
-        # filter non-empty lines
-        lines = list(filter(None, map(str.strip, content.splitlines())))
+    def scan_egg_link(self, path, entry):
+        with open(os.path.join(path, entry)) as raw_lines:
+            # filter non-empty lines
+            lines = list(filter(None, map(str.strip, raw_lines)))
 
         if len(lines) != 2:
             # format is not recognized; punt
             return
 
-        egg_path, _setup_path = lines
+        egg_path, setup_path = lines
 
         for dist in find_distributions(os.path.join(path, egg_path)):
             dist.location = os.path.join(path, *lines)
@@ -444,7 +417,9 @@ class PackageIndex(Environment):
         if not link.startswith(self.index_url):
             return NO_MATCH_SENTINEL
 
-        parts = list(map(urllib.parse.unquote, link[len(self.index_url) :].split('/')))
+        parts = list(map(
+            urllib.parse.unquote, link[len(self.index_url):].split('/')
+        ))
         if len(parts) != 2 or '#' in parts[1]:
             return NO_MATCH_SENTINEL
 
@@ -474,30 +449,31 @@ class PackageIndex(Environment):
             base, frag = egg_info_for_url(new_url)
             if base.endswith('.py') and not frag:
                 if ver:
-                    new_url += f'#egg={pkg}-{ver}'
+                    new_url += '#egg=%s-%s' % (pkg, ver)
                 else:
                     self.need_version_info(url)
             self.scan_url(new_url)
 
         return PYPI_MD5.sub(
-            lambda m: '{}'.format(*m.group(1, 3, 2)), page
+            lambda m: '%s' % m.group(1, 3, 2), page
         )
 
-    def need_version_info(self, url) -> None:
+    def need_version_info(self, url):
         self.scan_all(
             "Page at %s links to .py file(s) without version info; an index "
-            "scan is required.",
-            url,
+            "scan is required.", url
         )
 
-    def scan_all(self, msg=None, *args) -> None:
+    def scan_all(self, msg=None, *args):
         if self.index_url not in self.fetched_urls:
             if msg:
                 self.warn(msg, *args)
-            self.info("Scanning index of all packages (this may take a while)")
+            self.info(
+                "Scanning index of all packages (this may take a while)"
+            )
         self.scan_url(self.index_url)
 
-    def find_packages(self, requirement) -> None:
+    def find_packages(self, requirement):
         self.scan_url(self.index_url + requirement.unsafe_name + '/')
 
         if not self.package_pages.get(requirement.key):
@@ -519,22 +495,25 @@ class PackageIndex(Environment):
             if dist in requirement:
                 return dist
             self.debug("%s does not match %s", requirement, dist)
-        return super().obtain(requirement, installer)
+        return super(PackageIndex, self).obtain(requirement, installer)
 
-    def check_hash(self, checker, filename, tfp) -> None:
+    def check_hash(self, checker, filename, tfp):
         """
         checker is a ContentChecker
         """
-        checker.report(self.debug, f"Validating %s checksum for {filename}")
+        checker.report(
+            self.debug,
+            "Validating %%s checksum for %s" % filename)
         if not checker.is_valid():
             tfp.close()
             os.unlink(filename)
             raise DistutilsError(
-                f"{checker.hash.name} validation failed for {os.path.basename(filename)}; "
+                "%s validation failed for %s; "
                 "possible download problem?"
+                % (checker.hash.name, os.path.basename(filename))
             )
 
-    def add_find_links(self, urls) -> None:
+    def add_find_links(self, urls):
         """Add `urls` to the list that will be prescanned for searches"""
         for url in urls:
             if (
@@ -555,11 +534,13 @@ class PackageIndex(Environment):
             list(map(self.scan_url, self.to_scan))
         self.to_scan = None  # from now on, go ahead and process immediately
 
-    def not_found_in_index(self, requirement) -> None:
+    def not_found_in_index(self, requirement):
         if self[requirement.key]:  # we've seen at least one distro
             meth, msg = self.info, "Couldn't retrieve index page for %r"
         else:  # no distros seen for this name, might be misspelled
-            meth, msg = self.warn, "Couldn't find index page for %r (maybe misspelled?)"
+            meth, msg = (
+                self.warn,
+                "Couldn't find index page for %r (maybe misspelled?)")
         meth(msg, requirement.unsafe_name)
         self.scan_all()
 
@@ -585,7 +566,7 @@ class PackageIndex(Environment):
             scheme = URL_SCHEME(spec)
             if scheme:
                 # It's a url, download it to tmpdir
-                found = self._download_url(spec, tmpdir)
+                found = self._download_url(scheme.group(1), spec, tmpdir)
                 base, fragment = egg_info_for_url(spec)
                 if base.endswith('.py'):
                     found = self.gen_setup(found, fragment, tmpdir)
@@ -598,14 +579,8 @@ class PackageIndex(Environment):
         return getattr(self.fetch_distribution(spec, tmpdir), 'location', None)
 
     def fetch_distribution(  # noqa: C901  # is too complex (14)  # FIXME
-        self,
-        requirement,
-        tmpdir,
-        force_scan: bool = False,
-        source: bool = False,
-        develop_ok: bool = False,
-        local_index=None,
-    ) -> Distribution | None:
+            self, requirement, tmpdir, force_scan=False, source=False,
+            develop_ok=False, local_index=None):
         """Obtain a distribution suitable for fulfilling `requirement`
 
         `requirement` must be a ``pkg_resources.Requirement`` instance.
@@ -624,33 +599,34 @@ class PackageIndex(Environment):
         """
         # process a Requirement
         self.info("Searching for %s", requirement)
-        skipped = set()
+        skipped = {}
         dist = None
 
-        def find(req, env: Environment | None = None):
+        def find(req, env=None):
             if env is None:
                 env = self
             # Find a matching distribution; may be called more than once
 
             for dist in env[req.key]:
+
                 if dist.precedence == DEVELOP_DIST and not develop_ok:
                     if dist not in skipped:
                         self.warn(
-                            "Skipping development or system egg: %s",
-                            dist,
+                            "Skipping development or system egg: %s", dist,
                         )
-                        skipped.add(dist)
+                        skipped[dist] = 1
                     continue
 
-                test = dist in req and (dist.precedence <= SOURCE_DIST or not source)
+                test = (
+                    dist in req
+                    and (dist.precedence <= SOURCE_DIST or not source)
+                )
                 if test:
                     loc = self.download(dist.location, tmpdir)
                     dist.download_location = loc
                     if os.path.exists(dist.download_location):
                         return dist
 
-            return None
-
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
@@ -674,14 +650,11 @@ class PackageIndex(Environment):
                 (source and "a source distribution of " or ""),
                 requirement,
             )
-            return None
         else:
             self.info("Best match: %s", dist)
             return dist.clone(location=dist.download_location)
 
-    def fetch(
-        self, requirement, tmpdir, force_scan: bool = False, source: bool = False
-    ) -> str | None:
+    def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`
 
         DEPRECATED; use the ``fetch_distribution()`` method now instead.  For
@@ -696,15 +669,10 @@ class PackageIndex(Environment):
 
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
-        dists = (
-            match
-            and [
-                d
-                for d in interpret_distro_name(filename, match.group(1), None)
-                if d.version
-            ]
-            or []
-        )
+        dists = match and [
+            d for d in
+            interpret_distro_name(filename, match.group(1), None) if d.version
+        ] or []
 
         if len(dists) == 1:  # unambiguous ``#egg`` fragment
             basename = os.path.basename(filename)
@@ -716,18 +684,22 @@ class PackageIndex(Environment):
                     shutil.copy2(filename, dst)
                     filename = dst
 
-            with open(os.path.join(tmpdir, 'setup.py'), 'w', encoding="utf-8") as file:
+            with open(os.path.join(tmpdir, 'setup.py'), 'w') as file:
                 file.write(
                     "from setuptools import setup\n"
-                    f"setup(name={dists[0].project_name!r}, version={dists[0].version!r}, py_modules=[{os.path.splitext(basename)[0]!r}])\n"
+                    "setup(name=%r, version=%r, py_modules=[%r])\n"
+                    % (
+                        dists[0].project_name, dists[0].version,
+                        os.path.splitext(basename)[0]
+                    )
                 )
             return filename
 
         elif match:
             raise DistutilsError(
-                f"Can't unambiguously interpret project/version identifier {fragment!r}; "
+                "Can't unambiguously interpret project/version identifier %r; "
                 "any dashes in the name or version should be escaped using "
-                f"underscores. {dists!r}"
+                "underscores. %r" % (fragment, dists)
             )
         else:
             raise DistutilsError(
@@ -745,7 +717,9 @@ class PackageIndex(Environment):
             checker = HashChecker.from_url(url)
             fp = self.open_url(url)
             if isinstance(fp, urllib.error.HTTPError):
-                raise DistutilsError(f"Can't download {url}: {fp.code} {fp.msg}")
+                raise DistutilsError(
+                    "Can't download %s: %s %s" % (url, fp.code, fp.msg)
+                )
             headers = fp.info()
             blocknum = 0
             bs = self.dl_blocksize
@@ -771,7 +745,7 @@ class PackageIndex(Environment):
             if fp:
                 fp.close()
 
-    def reporthook(self, url, filename, blocknum, blksize, size) -> None:
+    def reporthook(self, url, filename, blocknum, blksize, size):
         pass  # no-op
 
     # FIXME:
@@ -785,192 +759,164 @@ class PackageIndex(Environment):
             if warning:
                 self.warn(warning, msg)
             else:
-                raise DistutilsError(f'{url} {msg}') from v
+                raise DistutilsError('%s %s' % (url, msg)) from v
         except urllib.error.HTTPError as v:
             return v
         except urllib.error.URLError as v:
             if warning:
                 self.warn(warning, v.reason)
             else:
-                raise DistutilsError(f"Download error for {url}: {v.reason}") from v
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v.reason)) from v
         except http.client.BadStatusLine as v:
             if warning:
                 self.warn(warning, v.line)
             else:
                 raise DistutilsError(
-                    f'{url} returned a bad status line. The server might be '
-                    f'down, {v.line}'
+                    '%s returned a bad status line. The server might be '
+                    'down, %s' %
+                    (url, v.line)
                 ) from v
-        except (http.client.HTTPException, OSError) as v:
+        except (http.client.HTTPException, socket.error) as v:
             if warning:
                 self.warn(warning, v)
             else:
-                raise DistutilsError(f"Download error for {url}: {v}") from v
+                raise DistutilsError("Download error for %s: %s"
+                                     % (url, v)) from v
 
-    @staticmethod
-    def _sanitize(name):
-        r"""
-        Replace unsafe path directives with underscores.
+    def _download_url(self, scheme, url, tmpdir):
+        # Determine download filename
+        #
+        name, fragment = egg_info_for_url(url)
+        if name:
+            while '..' in name:
+                name = name.replace('..', '.').replace('\\', '_')
+        else:
+            name = "__downloaded__"  # default if URL has no path contents
 
-        >>> san = PackageIndex._sanitize
-        >>> san('/home/user/.ssh/authorized_keys')
-        '_home_user_.ssh_authorized_keys'
-        >>> san('..\\foo\\bing')
-        '__foo_bing'
-        >>> san('D:bar')
-        'D_bar'
-        >>> san('C:\\bar')
-        'C__bar'
-        >>> san('foo..bar')
-        'foo..bar'
-        >>> san('D:../foo')
-        'D___foo'
-        """
-        pattern = '|'.join((
-            # drive letters
-            r':',
-            # path separators
-            r'[/\\]',
-            # parent dirs
-            r'(?:(?<=([/\\]|:))\.\.(?=[/\\]|$))|(?:^\.\.(?=[/\\]|$))',
-        ))
-        return re.sub(pattern, r'_', name)
+        if name.endswith('.egg.zip'):
+            name = name[:-4]  # strip the extra .zip before download
 
-    @classmethod
-    def _resolve_download_filename(cls, url, tmpdir):
-        """
-        >>> import pathlib
-        >>> du = PackageIndex._resolve_download_filename
-        >>> root = getfixture('tmp_path')
-        >>> url = 'https://files.pythonhosted.org/packages/a9/5a/0db.../setuptools-78.1.0.tar.gz'
-        >>> str(pathlib.Path(du(url, root)).relative_to(root))
-        'setuptools-78.1.0.tar.gz'
-        """
-        name, _fragment = egg_info_for_url(url)
-        name = cls._sanitize(
-            name
-            or
-            # default if URL has no path contents
-            '__downloaded__'
-        )
+        filename = os.path.join(tmpdir, name)
 
-        # strip any extra .zip before download
-        name = re.sub(r'\.egg\.zip$', '.egg', name)
+        # Download the file
+        #
+        if scheme == 'svn' or scheme.startswith('svn+'):
+            return self._download_svn(url, filename)
+        elif scheme == 'git' or scheme.startswith('git+'):
+            return self._download_git(url, filename)
+        elif scheme.startswith('hg+'):
+            return self._download_hg(url, filename)
+        elif scheme == 'file':
+            return urllib.request.url2pathname(urllib.parse.urlparse(url)[2])
+        else:
+            self.url_ok(url, True)  # raises error if not allowed
+            return self._attempt_download(url, filename)
 
-        return os.path.join(tmpdir, name)
-
-    def _download_url(self, url, tmpdir):
-        """
-        Determine the download filename.
-        """
-        filename = self._resolve_download_filename(url, tmpdir)
-        return self._download_vcs(url, filename) or self._download_other(url, filename)
-
-    @staticmethod
-    def _resolve_vcs(url):
-        """
-        >>> rvcs = PackageIndex._resolve_vcs
-        >>> rvcs('git+http://foo/bar')
-        'git'
-        >>> rvcs('hg+https://foo/bar')
-        'hg'
-        >>> rvcs('git:myhost')
-        'git'
-        >>> rvcs('hg:myhost')
-        >>> rvcs('http://foo/bar')
-        """
-        scheme = urllib.parse.urlsplit(url).scheme
-        pre, sep, _post = scheme.partition('+')
-        # svn and git have their own protocol; hg does not
-        allowed = set(['svn', 'git'] + ['hg'] * bool(sep))
-        return next(iter({pre} & allowed), None)
-
-    def _download_vcs(self, url, spec_filename):
-        vcs = self._resolve_vcs(url)
-        if not vcs:
-            return None
-        if vcs == 'svn':
-            raise DistutilsError(
-                f"Invalid config, SVN download is not supported: {url}"
-            )
-
-        filename, _, _ = spec_filename.partition('#')
-        url, rev = self._vcs_split_rev_from_url(url)
-
-        self.info(f"Doing {vcs} clone from {url} to {filename}")
-        subprocess.check_call([vcs, 'clone', '--quiet', url, filename])
-
-        co_commands = dict(
-            git=[vcs, '-C', filename, 'checkout', '--quiet', rev],
-            hg=[vcs, '--cwd', filename, 'up', '-C', '-r', rev, '-q'],
-        )
-        if rev is not None:
-            self.info(f"Checking out {rev}")
-            subprocess.check_call(co_commands[vcs])
-
-        return filename
-
-    def _download_other(self, url, filename):
-        scheme = urllib.parse.urlsplit(url).scheme
-        if scheme == 'file':  # pragma: no cover
-            return urllib.request.url2pathname(urllib.parse.urlparse(url).path)
-        # raise error if not allowed
-        self.url_ok(url, True)
-        return self._attempt_download(url, filename)
-
-    def scan_url(self, url) -> None:
+    def scan_url(self, url):
         self.process_url(url, True)
 
     def _attempt_download(self, url, filename):
         headers = self._download_to(url, filename)
         if 'html' in headers.get('content-type', '').lower():
-            return self._invalid_download_html(url, headers, filename)
+            return self._download_html(url, headers, filename)
         else:
             return filename
 
-    def _invalid_download_html(self, url, headers, filename):
+    def _download_html(self, url, headers, filename):
+        file = open(filename)
+        for line in file:
+            if line.strip():
+                # Check for a subversion index page
+                if re.search(r'([^- ]+ - )?Revision \d+:', line):
+                    # it's a subversion index page:
+                    file.close()
+                    os.unlink(filename)
+                    return self._download_svn(url, filename)
+                break  # not an index page
+        file.close()
         os.unlink(filename)
-        raise DistutilsError(f"Unexpected HTML page found at {url}")
+        raise DistutilsError("Unexpected HTML page found at " + url)
+
+    def _download_svn(self, url, filename):
+        warnings.warn("SVN download support is deprecated", UserWarning)
+        url = url.split('#', 1)[0]  # remove any fragment for svn's sake
+        creds = ''
+        if url.lower().startswith('svn:') and '@' in url:
+            scheme, netloc, path, p, q, f = urllib.parse.urlparse(url)
+            if not netloc and path.startswith('//') and '/' in path[2:]:
+                netloc, path = path[2:].split('/', 1)
+                auth, host = _splituser(netloc)
+                if auth:
+                    if ':' in auth:
+                        user, pw = auth.split(':', 1)
+                        creds = " --username=%s --password=%s" % (user, pw)
+                    else:
+                        creds = " --username=" + auth
+                    netloc = host
+                    parts = scheme, netloc, url, p, q, f
+                    url = urllib.parse.urlunparse(parts)
+        self.info("Doing subversion checkout from %s to %s", url, filename)
+        os.system("svn checkout%s -q %s %s" % (creds, url, filename))
+        return filename
 
     @staticmethod
-    def _vcs_split_rev_from_url(url):
-        """
-        Given a possible VCS URL, return a clean URL and resolved revision if any.
+    def _vcs_split_rev_from_url(url, pop_prefix=False):
+        scheme, netloc, path, query, frag = urllib.parse.urlsplit(url)
 
-        >>> vsrfu = PackageIndex._vcs_split_rev_from_url
-        >>> vsrfu('git+https://github.com/pypa/setuptools@v69.0.0#egg-info=setuptools')
-        ('https://github.com/pypa/setuptools', 'v69.0.0')
-        >>> vsrfu('git+https://github.com/pypa/setuptools#egg-info=setuptools')
-        ('https://github.com/pypa/setuptools', None)
-        >>> vsrfu('http://foo/bar')
-        ('http://foo/bar', None)
-        """
-        parts = urllib.parse.urlsplit(url)
-
-        clean_scheme = parts.scheme.split('+', 1)[-1]
+        scheme = scheme.split('+', 1)[-1]
 
         # Some fragment identification fails
-        no_fragment_path, _, _ = parts.path.partition('#')
+        path = path.split('#', 1)[0]
 
-        pre, sep, post = no_fragment_path.rpartition('@')
-        clean_path, rev = (pre, post) if sep else (post, None)
+        rev = None
+        if '@' in path:
+            path, rev = path.rsplit('@', 1)
 
-        resolved = parts._replace(
-            scheme=clean_scheme,
-            path=clean_path,
-            # discard the fragment
-            fragment='',
-        ).geturl()
+        # Also, discard fragment
+        url = urllib.parse.urlunsplit((scheme, netloc, path, query, ''))
 
-        return resolved, rev
+        return url, rev
 
-    def debug(self, msg, *args) -> None:
+    def _download_git(self, url, filename):
+        filename = filename.split('#', 1)[0]
+        url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+
+        self.info("Doing git clone from %s to %s", url, filename)
+        os.system("git clone --quiet %s %s" % (url, filename))
+
+        if rev is not None:
+            self.info("Checking out %s", rev)
+            os.system("git -C %s checkout --quiet %s" % (
+                filename,
+                rev,
+            ))
+
+        return filename
+
+    def _download_hg(self, url, filename):
+        filename = filename.split('#', 1)[0]
+        url, rev = self._vcs_split_rev_from_url(url, pop_prefix=True)
+
+        self.info("Doing hg clone from %s to %s", url, filename)
+        os.system("hg clone --quiet %s %s" % (url, filename))
+
+        if rev is not None:
+            self.info("Updating to %s", rev)
+            os.system("hg --cwd %s up -C -r %s -q" % (
+                filename,
+                rev,
+            ))
+
+        return filename
+
+    def debug(self, msg, *args):
         log.debug(msg, *args)
 
-    def info(self, msg, *args) -> None:
+    def info(self, msg, *args):
         log.info(msg, *args)
 
-    def warn(self, msg, *args) -> None:
+    def warn(self, msg, *args):
         log.warn(msg, *args)
 
 
@@ -1032,20 +978,21 @@ def _encode_auth(auth):
     return encoded.replace('\n', '')
 
 
-class Credential(NamedTuple):
+class Credential:
     """
-    A username/password pair.
-
-    Displayed separated by `:`.
-    >>> str(Credential('username', 'password'))
-    'username:password'
+    A username/password pair. Use like a namedtuple.
     """
 
-    username: str
-    password: str
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
 
-    def __str__(self) -> str:
-        return f'{self.username}:{self.password}'
+    def __iter__(self):
+        yield self.username
+        yield self.password
+
+    def __str__(self):
+        return '%(username)s:%(password)s' % vars(self)
 
 
 class PyPIConfig(configparser.RawConfigParser):
@@ -1058,13 +1005,12 @@ class PyPIConfig(configparser.RawConfigParser):
 
         rc = os.path.join(os.path.expanduser('~'), '.pypirc')
         if os.path.exists(rc):
-            _cfg_read_utf8_with_fallback(self, rc)
+            self.read(rc)
 
     @property
     def creds_by_repository(self):
         sections_with_repositories = [
-            section
-            for section in self.sections()
+            section for section in self.sections()
             if self.get(section, 'repository').strip()
         ]
 
@@ -1085,7 +1031,6 @@ class PyPIConfig(configparser.RawConfigParser):
         for repository, cred in self.creds_by_repository.items():
             if url.startswith(repository):
                 return cred
-        return None
 
 
 def open_with_auth(url, opener=urllib.request.urlopen):
@@ -1102,7 +1047,7 @@ def open_with_auth(url, opener=urllib.request.urlopen):
     if scheme in ('http', 'https'):
         auth, address = _splituser(netloc)
     else:
-        auth, address = (None, None)
+        auth = None
 
     if not auth:
         cred = PyPIConfig().find_credential(url)
@@ -1135,7 +1080,6 @@ def open_with_auth(url, opener=urllib.request.urlopen):
 
 
 # copy of urllib.parse._splituser from Python 3.8
-# See https://github.com/python/cpython/issues/80072.
 def _splituser(host):
     """splituser('user[:passwd]@host[:port]')
     --> 'user[:passwd]', 'host[:port]'."""
@@ -1153,7 +1097,7 @@ def fix_sf_url(url):
 
 def local_open(url):
     """Read a local path, with special support for directories"""
-    _scheme, _server, path, _param, _query, _frag = urllib.parse.urlparse(url)
+    scheme, server, path, param, query, frag = urllib.parse.urlparse(url)
     filename = urllib.request.url2pathname(path)
     if os.path.isfile(filename):
         return urllib.request.urlopen(url)
@@ -1162,13 +1106,16 @@ def local_open(url):
         for f in os.listdir(filename):
             filepath = os.path.join(filename, f)
             if f == 'index.html':
-                body = _read_utf8_with_fallback(filepath)
+                with open(filepath, 'r') as fp:
+                    body = fp.read()
                 break
             elif os.path.isdir(filepath):
                 f += '/'
-            files.append(f'<a href="{f}">{f}</a>')
+            files.append('<a href="{name}">{name}</a>'.format(name=f))
         else:
-            tmpl = "<html><head><title>{url}{files}"
+            tmpl = (
+                "{url}"
+                "{files}")
             body = tmpl.format(url=url, files='\n'.join(files))
         status, message = 200, "OK"
     else:
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/sandbox.py b/server/.venv/lib/python3.11/site-packages/setuptools/sandbox.py
index 2d84242..034fc80 100644
--- a/server/.venv/lib/python3.11/site-packages/setuptools/sandbox.py
+++ b/server/.venv/lib/python3.11/site-packages/setuptools/sandbox.py
@@ -1,36 +1,30 @@
-from __future__ import annotations
-
-import builtins
-import contextlib
-import functools
-import itertools
-import operator
 import os
-import pickle
-import re
 import sys
 import tempfile
+import operator
+import functools
+import itertools
+import re
+import contextlib
+import pickle
 import textwrap
-from types import TracebackType
-from typing import TYPE_CHECKING, Any, ClassVar
+import builtins
 
 import pkg_resources
+from distutils.errors import DistutilsError
 from pkg_resources import working_set
 
-from distutils.errors import DistutilsError
-
-if TYPE_CHECKING:
-    import os as _os
-elif sys.platform.startswith('java'):
-    import org.python.modules.posix.PosixModule as _os  # pyright: ignore[reportMissingImports]
+if sys.platform.startswith('java'):
+    import org.python.modules.posix.PosixModule as _os
 else:
     _os = sys.modules[os.name]
+try:
+    _file = file
+except NameError:
+    _file = None
 _open = open
 
 
-if TYPE_CHECKING:
-    from typing_extensions import Self
-
 __all__ = [
     "AbstractSandbox",
     "DirectorySandbox",
@@ -121,21 +115,16 @@ class UnpickleableException(Exception):
 
 class ExceptionSaver:
     """
-    A Context Manager that will save an exception, serialize, and restore it
+    A Context Manager that will save an exception, serialized, and restore it
     later.
     """
 
-    def __enter__(self) -> Self:
+    def __enter__(self):
         return self
 
-    def __exit__(
-        self,
-        type: type[BaseException] | None,
-        exc: BaseException | None,
-        tb: TracebackType | None,
-    ) -> bool:
+    def __exit__(self, type, exc, tb):
         if not exc:
-            return False
+            return
 
         # dump the exception
         self._saved = UnpickleableException.dump(type, exc)
@@ -150,7 +139,7 @@ class ExceptionSaver:
         if '_saved' not in vars(self):
             return
 
-        _type, exc = map(pickle.loads, self._saved)
+        type, exc = map(pickle.loads, self._saved)
         raise exc.with_traceback(self._tb)
 
 
@@ -248,7 +237,7 @@ def hide_setuptools():
     """
     _distutils_hack = sys.modules.get('_distutils_hack', None)
     if _distutils_hack is not None:
-        _distutils_hack._remove_shim()
+        _distutils_hack.remove_shim()
 
     modules = filter(_needs_hiding, sys.modules)
     _clear_modules(modules)
@@ -279,7 +268,7 @@ class AbstractSandbox:
 
     _active = False
 
-    def __init__(self) -> None:
+    def __init__(self):
         self._attrs = [
             name
             for name in dir(_os)
@@ -290,18 +279,17 @@ class AbstractSandbox:
         for name in self._attrs:
             setattr(os, name, getattr(source, name))
 
-    def __enter__(self) -> None:
+    def __enter__(self):
         self._copy(self)
+        if _file:
+            builtins.file = self._file
         builtins.open = self._open
         self._active = True
 
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback: TracebackType | None,
-    ):
+    def __exit__(self, exc_type, exc_value, traceback):
         self._active = False
+        if _file:
+            builtins.file = _file
         builtins.open = _open
         self._copy(_os)
 
@@ -310,7 +298,7 @@ class AbstractSandbox:
         with self:
             return func()
 
-    def _mk_dual_path_wrapper(name: str):  # type: ignore[misc] # https://github.com/pypa/setuptools/pull/4099
+    def _mk_dual_path_wrapper(name):
         original = getattr(_os, name)
 
         def wrap(self, src, dst, *args, **kw):
@@ -320,11 +308,11 @@ class AbstractSandbox:
 
         return wrap
 
-    for __name in ["rename", "link", "symlink"]:
-        if hasattr(_os, __name):
-            locals()[__name] = _mk_dual_path_wrapper(__name)
+    for name in ["rename", "link", "symlink"]:
+        if hasattr(_os, name):
+            locals()[name] = _mk_dual_path_wrapper(name)
 
-    def _mk_single_path_wrapper(name: str, original=None):  # type: ignore[misc] # https://github.com/pypa/setuptools/pull/4099
+    def _mk_single_path_wrapper(name, original=None):
         original = original or getattr(_os, name)
 
         def wrap(self, path, *args, **kw):
@@ -334,8 +322,10 @@ class AbstractSandbox:
 
         return wrap
 
+    if _file:
+        _file = _mk_single_path_wrapper('file', _file)
     _open = _mk_single_path_wrapper('open', _open)
-    for __name in [
+    for name in [
         "stat",
         "listdir",
         "chdir",
@@ -356,10 +346,10 @@ class AbstractSandbox:
         "pathconf",
         "access",
     ]:
-        if hasattr(_os, __name):
-            locals()[__name] = _mk_single_path_wrapper(__name)
+        if hasattr(_os, name):
+            locals()[name] = _mk_single_path_wrapper(name)
 
-    def _mk_single_with_return(name: str):  # type: ignore[misc] # https://github.com/pypa/setuptools/pull/4099
+    def _mk_single_with_return(name):
         original = getattr(_os, name)
 
         def wrap(self, path, *args, **kw):
@@ -370,11 +360,11 @@ class AbstractSandbox:
 
         return wrap
 
-    for __name in ['readlink', 'tempnam']:
-        if hasattr(_os, __name):
-            locals()[__name] = _mk_single_with_return(__name)
+    for name in ['readlink', 'tempnam']:
+        if hasattr(_os, name):
+            locals()[name] = _mk_single_with_return(name)
 
-    def _mk_query(name: str):  # type: ignore[misc] # https://github.com/pypa/setuptools/pull/4099
+    def _mk_query(name):
         original = getattr(_os, name)
 
         def wrap(self, *args, **kw):
@@ -385,9 +375,9 @@ class AbstractSandbox:
 
         return wrap
 
-    for __name in ['getcwd', 'tmpnam']:
-        if hasattr(_os, __name):
-            locals()[__name] = _mk_query(__name)
+    for name in ['getcwd', 'tmpnam']:
+        if hasattr(_os, name):
+            locals()[name] = _mk_query(name)
 
     def _validate_path(self, path):
         """Called to remap or validate any path, whether input or output"""
@@ -408,11 +398,6 @@ class AbstractSandbox:
             self._remap_input(operation + '-to', dst, *args, **kw),
         )
 
-    if TYPE_CHECKING:
-        # This is a catch-all for all the dynamically created attributes.
-        # This isn't public API anyway
-        def __getattribute__(self, name: str) -> Any: ...
-
 
 if hasattr(os, 'devnull'):
     _EXCEPTIONS = [os.devnull]
@@ -423,26 +408,28 @@ else:
 class DirectorySandbox(AbstractSandbox):
     """Restrict operations to a single subdirectory - pseudo-chroot"""
 
-    write_ops: ClassVar[dict[str, None]] = dict.fromkeys([
-        "open",
-        "chmod",
-        "chown",
-        "mkdir",
-        "remove",
-        "unlink",
-        "rmdir",
-        "utime",
-        "lchown",
-        "chroot",
-        "mkfifo",
-        "mknod",
-        "tempnam",
-    ])
+    write_ops = dict.fromkeys(
+        [
+            "open",
+            "chmod",
+            "chown",
+            "mkdir",
+            "remove",
+            "unlink",
+            "rmdir",
+            "utime",
+            "lchown",
+            "chroot",
+            "mkfifo",
+            "mknod",
+            "tempnam",
+        ]
+    )
 
-    _exception_patterns: list[str | re.Pattern] = []
+    _exception_patterns = []
     "exempt writing to paths that match the pattern"
 
-    def __init__(self, sandbox, exceptions=_EXCEPTIONS) -> None:
+    def __init__(self, sandbox, exceptions=_EXCEPTIONS):
         self._sandbox = os.path.normcase(os.path.realpath(sandbox))
         self._prefix = os.path.join(self._sandbox, '')
         self._exceptions = [
@@ -455,12 +442,19 @@ class DirectorySandbox(AbstractSandbox):
 
         raise SandboxViolation(operation, args, kw)
 
+    if _file:
+
+        def _file(self, path, mode='r', *args, **kw):
+            if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
+                self._violation("file", path, mode, *args, **kw)
+            return _file(path, mode, *args, **kw)
+
     def _open(self, path, mode='r', *args, **kw):
         if mode not in ('r', 'rt', 'rb', 'rU', 'U') and not self._ok(path):
             self._violation("open", path, mode, *args, **kw)
         return _open(path, mode, *args, **kw)
 
-    def tmpnam(self) -> None:
+    def tmpnam(self):
         self._violation("tmpnam")
 
     def _ok(self, path):
@@ -498,7 +492,7 @@ class DirectorySandbox(AbstractSandbox):
             self._violation(operation, src, dst, *args, **kw)
         return (src, dst)
 
-    def open(self, file, flags, mode: int = 0o777, *args, **kw) -> int:
+    def open(self, file, flags, mode=0o777, *args, **kw):
         """Called for low-level os.open()"""
         if flags & WRITE_FLAGS and not self._ok(file):
             self._violation("os.open", file, flags, mode, *args, **kw)
@@ -531,6 +525,6 @@ class SandboxViolation(DistutilsError):
         """
     ).lstrip()
 
-    def __str__(self) -> str:
+    def __str__(self):
         cmd, args, kwargs = self.args
         return self.tmpl.format(**locals())
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__init__.py
deleted file mode 100644
index eb70bfb..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import locale
-import sys
-
-import pytest
-
-__all__ = ['fail_on_ascii']
-
-if sys.version_info >= (3, 11):
-    locale_encoding = locale.getencoding()
-else:
-    locale_encoding = locale.getpreferredencoding(False)
-is_ascii = locale_encoding == 'ANSI_X3.4-1968'
-fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 75b1b5c..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/contexts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/contexts.cpython-311.pyc
deleted file mode 100644
index fcfb99f..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/contexts.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/environment.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/environment.cpython-311.pyc
deleted file mode 100644
index 885b5a0..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/environment.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/fixtures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/fixtures.cpython-311.pyc
deleted file mode 100644
index 7d568b6..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/fixtures.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/mod_with_constant.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/mod_with_constant.cpython-311.pyc
deleted file mode 100644
index 5758bc9..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/mod_with_constant.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/namespaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/namespaces.cpython-311.pyc
deleted file mode 100644
index 381ac54..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/namespaces.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/script-with-bom.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/script-with-bom.cpython-311.pyc
deleted file mode 100644
index e4e2326..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/script-with-bom.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/server.cpython-311.pyc
deleted file mode 100644
index 82eb95a..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/server.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_archive_util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_archive_util.cpython-311.pyc
deleted file mode 100644
index 712d7b6..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_archive_util.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_deprecations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_deprecations.cpython-311.pyc
deleted file mode 100644
index 0ef3872..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_deprecations.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_egg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_egg.cpython-311.pyc
deleted file mode 100644
index fa2c3ce..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_egg.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_wheel.cpython-311.pyc
deleted file mode 100644
index c3d0a5a..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_bdist_wheel.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build.cpython-311.pyc
deleted file mode 100644
index 38e0f16..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_clib.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_clib.cpython-311.pyc
deleted file mode 100644
index a2f25b9..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_clib.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_ext.cpython-311.pyc
deleted file mode 100644
index d882d25..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_ext.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_meta.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_meta.cpython-311.pyc
deleted file mode 100644
index 61640eb..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_meta.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_py.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_py.cpython-311.pyc
deleted file mode 100644
index 73f96c1..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_build_py.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_config_discovery.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_config_discovery.cpython-311.pyc
deleted file mode 100644
index b510cdd..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_config_discovery.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_core_metadata.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_core_metadata.cpython-311.pyc
deleted file mode 100644
index 1bb3b42..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_core_metadata.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_depends.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_depends.cpython-311.pyc
deleted file mode 100644
index 35df8ae..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_depends.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_develop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_develop.cpython-311.pyc
deleted file mode 100644
index dab6849..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_develop.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist.cpython-311.pyc
deleted file mode 100644
index 98701d5..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist_info.cpython-311.pyc
deleted file mode 100644
index 4d68534..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_dist_info.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_distutils_adoption.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_distutils_adoption.cpython-311.pyc
deleted file mode 100644
index d35694d..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_distutils_adoption.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_easy_install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_easy_install.cpython-311.pyc
deleted file mode 100644
index 371ff86..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_easy_install.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_editable_install.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_editable_install.cpython-311.pyc
deleted file mode 100644
index 740ba3b..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_editable_install.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_egg_info.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_egg_info.cpython-311.pyc
deleted file mode 100644
index 831392e..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_egg_info.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_extern.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_extern.cpython-311.pyc
deleted file mode 100644
index da41828..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_extern.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_packages.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_packages.cpython-311.pyc
deleted file mode 100644
index fcfc644..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_packages.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_py_modules.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_py_modules.cpython-311.pyc
deleted file mode 100644
index 1362def..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_find_py_modules.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_glob.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_glob.cpython-311.pyc
deleted file mode 100644
index 9d6ffbf..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_glob.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_install_scripts.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_install_scripts.cpython-311.pyc
deleted file mode 100644
index 710d232..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_install_scripts.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_logging.cpython-311.pyc
deleted file mode 100644
index daf9f43..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_logging.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_manifest.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_manifest.cpython-311.pyc
deleted file mode 100644
index 6426132..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_manifest.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_namespaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_namespaces.cpython-311.pyc
deleted file mode 100644
index bf6ea62..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_namespaces.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_packageindex.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_packageindex.cpython-311.pyc
deleted file mode 100644
index e333b20..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_packageindex.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sandbox.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sandbox.cpython-311.pyc
deleted file mode 100644
index 1e1fa36..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sandbox.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sdist.cpython-311.pyc
deleted file mode 100644
index 5adec91..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_sdist.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setopt.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setopt.cpython-311.pyc
deleted file mode 100644
index ecfa99f..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setopt.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setuptools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setuptools.cpython-311.pyc
deleted file mode 100644
index ad8faae..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_setuptools.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_shutil_wrapper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_shutil_wrapper.cpython-311.pyc
deleted file mode 100644
index 500afe1..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_shutil_wrapper.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_unicode_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_unicode_utils.cpython-311.pyc
deleted file mode 100644
index b04d22b..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_unicode_utils.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_virtualenv.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_virtualenv.cpython-311.pyc
deleted file mode 100644
index 9133b59..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_virtualenv.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_warnings.cpython-311.pyc
deleted file mode 100644
index 93ae719..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_warnings.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_wheel.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_wheel.cpython-311.pyc
deleted file mode 100644
index ab8fb37..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_wheel.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_windows_wrappers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_windows_wrappers.cpython-311.pyc
deleted file mode 100644
index 7b3b3fb..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/test_windows_wrappers.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/text.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/text.cpython-311.pyc
deleted file mode 100644
index 9d31186..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/text.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/textwrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/textwrap.cpython-311.pyc
deleted file mode 100644
index adc8456..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/__pycache__/textwrap.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 4c7d997..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/py39.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/py39.cpython-311.pyc
deleted file mode 100644
index 67cf6d1..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/__pycache__/py39.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/py39.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/py39.py
deleted file mode 100644
index 1fdb9da..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/compat/py39.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from jaraco.test.cpython import from_test_support, try_import
-
-os_helper = try_import('os_helper') or from_test_support('can_symlink')
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 9fea5a7..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_apply_pyprojecttoml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_apply_pyprojecttoml.cpython-311.pyc
deleted file mode 100644
index a7bacfe..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_apply_pyprojecttoml.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_expand.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_expand.cpython-311.pyc
deleted file mode 100644
index ac40019..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_expand.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml.cpython-311.pyc
deleted file mode 100644
index f301932..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml_dynamic_deps.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml_dynamic_deps.cpython-311.pyc
deleted file mode 100644
index 044ffbf..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_pyprojecttoml_dynamic_deps.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_setupcfg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_setupcfg.cpython-311.pyc
deleted file mode 100644
index aeb8342..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/__pycache__/test_setupcfg.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__init__.py
deleted file mode 100644
index 00a1642..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__init__.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from __future__ import annotations
-
-import re
-import time
-from pathlib import Path
-from urllib.error import HTTPError
-from urllib.request import urlopen
-
-__all__ = ["DOWNLOAD_DIR", "retrieve_file", "output_file", "urls_from_file"]
-
-
-NAME_REMOVE = ("http://", "https://", "github.com/", "/raw/")
-DOWNLOAD_DIR = Path(__file__).parent
-
-
-# ----------------------------------------------------------------------
-# Please update ./preload.py accordingly when modifying this file
-# ----------------------------------------------------------------------
-
-
-def output_file(url: str, download_dir: Path = DOWNLOAD_DIR) -> Path:
-    file_name = url.strip()
-    for part in NAME_REMOVE:
-        file_name = file_name.replace(part, '').strip().strip('/:').strip()
-    return Path(download_dir, re.sub(r"[^\-_\.\w\d]+", "_", file_name))
-
-
-def retrieve_file(url: str, download_dir: Path = DOWNLOAD_DIR, wait: float = 5) -> Path:
-    path = output_file(url, download_dir)
-    if path.exists():
-        print(f"Skipping {url} (already exists: {path})")
-    else:
-        download_dir.mkdir(exist_ok=True, parents=True)
-        print(f"Downloading {url} to {path}")
-        try:
-            download(url, path)
-        except HTTPError:
-            time.sleep(wait)  # wait a few seconds and try again.
-            download(url, path)
-    return path
-
-
-def urls_from_file(list_file: Path) -> list[str]:
-    """``list_file`` should be a text file where each line corresponds to a URL to
-    download.
-    """
-    print(f"file: {list_file}")
-    content = list_file.read_text(encoding="utf-8")
-    return [url for url in content.splitlines() if not url.startswith("#")]
-
-
-def download(url: str, dest: Path):
-    with urlopen(url) as f:
-        data = f.read()
-
-    with open(dest, "wb") as f:
-        f.write(data)
-
-    assert Path(dest).exists()
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 8fa0f48..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/__init__.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/preload.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/preload.cpython-311.pyc
deleted file mode 100644
index 0346132..0000000
Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/__pycache__/preload.cpython-311.pyc and /dev/null differ
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/preload.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/preload.py
deleted file mode 100644
index 8eeb5dd..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/downloads/preload.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""This file can be used to preload files needed for testing.
-
-For example you can use::
-
-    cd setuptools/tests/config
-    python -m downloads.preload setupcfg_examples.txt
-
-to make sure the `setup.cfg` examples are downloaded before starting the tests.
-"""
-
-import sys
-from pathlib import Path
-
-from . import retrieve_file, urls_from_file
-
-if __name__ == "__main__":
-    urls = urls_from_file(Path(sys.argv[1]))
-    list(map(retrieve_file, urls))
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/setupcfg_examples.txt b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/setupcfg_examples.txt
deleted file mode 100644
index 6aab887..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/setupcfg_examples.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# ====================================================================
-# Some popular packages that use setup.cfg (and others not so popular)
-# Reference: https://hugovk.github.io/top-pypi-packages/
-# ====================================================================
-https://github.com/pypa/setuptools/raw/52c990172fec37766b3566679724aa8bf70ae06d/setup.cfg
-https://github.com/pypa/wheel/raw/0acd203cd896afec7f715aa2ff5980a403459a3b/setup.cfg
-https://github.com/python/importlib_metadata/raw/2f05392ca980952a6960d82b2f2d2ea10aa53239/setup.cfg
-https://github.com/jaraco/skeleton/raw/d9008b5c510cd6969127a6a2ab6f832edddef296/setup.cfg
-https://github.com/jaraco/zipp/raw/700d3a96390e970b6b962823bfea78b4f7e1c537/setup.cfg
-https://github.com/pallets/jinja/raw/7d72eb7fefb7dce065193967f31f805180508448/setup.cfg
-https://github.com/tkem/cachetools/raw/2fd87a94b8d3861d80e9e4236cd480bfdd21c90d/setup.cfg
-https://github.com/aio-libs/aiohttp/raw/5e0e6b7080f2408d5f1dd544c0e1cf88378b7b10/setup.cfg
-https://github.com/pallets/flask/raw/9486b6cf57bd6a8a261f67091aca8ca78eeec1e3/setup.cfg
-https://github.com/pallets/click/raw/6411f425fae545f42795665af4162006b36c5e4a/setup.cfg
-https://github.com/sqlalchemy/sqlalchemy/raw/533f5718904b620be8d63f2474229945d6f8ba5d/setup.cfg
-https://github.com/pytest-dev/pluggy/raw/461ef63291d13589c4e21aa182cd1529257e9a0a/setup.cfg
-https://github.com/pytest-dev/pytest/raw/c7be96dae487edbd2f55b561b31b68afac1dabe6/setup.cfg
-https://github.com/platformdirs/platformdirs/raw/7b7852128dd6f07511b618d6edea35046bd0c6ff/setup.cfg
-https://github.com/pandas-dev/pandas/raw/bc17343f934a33dc231c8c74be95d8365537c376/setup.cfg
-https://github.com/django/django/raw/4e249d11a6e56ca8feb4b055b681cec457ef3a3d/setup.cfg
-https://github.com/pyscaffold/pyscaffold/raw/de7aa5dc059fbd04307419c667cc4961bc9df4b8/setup.cfg
-https://github.com/pypa/virtualenv/raw/f92eda6e3da26a4d28c2663ffb85c4960bdb990c/setup.cfg
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_apply_pyprojecttoml.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_apply_pyprojecttoml.py
deleted file mode 100644
index 489fd98..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_apply_pyprojecttoml.py
+++ /dev/null
@@ -1,772 +0,0 @@
-"""Make sure that applying the configuration from pyproject.toml is equivalent to
-applying a similar configuration from setup.cfg
-
-To run these tests offline, please have a look on ``./downloads/preload.py``
-"""
-
-from __future__ import annotations
-
-import io
-import re
-import tarfile
-from inspect import cleandoc
-from pathlib import Path
-from unittest.mock import Mock
-
-import pytest
-from ini2toml.api import LiteTranslator
-from packaging.metadata import Metadata
-
-import setuptools  # noqa: F401 # ensure monkey patch to metadata
-from setuptools._static import is_static
-from setuptools.command.egg_info import write_requirements
-from setuptools.config import expand, pyprojecttoml, setupcfg
-from setuptools.config._apply_pyprojecttoml import _MissingDynamic, _some_attrgetter
-from setuptools.dist import Distribution
-from setuptools.errors import InvalidConfigError, RemovedConfigError
-from setuptools.warnings import InformationOnly, SetuptoolsDeprecationWarning
-
-from .downloads import retrieve_file, urls_from_file
-
-HERE = Path(__file__).parent
-EXAMPLES_FILE = "setupcfg_examples.txt"
-
-
-def makedist(path, **attrs):
-    return Distribution({"src_root": path, **attrs})
-
-
-def _mock_expand_patterns(patterns, *_, **__):
-    """
-    Allow comparing the given patterns for 2 dist objects.
-    We need to strip special chars to avoid errors when validating.
-    """
-    return [re.sub("[^a-z0-9]+", "", p, flags=re.I) or "empty" for p in patterns]
-
-
-@pytest.mark.parametrize("url", urls_from_file(HERE / EXAMPLES_FILE))
-@pytest.mark.filterwarnings("ignore")
-@pytest.mark.uses_network
-def test_apply_pyproject_equivalent_to_setupcfg(url, monkeypatch, tmp_path):
-    monkeypatch.setattr(expand, "read_attr", Mock(return_value="0.0.1"))
-    monkeypatch.setattr(
-        Distribution, "_expand_patterns", Mock(side_effect=_mock_expand_patterns)
-    )
-    setupcfg_example = retrieve_file(url)
-    pyproject_example = Path(tmp_path, "pyproject.toml")
-    setupcfg_text = setupcfg_example.read_text(encoding="utf-8")
-    toml_config = LiteTranslator().translate(setupcfg_text, "setup.cfg")
-    pyproject_example.write_text(toml_config, encoding="utf-8")
-
-    dist_toml = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject_example)
-    dist_cfg = setupcfg.apply_configuration(makedist(tmp_path), setupcfg_example)
-
-    pkg_info_toml = core_metadata(dist_toml)
-    pkg_info_cfg = core_metadata(dist_cfg)
-    assert pkg_info_toml == pkg_info_cfg
-
-    if any(getattr(d, "license_files", None) for d in (dist_toml, dist_cfg)):
-        assert set(dist_toml.license_files) == set(dist_cfg.license_files)
-
-    if any(getattr(d, "entry_points", None) for d in (dist_toml, dist_cfg)):
-        print(dist_cfg.entry_points)
-        ep_toml = {
-            (k, *sorted(i.replace(" ", "") for i in v))
-            for k, v in dist_toml.entry_points.items()
-        }
-        ep_cfg = {
-            (k, *sorted(i.replace(" ", "") for i in v))
-            for k, v in dist_cfg.entry_points.items()
-        }
-        assert ep_toml == ep_cfg
-
-    if any(getattr(d, "package_data", None) for d in (dist_toml, dist_cfg)):
-        pkg_data_toml = {(k, *sorted(v)) for k, v in dist_toml.package_data.items()}
-        pkg_data_cfg = {(k, *sorted(v)) for k, v in dist_cfg.package_data.items()}
-        assert pkg_data_toml == pkg_data_cfg
-
-    if any(getattr(d, "data_files", None) for d in (dist_toml, dist_cfg)):
-        data_files_toml = {(k, *sorted(v)) for k, v in dist_toml.data_files}
-        data_files_cfg = {(k, *sorted(v)) for k, v in dist_cfg.data_files}
-        assert data_files_toml == data_files_cfg
-
-    assert set(dist_toml.install_requires) == set(dist_cfg.install_requires)
-    if any(getattr(d, "extras_require", None) for d in (dist_toml, dist_cfg)):
-        extra_req_toml = {(k, *sorted(v)) for k, v in dist_toml.extras_require.items()}
-        extra_req_cfg = {(k, *sorted(v)) for k, v in dist_cfg.extras_require.items()}
-        assert extra_req_toml == extra_req_cfg
-
-
-PEP621_EXAMPLE = """\
-[project]
-name = "spam"
-version = "2020.0.0"
-description = "Lovely Spam! Wonderful Spam!"
-readme = "README.rst"
-requires-python = ">=3.8"
-license-files = ["LICENSE.txt"]  # Updated to be PEP 639 compliant
-keywords = ["egg", "bacon", "sausage", "tomatoes", "Lobster Thermidor"]
-authors = [
-  {email = "hi@pradyunsg.me"},
-  {name = "Tzu-Ping Chung"}
-]
-maintainers = [
-  {name = "Brett Cannon", email = "brett@python.org"},
-  {name = "John X. Ãørçeč", email = "john@utf8.org"},
-  {name = "Γαμα קּ 東", email = "gama@utf8.org"},
-]
-classifiers = [
-  "Development Status :: 4 - Beta",
-  "Programming Language :: Python"
-]
-
-dependencies = [
-  "httpx",
-  "gidgethub[httpx]>4.0.0",
-  "django>2.1; os_name != 'nt'",
-  "django>2.0; os_name == 'nt'"
-]
-
-[project.optional-dependencies]
-test = [
-  "pytest < 5.0.0",
-  "pytest-cov[all]"
-]
-
-[project.urls]
-homepage = "http://example.com"
-documentation = "http://readthedocs.org"
-repository = "http://github.com"
-changelog = "http://github.com/me/spam/blob/master/CHANGELOG.md"
-
-[project.scripts]
-spam-cli = "spam:main_cli"
-
-[project.gui-scripts]
-spam-gui = "spam:main_gui"
-
-[project.entry-points."spam.magical"]
-tomatoes = "spam:main_tomatoes"
-"""
-
-PEP621_INTERNATIONAL_EMAIL_EXAMPLE = """\
-[project]
-name = "spam"
-version = "2020.0.0"
-authors = [
-  {email = "hi@pradyunsg.me"},
-  {name = "Tzu-Ping Chung"}
-]
-maintainers = [
-  {name = "Степан Бандера", email = "криївка@оун-упа.укр"},
-]
-"""
-
-PEP621_EXAMPLE_SCRIPT = """
-def main_cli(): pass
-def main_gui(): pass
-def main_tomatoes(): pass
-"""
-
-PEP639_LICENSE_TEXT = """\
-[project]
-name = "spam"
-version = "2020.0.0"
-authors = [
-  {email = "hi@pradyunsg.me"},
-  {name = "Tzu-Ping Chung"}
-]
-license = {text = "MIT"}
-"""
-
-PEP639_LICENSE_EXPRESSION = """\
-[project]
-name = "spam"
-version = "2020.0.0"
-authors = [
-  {email = "hi@pradyunsg.me"},
-  {name = "Tzu-Ping Chung"}
-]
-license = "mit or apache-2.0"  # should be normalized in metadata
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-]
-"""
-
-
-def _pep621_example_project(
-    tmp_path,
-    readme="README.rst",
-    pyproject_text=PEP621_EXAMPLE,
-):
-    pyproject = tmp_path / "pyproject.toml"
-    text = pyproject_text
-    replacements = {'readme = "README.rst"': f'readme = "{readme}"'}
-    for orig, subst in replacements.items():
-        text = text.replace(orig, subst)
-    pyproject.write_text(text, encoding="utf-8")
-
-    (tmp_path / readme).write_text("hello world", encoding="utf-8")
-    (tmp_path / "LICENSE.txt").write_text("--- LICENSE stub ---", encoding="utf-8")
-    (tmp_path / "spam.py").write_text(PEP621_EXAMPLE_SCRIPT, encoding="utf-8")
-    return pyproject
-
-
-def test_pep621_example(tmp_path):
-    """Make sure the example in PEP 621 works"""
-    pyproject = _pep621_example_project(tmp_path)
-    dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-    assert set(dist.metadata.license_files) == {"LICENSE.txt"}
-
-
-@pytest.mark.parametrize(
-    ("readme", "ctype"),
-    [
-        ("Readme.txt", "text/plain"),
-        ("readme.md", "text/markdown"),
-        ("text.rst", "text/x-rst"),
-    ],
-)
-def test_readme_content_type(tmp_path, readme, ctype):
-    pyproject = _pep621_example_project(tmp_path, readme)
-    dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-    assert dist.metadata.long_description_content_type == ctype
-
-
-def test_undefined_content_type(tmp_path):
-    pyproject = _pep621_example_project(tmp_path, "README.tex")
-    with pytest.raises(ValueError, match="Undefined content type for README.tex"):
-        pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-
-def test_no_explicit_content_type_for_missing_extension(tmp_path):
-    pyproject = _pep621_example_project(tmp_path, "README")
-    dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-    assert dist.metadata.long_description_content_type is None
-
-
-@pytest.mark.parametrize(
-    ("pyproject_text", "expected_maintainers_meta_value"),
-    (
-        pytest.param(
-            PEP621_EXAMPLE,
-            (
-                'Brett Cannon , "John X. Ãørçeč" , '
-                'Γαμα קּ 東 '
-            ),
-            id='non-international-emails',
-        ),
-        pytest.param(
-            PEP621_INTERNATIONAL_EMAIL_EXAMPLE,
-            'Степан Бандера <криївка@оун-упа.укр>',
-            marks=pytest.mark.xfail(
-                reason="CPython's `email.headerregistry.Address` only supports "
-                'RFC 5322, as of Nov 10, 2022 and latest Python 3.11.0',
-                strict=True,
-            ),
-            id='international-email',
-        ),
-    ),
-)
-def test_utf8_maintainer_in_metadata(  # issue-3663
-    expected_maintainers_meta_value,
-    pyproject_text,
-    tmp_path,
-):
-    pyproject = _pep621_example_project(
-        tmp_path,
-        "README",
-        pyproject_text=pyproject_text,
-    )
-    dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-    assert dist.metadata.maintainer_email == expected_maintainers_meta_value
-    pkg_file = tmp_path / "PKG-FILE"
-    with open(pkg_file, "w", encoding="utf-8") as fh:
-        dist.metadata.write_pkg_file(fh)
-    content = pkg_file.read_text(encoding="utf-8")
-    assert f"Maintainer-email: {expected_maintainers_meta_value}" in content
-
-
-@pytest.mark.parametrize(
-    (
-        'pyproject_text',
-        'license',
-        'license_expression',
-        'content_str',
-        'not_content_str',
-    ),
-    (
-        pytest.param(
-            PEP639_LICENSE_TEXT,
-            'MIT',
-            None,
-            'License: MIT',
-            'License-Expression: ',
-            id='license-text',
-            marks=[
-                pytest.mark.filterwarnings(
-                    "ignore:.project.license. as a TOML table is deprecated",
-                )
-            ],
-        ),
-        pytest.param(
-            PEP639_LICENSE_EXPRESSION,
-            None,
-            'MIT OR Apache-2.0',
-            'License-Expression: MIT OR Apache-2.0',
-            'License: ',
-            id='license-expression',
-        ),
-    ),
-)
-def test_license_in_metadata(
-    license,
-    license_expression,
-    content_str,
-    not_content_str,
-    pyproject_text,
-    tmp_path,
-):
-    pyproject = _pep621_example_project(
-        tmp_path,
-        "README",
-        pyproject_text=pyproject_text,
-    )
-    dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-    assert dist.metadata.license == license
-    assert dist.metadata.license_expression == license_expression
-    pkg_file = tmp_path / "PKG-FILE"
-    with open(pkg_file, "w", encoding="utf-8") as fh:
-        dist.metadata.write_pkg_file(fh)
-    content = pkg_file.read_text(encoding="utf-8")
-    assert "Metadata-Version: 2.4" in content
-    assert content_str in content
-    assert not_content_str not in content
-
-
-def test_license_classifier_with_license_expression(tmp_path):
-    text = PEP639_LICENSE_EXPRESSION.rsplit("\n", 2)[0]
-    pyproject = _pep621_example_project(
-        tmp_path,
-        "README",
-        f"{text}\n    \"License :: OSI Approved :: MIT License\"\n]",
-    )
-    msg = "License classifiers have been superseded by license expressions"
-    with pytest.raises(InvalidConfigError, match=msg) as exc:
-        pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-    assert "License :: OSI Approved :: MIT License" in str(exc.value)
-
-
-def test_license_classifier_without_license_expression(tmp_path):
-    text = """\
-    [project]
-    name = "spam"
-    version = "2020.0.0"
-    license = {text = "mit or apache-2.0"}
-    classifiers = ["License :: OSI Approved :: MIT License"]
-    """
-    pyproject = _pep621_example_project(tmp_path, "README", text)
-
-    msg1 = "License classifiers are deprecated(?:.|\n)*MIT License"
-    msg2 = ".project.license. as a TOML table is deprecated"
-    with (
-        pytest.warns(SetuptoolsDeprecationWarning, match=msg1),
-        pytest.warns(SetuptoolsDeprecationWarning, match=msg2),
-    ):
-        dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-    # Check license classifier is still included
-    assert dist.metadata.get_classifiers() == ["License :: OSI Approved :: MIT License"]
-
-
-class TestLicenseFiles:
-    def base_pyproject(
-        self,
-        tmp_path,
-        additional_text="",
-        license_toml='license = {file = "LICENSE.txt"}\n',
-    ):
-        text = PEP639_LICENSE_EXPRESSION
-
-        # Sanity-check
-        assert 'license = "mit or apache-2.0"' in text
-        assert 'license-files' not in text
-        assert "[tool.setuptools]" not in text
-
-        text = re.sub(
-            r"(license = .*)\n",
-            license_toml,
-            text,
-            count=1,
-        )
-        assert license_toml in text  # sanity check
-        text = f"{text}\n{additional_text}\n"
-        pyproject = _pep621_example_project(tmp_path, "README", pyproject_text=text)
-        return pyproject
-
-    def base_pyproject_license_pep639(self, tmp_path, additional_text=""):
-        return self.base_pyproject(
-            tmp_path,
-            additional_text=additional_text,
-            license_toml='license = "licenseref-Proprietary"'
-            '\nlicense-files = ["_FILE*"]\n',
-        )
-
-    def test_both_license_and_license_files_defined(self, tmp_path):
-        setuptools_config = '[tool.setuptools]\nlicense-files = ["_FILE*"]'
-        pyproject = self.base_pyproject(tmp_path, setuptools_config)
-
-        (tmp_path / "_FILE.txt").touch()
-        (tmp_path / "_FILE.rst").touch()
-
-        # Would normally match the `license_files` patterns, but we want to exclude it
-        # by being explicit. On the other hand, contents should be added to `license`
-        license = tmp_path / "LICENSE.txt"
-        license.write_text("LicenseRef-Proprietary\n", encoding="utf-8")
-
-        msg1 = "'tool.setuptools.license-files' is deprecated in favor of 'project.license-files'"
-        msg2 = ".project.license. as a TOML table is deprecated"
-        with (
-            pytest.warns(SetuptoolsDeprecationWarning, match=msg1),
-            pytest.warns(SetuptoolsDeprecationWarning, match=msg2),
-        ):
-            dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-        assert set(dist.metadata.license_files) == {"_FILE.rst", "_FILE.txt"}
-        assert dist.metadata.license == "LicenseRef-Proprietary\n"
-
-    def test_both_license_and_license_files_defined_pep639(self, tmp_path):
-        # Set license and license-files
-        pyproject = self.base_pyproject_license_pep639(tmp_path)
-
-        (tmp_path / "_FILE.txt").touch()
-        (tmp_path / "_FILE.rst").touch()
-
-        msg = "Normalizing.*LicenseRef"
-        with pytest.warns(InformationOnly, match=msg):
-            dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-        assert set(dist.metadata.license_files) == {"_FILE.rst", "_FILE.txt"}
-        assert dist.metadata.license is None
-        assert dist.metadata.license_expression == "LicenseRef-Proprietary"
-
-    def test_license_files_defined_twice(self, tmp_path):
-        # Set project.license-files and tools.setuptools.license-files
-        setuptools_config = '[tool.setuptools]\nlicense-files = ["_FILE*"]'
-        pyproject = self.base_pyproject_license_pep639(tmp_path, setuptools_config)
-
-        msg = "'project.license-files' is defined already. Remove 'tool.setuptools.license-files'"
-        with pytest.raises(InvalidConfigError, match=msg):
-            pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-    def test_default_patterns(self, tmp_path):
-        setuptools_config = '[tool.setuptools]\nzip-safe = false'
-        # ^ used just to trigger section validation
-        pyproject = self.base_pyproject(tmp_path, setuptools_config, license_toml="")
-
-        license_files = "LICENCE-a.html COPYING-abc.txt AUTHORS-xyz NOTICE,def".split()
-
-        for fname in license_files:
-            (tmp_path / fname).write_text(f"{fname}\n", encoding="utf-8")
-
-        dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-        assert (tmp_path / "LICENSE.txt").exists()  # from base example
-        assert set(dist.metadata.license_files) == {*license_files, "LICENSE.txt"}
-
-    def test_missing_patterns(self, tmp_path):
-        pyproject = self.base_pyproject_license_pep639(tmp_path)
-        assert list(tmp_path.glob("_FILE*")) == []  # sanity check
-
-        msg1 = "Cannot find any files for the given pattern.*"
-        msg2 = "Normalizing 'licenseref-Proprietary' to 'LicenseRef-Proprietary'"
-        with (
-            pytest.warns(SetuptoolsDeprecationWarning, match=msg1),
-            pytest.warns(InformationOnly, match=msg2),
-        ):
-            pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-    def test_deprecated_file_expands_to_text(self, tmp_path):
-        """Make sure the old example with ``license = {text = ...}`` works"""
-
-        assert 'license-files = ["LICENSE.txt"]' in PEP621_EXAMPLE  # sanity check
-        text = PEP621_EXAMPLE.replace(
-            'license-files = ["LICENSE.txt"]',
-            'license = {file = "LICENSE.txt"}',
-        )
-        pyproject = _pep621_example_project(tmp_path, pyproject_text=text)
-
-        msg = ".project.license. as a TOML table is deprecated"
-        with pytest.warns(SetuptoolsDeprecationWarning, match=msg):
-            dist = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-        assert dist.metadata.license == "--- LICENSE stub ---"
-        assert set(dist.metadata.license_files) == {"LICENSE.txt"}  # auto-filled
-
-
-class TestPyModules:
-    # https://github.com/pypa/setuptools/issues/4316
-
-    def dist(self, name):
-        toml_config = f"""
-        [project]
-        name = "test"
-        version = "42.0"
-        [tool.setuptools]
-        py-modules = [{name!r}]
-        """
-        pyproject = Path("pyproject.toml")
-        pyproject.write_text(cleandoc(toml_config), encoding="utf-8")
-        return pyprojecttoml.apply_configuration(Distribution({}), pyproject)
-
-    @pytest.mark.parametrize("module", ["pip-run", "abc-d.λ-xyz-e"])
-    def test_valid_module_name(self, tmp_path, monkeypatch, module):
-        monkeypatch.chdir(tmp_path)
-        assert module in self.dist(module).py_modules
-
-    @pytest.mark.parametrize("module", ["pip run", "-pip-run", "pip-run-stubs"])
-    def test_invalid_module_name(self, tmp_path, monkeypatch, module):
-        monkeypatch.chdir(tmp_path)
-        with pytest.raises(ValueError, match="py-modules"):
-            self.dist(module).py_modules
-
-
-class TestExtModules:
-    def test_pyproject_sets_attribute(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        pyproject = Path("pyproject.toml")
-        toml_config = """
-        [project]
-        name = "test"
-        version = "42.0"
-        [tool.setuptools]
-        ext-modules = [
-          {name = "my.ext", sources = ["hello.c", "world.c"]}
-        ]
-        """
-        pyproject.write_text(cleandoc(toml_config), encoding="utf-8")
-        with pytest.warns(pyprojecttoml._ExperimentalConfiguration):
-            dist = pyprojecttoml.apply_configuration(Distribution({}), pyproject)
-        assert len(dist.ext_modules) == 1
-        assert dist.ext_modules[0].name == "my.ext"
-        assert set(dist.ext_modules[0].sources) == {"hello.c", "world.c"}
-
-
-class TestDeprecatedFields:
-    def test_namespace_packages(self, tmp_path):
-        pyproject = tmp_path / "pyproject.toml"
-        config = """
-        [project]
-        name = "myproj"
-        version = "42"
-        [tool.setuptools]
-        namespace-packages = ["myproj.pkg"]
-        """
-        pyproject.write_text(cleandoc(config), encoding="utf-8")
-        with pytest.raises(RemovedConfigError, match="namespace-packages"):
-            pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject)
-
-
-class TestPresetField:
-    def pyproject(self, tmp_path, dynamic, extra_content=""):
-        content = f"[project]\nname = 'proj'\ndynamic = {dynamic!r}\n"
-        if "version" not in dynamic:
-            content += "version = '42'\n"
-        file = tmp_path / "pyproject.toml"
-        file.write_text(content + extra_content, encoding="utf-8")
-        return file
-
-    @pytest.mark.parametrize(
-        ("attr", "field", "value"),
-        [
-            ("license_expression", "license", "MIT"),
-            pytest.param(
-                *("license", "license", "Not SPDX"),
-                marks=[pytest.mark.filterwarnings("ignore:.*license. overwritten")],
-            ),
-            ("classifiers", "classifiers", ["Private :: Classifier"]),
-            ("entry_points", "scripts", {"console_scripts": ["foobar=foobar:main"]}),
-            ("entry_points", "gui-scripts", {"gui_scripts": ["bazquux=bazquux:main"]}),
-            pytest.param(
-                *("install_requires", "dependencies", ["six"]),
-                marks=[
-                    pytest.mark.filterwarnings("ignore:.*install_requires. overwritten")
-                ],
-            ),
-        ],
-    )
-    def test_not_listed_in_dynamic(self, tmp_path, attr, field, value):
-        """Setuptools cannot set a field if not listed in ``dynamic``"""
-        pyproject = self.pyproject(tmp_path, [])
-        dist = makedist(tmp_path, **{attr: value})
-        msg = re.compile(f"defined outside of `pyproject.toml`:.*{field}", re.S)
-        with pytest.warns(_MissingDynamic, match=msg):
-            dist = pyprojecttoml.apply_configuration(dist, pyproject)
-
-        dist_value = _some_attrgetter(f"metadata.{attr}", attr)(dist)
-        assert not dist_value
-
-    @pytest.mark.parametrize(
-        ("attr", "field", "value"),
-        [
-            ("license_expression", "license", "MIT"),
-            ("install_requires", "dependencies", []),
-            ("extras_require", "optional-dependencies", {}),
-            ("install_requires", "dependencies", ["six"]),
-            ("classifiers", "classifiers", ["Private :: Classifier"]),
-        ],
-    )
-    def test_listed_in_dynamic(self, tmp_path, attr, field, value):
-        pyproject = self.pyproject(tmp_path, [field])
-        dist = makedist(tmp_path, **{attr: value})
-        dist = pyprojecttoml.apply_configuration(dist, pyproject)
-        dist_value = _some_attrgetter(f"metadata.{attr}", attr)(dist)
-        assert dist_value == value
-
-    def test_license_files_exempt_from_dynamic(self, monkeypatch, tmp_path):
-        """
-        license-file is currently not considered in the context of dynamic.
-        As per 2025-02-19, https://packaging.python.org/en/latest/specifications/pyproject-toml/#license-files
-        allows setuptools to fill-in `license-files` the way it sees fit:
-
-        > If the license-files key is not defined, tools can decide how to handle license files.
-        > For example they can choose not to include any files or use their own
-        > logic to discover the appropriate files in the distribution.
-
-        Using license_files from setup.py to fill-in the value is in accordance
-        with this rule.
-        """
-        monkeypatch.chdir(tmp_path)
-        pyproject = self.pyproject(tmp_path, [])
-        dist = makedist(tmp_path, license_files=["LIC*"])
-        (tmp_path / "LIC1").write_text("42", encoding="utf-8")
-        dist = pyprojecttoml.apply_configuration(dist, pyproject)
-        assert dist.metadata.license_files == ["LIC1"]
-
-    def test_warning_overwritten_dependencies(self, tmp_path):
-        src = "[project]\nname='pkg'\nversion='0.1'\ndependencies=['click']\n"
-        pyproject = tmp_path / "pyproject.toml"
-        pyproject.write_text(src, encoding="utf-8")
-        dist = makedist(tmp_path, install_requires=["wheel"])
-        with pytest.warns(match="`install_requires` overwritten"):
-            dist = pyprojecttoml.apply_configuration(dist, pyproject)
-        assert "wheel" not in dist.install_requires
-
-    def test_optional_dependencies_dont_remove_env_markers(self, tmp_path):
-        """
-        Internally setuptools converts dependencies with markers to "extras".
-        If ``install_requires`` is given by ``setup.py``, we have to ensure that
-        applying ``optional-dependencies`` does not overwrite the mandatory
-        dependencies with markers (see #3204).
-        """
-        # If setuptools replace its internal mechanism that uses `requires.txt`
-        # this test has to be rewritten to adapt accordingly
-        extra = "\n[project.optional-dependencies]\nfoo = ['bar>1']\n"
-        pyproject = self.pyproject(tmp_path, ["dependencies"], extra)
-        install_req = ['importlib-resources (>=3.0.0) ; python_version < "3.7"']
-        dist = makedist(tmp_path, install_requires=install_req)
-        dist = pyprojecttoml.apply_configuration(dist, pyproject)
-        assert "foo" in dist.extras_require
-        egg_info = dist.get_command_obj("egg_info")
-        write_requirements(egg_info, tmp_path, tmp_path / "requires.txt")
-        reqs = (tmp_path / "requires.txt").read_text(encoding="utf-8")
-        assert "importlib-resources" in reqs
-        assert "bar" in reqs
-        assert ':python_version < "3.7"' in reqs
-
-    @pytest.mark.parametrize(
-        ("field", "group"),
-        [("scripts", "console_scripts"), ("gui-scripts", "gui_scripts")],
-    )
-    @pytest.mark.filterwarnings("error")
-    def test_scripts_dont_require_dynamic_entry_points(self, tmp_path, field, group):
-        # Issue 3862
-        pyproject = self.pyproject(tmp_path, [field])
-        dist = makedist(tmp_path, entry_points={group: ["foobar=foobar:main"]})
-        dist = pyprojecttoml.apply_configuration(dist, pyproject)
-        assert group in dist.entry_points
-
-
-class TestMeta:
-    def test_example_file_in_sdist(self, setuptools_sdist):
-        """Meta test to ensure tests can run from sdist"""
-        with tarfile.open(setuptools_sdist) as tar:
-            assert any(name.endswith(EXAMPLES_FILE) for name in tar.getnames())
-
-
-class TestInteropCommandLineParsing:
-    def test_version(self, tmp_path, monkeypatch, capsys):
-        # See pypa/setuptools#4047
-        # This test can be removed once the CLI interface of setup.py is removed
-        monkeypatch.chdir(tmp_path)
-        toml_config = """
-        [project]
-        name = "test"
-        version = "42.0"
-        """
-        pyproject = Path(tmp_path, "pyproject.toml")
-        pyproject.write_text(cleandoc(toml_config), encoding="utf-8")
-        opts = {"script_args": ["--version"]}
-        dist = pyprojecttoml.apply_configuration(Distribution(opts), pyproject)
-        dist.parse_command_line()  # <-- there should be no exception here.
-        captured = capsys.readouterr()
-        assert "42.0" in captured.out
-
-
-class TestStaticConfig:
-    def test_mark_static_fields(self, tmp_path, monkeypatch):
-        monkeypatch.chdir(tmp_path)
-        toml_config = """
-        [project]
-        name = "test"
-        version = "42.0"
-        dependencies = ["hello"]
-        keywords = ["world"]
-        classifiers = ["private :: hello world"]
-        [tool.setuptools]
-        obsoletes = ["abcd"]
-        provides = ["abcd"]
-        platforms = ["abcd"]
-        """
-        pyproject = Path(tmp_path, "pyproject.toml")
-        pyproject.write_text(cleandoc(toml_config), encoding="utf-8")
-        dist = pyprojecttoml.apply_configuration(Distribution({}), pyproject)
-        assert is_static(dist.install_requires)
-        assert is_static(dist.metadata.keywords)
-        assert is_static(dist.metadata.classifiers)
-        assert is_static(dist.metadata.obsoletes)
-        assert is_static(dist.metadata.provides)
-        assert is_static(dist.metadata.platforms)
-
-
-# --- Auxiliary Functions ---
-
-
-def core_metadata(dist) -> str:
-    with io.StringIO() as buffer:
-        dist.metadata.write_pkg_file(buffer)
-        pkg_file_txt = buffer.getvalue()
-
-    # Make sure core metadata is valid
-    Metadata.from_email(pkg_file_txt, validate=True)  # can raise exceptions
-
-    skip_prefixes: tuple[str, ...] = ()
-    skip_lines = set()
-    # ---- DIFF NORMALISATION ----
-    # PEP 621 is very particular about author/maintainer metadata conversion, so skip
-    skip_prefixes += ("Author:", "Author-email:", "Maintainer:", "Maintainer-email:")
-    # May be redundant with Home-page
-    skip_prefixes += ("Project-URL: Homepage,", "Home-page:")
-    # May be missing in original (relying on default) but backfilled in the TOML
-    skip_prefixes += ("Description-Content-Type:",)
-    # Remove empty lines
-    skip_lines.add("")
-
-    result = []
-    for line in pkg_file_txt.splitlines():
-        if line.startswith(skip_prefixes) or line in skip_lines:
-            continue
-        result.append(line + "\n")
-
-    return "".join(result)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_expand.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_expand.py
deleted file mode 100644
index c5710ec..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_expand.py
+++ /dev/null
@@ -1,247 +0,0 @@
-import os
-import sys
-from pathlib import Path
-
-import pytest
-
-from setuptools._static import is_static
-from setuptools.config import expand
-from setuptools.discovery import find_package_path
-
-from distutils.errors import DistutilsOptionError
-
-
-def write_files(files, root_dir):
-    for file, content in files.items():
-        path = root_dir / file
-        path.parent.mkdir(exist_ok=True, parents=True)
-        path.write_text(content, encoding="utf-8")
-
-
-def test_glob_relative(tmp_path, monkeypatch):
-    files = {
-        "dir1/dir2/dir3/file1.txt",
-        "dir1/dir2/file2.txt",
-        "dir1/file3.txt",
-        "a.ini",
-        "b.ini",
-        "dir1/c.ini",
-        "dir1/dir2/a.ini",
-    }
-
-    write_files({k: "" for k in files}, tmp_path)
-    patterns = ["**/*.txt", "[ab].*", "**/[ac].ini"]
-    monkeypatch.chdir(tmp_path)
-    assert set(expand.glob_relative(patterns)) == files
-    # Make sure the same APIs work outside cwd
-    assert set(expand.glob_relative(patterns, tmp_path)) == files
-
-
-def test_read_files(tmp_path, monkeypatch):
-    dir_ = tmp_path / "dir_"
-    (tmp_path / "_dir").mkdir(exist_ok=True)
-    (tmp_path / "a.txt").touch()
-    files = {"a.txt": "a", "dir1/b.txt": "b", "dir1/dir2/c.txt": "c"}
-    write_files(files, dir_)
-
-    secrets = Path(str(dir_) + "secrets")
-    secrets.mkdir(exist_ok=True)
-    write_files({"secrets.txt": "secret keys"}, secrets)
-
-    with monkeypatch.context() as m:
-        m.chdir(dir_)
-        assert expand.read_files(list(files)) == "a\nb\nc"
-
-        cannot_access_msg = r"Cannot access '.*\.\..a\.txt'"
-        with pytest.raises(DistutilsOptionError, match=cannot_access_msg):
-            expand.read_files(["../a.txt"])
-
-        cannot_access_secrets_msg = r"Cannot access '.*secrets\.txt'"
-        with pytest.raises(DistutilsOptionError, match=cannot_access_secrets_msg):
-            expand.read_files(["../dir_secrets/secrets.txt"])
-
-    # Make sure the same APIs work outside cwd
-    assert expand.read_files(list(files), dir_) == "a\nb\nc"
-    with pytest.raises(DistutilsOptionError, match=cannot_access_msg):
-        expand.read_files(["../a.txt"], dir_)
-
-
-class TestReadAttr:
-    @pytest.mark.parametrize(
-        "example",
-        [
-            # No cookie means UTF-8:
-            b"__version__ = '\xc3\xa9'\nraise SystemExit(1)\n",
-            # If a cookie is present, honor it:
-            b"# -*- coding: utf-8 -*-\n__version__ = '\xc3\xa9'\nraise SystemExit(1)\n",
-            b"# -*- coding: latin1 -*-\n__version__ = '\xe9'\nraise SystemExit(1)\n",
-        ],
-    )
-    def test_read_attr_encoding_cookie(self, example, tmp_path):
-        (tmp_path / "mod.py").write_bytes(example)
-        assert expand.read_attr('mod.__version__', root_dir=tmp_path) == 'é'
-
-    def test_read_attr(self, tmp_path, monkeypatch):
-        files = {
-            "pkg/__init__.py": "",
-            "pkg/sub/__init__.py": "VERSION = '0.1.1'",
-            "pkg/sub/mod.py": (
-                "VALUES = {'a': 0, 'b': {42}, 'c': (0, 1, 1)}\nraise SystemExit(1)"
-            ),
-        }
-        write_files(files, tmp_path)
-
-        with monkeypatch.context() as m:
-            m.chdir(tmp_path)
-            # Make sure it can read the attr statically without evaluating the module
-            version = expand.read_attr('pkg.sub.VERSION')
-            values = expand.read_attr('lib.mod.VALUES', {'lib': 'pkg/sub'})
-
-        assert version == '0.1.1'
-        assert is_static(values)
-
-        assert values['a'] == 0
-        assert values['b'] == {42}
-        assert is_static(values)
-
-        # Make sure the same APIs work outside cwd
-        assert expand.read_attr('pkg.sub.VERSION', root_dir=tmp_path) == '0.1.1'
-        values = expand.read_attr('lib.mod.VALUES', {'lib': 'pkg/sub'}, tmp_path)
-        assert values['c'] == (0, 1, 1)
-
-    @pytest.mark.parametrize(
-        "example",
-        [
-            "VERSION: str\nVERSION = '0.1.1'\nraise SystemExit(1)\n",
-            "VERSION: str = '0.1.1'\nraise SystemExit(1)\n",
-        ],
-    )
-    def test_read_annotated_attr(self, tmp_path, example):
-        files = {
-            "pkg/__init__.py": "",
-            "pkg/sub/__init__.py": example,
-        }
-        write_files(files, tmp_path)
-        # Make sure this attribute can be read statically
-        version = expand.read_attr('pkg.sub.VERSION', root_dir=tmp_path)
-        assert version == '0.1.1'
-        assert is_static(version)
-
-    @pytest.mark.parametrize(
-        "example",
-        [
-            "VERSION = (lambda: '0.1.1')()\n",
-            "def fn(): return '0.1.1'\nVERSION = fn()\n",
-            "VERSION: str = (lambda: '0.1.1')()\n",
-        ],
-    )
-    def test_read_dynamic_attr(self, tmp_path, monkeypatch, example):
-        files = {
-            "pkg/__init__.py": "",
-            "pkg/sub/__init__.py": example,
-        }
-        write_files(files, tmp_path)
-        monkeypatch.chdir(tmp_path)
-        version = expand.read_attr('pkg.sub.VERSION')
-        assert version == '0.1.1'
-        assert not is_static(version)
-
-    def test_import_order(self, tmp_path):
-        """
-        Sometimes the import machinery will import the parent package of a nested
-        module, which triggers side-effects and might create problems (see issue #3176)
-
-        ``read_attr`` should bypass these limitations by resolving modules statically
-        (via ast.literal_eval).
-        """
-        files = {
-            "src/pkg/__init__.py": "from .main import func\nfrom .about import version",
-            "src/pkg/main.py": "import super_complicated_dep\ndef func(): return 42",
-            "src/pkg/about.py": "version = '42'",
-        }
-        write_files(files, tmp_path)
-        attr_desc = "pkg.about.version"
-        package_dir = {"": "src"}
-        # `import super_complicated_dep` should not run, otherwise the build fails
-        assert expand.read_attr(attr_desc, package_dir, tmp_path) == "42"
-
-
-@pytest.mark.parametrize(
-    ("package_dir", "file", "module", "return_value"),
-    [
-        ({"": "src"}, "src/pkg/main.py", "pkg.main", 42),
-        ({"pkg": "lib"}, "lib/main.py", "pkg.main", 13),
-        ({}, "single_module.py", "single_module", 70),
-        ({}, "flat_layout/pkg.py", "flat_layout.pkg", 836),
-    ],
-)
-def test_resolve_class(monkeypatch, tmp_path, package_dir, file, module, return_value):
-    monkeypatch.setattr(sys, "modules", {})  # reproducibility
-    files = {file: f"class Custom:\n    def testing(self): return {return_value}"}
-    write_files(files, tmp_path)
-    cls = expand.resolve_class(f"{module}.Custom", package_dir, tmp_path)
-    assert cls().testing() == return_value
-
-
-@pytest.mark.parametrize(
-    ("args", "pkgs"),
-    [
-        ({"where": ["."], "namespaces": False}, {"pkg", "other"}),
-        ({"where": [".", "dir1"], "namespaces": False}, {"pkg", "other", "dir2"}),
-        ({"namespaces": True}, {"pkg", "other", "dir1", "dir1.dir2"}),
-        ({}, {"pkg", "other", "dir1", "dir1.dir2"}),  # default value for `namespaces`
-    ],
-)
-def test_find_packages(tmp_path, args, pkgs):
-    files = {
-        "pkg/__init__.py",
-        "other/__init__.py",
-        "dir1/dir2/__init__.py",
-    }
-    write_files({k: "" for k in files}, tmp_path)
-
-    package_dir = {}
-    kwargs = {"root_dir": tmp_path, "fill_package_dir": package_dir, **args}
-    where = kwargs.get("where", ["."])
-    assert set(expand.find_packages(**kwargs)) == pkgs
-    for pkg in pkgs:
-        pkg_path = find_package_path(pkg, package_dir, tmp_path)
-        assert os.path.exists(pkg_path)
-
-    # Make sure the same APIs work outside cwd
-    where = [
-        str((tmp_path / p).resolve()).replace(os.sep, "/")  # ensure posix-style paths
-        for p in args.pop("where", ["."])
-    ]
-
-    assert set(expand.find_packages(where=where, **args)) == pkgs
-
-
-@pytest.mark.parametrize(
-    ("files", "where", "expected_package_dir"),
-    [
-        (["pkg1/__init__.py", "pkg1/other.py"], ["."], {}),
-        (["pkg1/__init__.py", "pkg2/__init__.py"], ["."], {}),
-        (["src/pkg1/__init__.py", "src/pkg1/other.py"], ["src"], {"": "src"}),
-        (["src/pkg1/__init__.py", "src/pkg2/__init__.py"], ["src"], {"": "src"}),
-        (
-            ["src1/pkg1/__init__.py", "src2/pkg2/__init__.py"],
-            ["src1", "src2"],
-            {"pkg1": "src1/pkg1", "pkg2": "src2/pkg2"},
-        ),
-        (
-            ["src/pkg1/__init__.py", "pkg2/__init__.py"],
-            ["src", "."],
-            {"pkg1": "src/pkg1"},
-        ),
-    ],
-)
-def test_fill_package_dir(tmp_path, files, where, expected_package_dir):
-    write_files({k: "" for k in files}, tmp_path)
-    pkg_dir = {}
-    kwargs = {"root_dir": tmp_path, "fill_package_dir": pkg_dir, "namespaces": False}
-    pkgs = expand.find_packages(where=where, **kwargs)
-    assert set(pkg_dir.items()) == set(expected_package_dir.items())
-    for pkg in pkgs:
-        pkg_path = find_package_path(pkg, pkg_dir, tmp_path)
-        assert os.path.exists(pkg_path)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml.py
deleted file mode 100644
index db40fcd..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml.py
+++ /dev/null
@@ -1,396 +0,0 @@
-import re
-from configparser import ConfigParser
-from inspect import cleandoc
-
-import jaraco.path
-import pytest
-import tomli_w
-from path import Path
-
-import setuptools  # noqa: F401 # force distutils.core to be patched
-from setuptools.config.pyprojecttoml import (
-    _ToolsTypoInMetadata,
-    apply_configuration,
-    expand_configuration,
-    read_configuration,
-    validate,
-)
-from setuptools.dist import Distribution
-from setuptools.errors import OptionError
-
-import distutils.core
-
-EXAMPLE = """
-[project]
-name = "myproj"
-keywords = ["some", "key", "words"]
-dynamic = ["version", "readme"]
-requires-python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-dependencies = [
-    'importlib-metadata>=0.12;python_version<"3.8"',
-    'importlib-resources>=1.0;python_version<"3.7"',
-    'pathlib2>=2.3.3,<3;python_version < "3.4" and sys.platform != "win32"',
-]
-
-[project.optional-dependencies]
-docs = [
-    "sphinx>=3",
-    "sphinx-argparse>=0.2.5",
-    "sphinx-rtd-theme>=0.4.3",
-]
-testing = [
-    "pytest>=1",
-    "coverage>=3,<5",
-]
-
-[project.scripts]
-exec = "pkg.__main__:exec"
-
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-zip-safe = true
-platforms = ["any"]
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.cmdclass]
-sdist = "pkg.mod.CustomSdist"
-
-[tool.setuptools.dynamic.version]
-attr = "pkg.__version__.VERSION"
-
-[tool.setuptools.dynamic.readme]
-file = ["README.md"]
-content-type = "text/markdown"
-
-[tool.setuptools.package-data]
-"*" = ["*.txt"]
-
-[tool.setuptools.data-files]
-"data" = ["_files/*.txt"]
-
-[tool.distutils.sdist]
-formats = "gztar"
-
-[tool.distutils.bdist_wheel]
-universal = true
-"""
-
-
-def create_example(path, pkg_root):
-    files = {
-        "pyproject.toml": EXAMPLE,
-        "README.md": "hello world",
-        "_files": {
-            "file.txt": "",
-        },
-    }
-    packages = {
-        "pkg": {
-            "__init__.py": "",
-            "mod.py": "class CustomSdist: pass",
-            "__version__.py": "VERSION = (3, 10)",
-            "__main__.py": "def exec(): print('hello')",
-        },
-    }
-
-    assert pkg_root  # Meta-test: cannot be empty string.
-
-    if pkg_root == ".":
-        files = {**files, **packages}
-        # skip other files: flat-layout will raise error for multi-package dist
-    else:
-        # Use this opportunity to ensure namespaces are discovered
-        files[pkg_root] = {**packages, "other": {"nested": {"__init__.py": ""}}}
-
-    jaraco.path.build(files, prefix=path)
-
-
-def verify_example(config, path, pkg_root):
-    pyproject = path / "pyproject.toml"
-    pyproject.write_text(tomli_w.dumps(config), encoding="utf-8")
-    expanded = expand_configuration(config, path)
-    expanded_project = expanded["project"]
-    assert read_configuration(pyproject, expand=True) == expanded
-    assert expanded_project["version"] == "3.10"
-    assert expanded_project["readme"]["text"] == "hello world"
-    assert "packages" in expanded["tool"]["setuptools"]
-    if pkg_root == ".":
-        # Auto-discovery will raise error for multi-package dist
-        assert set(expanded["tool"]["setuptools"]["packages"]) == {"pkg"}
-    else:
-        assert set(expanded["tool"]["setuptools"]["packages"]) == {
-            "pkg",
-            "other",
-            "other.nested",
-        }
-    assert expanded["tool"]["setuptools"]["include-package-data"] is True
-    assert "" in expanded["tool"]["setuptools"]["package-data"]
-    assert "*" not in expanded["tool"]["setuptools"]["package-data"]
-    assert expanded["tool"]["setuptools"]["data-files"] == [
-        ("data", ["_files/file.txt"])
-    ]
-
-
-def test_read_configuration(tmp_path):
-    create_example(tmp_path, "src")
-    pyproject = tmp_path / "pyproject.toml"
-
-    config = read_configuration(pyproject, expand=False)
-    assert config["project"].get("version") is None
-    assert config["project"].get("readme") is None
-
-    verify_example(config, tmp_path, "src")
-
-
-@pytest.mark.parametrize(
-    ("pkg_root", "opts"),
-    [
-        (".", {}),
-        ("src", {}),
-        ("lib", {"packages": {"find": {"where": ["lib"]}}}),
-    ],
-)
-def test_discovered_package_dir_with_attr_directive_in_config(tmp_path, pkg_root, opts):
-    create_example(tmp_path, pkg_root)
-
-    pyproject = tmp_path / "pyproject.toml"
-
-    config = read_configuration(pyproject, expand=False)
-    assert config["project"].get("version") is None
-    assert config["project"].get("readme") is None
-    config["tool"]["setuptools"].pop("packages", None)
-    config["tool"]["setuptools"].pop("package-dir", None)
-
-    config["tool"]["setuptools"].update(opts)
-    verify_example(config, tmp_path, pkg_root)
-
-
-ENTRY_POINTS = {
-    "console_scripts": {"a": "mod.a:func"},
-    "gui_scripts": {"b": "mod.b:func"},
-    "other": {"c": "mod.c:func [extra]"},
-}
-
-
-class TestEntryPoints:
-    def write_entry_points(self, tmp_path):
-        entry_points = ConfigParser()
-        entry_points.read_dict(ENTRY_POINTS)
-        with open(tmp_path / "entry-points.txt", "w", encoding="utf-8") as f:
-            entry_points.write(f)
-
-    def pyproject(self, dynamic=None):
-        project = {"dynamic": dynamic or ["scripts", "gui-scripts", "entry-points"]}
-        tool = {"dynamic": {"entry-points": {"file": "entry-points.txt"}}}
-        return {"project": project, "tool": {"setuptools": tool}}
-
-    def test_all_listed_in_dynamic(self, tmp_path):
-        self.write_entry_points(tmp_path)
-        expanded = expand_configuration(self.pyproject(), tmp_path)
-        expanded_project = expanded["project"]
-        assert len(expanded_project["scripts"]) == 1
-        assert expanded_project["scripts"]["a"] == "mod.a:func"
-        assert len(expanded_project["gui-scripts"]) == 1
-        assert expanded_project["gui-scripts"]["b"] == "mod.b:func"
-        assert len(expanded_project["entry-points"]) == 1
-        assert expanded_project["entry-points"]["other"]["c"] == "mod.c:func [extra]"
-
-    @pytest.mark.parametrize("missing_dynamic", ("scripts", "gui-scripts"))
-    def test_scripts_not_listed_in_dynamic(self, tmp_path, missing_dynamic):
-        self.write_entry_points(tmp_path)
-        dynamic = {"scripts", "gui-scripts", "entry-points"} - {missing_dynamic}
-
-        msg = f"defined outside of `pyproject.toml`:.*{missing_dynamic}"
-        with pytest.raises(OptionError, match=re.compile(msg, re.S)):
-            expand_configuration(self.pyproject(dynamic), tmp_path)
-
-
-class TestClassifiers:
-    def test_dynamic(self, tmp_path):
-        # Let's create a project example that has dynamic classifiers
-        # coming from a txt file.
-        create_example(tmp_path, "src")
-        classifiers = cleandoc(
-            """
-            Framework :: Flask
-            Programming Language :: Haskell
-            """
-        )
-        (tmp_path / "classifiers.txt").write_text(classifiers, encoding="utf-8")
-
-        pyproject = tmp_path / "pyproject.toml"
-        config = read_configuration(pyproject, expand=False)
-        dynamic = config["project"]["dynamic"]
-        config["project"]["dynamic"] = list({*dynamic, "classifiers"})
-        dynamic_config = config["tool"]["setuptools"]["dynamic"]
-        dynamic_config["classifiers"] = {"file": "classifiers.txt"}
-
-        # When the configuration is expanded,
-        # each line of the file should be an different classifier.
-        validate(config, pyproject)
-        expanded = expand_configuration(config, tmp_path)
-
-        assert set(expanded["project"]["classifiers"]) == {
-            "Framework :: Flask",
-            "Programming Language :: Haskell",
-        }
-
-    def test_dynamic_without_config(self, tmp_path):
-        config = """
-        [project]
-        name = "myproj"
-        version = '42'
-        dynamic = ["classifiers"]
-        """
-
-        pyproject = tmp_path / "pyproject.toml"
-        pyproject.write_text(cleandoc(config), encoding="utf-8")
-        with pytest.raises(OptionError, match="No configuration .* .classifiers."):
-            read_configuration(pyproject)
-
-    def test_dynamic_readme_from_setup_script_args(self, tmp_path):
-        config = """
-        [project]
-        name = "myproj"
-        version = '42'
-        dynamic = ["readme"]
-        """
-        pyproject = tmp_path / "pyproject.toml"
-        pyproject.write_text(cleandoc(config), encoding="utf-8")
-        dist = Distribution(attrs={"long_description": "42"})
-        # No error should occur because of missing `readme`
-        dist = apply_configuration(dist, pyproject)
-        assert dist.metadata.long_description == "42"
-
-    def test_dynamic_without_file(self, tmp_path):
-        config = """
-        [project]
-        name = "myproj"
-        version = '42'
-        dynamic = ["classifiers"]
-
-        [tool.setuptools.dynamic]
-        classifiers = {file = ["classifiers.txt"]}
-        """
-
-        pyproject = tmp_path / "pyproject.toml"
-        pyproject.write_text(cleandoc(config), encoding="utf-8")
-        with pytest.warns(UserWarning, match="File .*classifiers.txt. cannot be found"):
-            expanded = read_configuration(pyproject)
-        assert "classifiers" not in expanded["project"]
-
-
-@pytest.mark.parametrize(
-    "example",
-    (
-        """
-        [project]
-        name = "myproj"
-        version = "1.2"
-
-        [my-tool.that-disrespect.pep518]
-        value = 42
-        """,
-    ),
-)
-def test_ignore_unrelated_config(tmp_path, example):
-    pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text(cleandoc(example), encoding="utf-8")
-
-    # Make sure no error is raised due to 3rd party configs in pyproject.toml
-    assert read_configuration(pyproject) is not None
-
-
-@pytest.mark.parametrize(
-    ("example", "error_msg"),
-    [
-        (
-            """
-            [project]
-            name = "myproj"
-            version = "1.2"
-            requires = ['pywin32; platform_system=="Windows"' ]
-            """,
-            "configuration error: .project. must not contain ..requires.. properties",
-        ),
-    ],
-)
-def test_invalid_example(tmp_path, example, error_msg):
-    pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text(cleandoc(example), encoding="utf-8")
-
-    pattern = re.compile(f"invalid pyproject.toml.*{error_msg}.*", re.M | re.S)
-    with pytest.raises(ValueError, match=pattern):
-        read_configuration(pyproject)
-
-
-@pytest.mark.parametrize("config", ("", "[tool.something]\nvalue = 42"))
-def test_empty(tmp_path, config):
-    pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text(config, encoding="utf-8")
-
-    # Make sure no error is raised
-    assert read_configuration(pyproject) == {}
-
-
-@pytest.mark.parametrize("config", ("[project]\nname = 'myproj'\nversion='42'\n",))
-def test_include_package_data_by_default(tmp_path, config):
-    """Builds with ``pyproject.toml`` should consider ``include-package-data=True`` as
-    default.
-    """
-    pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text(config, encoding="utf-8")
-
-    config = read_configuration(pyproject)
-    assert config["tool"]["setuptools"]["include-package-data"] is True
-
-
-def test_include_package_data_in_setuppy(tmp_path):
-    """Builds with ``pyproject.toml`` should consider ``include_package_data`` set in
-    ``setup.py``.
-
-    See https://github.com/pypa/setuptools/issues/3197#issuecomment-1079023889
-    """
-    files = {
-        "pyproject.toml": "[project]\nname = 'myproj'\nversion='42'\n",
-        "setup.py": "__import__('setuptools').setup(include_package_data=False)",
-    }
-    jaraco.path.build(files, prefix=tmp_path)
-
-    with Path(tmp_path):
-        dist = distutils.core.run_setup("setup.py", {}, stop_after="config")
-
-    assert dist.get_name() == "myproj"
-    assert dist.get_version() == "42"
-    assert dist.include_package_data is False
-
-
-def test_warn_tools_typo(tmp_path):
-    """Test that the common ``tools.setuptools`` typo in ``pyproject.toml`` issues a warning
-
-    See https://github.com/pypa/setuptools/issues/4150
-    """
-    config = """
-    [build-system]
-    requires = ["setuptools"]
-    build-backend = "setuptools.build_meta"
-
-    [project]
-    name = "myproj"
-    version = '42'
-
-    [tools.setuptools]
-    packages = ["package"]
-    """
-
-    pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text(cleandoc(config), encoding="utf-8")
-
-    with pytest.warns(_ToolsTypoInMetadata):
-        read_configuration(pyproject)
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py
deleted file mode 100644
index e42f28f..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_pyprojecttoml_dynamic_deps.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from inspect import cleandoc
-
-import pytest
-from jaraco import path
-
-from setuptools.config.pyprojecttoml import apply_configuration
-from setuptools.dist import Distribution
-from setuptools.warnings import SetuptoolsWarning
-
-
-def test_dynamic_dependencies(tmp_path):
-    files = {
-        "requirements.txt": "six\n  # comment\n",
-        "pyproject.toml": cleandoc(
-            """
-            [project]
-            name = "myproj"
-            version = "1.0"
-            dynamic = ["dependencies"]
-
-            [build-system]
-            requires = ["setuptools", "wheel"]
-            build-backend = "setuptools.build_meta"
-
-            [tool.setuptools.dynamic.dependencies]
-            file = ["requirements.txt"]
-            """
-        ),
-    }
-    path.build(files, prefix=tmp_path)
-    dist = Distribution()
-    dist = apply_configuration(dist, tmp_path / "pyproject.toml")
-    assert dist.install_requires == ["six"]
-
-
-def test_dynamic_optional_dependencies(tmp_path):
-    files = {
-        "requirements-docs.txt": "sphinx\n  # comment\n",
-        "pyproject.toml": cleandoc(
-            """
-            [project]
-            name = "myproj"
-            version = "1.0"
-            dynamic = ["optional-dependencies"]
-
-            [tool.setuptools.dynamic.optional-dependencies.docs]
-            file = ["requirements-docs.txt"]
-
-            [build-system]
-            requires = ["setuptools", "wheel"]
-            build-backend = "setuptools.build_meta"
-            """
-        ),
-    }
-    path.build(files, prefix=tmp_path)
-    dist = Distribution()
-    dist = apply_configuration(dist, tmp_path / "pyproject.toml")
-    assert dist.extras_require == {"docs": ["sphinx"]}
-
-
-def test_mixed_dynamic_optional_dependencies(tmp_path):
-    """
-    Test that if PEP 621 was loosened to allow mixing of dynamic and static
-    configurations in the case of fields containing sub-fields (groups),
-    things would work out.
-    """
-    files = {
-        "requirements-images.txt": "pillow~=42.0\n  # comment\n",
-        "pyproject.toml": cleandoc(
-            """
-            [project]
-            name = "myproj"
-            version = "1.0"
-            dynamic = ["optional-dependencies"]
-
-            [project.optional-dependencies]
-            docs = ["sphinx"]
-
-            [tool.setuptools.dynamic.optional-dependencies.images]
-            file = ["requirements-images.txt"]
-            """
-        ),
-    }
-
-    path.build(files, prefix=tmp_path)
-    pyproject = tmp_path / "pyproject.toml"
-    with pytest.raises(ValueError, match="project.optional-dependencies"):
-        apply_configuration(Distribution(), pyproject)
-
-
-def test_mixed_extras_require_optional_dependencies(tmp_path):
-    files = {
-        "pyproject.toml": cleandoc(
-            """
-            [project]
-            name = "myproj"
-            version = "1.0"
-            optional-dependencies.docs = ["sphinx"]
-            """
-        ),
-    }
-
-    path.build(files, prefix=tmp_path)
-    pyproject = tmp_path / "pyproject.toml"
-
-    with pytest.warns(SetuptoolsWarning, match=".extras_require. overwritten"):
-        dist = Distribution({"extras_require": {"hello": ["world"]}})
-        dist = apply_configuration(dist, pyproject)
-        assert dist.extras_require == {"docs": ["sphinx"]}
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_setupcfg.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_setupcfg.py
deleted file mode 100644
index 61af990..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/config/test_setupcfg.py
+++ /dev/null
@@ -1,980 +0,0 @@
-import configparser
-import contextlib
-import inspect
-import re
-from pathlib import Path
-from unittest.mock import Mock, patch
-
-import pytest
-from packaging.requirements import InvalidRequirement
-
-from setuptools.config.setupcfg import ConfigHandler, Target, read_configuration
-from setuptools.dist import Distribution, _Distribution
-from setuptools.warnings import SetuptoolsDeprecationWarning
-
-from ..textwrap import DALS
-
-from distutils.errors import DistutilsFileError, DistutilsOptionError
-
-
-class ErrConfigHandler(ConfigHandler[Target]):
-    """Erroneous handler. Fails to implement required methods."""
-
-    section_prefix = "**err**"
-
-
-def make_package_dir(name, base_dir, ns=False):
-    dir_package = base_dir
-    for dir_name in name.split('/'):
-        dir_package = dir_package.mkdir(dir_name)
-    init_file = None
-    if not ns:
-        init_file = dir_package.join('__init__.py')
-        init_file.write('')
-    return dir_package, init_file
-
-
-def fake_env(
-    tmpdir, setup_cfg, setup_py=None, encoding='ascii', package_path='fake_package'
-):
-    if setup_py is None:
-        setup_py = 'from setuptools import setup\nsetup()\n'
-
-    tmpdir.join('setup.py').write(setup_py)
-    config = tmpdir.join('setup.cfg')
-    config.write(setup_cfg.encode(encoding), mode='wb')
-
-    package_dir, init_file = make_package_dir(package_path, tmpdir)
-
-    init_file.write(
-        'VERSION = (1, 2, 3)\n'
-        '\n'
-        'VERSION_MAJOR = 1'
-        '\n'
-        'def get_version():\n'
-        '    return [3, 4, 5, "dev"]\n'
-        '\n'
-    )
-
-    return package_dir, config
-
-
-@contextlib.contextmanager
-def get_dist(tmpdir, kwargs_initial=None, parse=True):
-    kwargs_initial = kwargs_initial or {}
-
-    with tmpdir.as_cwd():
-        dist = Distribution(kwargs_initial)
-        dist.script_name = 'setup.py'
-        parse and dist.parse_config_files()
-
-        yield dist
-
-
-def test_parsers_implemented():
-    with pytest.raises(NotImplementedError):
-        handler = ErrConfigHandler(None, {}, False, Mock())
-        handler.parsers
-
-
-class TestConfigurationReader:
-    def test_basic(self, tmpdir):
-        _, config = fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = 10.1.1\n'
-            'keywords = one, two\n'
-            '\n'
-            '[options]\n'
-            'scripts = bin/a.py, bin/b.py\n',
-        )
-        config_dict = read_configuration(str(config))
-        assert config_dict['metadata']['version'] == '10.1.1'
-        assert config_dict['metadata']['keywords'] == ['one', 'two']
-        assert config_dict['options']['scripts'] == ['bin/a.py', 'bin/b.py']
-
-    def test_no_config(self, tmpdir):
-        with pytest.raises(DistutilsFileError):
-            read_configuration(str(tmpdir.join('setup.cfg')))
-
-    def test_ignore_errors(self, tmpdir):
-        _, config = fake_env(
-            tmpdir,
-            '[metadata]\nversion = attr: none.VERSION\nkeywords = one, two\n',
-        )
-        with pytest.raises(ImportError):
-            read_configuration(str(config))
-
-        config_dict = read_configuration(str(config), ignore_option_errors=True)
-
-        assert config_dict['metadata']['keywords'] == ['one', 'two']
-        assert 'version' not in config_dict['metadata']
-
-        config.remove()
-
-
-class TestMetadata:
-    def test_basic(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = 10.1.1\n'
-            'description = Some description\n'
-            'long_description_content_type = text/something\n'
-            'long_description = file: README\n'
-            'name = fake_name\n'
-            'keywords = one, two\n'
-            'provides = package, package.sub\n'
-            'license = otherlic\n'
-            'download_url = http://test.test.com/test/\n'
-            'maintainer_email = test@test.com\n',
-        )
-
-        tmpdir.join('README').write('readme contents\nline2')
-
-        meta_initial = {
-            # This will be used so `otherlic` won't replace it.
-            'license': 'BSD 3-Clause License',
-        }
-
-        with get_dist(tmpdir, meta_initial) as dist:
-            metadata = dist.metadata
-
-            assert metadata.version == '10.1.1'
-            assert metadata.description == 'Some description'
-            assert metadata.long_description_content_type == 'text/something'
-            assert metadata.long_description == 'readme contents\nline2'
-            assert metadata.provides == ['package', 'package.sub']
-            assert metadata.license == 'BSD 3-Clause License'
-            assert metadata.name == 'fake_name'
-            assert metadata.keywords == ['one', 'two']
-            assert metadata.download_url == 'http://test.test.com/test/'
-            assert metadata.maintainer_email == 'test@test.com'
-
-    def test_license_cfg(self, tmpdir):
-        fake_env(
-            tmpdir,
-            DALS(
-                """
-            [metadata]
-            name=foo
-            version=0.0.1
-            license=Apache 2.0
-            """
-            ),
-        )
-
-        with get_dist(tmpdir) as dist:
-            metadata = dist.metadata
-
-            assert metadata.name == "foo"
-            assert metadata.version == "0.0.1"
-            assert metadata.license == "Apache 2.0"
-
-    def test_file_mixed(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\nlong_description = file: README.rst, CHANGES.rst\n\n',
-        )
-
-        tmpdir.join('README.rst').write('readme contents\nline2')
-        tmpdir.join('CHANGES.rst').write('changelog contents\nand stuff')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.long_description == (
-                'readme contents\nline2\nchangelog contents\nand stuff'
-            )
-
-    def test_file_sandboxed(self, tmpdir):
-        tmpdir.ensure("README")
-        project = tmpdir.join('depth1', 'depth2')
-        project.ensure(dir=True)
-        fake_env(project, '[metadata]\nlong_description = file: ../../README\n')
-
-        with get_dist(project, parse=False) as dist:
-            with pytest.raises(DistutilsOptionError):
-                dist.parse_config_files()  # file: out of sandbox
-
-    def test_aliases(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'author_email = test@test.com\n'
-            'home_page = http://test.test.com/test/\n'
-            'summary = Short summary\n'
-            'platform = a, b\n'
-            'classifier =\n'
-            '  Framework :: Django\n'
-            '  Programming Language :: Python :: 3.5\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            metadata = dist.metadata
-            assert metadata.author_email == 'test@test.com'
-            assert metadata.url == 'http://test.test.com/test/'
-            assert metadata.description == 'Short summary'
-            assert metadata.platforms == ['a', 'b']
-            assert metadata.classifiers == [
-                'Framework :: Django',
-                'Programming Language :: Python :: 3.5',
-            ]
-
-    def test_multiline(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'name = fake_name\n'
-            'keywords =\n'
-            '  one\n'
-            '  two\n'
-            'classifiers =\n'
-            '  Framework :: Django\n'
-            '  Programming Language :: Python :: 3.5\n',
-        )
-        with get_dist(tmpdir) as dist:
-            metadata = dist.metadata
-            assert metadata.keywords == ['one', 'two']
-            assert metadata.classifiers == [
-                'Framework :: Django',
-                'Programming Language :: Python :: 3.5',
-            ]
-
-    def test_dict(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'project_urls =\n'
-            '  Link One = https://example.com/one/\n'
-            '  Link Two = https://example.com/two/\n',
-        )
-        with get_dist(tmpdir) as dist:
-            metadata = dist.metadata
-            assert metadata.project_urls == {
-                'Link One': 'https://example.com/one/',
-                'Link Two': 'https://example.com/two/',
-            }
-
-    def test_version(self, tmpdir):
-        package_dir, config = fake_env(
-            tmpdir, '[metadata]\nversion = attr: fake_package.VERSION\n'
-        )
-
-        sub_a = package_dir.mkdir('subpkg_a')
-        sub_a.join('__init__.py').write('')
-        sub_a.join('mod.py').write('VERSION = (2016, 11, 26)')
-
-        sub_b = package_dir.mkdir('subpkg_b')
-        sub_b.join('__init__.py').write('')
-        sub_b.join('mod.py').write(
-            'import third_party_module\nVERSION = (2016, 11, 26)'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-        config.write('[metadata]\nversion = attr: fake_package.get_version\n')
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '3.4.5.dev'
-
-        config.write('[metadata]\nversion = attr: fake_package.VERSION_MAJOR\n')
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1'
-
-        config.write('[metadata]\nversion = attr: fake_package.subpkg_a.mod.VERSION\n')
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '2016.11.26'
-
-        config.write('[metadata]\nversion = attr: fake_package.subpkg_b.mod.VERSION\n')
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '2016.11.26'
-
-    def test_version_file(self, tmpdir):
-        fake_env(tmpdir, '[metadata]\nversion = file: fake_package/version.txt\n')
-        tmpdir.join('fake_package', 'version.txt').write('1.2.3\n')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-        tmpdir.join('fake_package', 'version.txt').write('1.2.3\n4.5.6\n')
-        with pytest.raises(DistutilsOptionError):
-            with get_dist(tmpdir) as dist:
-                dist.metadata.version
-
-    def test_version_with_package_dir_simple(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = attr: fake_package_simple.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    = src\n',
-            package_path='src/fake_package_simple',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-    def test_version_with_package_dir_rename(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = attr: fake_package_rename.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    fake_package_rename = fake_dir\n',
-            package_path='fake_dir',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-    def test_version_with_package_dir_complex(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = attr: fake_package_complex.VERSION\n'
-            '[options]\n'
-            'package_dir =\n'
-            '    fake_package_complex = src/fake_dir\n',
-            package_path='src/fake_dir',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.version == '1.2.3'
-
-    def test_unknown_meta_item(self, tmpdir):
-        fake_env(tmpdir, '[metadata]\nname = fake_name\nunknown = some\n')
-        with get_dist(tmpdir, parse=False) as dist:
-            dist.parse_config_files()  # Skip unknown.
-
-    def test_usupported_section(self, tmpdir):
-        fake_env(tmpdir, '[metadata.some]\nkey = val\n')
-        with get_dist(tmpdir, parse=False) as dist:
-            with pytest.raises(DistutilsOptionError):
-                dist.parse_config_files()
-
-    def test_classifiers(self, tmpdir):
-        expected = set([
-            'Framework :: Django',
-            'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.5',
-        ])
-
-        # From file.
-        _, config = fake_env(tmpdir, '[metadata]\nclassifiers = file: classifiers\n')
-
-        tmpdir.join('classifiers').write(
-            'Framework :: Django\n'
-            'Programming Language :: Python :: 3\n'
-            'Programming Language :: Python :: 3.5\n'
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert set(dist.metadata.classifiers) == expected
-
-        # From list notation
-        config.write(
-            '[metadata]\n'
-            'classifiers =\n'
-            '    Framework :: Django\n'
-            '    Programming Language :: Python :: 3\n'
-            '    Programming Language :: Python :: 3.5\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert set(dist.metadata.classifiers) == expected
-
-    def test_interpolation(self, tmpdir):
-        fake_env(tmpdir, '[metadata]\ndescription = %(message)s\n')
-        with pytest.raises(configparser.InterpolationMissingOptionError):
-            with get_dist(tmpdir):
-                pass
-
-    def test_non_ascii_1(self, tmpdir):
-        fake_env(tmpdir, '[metadata]\ndescription = éàïôñ\n', encoding='utf-8')
-        with get_dist(tmpdir):
-            pass
-
-    def test_non_ascii_3(self, tmpdir):
-        fake_env(tmpdir, '\n# -*- coding: invalid\n')
-        with get_dist(tmpdir):
-            pass
-
-    def test_non_ascii_4(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '# -*- coding: utf-8\n[metadata]\ndescription = éàïôñ\n',
-            encoding='utf-8',
-        )
-        with get_dist(tmpdir) as dist:
-            assert dist.metadata.description == 'éàïôñ'
-
-    def test_not_utf8(self, tmpdir):
-        """
-        Config files encoded not in UTF-8 will fail
-        """
-        fake_env(
-            tmpdir,
-            '# vim: set fileencoding=iso-8859-15 :\n[metadata]\ndescription = éàïôñ\n',
-            encoding='iso-8859-15',
-        )
-        with pytest.raises(UnicodeDecodeError):
-            with get_dist(tmpdir):
-                pass
-
-    @pytest.mark.parametrize(
-        ("error_msg", "config", "invalid"),
-        [
-            (
-                "Invalid dash-separated key 'author-email' in 'metadata' (setup.cfg)",
-                DALS(
-                    """
-                    [metadata]
-                    author-email = test@test.com
-                    maintainer_email = foo@foo.com
-                    """
-                ),
-                {"author-email": "test@test.com"},
-            ),
-            (
-                "Invalid uppercase key 'Name' in 'metadata' (setup.cfg)",
-                DALS(
-                    """
-                    [metadata]
-                    Name = foo
-                    description = Some description
-                    """
-                ),
-                {"Name": "foo"},
-            ),
-        ],
-    )
-    def test_invalid_options_previously_deprecated(
-        self, tmpdir, error_msg, config, invalid
-    ):
-        # This test and related methods can be removed when no longer needed.
-        # Deprecation postponed due to push-back from the community in
-        # https://github.com/pypa/setuptools/issues/4910
-        fake_env(tmpdir, config)
-        with pytest.warns(SetuptoolsDeprecationWarning, match=re.escape(error_msg)):
-            dist = get_dist(tmpdir).__enter__()
-
-        tmpdir.join('setup.cfg').remove()
-
-        for field, value in invalid.items():
-            attr = field.replace("-", "_").lower()
-            assert getattr(dist.metadata, attr) == value
-
-
-class TestOptions:
-    def test_basic(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options]\n'
-            'zip_safe = True\n'
-            'include_package_data = yes\n'
-            'package_dir = b=c, =src\n'
-            'packages = pack_a, pack_b.subpack\n'
-            'namespace_packages = pack1, pack2\n'
-            'scripts = bin/one.py, bin/two.py\n'
-            'eager_resources = bin/one.py, bin/two.py\n'
-            'install_requires = docutils>=0.3; pack ==1.1, ==1.3; hey\n'
-            'setup_requires = docutils>=0.3; spack ==1.1, ==1.3; there\n'
-            'dependency_links = http://some.com/here/1, '
-            'http://some.com/there/2\n'
-            'python_requires = >=1.0, !=2.8\n'
-            'py_modules = module1, module2\n',
-        )
-        deprec = pytest.warns(SetuptoolsDeprecationWarning, match="namespace_packages")
-        with deprec, get_dist(tmpdir) as dist:
-            assert dist.zip_safe
-            assert dist.include_package_data
-            assert dist.package_dir == {'': 'src', 'b': 'c'}
-            assert dist.packages == ['pack_a', 'pack_b.subpack']
-            assert dist.namespace_packages == ['pack1', 'pack2']
-            assert dist.scripts == ['bin/one.py', 'bin/two.py']
-            assert dist.dependency_links == ([
-                'http://some.com/here/1',
-                'http://some.com/there/2',
-            ])
-            assert dist.install_requires == ([
-                'docutils>=0.3',
-                'pack==1.1,==1.3',
-                'hey',
-            ])
-            assert dist.setup_requires == ([
-                'docutils>=0.3',
-                'spack ==1.1, ==1.3',
-                'there',
-            ])
-            assert dist.python_requires == '>=1.0, !=2.8'
-            assert dist.py_modules == ['module1', 'module2']
-
-    def test_multiline(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options]\n'
-            'package_dir = \n'
-            '  b=c\n'
-            '  =src\n'
-            'packages = \n'
-            '  pack_a\n'
-            '  pack_b.subpack\n'
-            'namespace_packages = \n'
-            '  pack1\n'
-            '  pack2\n'
-            'scripts = \n'
-            '  bin/one.py\n'
-            '  bin/two.py\n'
-            'eager_resources = \n'
-            '  bin/one.py\n'
-            '  bin/two.py\n'
-            'install_requires = \n'
-            '  docutils>=0.3\n'
-            '  pack ==1.1, ==1.3\n'
-            '  hey\n'
-            'setup_requires = \n'
-            '  docutils>=0.3\n'
-            '  spack ==1.1, ==1.3\n'
-            '  there\n'
-            'dependency_links = \n'
-            '  http://some.com/here/1\n'
-            '  http://some.com/there/2\n',
-        )
-        deprec = pytest.warns(SetuptoolsDeprecationWarning, match="namespace_packages")
-        with deprec, get_dist(tmpdir) as dist:
-            assert dist.package_dir == {'': 'src', 'b': 'c'}
-            assert dist.packages == ['pack_a', 'pack_b.subpack']
-            assert dist.namespace_packages == ['pack1', 'pack2']
-            assert dist.scripts == ['bin/one.py', 'bin/two.py']
-            assert dist.dependency_links == ([
-                'http://some.com/here/1',
-                'http://some.com/there/2',
-            ])
-            assert dist.install_requires == ([
-                'docutils>=0.3',
-                'pack==1.1,==1.3',
-                'hey',
-            ])
-            assert dist.setup_requires == ([
-                'docutils>=0.3',
-                'spack ==1.1, ==1.3',
-                'there',
-            ])
-
-    def test_package_dir_fail(self, tmpdir):
-        fake_env(tmpdir, '[options]\npackage_dir = a b\n')
-        with get_dist(tmpdir, parse=False) as dist:
-            with pytest.raises(DistutilsOptionError):
-                dist.parse_config_files()
-
-    def test_package_data(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.package_data]\n'
-            '* = *.txt, *.rst\n'
-            'hello = *.msg\n'
-            '\n'
-            '[options.exclude_package_data]\n'
-            '* = fake1.txt, fake2.txt\n'
-            'hello = *.dat\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.package_data == {
-                '': ['*.txt', '*.rst'],
-                'hello': ['*.msg'],
-            }
-            assert dist.exclude_package_data == {
-                '': ['fake1.txt', 'fake2.txt'],
-                'hello': ['*.dat'],
-            }
-
-    def test_packages(self, tmpdir):
-        fake_env(tmpdir, '[options]\npackages = find:\n')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.packages == ['fake_package']
-
-    def test_find_directive(self, tmpdir):
-        dir_package, config = fake_env(tmpdir, '[options]\npackages = find:\n')
-
-        make_package_dir('sub_one', dir_package)
-        make_package_dir('sub_two', dir_package)
-
-        with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == set([
-                'fake_package',
-                'fake_package.sub_two',
-                'fake_package.sub_one',
-            ])
-
-        config.write(
-            '[options]\n'
-            'packages = find:\n'
-            '\n'
-            '[options.packages.find]\n'
-            'where = .\n'
-            'include =\n'
-            '    fake_package.sub_one\n'
-            '    two\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert dist.packages == ['fake_package.sub_one']
-
-        config.write(
-            '[options]\n'
-            'packages = find:\n'
-            '\n'
-            '[options.packages.find]\n'
-            'exclude =\n'
-            '    fake_package.sub_one\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == set(['fake_package', 'fake_package.sub_two'])
-
-    def test_find_namespace_directive(self, tmpdir):
-        dir_package, config = fake_env(
-            tmpdir, '[options]\npackages = find_namespace:\n'
-        )
-
-        make_package_dir('sub_one', dir_package)
-        make_package_dir('sub_two', dir_package, ns=True)
-
-        with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == {
-                'fake_package',
-                'fake_package.sub_two',
-                'fake_package.sub_one',
-            }
-
-        config.write(
-            '[options]\n'
-            'packages = find_namespace:\n'
-            '\n'
-            '[options.packages.find]\n'
-            'where = .\n'
-            'include =\n'
-            '    fake_package.sub_one\n'
-            '    two\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert dist.packages == ['fake_package.sub_one']
-
-        config.write(
-            '[options]\n'
-            'packages = find_namespace:\n'
-            '\n'
-            '[options.packages.find]\n'
-            'exclude =\n'
-            '    fake_package.sub_one\n'
-        )
-        with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == {'fake_package', 'fake_package.sub_two'}
-
-    def test_extras_require(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.extras_require]\n'
-            'pdf = ReportLab>=1.2; RXP\n'
-            'rest = \n'
-            '  docutils>=0.3\n'
-            '  pack ==1.1, ==1.3\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.extras_require == {
-                'pdf': ['ReportLab>=1.2', 'RXP'],
-                'rest': ['docutils>=0.3', 'pack==1.1,==1.3'],
-            }
-            assert set(dist.metadata.provides_extras) == {'pdf', 'rest'}
-
-    @pytest.mark.parametrize(
-        "config",
-        [
-            "[options.extras_require]\nfoo = bar;python_version<'3'",
-            "[options.extras_require]\nfoo = bar;os_name=='linux'",
-            "[options.extras_require]\nfoo = bar;python_version<'3'\n",
-            "[options.extras_require]\nfoo = bar;os_name=='linux'\n",
-            "[options]\ninstall_requires = bar;python_version<'3'",
-            "[options]\ninstall_requires = bar;os_name=='linux'",
-            "[options]\ninstall_requires = bar;python_version<'3'\n",
-            "[options]\ninstall_requires = bar;os_name=='linux'\n",
-        ],
-    )
-    def test_raises_accidental_env_marker_misconfig(self, config, tmpdir):
-        fake_env(tmpdir, config)
-        match = (
-            r"One of the parsed requirements in `(install_requires|extras_require.+)` "
-            "looks like a valid environment marker.*"
-        )
-        with pytest.raises(InvalidRequirement, match=match):
-            with get_dist(tmpdir) as _:
-                pass
-
-    @pytest.mark.parametrize(
-        "config",
-        [
-            "[options.extras_require]\nfoo = bar;python_version<3",
-            "[options.extras_require]\nfoo = bar;python_version<3\n",
-            "[options]\ninstall_requires = bar;python_version<3",
-            "[options]\ninstall_requires = bar;python_version<3\n",
-        ],
-    )
-    def test_warn_accidental_env_marker_misconfig(self, config, tmpdir):
-        fake_env(tmpdir, config)
-        match = (
-            r"One of the parsed requirements in `(install_requires|extras_require.+)` "
-            "looks like a valid environment marker.*"
-        )
-        with pytest.warns(SetuptoolsDeprecationWarning, match=match):
-            with get_dist(tmpdir) as _:
-                pass
-
-    @pytest.mark.parametrize(
-        "config",
-        [
-            "[options.extras_require]\nfoo =\n    bar;python_version<'3'",
-            "[options.extras_require]\nfoo = bar;baz\nboo = xxx;yyy",
-            "[options.extras_require]\nfoo =\n    bar;python_version<'3'\n",
-            "[options.extras_require]\nfoo = bar;baz\nboo = xxx;yyy\n",
-            "[options.extras_require]\nfoo =\n    bar\n    python_version<3\n",
-            "[options]\ninstall_requires =\n    bar;python_version<'3'",
-            "[options]\ninstall_requires = bar;baz\nboo = xxx;yyy",
-            "[options]\ninstall_requires =\n    bar;python_version<'3'\n",
-            "[options]\ninstall_requires = bar;baz\nboo = xxx;yyy\n",
-            "[options]\ninstall_requires =\n    bar\n    python_version<3\n",
-        ],
-    )
-    @pytest.mark.filterwarnings("error::setuptools.SetuptoolsDeprecationWarning")
-    def test_nowarn_accidental_env_marker_misconfig(self, config, tmpdir, recwarn):
-        fake_env(tmpdir, config)
-        num_warnings = len(recwarn)
-        with get_dist(tmpdir) as _:
-            pass
-        # The examples are valid, no warnings shown
-        assert len(recwarn) == num_warnings
-
-    def test_dash_preserved_extras_require(self, tmpdir):
-        fake_env(tmpdir, '[options.extras_require]\nfoo-a = foo\nfoo_b = test\n')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.extras_require == {'foo-a': ['foo'], 'foo_b': ['test']}
-
-    def test_entry_points(self, tmpdir):
-        _, config = fake_env(
-            tmpdir,
-            '[options.entry_points]\n'
-            'group1 = point1 = pack.module:func, '
-            '.point2 = pack.module2:func_rest [rest]\n'
-            'group2 = point3 = pack.module:func2\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.entry_points == {
-                'group1': [
-                    'point1 = pack.module:func',
-                    '.point2 = pack.module2:func_rest [rest]',
-                ],
-                'group2': ['point3 = pack.module:func2'],
-            }
-
-        expected = (
-            '[blogtool.parsers]\n'
-            '.rst = some.nested.module:SomeClass.some_classmethod[reST]\n'
-        )
-
-        tmpdir.join('entry_points').write(expected)
-
-        # From file.
-        config.write('[options]\nentry_points = file: entry_points\n')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.entry_points == expected
-
-    def test_case_sensitive_entry_points(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.entry_points]\n'
-            'GROUP1 = point1 = pack.module:func, '
-            '.point2 = pack.module2:func_rest [rest]\n'
-            'group2 = point3 = pack.module:func2\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            assert dist.entry_points == {
-                'GROUP1': [
-                    'point1 = pack.module:func',
-                    '.point2 = pack.module2:func_rest [rest]',
-                ],
-                'group2': ['point3 = pack.module:func2'],
-            }
-
-    def test_data_files(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.data_files]\n'
-            'cfg =\n'
-            '      a/b.conf\n'
-            '      c/d.conf\n'
-            'data = e/f.dat, g/h.dat\n',
-        )
-
-        with get_dist(tmpdir) as dist:
-            expected = [
-                ('cfg', ['a/b.conf', 'c/d.conf']),
-                ('data', ['e/f.dat', 'g/h.dat']),
-            ]
-            assert sorted(dist.data_files) == sorted(expected)
-
-    def test_data_files_globby(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.data_files]\n'
-            'cfg =\n'
-            '      a/b.conf\n'
-            '      c/d.conf\n'
-            'data = *.dat\n'
-            'icons = \n'
-            '      *.ico\n'
-            'audio = \n'
-            '      *.wav\n'
-            '      sounds.db\n',
-        )
-
-        # Create dummy files for glob()'s sake:
-        tmpdir.join('a.dat').write('')
-        tmpdir.join('b.dat').write('')
-        tmpdir.join('c.dat').write('')
-        tmpdir.join('a.ico').write('')
-        tmpdir.join('b.ico').write('')
-        tmpdir.join('c.ico').write('')
-        tmpdir.join('beep.wav').write('')
-        tmpdir.join('boop.wav').write('')
-        tmpdir.join('sounds.db').write('')
-
-        with get_dist(tmpdir) as dist:
-            expected = [
-                ('cfg', ['a/b.conf', 'c/d.conf']),
-                ('data', ['a.dat', 'b.dat', 'c.dat']),
-                ('icons', ['a.ico', 'b.ico', 'c.ico']),
-                ('audio', ['beep.wav', 'boop.wav', 'sounds.db']),
-            ]
-            assert sorted(dist.data_files) == sorted(expected)
-
-    def test_python_requires_simple(self, tmpdir):
-        fake_env(
-            tmpdir,
-            DALS(
-                """
-            [options]
-            python_requires=>=2.7
-            """
-            ),
-        )
-        with get_dist(tmpdir) as dist:
-            dist.parse_config_files()
-
-    def test_python_requires_compound(self, tmpdir):
-        fake_env(
-            tmpdir,
-            DALS(
-                """
-            [options]
-            python_requires=>=2.7,!=3.0.*
-            """
-            ),
-        )
-        with get_dist(tmpdir) as dist:
-            dist.parse_config_files()
-
-    def test_python_requires_invalid(self, tmpdir):
-        fake_env(
-            tmpdir,
-            DALS(
-                """
-            [options]
-            python_requires=invalid
-            """
-            ),
-        )
-        with pytest.raises(Exception):
-            with get_dist(tmpdir) as dist:
-                dist.parse_config_files()
-
-    def test_cmdclass(self, tmpdir):
-        module_path = Path(tmpdir, "src/custom_build.py")  # auto discovery for src
-        module_path.parent.mkdir(parents=True, exist_ok=True)
-        module_path.write_text(
-            "from distutils.core import Command\nclass CustomCmd(Command): pass\n",
-            encoding="utf-8",
-        )
-
-        setup_cfg = """
-            [options]
-            cmdclass =
-                customcmd = custom_build.CustomCmd
-        """
-        fake_env(tmpdir, inspect.cleandoc(setup_cfg))
-
-        with get_dist(tmpdir) as dist:
-            cmdclass = dist.cmdclass['customcmd']
-            assert cmdclass.__name__ == "CustomCmd"
-            assert cmdclass.__module__ == "custom_build"
-            assert module_path.samefile(inspect.getfile(cmdclass))
-
-    def test_requirements_file(self, tmpdir):
-        fake_env(
-            tmpdir,
-            DALS(
-                """
-            [options]
-            install_requires = file:requirements.txt
-            [options.extras_require]
-            colors = file:requirements-extra.txt
-            """
-            ),
-        )
-
-        tmpdir.join('requirements.txt').write('\ndocutils>=0.3\n\n')
-        tmpdir.join('requirements-extra.txt').write('colorama')
-
-        with get_dist(tmpdir) as dist:
-            assert dist.install_requires == ['docutils>=0.3']
-            assert dist.extras_require == {'colors': ['colorama']}
-
-
-saved_dist_init = _Distribution.__init__
-
-
-class TestExternalSetters:
-    # During creation of the setuptools Distribution() object, we call
-    # the init of the parent distutils Distribution object via
-    # _Distribution.__init__ ().
-    #
-    # It's possible distutils calls out to various keyword
-    # implementations (i.e. distutils.setup_keywords entry points)
-    # that may set a range of variables.
-    #
-    # This wraps distutil's Distribution.__init__ and simulates
-    # pbr or something else setting these values.
-    def _fake_distribution_init(self, dist, attrs):
-        saved_dist_init(dist, attrs)
-        # see self._DISTUTILS_UNSUPPORTED_METADATA
-        dist.metadata.long_description_content_type = 'text/something'
-        # Test overwrite setup() args
-        dist.metadata.project_urls = {
-            'Link One': 'https://example.com/one/',
-            'Link Two': 'https://example.com/two/',
-        }
-
-    @patch.object(_Distribution, '__init__', autospec=True)
-    def test_external_setters(self, mock_parent_init, tmpdir):
-        mock_parent_init.side_effect = self._fake_distribution_init
-
-        dist = Distribution(attrs={'project_urls': {'will_be': 'ignored'}})
-
-        assert dist.metadata.long_description_content_type == 'text/something'
-        assert dist.metadata.project_urls == {
-            'Link One': 'https://example.com/one/',
-            'Link Two': 'https://example.com/two/',
-        }
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/contexts.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/contexts.py
deleted file mode 100644
index 97cceea..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/contexts.py
+++ /dev/null
@@ -1,145 +0,0 @@
-import contextlib
-import io
-import os
-import shutil
-import site
-import sys
-import tempfile
-
-from filelock import FileLock
-
-
-@contextlib.contextmanager
-def tempdir(cd=lambda dir: None, **kwargs):
-    temp_dir = tempfile.mkdtemp(**kwargs)
-    orig_dir = os.getcwd()
-    try:
-        cd(temp_dir)
-        yield temp_dir
-    finally:
-        cd(orig_dir)
-        shutil.rmtree(temp_dir)
-
-
-@contextlib.contextmanager
-def environment(**replacements):
-    """
-    In a context, patch the environment with replacements. Pass None values
-    to clear the values.
-    """
-    saved = dict((key, os.environ[key]) for key in replacements if key in os.environ)
-
-    # remove values that are null
-    remove = (key for (key, value) in replacements.items() if value is None)
-    for key in list(remove):
-        os.environ.pop(key, None)
-        replacements.pop(key)
-
-    os.environ.update(replacements)
-
-    try:
-        yield saved
-    finally:
-        for key in replacements:
-            os.environ.pop(key, None)
-        os.environ.update(saved)
-
-
-@contextlib.contextmanager
-def quiet():
-    """
-    Redirect stdout/stderr to StringIO objects to prevent console output from
-    distutils commands.
-    """
-
-    old_stdout = sys.stdout
-    old_stderr = sys.stderr
-    new_stdout = sys.stdout = io.StringIO()
-    new_stderr = sys.stderr = io.StringIO()
-    try:
-        yield new_stdout, new_stderr
-    finally:
-        new_stdout.seek(0)
-        new_stderr.seek(0)
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
-
-
-@contextlib.contextmanager
-def save_user_site_setting():
-    saved = site.ENABLE_USER_SITE
-    try:
-        yield saved
-    finally:
-        site.ENABLE_USER_SITE = saved
-
-
-@contextlib.contextmanager
-def save_pkg_resources_state():
-    import pkg_resources
-
-    pr_state = pkg_resources.__getstate__()
-    # also save sys.path
-    sys_path = sys.path[:]
-    try:
-        yield pr_state, sys_path
-    finally:
-        sys.path[:] = sys_path
-        pkg_resources.__setstate__(pr_state)
-
-
-@contextlib.contextmanager
-def suppress_exceptions(*excs):
-    try:
-        yield
-    except excs:
-        pass
-
-
-def multiproc(request):
-    """
-    Return True if running under xdist and multiple
-    workers are used.
-    """
-    try:
-        worker_id = request.getfixturevalue('worker_id')
-    except Exception:
-        return False
-    return worker_id != 'master'
-
-
-@contextlib.contextmanager
-def session_locked_tmp_dir(request, tmp_path_factory, name):
-    """Uses a file lock to guarantee only one worker can access a temp dir"""
-    # get the temp directory shared by all workers
-    base = tmp_path_factory.getbasetemp()
-    shared_dir = base.parent if multiproc(request) else base
-
-    locked_dir = shared_dir / name
-    with FileLock(locked_dir.with_suffix(".lock")):
-        # ^-- prevent multiple workers to access the directory at once
-        locked_dir.mkdir(exist_ok=True, parents=True)
-        yield locked_dir
-
-
-@contextlib.contextmanager
-def save_paths():
-    """Make sure ``sys.path``, ``sys.meta_path`` and ``sys.path_hooks`` are preserved"""
-    prev = sys.path[:], sys.meta_path[:], sys.path_hooks[:]
-
-    try:
-        yield
-    finally:
-        sys.path, sys.meta_path, sys.path_hooks = prev
-
-
-@contextlib.contextmanager
-def save_sys_modules():
-    """Make sure initial ``sys.modules`` is preserved"""
-    prev_modules = sys.modules
-
-    try:
-        sys.modules = sys.modules.copy()
-        yield
-    finally:
-        sys.modules = prev_modules
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/environment.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/environment.py
deleted file mode 100644
index ed5499e..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/environment.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import os
-import subprocess
-import sys
-import unicodedata
-from subprocess import PIPE as _PIPE, Popen as _Popen
-
-import jaraco.envs
-
-
-class VirtualEnv(jaraco.envs.VirtualEnv):
-    name = '.env'
-    # Some version of PyPy will import distutils on startup, implicitly
-    # importing setuptools, and thus leading to BackendInvalid errors
-    # when upgrading Setuptools. Bypass this behavior by avoiding the
-    # early availability and need to upgrade.
-    create_opts = ['--no-setuptools']
-
-    def run(self, cmd, *args, **kwargs):
-        cmd = [self.exe(cmd[0])] + cmd[1:]
-        kwargs = {"cwd": self.root, "encoding": "utf-8", **kwargs}  # Allow overriding
-        # In some environments (eg. downstream distro packaging), where:
-        # - tox isn't used to run tests and
-        # - PYTHONPATH is set to point to a specific setuptools codebase and
-        # - no custom env is explicitly set by a test
-        # PYTHONPATH will leak into the spawned processes.
-        # In that case tests look for module in the wrong place (on PYTHONPATH).
-        # Unless the test sets its own special env, pass a copy of the existing
-        # environment with removed PYTHONPATH to the subprocesses.
-        if "env" not in kwargs:
-            env = dict(os.environ)
-            if "PYTHONPATH" in env:
-                del env["PYTHONPATH"]
-            kwargs["env"] = env
-        return subprocess.check_output(cmd, *args, **kwargs)
-
-
-def _which_dirs(cmd):
-    result = set()
-    for path in os.environ.get('PATH', '').split(os.pathsep):
-        filename = os.path.join(path, cmd)
-        if os.access(filename, os.X_OK):
-            result.add(path)
-    return result
-
-
-def run_setup_py(cmd, pypath=None, path=None, data_stream=0, env=None):
-    """
-    Execution command for tests, separate from those used by the
-    code directly to prevent accidental behavior issues
-    """
-    if env is None:
-        env = dict()
-        for envname in os.environ:
-            env[envname] = os.environ[envname]
-
-    # override the python path if needed
-    if pypath is not None:
-        env["PYTHONPATH"] = pypath
-
-    # override the execution path if needed
-    if path is not None:
-        env["PATH"] = path
-    if not env.get("PATH", ""):
-        env["PATH"] = _which_dirs("tar").union(_which_dirs("gzip"))
-        env["PATH"] = os.pathsep.join(env["PATH"])
-
-    cmd = [sys.executable, "setup.py"] + list(cmd)
-
-    # https://bugs.python.org/issue8557
-    shell = sys.platform == 'win32'
-
-    try:
-        proc = _Popen(
-            cmd,
-            stdout=_PIPE,
-            stderr=_PIPE,
-            shell=shell,
-            env=env,
-            encoding="utf-8",
-        )
-
-        if isinstance(data_stream, tuple):
-            data_stream = slice(*data_stream)
-        data = proc.communicate()[data_stream]
-    except OSError:
-        return 1, ''
-
-    # decode the console string if needed
-    if hasattr(data, "decode"):
-        # use the default encoding
-        data = data.decode()
-        data = unicodedata.normalize('NFC', data)
-
-    # communicate calls wait()
-    return proc.returncode, data
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/fixtures.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/fixtures.py
deleted file mode 100644
index a547298..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/fixtures.py
+++ /dev/null
@@ -1,157 +0,0 @@
-import contextlib
-import os
-import subprocess
-import sys
-from pathlib import Path
-
-import path
-import pytest
-
-from . import contexts, environment
-
-
-@pytest.fixture
-def user_override(monkeypatch):
-    """
-    Override site.USER_BASE and site.USER_SITE with temporary directories in
-    a context.
-    """
-    with contexts.tempdir() as user_base:
-        monkeypatch.setattr('site.USER_BASE', user_base)
-        with contexts.tempdir() as user_site:
-            monkeypatch.setattr('site.USER_SITE', user_site)
-            with contexts.save_user_site_setting():
-                yield
-
-
-@pytest.fixture
-def tmpdir_cwd(tmpdir):
-    with tmpdir.as_cwd() as orig:
-        yield orig
-
-
-@pytest.fixture(autouse=True, scope="session")
-def workaround_xdist_376(request):
-    """
-    Workaround pytest-dev/pytest-xdist#376
-
-    ``pytest-xdist`` tends to inject '' into ``sys.path``,
-    which may break certain isolation expectations.
-    Remove the entry so the import
-    machinery behaves the same irrespective of xdist.
-    """
-    if not request.config.pluginmanager.has_plugin('xdist'):
-        return
-
-    with contextlib.suppress(ValueError):
-        sys.path.remove('')
-
-
-@pytest.fixture
-def sample_project(tmp_path):
-    """
-    Clone the 'sampleproject' and return a path to it.
-    """
-    cmd = ['git', 'clone', 'https://github.com/pypa/sampleproject']
-    try:
-        subprocess.check_call(cmd, cwd=str(tmp_path))
-    except Exception:
-        pytest.skip("Unable to clone sampleproject")
-    return tmp_path / 'sampleproject'
-
-
-# sdist and wheel artifacts should be stable across a round of tests
-# so we can build them once per session and use the files as "readonly"
-
-# In the case of setuptools, building the wheel without sdist may cause
-# it to contain the `build` directory, and therefore create situations with
-# `setuptools/build/lib/build/lib/...`. To avoid that, build both artifacts at once.
-
-
-def _build_distributions(tmp_path_factory, request):
-    with contexts.session_locked_tmp_dir(
-        request, tmp_path_factory, "dist_build"
-    ) as tmp:  # pragma: no cover
-        sdist = next(tmp.glob("*.tar.gz"), None)
-        wheel = next(tmp.glob("*.whl"), None)
-        if sdist and wheel:
-            return (sdist, wheel)
-
-        # Sanity check: should not create recursive setuptools/build/lib/build/lib/...
-        assert not Path(request.config.rootdir, "build/lib/build").exists()
-
-        subprocess.check_output([
-            sys.executable,
-            "-m",
-            "build",
-            "--outdir",
-            str(tmp),
-            str(request.config.rootdir),
-        ])
-
-        # Sanity check: should not create recursive setuptools/build/lib/build/lib/...
-        assert not Path(request.config.rootdir, "build/lib/build").exists()
-
-        return next(tmp.glob("*.tar.gz")), next(tmp.glob("*.whl"))
-
-
-@pytest.fixture(scope="session")
-def setuptools_sdist(tmp_path_factory, request):
-    prebuilt = os.getenv("PRE_BUILT_SETUPTOOLS_SDIST")
-    if prebuilt and os.path.exists(prebuilt):  # pragma: no cover
-        return Path(prebuilt).resolve()
-
-    sdist, _ = _build_distributions(tmp_path_factory, request)
-    return sdist
-
-
-@pytest.fixture(scope="session")
-def setuptools_wheel(tmp_path_factory, request):
-    prebuilt = os.getenv("PRE_BUILT_SETUPTOOLS_WHEEL")
-    if prebuilt and os.path.exists(prebuilt):  # pragma: no cover
-        return Path(prebuilt).resolve()
-
-    _, wheel = _build_distributions(tmp_path_factory, request)
-    return wheel
-
-
-@pytest.fixture
-def venv(tmp_path, setuptools_wheel):
-    """Virtual env with the version of setuptools under test installed"""
-    env = environment.VirtualEnv()
-    env.root = path.Path(tmp_path / 'venv')
-    env.create_opts = ['--no-setuptools', '--wheel=bundle']
-    # TODO: Use `--no-wheel` when setuptools implements its own bdist_wheel
-    env.req = str(setuptools_wheel)
-    # In some environments (eg. downstream distro packaging),
-    # where tox isn't used to run tests and PYTHONPATH is set to point to
-    # a specific setuptools codebase, PYTHONPATH will leak into the spawned
-    # processes.
-    # env.create() should install the just created setuptools
-    # wheel, but it doesn't if it finds another existing matching setuptools
-    # installation present on PYTHONPATH:
-    # `setuptools is already installed with the same version as the provided
-    # wheel. Use --force-reinstall to force an installation of the wheel.`
-    # This prevents leaking PYTHONPATH to the created environment.
-    with contexts.environment(PYTHONPATH=None):
-        return env.create()
-
-
-@pytest.fixture
-def venv_without_setuptools(tmp_path):
-    """Virtual env without any version of setuptools installed"""
-    env = environment.VirtualEnv()
-    env.root = path.Path(tmp_path / 'venv_without_setuptools')
-    env.create_opts = ['--no-setuptools', '--no-wheel']
-    env.ensure_env()
-    return env
-
-
-@pytest.fixture
-def bare_venv(tmp_path):
-    """Virtual env without any common packages installed"""
-    env = environment.VirtualEnv()
-    env.root = path.Path(tmp_path / 'bare_venv')
-    env.create_opts = ['--no-setuptools', '--no-pip', '--no-wheel', '--no-seed']
-    env.ensure_env()
-    return env
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/external.html b/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/external.html
deleted file mode 100644
index 92e4702..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/external.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bad old link
-
diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html b/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
deleted file mode 100644
index fefb028..0000000
--- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-foobar-0.1.tar.gz
-external homepage
- diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__init__.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 5d832b9..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/helpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/helpers.cpython-311.pyc deleted file mode 100644 index e1ac4ec..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/helpers.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/test_pip_install_sdist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/test_pip_install_sdist.cpython-311.pyc deleted file mode 100644 index 24b4ebf..0000000 Binary files a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/__pycache__/test_pip_install_sdist.cpython-311.pyc and /dev/null differ diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/helpers.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/helpers.py deleted file mode 100644 index 77b196e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/helpers.py +++ /dev/null @@ -1,77 +0,0 @@ -"""Reusable functions and classes for different types of integration tests. - -For example ``Archive`` can be used to check the contents of distribution built -with setuptools, and ``run`` will always try to be as verbose as possible to -facilitate debugging. -""" - -import os -import subprocess -import tarfile -from pathlib import Path -from zipfile import ZipFile - - -def run(cmd, env=None): - r = subprocess.run( - cmd, - capture_output=True, - text=True, - encoding="utf-8", - env={**os.environ, **(env or {})}, - # ^-- allow overwriting instead of discarding the current env - ) - - out = r.stdout + "\n" + r.stderr - # pytest omits stdout/err by default, if the test fails they help debugging - print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") - print(f"Command: {cmd}\nreturn code: {r.returncode}\n\n{out}") - - if r.returncode == 0: - return out - raise subprocess.CalledProcessError(r.returncode, cmd, r.stdout, r.stderr) - - -class Archive: - """Compatibility layer for ZipFile/Info and TarFile/Info""" - - def __init__(self, filename): - self._filename = filename - if filename.endswith("tar.gz"): - self._obj = tarfile.open(filename, "r:gz") - elif filename.endswith("zip"): - self._obj = ZipFile(filename) - else: - raise ValueError(f"{filename} doesn't seem to be a zip or tar.gz") - - def __iter__(self): - if hasattr(self._obj, "infolist"): - return iter(self._obj.infolist()) - return iter(self._obj) - - def get_name(self, zip_or_tar_info): - if hasattr(zip_or_tar_info, "filename"): - return zip_or_tar_info.filename - return zip_or_tar_info.name - - def get_content(self, zip_or_tar_info): - if hasattr(self._obj, "extractfile"): - content = self._obj.extractfile(zip_or_tar_info) - if content is None: - msg = f"Invalid {zip_or_tar_info.name} in {self._filename}" - raise ValueError(msg) - return str(content.read(), "utf-8") - return str(self._obj.read(zip_or_tar_info), "utf-8") - - -def get_sdist_members(sdist_path): - with tarfile.open(sdist_path, "r:gz") as tar: - files = [Path(f) for f in tar.getnames()] - # remove root folder - relative_files = ("/".join(f.parts[1:]) for f in files) - return {f for f in relative_files if f} - - -def get_wheel_members(wheel_path): - with ZipFile(wheel_path) as zipfile: - return set(zipfile.namelist()) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/test_pip_install_sdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/test_pip_install_sdist.py deleted file mode 100644 index 4e84f21..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/integration/test_pip_install_sdist.py +++ /dev/null @@ -1,223 +0,0 @@ -# https://github.com/python/mypy/issues/16936 -# mypy: disable-error-code="has-type" -"""Integration tests for setuptools that focus on building packages via pip. - -The idea behind these tests is not to exhaustively check all the possible -combinations of packages, operating systems, supporting libraries, etc, but -rather check a limited number of popular packages and how they interact with -the exposed public API. This way if any change in API is introduced, we hope to -identify backward compatibility problems before publishing a release. - -The number of tested packages is purposefully kept small, to minimise duration -and the associated maintenance cost (changes in the way these packages define -their build process may require changes in the tests). -""" - -import json -import os -import shutil -import sys -from enum import Enum -from glob import glob -from hashlib import md5 -from urllib.request import urlopen - -import pytest -from packaging.requirements import Requirement - -from .helpers import Archive, run - -pytestmark = pytest.mark.integration - - -(LATEST,) = Enum("v", "LATEST") # type: ignore[misc] # https://github.com/python/mypy/issues/16936 -"""Default version to be checked""" -# There are positive and negative aspects of checking the latest version of the -# packages. -# The main positive aspect is that the latest version might have already -# removed the use of APIs deprecated in previous releases of setuptools. - - -# Packages to be tested: -# (Please notice the test environment cannot support EVERY library required for -# compiling binary extensions. In Ubuntu/Debian nomenclature, we only assume -# that `build-essential`, `gfortran` and `libopenblas-dev` are installed, -# due to their relevance to the numerical/scientific programming ecosystem) -EXAMPLES = [ - ("pip", LATEST), # just in case... - ("pytest", LATEST), # uses setuptools_scm - ("mypy", LATEST), # custom build_py + ext_modules - # --- Popular packages: https://hugovk.github.io/top-pypi-packages/ --- - ("botocore", LATEST), - ("kiwisolver", LATEST), # build_ext - ("brotli", LATEST), # not in the list but used by urllib3 - ("pyyaml", LATEST), # cython + custom build_ext + custom distclass - ("charset-normalizer", LATEST), # uses mypyc, used by aiohttp - ("protobuf", LATEST), - # ("requests", LATEST), # XXX: https://github.com/psf/requests/pull/6920 - ("celery", LATEST), - # When adding packages to this list, make sure they expose a `__version__` - # attribute, or modify the tests below -] - - -# Some packages have "optional" dependencies that modify their build behaviour -# and are not listed in pyproject.toml, others still use `setup_requires` -EXTRA_BUILD_DEPS = { - "pyyaml": ("Cython<3.0",), # constraint to avoid errors - "charset-normalizer": ("mypy>=1.4.1",), # no pyproject.toml available -} - -EXTRA_ENV_VARS = { - "pyyaml": {"PYYAML_FORCE_CYTHON": "1"}, - "charset-normalizer": {"CHARSET_NORMALIZER_USE_MYPYC": "1"}, -} - -IMPORT_NAME = { - "pyyaml": "yaml", - "protobuf": "google.protobuf", -} - - -VIRTUALENV = (sys.executable, "-m", "virtualenv") - - -# By default, pip will try to build packages in isolation (PEP 517), which -# means it will download the previous stable version of setuptools. -# `pip` flags can avoid that (the version of setuptools under test -# should be the one to be used) -INSTALL_OPTIONS = ( - "--ignore-installed", - "--no-build-isolation", - # Omit "--no-binary :all:" the sdist is supplied directly. - # Allows dependencies as wheels. -) -# The downside of `--no-build-isolation` is that pip will not download build -# dependencies. The test script will have to also handle that. - - -@pytest.fixture -def venv_python(tmp_path): - run([*VIRTUALENV, str(tmp_path / ".venv")]) - possible_path = (str(p.parent) for p in tmp_path.glob(".venv/*/python*")) - return shutil.which("python", path=os.pathsep.join(possible_path)) - - -@pytest.fixture(autouse=True) -def _prepare(tmp_path, venv_python, monkeypatch): - download_path = os.getenv("DOWNLOAD_PATH", str(tmp_path)) - os.makedirs(download_path, exist_ok=True) - - # Environment vars used for building some of the packages - monkeypatch.setenv("USE_MYPYC", "1") - - yield - - # Let's provide the maximum amount of information possible in the case - # it is necessary to debug the tests directly from the CI logs. - print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") - print("Temporary directory:") - map(print, tmp_path.glob("*")) - print("Virtual environment:") - run([venv_python, "-m", "pip", "freeze"]) - - -@pytest.mark.parametrize(("package", "version"), EXAMPLES) -@pytest.mark.uses_network -def test_install_sdist(package, version, tmp_path, venv_python, setuptools_wheel): - venv_pip = (venv_python, "-m", "pip") - sdist = retrieve_sdist(package, version, tmp_path) - deps = build_deps(package, sdist) - if deps: - print("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~") - print("Dependencies:", deps) - run([*venv_pip, "install", *deps]) - - # Use a virtualenv to simulate PEP 517 isolation - # but install fresh setuptools wheel to ensure the version under development - env = EXTRA_ENV_VARS.get(package, {}) - run([*venv_pip, "install", "--force-reinstall", setuptools_wheel]) - run([*venv_pip, "install", *INSTALL_OPTIONS, sdist], env) - - # Execute a simple script to make sure the package was installed correctly - pkg = IMPORT_NAME.get(package, package).replace("-", "_") - script = f"import {pkg}; print(getattr({pkg}, '__version__', 0))" - run([venv_python, "-c", script]) - - -# ---- Helper Functions ---- - - -def retrieve_sdist(package, version, tmp_path): - """Either use cached sdist file or download it from PyPI""" - # `pip download` cannot be used due to - # https://github.com/pypa/pip/issues/1884 - # https://discuss.python.org/t/pep-625-file-name-of-a-source-distribution/4686 - # We have to find the correct distribution file and download it - download_path = os.getenv("DOWNLOAD_PATH", str(tmp_path)) - dist = retrieve_pypi_sdist_metadata(package, version) - - # Remove old files to prevent cache to grow indefinitely - for file in glob(os.path.join(download_path, f"{package}*")): - if dist["filename"] != file: - os.unlink(file) - - dist_file = os.path.join(download_path, dist["filename"]) - if not os.path.exists(dist_file): - download(dist["url"], dist_file, dist["md5_digest"]) - return dist_file - - -def retrieve_pypi_sdist_metadata(package, version): - # https://warehouse.pypa.io/api-reference/json.html - id_ = package if version is LATEST else f"{package}/{version}" - with urlopen(f"https://pypi.org/pypi/{id_}/json") as f: - metadata = json.load(f) - - if metadata["info"]["yanked"]: - raise ValueError(f"Release for {package} {version} was yanked") - - version = metadata["info"]["version"] - release = metadata["releases"][version] if version is LATEST else metadata["urls"] - (sdist,) = filter(lambda d: d["packagetype"] == "sdist", release) - return sdist - - -def download(url, dest, md5_digest): - with urlopen(url) as f: - data = f.read() - - assert md5(data).hexdigest() == md5_digest - - with open(dest, "wb") as f: - f.write(data) - - assert os.path.exists(dest) - - -def build_deps(package, sdist_file): - """Find out what are the build dependencies for a package. - - "Manually" install them, since pip will not install build - deps with `--no-build-isolation`. - """ - # delay importing, since pytest discovery phase may hit this file from a - # testenv without tomli - from setuptools.compat.py310 import tomllib - - archive = Archive(sdist_file) - info = tomllib.loads(_read_pyproject(archive)) - deps = info.get("build-system", {}).get("requires", []) - deps += EXTRA_BUILD_DEPS.get(package, []) - # Remove setuptools from requirements (and deduplicate) - requirements = {Requirement(d).name: d for d in deps} - return [v for k, v in requirements.items() if k != "setuptools"] - - -def _read_pyproject(archive): - contents = ( - archive.get_content(member) - for member in archive - if os.path.basename(archive.get_name(member)) == "pyproject.toml" - ) - return next(contents, "") diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/mod_with_constant.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/mod_with_constant.py deleted file mode 100644 index ef755dd..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/mod_with_constant.py +++ /dev/null @@ -1 +0,0 @@ -value = 'three, sir!' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/namespaces.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/namespaces.py deleted file mode 100644 index 248db98..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/namespaces.py +++ /dev/null @@ -1,90 +0,0 @@ -import ast -import json -import textwrap -from pathlib import Path - - -def iter_namespace_pkgs(namespace): - parts = namespace.split(".") - for i in range(len(parts)): - yield ".".join(parts[: i + 1]) - - -def build_namespace_package(tmpdir, name, version="1.0", impl="pkg_resources"): - src_dir = tmpdir / name - src_dir.mkdir() - setup_py = src_dir / 'setup.py' - namespace, _, rest = name.rpartition('.') - namespaces = list(iter_namespace_pkgs(namespace)) - setup_args = { - "name": name, - "version": version, - "packages": namespaces, - } - - if impl == "pkg_resources": - tmpl = '__import__("pkg_resources").declare_namespace(__name__)' - setup_args["namespace_packages"] = namespaces - elif impl == "pkgutil": - tmpl = '__path__ = __import__("pkgutil").extend_path(__path__, __name__)' - else: - raise ValueError(f"Cannot recognise {impl=} when creating namespaces") - - args = json.dumps(setup_args, indent=4) - assert ast.literal_eval(args) # ensure it is valid Python - - script = textwrap.dedent( - """\ - import setuptools - args = {args} - setuptools.setup(**args) - """ - ).format(args=args) - setup_py.write_text(script, encoding='utf-8') - - ns_pkg_dir = Path(src_dir, namespace.replace(".", "/")) - ns_pkg_dir.mkdir(parents=True) - - for ns in namespaces: - pkg_init = src_dir / ns.replace(".", "/") / '__init__.py' - pkg_init.write_text(tmpl, encoding='utf-8') - - pkg_mod = ns_pkg_dir / (rest + '.py') - some_functionality = 'name = {rest!r}'.format(**locals()) - pkg_mod.write_text(some_functionality, encoding='utf-8') - return src_dir - - -def build_pep420_namespace_package(tmpdir, name): - src_dir = tmpdir / name - src_dir.mkdir() - pyproject = src_dir / "pyproject.toml" - namespace, _, rest = name.rpartition(".") - script = f"""\ - [build-system] - requires = ["setuptools"] - build-backend = "setuptools.build_meta" - - [project] - name = "{name}" - version = "3.14159" - """ - pyproject.write_text(textwrap.dedent(script), encoding='utf-8') - ns_pkg_dir = Path(src_dir, namespace.replace(".", "/")) - ns_pkg_dir.mkdir(parents=True) - pkg_mod = ns_pkg_dir / (rest + ".py") - some_functionality = f"name = {rest!r}" - pkg_mod.write_text(some_functionality, encoding='utf-8') - return src_dir - - -def make_site_dir(target): - """ - Add a sitecustomize.py module in target to cause - target to be added to site dirs such that .pth files - are processed there. - """ - sc = target / 'sitecustomize.py' - target_str = str(target) - tmpl = '__import__("site").addsitedir({target_str!r})' - sc.write_text(tmpl.format(**locals()), encoding='utf-8') diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/script-with-bom.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/script-with-bom.py deleted file mode 100644 index c074d26..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/script-with-bom.py +++ /dev/null @@ -1 +0,0 @@ -result = 'passed' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/server.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/server.py deleted file mode 100644 index 623a49a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/server.py +++ /dev/null @@ -1,86 +0,0 @@ -"""Basic http server for tests to simulate PyPI or custom indexes""" - -import http.server -import os -import threading -import time -import urllib.parse -import urllib.request - - -class IndexServer(http.server.HTTPServer): - """Basic single-threaded http server simulating a package index - - You can use this server in unittest like this:: - s = IndexServer() - s.start() - index_url = s.base_url() + 'mytestindex' - # do some test requests to the index - # The index files should be located in setuptools/tests/indexes - s.stop() - """ - - def __init__( - self, - server_address=('', 0), - RequestHandlerClass=http.server.SimpleHTTPRequestHandler, - ): - http.server.HTTPServer.__init__(self, server_address, RequestHandlerClass) - self._run = True - - def start(self): - self.thread = threading.Thread(target=self.serve_forever) - self.thread.start() - - def stop(self): - "Stop the server" - - # Let the server finish the last request and wait for a new one. - time.sleep(0.1) - - self.shutdown() - self.thread.join() - self.socket.close() - - def base_url(self): - port = self.server_port - return f'http://127.0.0.1:{port}/setuptools/tests/indexes/' - - -class RequestRecorder(http.server.BaseHTTPRequestHandler): - def do_GET(self): - requests = vars(self.server).setdefault('requests', []) - requests.append(self) - self.send_response(200, 'OK') - - -class MockServer(http.server.HTTPServer, threading.Thread): - """ - A simple HTTP Server that records the requests made to it. - """ - - def __init__(self, server_address=('', 0), RequestHandlerClass=RequestRecorder): - http.server.HTTPServer.__init__(self, server_address, RequestHandlerClass) - threading.Thread.__init__(self) - self.daemon = True - self.requests = [] - - def run(self): - self.serve_forever() - - @property - def netloc(self): - return f'localhost:{self.server_port}' - - @property - def url(self): - return f'http://{self.netloc}/' - - -def path_to_url(path, authority=None): - """Convert a path to a file: URL.""" - path = os.path.normpath(os.path.abspath(path)) - base = 'file:' - if authority is not None: - base += '//' + authority - return urllib.parse.urljoin(base, urllib.request.pathname2url(path)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_archive_util.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_archive_util.py deleted file mode 100644 index e3efc62..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_archive_util.py +++ /dev/null @@ -1,36 +0,0 @@ -import io -import tarfile - -import pytest - -from setuptools import archive_util - - -@pytest.fixture -def tarfile_with_unicode(tmpdir): - """ - Create a tarfile containing only a file whose name is - a zero byte file called testimäge.png. - """ - tarobj = io.BytesIO() - - with tarfile.open(fileobj=tarobj, mode="w:gz") as tgz: - data = b"" - - filename = "testimäge.png" - - t = tarfile.TarInfo(filename) - t.size = len(data) - - tgz.addfile(t, io.BytesIO(data)) - - target = tmpdir / 'unicode-pkg-1.0.tar.gz' - with open(str(target), mode='wb') as tf: - tf.write(tarobj.getvalue()) - return str(target) - - -@pytest.mark.xfail(reason="#710 and #712") -def test_unicode_files(tarfile_with_unicode, tmpdir): - target = tmpdir / 'out' - archive_util.unpack_archive(tarfile_with_unicode, str(target)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_deprecations.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_deprecations.py deleted file mode 100644 index d9d67b0..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_deprecations.py +++ /dev/null @@ -1,28 +0,0 @@ -"""develop tests""" - -import sys -from unittest import mock - -import pytest - -from setuptools import SetuptoolsDeprecationWarning -from setuptools.dist import Distribution - - -@pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only') -@pytest.mark.xfail(reason="bdist_rpm is long deprecated, should we remove it? #1988") -@mock.patch('distutils.command.bdist_rpm.bdist_rpm') -def test_bdist_rpm_warning(distutils_cmd, tmpdir_cwd): - dist = Distribution( - dict( - script_name='setup.py', - script_args=['bdist_rpm'], - name='foo', - py_modules=['hi'], - ) - ) - dist.parse_command_line() - with pytest.warns(SetuptoolsDeprecationWarning): - dist.run_commands() - - distutils_cmd.run.assert_called_once() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_egg.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_egg.py deleted file mode 100644 index 036167d..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_egg.py +++ /dev/null @@ -1,73 +0,0 @@ -"""develop tests""" - -import os -import re -import zipfile - -import pytest - -from setuptools.dist import Distribution - -from . import contexts - -SETUP_PY = """\ -from setuptools import setup - -setup(py_modules=['hi']) -""" - - -@pytest.fixture -def setup_context(tmpdir): - with (tmpdir / 'setup.py').open('w') as f: - f.write(SETUP_PY) - with (tmpdir / 'hi.py').open('w') as f: - f.write('1\n') - with tmpdir.as_cwd(): - yield tmpdir - - -class Test: - @pytest.mark.usefixtures("user_override") - @pytest.mark.usefixtures("setup_context") - def test_bdist_egg(self): - dist = Distribution( - dict( - script_name='setup.py', - script_args=['bdist_egg'], - name='foo', - py_modules=['hi'], - ) - ) - os.makedirs(os.path.join('build', 'src')) - with contexts.quiet(): - dist.parse_command_line() - dist.run_commands() - - # let's see if we got our egg link at the right place - [content] = os.listdir('dist') - assert re.match(r'foo-0.0.0-py[23].\d+.egg$', content) - - @pytest.mark.xfail( - os.environ.get('PYTHONDONTWRITEBYTECODE', False), - reason="Byte code disabled", - ) - @pytest.mark.usefixtures("user_override") - @pytest.mark.usefixtures("setup_context") - def test_exclude_source_files(self): - dist = Distribution( - dict( - script_name='setup.py', - script_args=['bdist_egg', '--exclude-source-files'], - py_modules=['hi'], - ) - ) - with contexts.quiet(): - dist.parse_command_line() - dist.run_commands() - [dist_name] = os.listdir('dist') - dist_filename = os.path.join('dist', dist_name) - zip = zipfile.ZipFile(dist_filename) - names = list(zi.filename for zi in zip.filelist) - assert 'hi.pyc' in names - assert 'hi.py' not in names diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_wheel.py deleted file mode 100644 index 2ab4e9c..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_bdist_wheel.py +++ /dev/null @@ -1,708 +0,0 @@ -from __future__ import annotations - -import builtins -import importlib -import os.path -import platform -import shutil -import stat -import struct -import sys -import sysconfig -from contextlib import suppress -from inspect import cleandoc -from zipfile import ZipFile - -import jaraco.path -import pytest -from packaging import tags - -import setuptools -from setuptools.command.bdist_wheel import bdist_wheel, get_abi_tag -from setuptools.dist import Distribution -from setuptools.warnings import SetuptoolsDeprecationWarning - -from distutils.core import run_setup - -DEFAULT_FILES = { - "dummy_dist-1.0.dist-info/top_level.txt", - "dummy_dist-1.0.dist-info/METADATA", - "dummy_dist-1.0.dist-info/WHEEL", - "dummy_dist-1.0.dist-info/RECORD", -} -DEFAULT_LICENSE_FILES = { - "LICENSE", - "LICENSE.txt", - "LICENCE", - "LICENCE.txt", - "COPYING", - "COPYING.md", - "NOTICE", - "NOTICE.rst", - "AUTHORS", - "AUTHORS.txt", -} -OTHER_IGNORED_FILES = { - "LICENSE~", - "AUTHORS~", -} -SETUPPY_EXAMPLE = """\ -from setuptools import setup - -setup( - name='dummy_dist', - version='1.0', -) -""" - - -EXAMPLES = { - "dummy-dist": { - "setup.py": SETUPPY_EXAMPLE, - "licenses_dir": {"DUMMYFILE": ""}, - **dict.fromkeys(DEFAULT_LICENSE_FILES | OTHER_IGNORED_FILES, ""), - }, - "simple-dist": { - "setup.py": cleandoc( - """ - from setuptools import setup - - setup( - name="simple.dist", - version="0.1", - description="A testing distribution \N{SNOWMAN}", - extras_require={"voting": ["beaglevote"]}, - ) - """ - ), - "simpledist": "", - }, - "complex-dist": { - "setup.py": cleandoc( - """ - from setuptools import setup - - setup( - name="complex-dist", - version="0.1", - description="Another testing distribution \N{SNOWMAN}", - long_description="Another testing distribution \N{SNOWMAN}", - author="Illustrious Author", - author_email="illustrious@example.org", - url="http://example.org/exemplary", - packages=["complexdist"], - setup_requires=["setuptools"], - install_requires=["quux", "splort"], - extras_require={"simple": ["simple.dist"]}, - entry_points={ - "console_scripts": [ - "complex-dist=complexdist:main", - "complex-dist2=complexdist:main", - ], - }, - ) - """ - ), - "complexdist": {"__init__.py": "def main(): return"}, - }, - "headers-dist": { - "setup.py": cleandoc( - """ - from setuptools import setup - - setup( - name="headers.dist", - version="0.1", - description="A distribution with headers", - headers=["header.h"], - ) - """ - ), - "headersdist.py": "", - "header.h": "", - }, - "commasinfilenames-dist": { - "setup.py": cleandoc( - """ - from setuptools import setup - - setup( - name="testrepo", - version="0.1", - packages=["mypackage"], - description="A test package with commas in file names", - include_package_data=True, - package_data={"mypackage.data": ["*"]}, - ) - """ - ), - "mypackage": { - "__init__.py": "", - "data": {"__init__.py": "", "1,2,3.txt": ""}, - }, - "testrepo-0.1.0": { - "mypackage": {"__init__.py": ""}, - }, - }, - "unicode-dist": { - "setup.py": cleandoc( - """ - from setuptools import setup - - setup( - name="unicode.dist", - version="0.1", - description="A testing distribution \N{SNOWMAN}", - packages=["unicodedist"], - zip_safe=True, - ) - """ - ), - "unicodedist": {"__init__.py": "", "åäö_日本語.py": ""}, - }, - "utf8-metadata-dist": { - "setup.cfg": cleandoc( - """ - [metadata] - name = utf8-metadata-dist - version = 42 - author_email = "John X. Ãørçeč" , Γαμα קּ 東 - long_description = file: README.rst - """ - ), - "README.rst": "UTF-8 描述 説明", - }, - "licenses-dist": { - "setup.cfg": cleandoc( - """ - [metadata] - name = licenses-dist - version = 1.0 - license_files = **/LICENSE - """ - ), - "LICENSE": "", - "src": { - "vendor": {"LICENSE": ""}, - }, - }, -} - - -if sys.platform != "win32": - # ABI3 extensions don't really work on Windows - EXAMPLES["abi3extension-dist"] = { - "setup.py": cleandoc( - """ - from setuptools import Extension, setup - - setup( - name="extension.dist", - version="0.1", - description="A testing distribution \N{SNOWMAN}", - ext_modules=[ - Extension( - name="extension", sources=["extension.c"], py_limited_api=True - ) - ], - ) - """ - ), - "setup.cfg": "[bdist_wheel]\npy_limited_api=cp32", - "extension.c": "#define Py_LIMITED_API 0x03020000\n#include ", - } - - -def bdist_wheel_cmd(**kwargs): - """Run command in the same process so that it is easier to collect coverage""" - dist_obj = ( - run_setup("setup.py", stop_after="init") - if os.path.exists("setup.py") - else Distribution({"script_name": "%%build_meta%%"}) - ) - dist_obj.parse_config_files() - cmd = bdist_wheel(dist_obj) - for attr, value in kwargs.items(): - setattr(cmd, attr, value) - cmd.finalize_options() - return cmd - - -def mkexample(tmp_path_factory, name): - basedir = tmp_path_factory.mktemp(name) - jaraco.path.build(EXAMPLES[name], prefix=str(basedir)) - return basedir - - -@pytest.fixture(scope="session") -def wheel_paths(tmp_path_factory): - build_base = tmp_path_factory.mktemp("build") - dist_dir = tmp_path_factory.mktemp("dist") - for name in EXAMPLES: - example_dir = mkexample(tmp_path_factory, name) - build_dir = build_base / name - with jaraco.path.DirectoryStack().context(example_dir): - bdist_wheel_cmd(bdist_dir=str(build_dir), dist_dir=str(dist_dir)).run() - - return sorted(str(fname) for fname in dist_dir.glob("*.whl")) - - -@pytest.fixture -def dummy_dist(tmp_path_factory): - return mkexample(tmp_path_factory, "dummy-dist") - - -@pytest.fixture -def licenses_dist(tmp_path_factory): - return mkexample(tmp_path_factory, "licenses-dist") - - -def test_no_scripts(wheel_paths): - """Make sure entry point scripts are not generated.""" - path = next(path for path in wheel_paths if "complex_dist" in path) - for entry in ZipFile(path).infolist(): - assert ".data/scripts/" not in entry.filename - - -def test_unicode_record(wheel_paths): - path = next(path for path in wheel_paths if "unicode_dist" in path) - with ZipFile(path) as zf: - record = zf.read("unicode_dist-0.1.dist-info/RECORD") - - assert "åäö_日本語.py".encode() in record - - -UTF8_PKG_INFO = """\ -Metadata-Version: 2.1 -Name: helloworld -Version: 42 -Author-email: "John X. Ãørçeč" , Γαμα קּ 東 - - -UTF-8 描述 説明 -""" - - -def test_preserve_unicode_metadata(monkeypatch, tmp_path): - monkeypatch.chdir(tmp_path) - egginfo = tmp_path / "dummy_dist.egg-info" - distinfo = tmp_path / "dummy_dist.dist-info" - - egginfo.mkdir() - (egginfo / "PKG-INFO").write_text(UTF8_PKG_INFO, encoding="utf-8") - (egginfo / "dependency_links.txt").touch() - - class simpler_bdist_wheel(bdist_wheel): - """Avoid messing with setuptools/distutils internals""" - - def __init__(self): - pass - - @property - def license_paths(self): - return [] - - cmd_obj = simpler_bdist_wheel() - cmd_obj.egg2dist(egginfo, distinfo) - - metadata = (distinfo / "METADATA").read_text(encoding="utf-8") - assert 'Author-email: "John X. Ãørçeč"' in metadata - assert "Γαμα קּ 東 " in metadata - assert "UTF-8 描述 説明" in metadata - - -def test_licenses_default(dummy_dist, monkeypatch, tmp_path): - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path)).run() - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - license_files = { - "dummy_dist-1.0.dist-info/licenses/" + fname - for fname in DEFAULT_LICENSE_FILES - } - assert set(wf.namelist()) == DEFAULT_FILES | license_files - - -def test_licenses_deprecated(dummy_dist, monkeypatch, tmp_path): - dummy_dist.joinpath("setup.cfg").write_text( - "[metadata]\nlicense_file=licenses_dir/DUMMYFILE", encoding="utf-8" - ) - monkeypatch.chdir(dummy_dist) - - bdist_wheel_cmd(bdist_dir=str(tmp_path)).run() - - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - license_files = {"dummy_dist-1.0.dist-info/licenses/licenses_dir/DUMMYFILE"} - assert set(wf.namelist()) == DEFAULT_FILES | license_files - - -@pytest.mark.parametrize( - ("config_file", "config"), - [ - ("setup.cfg", "[metadata]\nlicense_files=licenses_dir/*\n LICENSE"), - ("setup.cfg", "[metadata]\nlicense_files=licenses_dir/*, LICENSE"), - ( - "setup.py", - SETUPPY_EXAMPLE.replace( - ")", " license_files=['licenses_dir/DUMMYFILE', 'LICENSE'])" - ), - ), - ], -) -def test_licenses_override(dummy_dist, monkeypatch, tmp_path, config_file, config): - dummy_dist.joinpath(config_file).write_text(config, encoding="utf-8") - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path)).run() - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - license_files = { - "dummy_dist-1.0.dist-info/licenses/" + fname - for fname in {"licenses_dir/DUMMYFILE", "LICENSE"} - } - assert set(wf.namelist()) == DEFAULT_FILES | license_files - metadata = wf.read("dummy_dist-1.0.dist-info/METADATA").decode("utf8") - assert "License-File: licenses_dir/DUMMYFILE" in metadata - assert "License-File: LICENSE" in metadata - - -def test_licenses_preserve_folder_structure(licenses_dist, monkeypatch, tmp_path): - monkeypatch.chdir(licenses_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path)).run() - print(os.listdir("dist")) - with ZipFile("dist/licenses_dist-1.0-py3-none-any.whl") as wf: - default_files = {name.replace("dummy_", "licenses_") for name in DEFAULT_FILES} - license_files = { - "licenses_dist-1.0.dist-info/licenses/LICENSE", - "licenses_dist-1.0.dist-info/licenses/src/vendor/LICENSE", - } - assert set(wf.namelist()) == default_files | license_files - metadata = wf.read("licenses_dist-1.0.dist-info/METADATA").decode("utf8") - assert "License-File: src/vendor/LICENSE" in metadata - assert "License-File: LICENSE" in metadata - - -def test_licenses_disabled(dummy_dist, monkeypatch, tmp_path): - dummy_dist.joinpath("setup.cfg").write_text( - "[metadata]\nlicense_files=\n", encoding="utf-8" - ) - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path)).run() - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - assert set(wf.namelist()) == DEFAULT_FILES - - -def test_build_number(dummy_dist, monkeypatch, tmp_path): - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path), build_number="2").run() - with ZipFile("dist/dummy_dist-1.0-2-py3-none-any.whl") as wf: - filenames = set(wf.namelist()) - assert "dummy_dist-1.0.dist-info/RECORD" in filenames - assert "dummy_dist-1.0.dist-info/METADATA" in filenames - - -def test_universal_deprecated(dummy_dist, monkeypatch, tmp_path): - monkeypatch.chdir(dummy_dist) - with pytest.warns(SetuptoolsDeprecationWarning, match=".*universal is deprecated"): - bdist_wheel_cmd(bdist_dir=str(tmp_path), universal=True).run() - - # For now we still respect the option - assert os.path.exists("dist/dummy_dist-1.0-py2.py3-none-any.whl") - - -EXTENSION_EXAMPLE = """\ -#include - -static PyMethodDef methods[] = { - { NULL, NULL, 0, NULL } -}; - -static struct PyModuleDef module_def = { - PyModuleDef_HEAD_INIT, - "extension", - "Dummy extension module", - -1, - methods -}; - -PyMODINIT_FUNC PyInit_extension(void) { - return PyModule_Create(&module_def); -} -""" -EXTENSION_SETUPPY = """\ -from __future__ import annotations - -from setuptools import Extension, setup - -setup( - name="extension.dist", - version="0.1", - description="A testing distribution \N{SNOWMAN}", - ext_modules=[Extension(name="extension", sources=["extension.c"])], -) -""" - - -@pytest.mark.filterwarnings( - "once:Config variable '.*' is unset.*, Python ABI tag may be incorrect" -) -def test_limited_abi(monkeypatch, tmp_path, tmp_path_factory): - """Test that building a binary wheel with the limited ABI works.""" - source_dir = tmp_path_factory.mktemp("extension_dist") - (source_dir / "setup.py").write_text(EXTENSION_SETUPPY, encoding="utf-8") - (source_dir / "extension.c").write_text(EXTENSION_EXAMPLE, encoding="utf-8") - build_dir = tmp_path.joinpath("build") - dist_dir = tmp_path.joinpath("dist") - monkeypatch.chdir(source_dir) - bdist_wheel_cmd(bdist_dir=str(build_dir), dist_dir=str(dist_dir)).run() - - -def test_build_from_readonly_tree(dummy_dist, monkeypatch, tmp_path): - basedir = str(tmp_path.joinpath("dummy")) - shutil.copytree(str(dummy_dist), basedir) - monkeypatch.chdir(basedir) - - # Make the tree read-only - for root, _dirs, files in os.walk(basedir): - for fname in files: - os.chmod(os.path.join(root, fname), stat.S_IREAD) - - bdist_wheel_cmd().run() - - -@pytest.mark.parametrize( - ("option", "compress_type"), - list(bdist_wheel.supported_compressions.items()), - ids=list(bdist_wheel.supported_compressions), -) -def test_compression(dummy_dist, monkeypatch, tmp_path, option, compress_type): - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path), compression=option).run() - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - filenames = set(wf.namelist()) - assert "dummy_dist-1.0.dist-info/RECORD" in filenames - assert "dummy_dist-1.0.dist-info/METADATA" in filenames - for zinfo in wf.filelist: - assert zinfo.compress_type == compress_type - - -def test_wheelfile_line_endings(wheel_paths): - for path in wheel_paths: - with ZipFile(path) as wf: - wheelfile = next(fn for fn in wf.filelist if fn.filename.endswith("WHEEL")) - wheelfile_contents = wf.read(wheelfile) - assert b"\r" not in wheelfile_contents - - -def test_unix_epoch_timestamps(dummy_dist, monkeypatch, tmp_path): - monkeypatch.setenv("SOURCE_DATE_EPOCH", "0") - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(bdist_dir=str(tmp_path), build_number="2a").run() - with ZipFile("dist/dummy_dist-1.0-2a-py3-none-any.whl") as wf: - for zinfo in wf.filelist: - assert zinfo.date_time >= (1980, 1, 1, 0, 0, 0) # min epoch is used - - -def test_get_abi_tag_windows(monkeypatch): - monkeypatch.setattr(tags, "interpreter_name", lambda: "cp") - monkeypatch.setattr(sysconfig, "get_config_var", lambda x: "cp313-win_amd64") - assert get_abi_tag() == "cp313" - monkeypatch.setattr(sys, "gettotalrefcount", lambda: 1, False) - assert get_abi_tag() == "cp313d" - monkeypatch.setattr(sysconfig, "get_config_var", lambda x: "cp313t-win_amd64") - assert get_abi_tag() == "cp313td" - monkeypatch.delattr(sys, "gettotalrefcount") - assert get_abi_tag() == "cp313t" - - -def test_get_abi_tag_pypy_old(monkeypatch): - monkeypatch.setattr(tags, "interpreter_name", lambda: "pp") - monkeypatch.setattr(sysconfig, "get_config_var", lambda x: "pypy36-pp73") - assert get_abi_tag() == "pypy36_pp73" - - -def test_get_abi_tag_pypy_new(monkeypatch): - monkeypatch.setattr(sysconfig, "get_config_var", lambda x: "pypy37-pp73-darwin") - monkeypatch.setattr(tags, "interpreter_name", lambda: "pp") - assert get_abi_tag() == "pypy37_pp73" - - -def test_get_abi_tag_graalpy(monkeypatch): - monkeypatch.setattr( - sysconfig, "get_config_var", lambda x: "graalpy231-310-native-x86_64-linux" - ) - monkeypatch.setattr(tags, "interpreter_name", lambda: "graalpy") - assert get_abi_tag() == "graalpy231_310_native" - - -def test_get_abi_tag_fallback(monkeypatch): - monkeypatch.setattr(sysconfig, "get_config_var", lambda x: "unknown-python-310") - monkeypatch.setattr(tags, "interpreter_name", lambda: "unknown-python") - assert get_abi_tag() == "unknown_python_310" - - -def test_platform_with_space(dummy_dist, monkeypatch): - """Ensure building on platforms with a space in the name succeed.""" - monkeypatch.chdir(dummy_dist) - bdist_wheel_cmd(plat_name="isilon onefs").run() - - -def test_data_dir_with_tag_build(monkeypatch, tmp_path): - """ - Setuptools allow authors to set PEP 440's local version segments - using ``egg_info.tag_build``. This should be reflected not only in the - ``.whl`` file name, but also in the ``.dist-info`` and ``.data`` dirs. - See pypa/setuptools#3997. - """ - monkeypatch.chdir(tmp_path) - files = { - "setup.py": """ - from setuptools import setup - setup(headers=["hello.h"]) - """, - "setup.cfg": """ - [metadata] - name = test - version = 1.0 - - [options.data_files] - hello/world = file.txt - - [egg_info] - tag_build = +what - tag_date = 0 - """, - "file.txt": "", - "hello.h": "", - } - for file, content in files.items(): - with open(file, "w", encoding="utf-8") as fh: - fh.write(cleandoc(content)) - - bdist_wheel_cmd().run() - - # Ensure .whl, .dist-info and .data contain the local segment - wheel_path = "dist/test-1.0+what-py3-none-any.whl" - assert os.path.exists(wheel_path) - entries = set(ZipFile(wheel_path).namelist()) - for expected in ( - "test-1.0+what.data/headers/hello.h", - "test-1.0+what.data/data/hello/world/file.txt", - "test-1.0+what.dist-info/METADATA", - "test-1.0+what.dist-info/WHEEL", - ): - assert expected in entries - - for not_expected in ( - "test.data/headers/hello.h", - "test-1.0.data/data/hello/world/file.txt", - "test.dist-info/METADATA", - "test-1.0.dist-info/WHEEL", - ): - assert not_expected not in entries - - -@pytest.mark.parametrize( - ("reported", "expected"), - [("linux-x86_64", "linux_i686"), ("linux-aarch64", "linux_armv7l")], -) -@pytest.mark.skipif( - platform.system() != "Linux", reason="Only makes sense to test on Linux" -) -def test_platform_linux32(reported, expected, monkeypatch): - monkeypatch.setattr(struct, "calcsize", lambda x: 4) - dist = setuptools.Distribution() - cmd = bdist_wheel(dist) - cmd.plat_name = reported - cmd.root_is_pure = False - _, _, actual = cmd.get_tag() - assert actual == expected - - -def test_no_ctypes(monkeypatch) -> None: - def _fake_import(name: str, *args, **kwargs): - if name == "ctypes": - raise ModuleNotFoundError(f"No module named {name}") - - return importlib.__import__(name, *args, **kwargs) - - with suppress(KeyError): - monkeypatch.delitem(sys.modules, "wheel.macosx_libfile") - - # Install an importer shim that refuses to load ctypes - monkeypatch.setattr(builtins, "__import__", _fake_import) - with pytest.raises(ModuleNotFoundError, match="No module named ctypes"): - import wheel.macosx_libfile # noqa: F401 - - # Unload and reimport the bdist_wheel command module to make sure it won't try to - # import ctypes - monkeypatch.delitem(sys.modules, "setuptools.command.bdist_wheel") - - import setuptools.command.bdist_wheel # noqa: F401 - - -def test_dist_info_provided(dummy_dist, monkeypatch, tmp_path): - monkeypatch.chdir(dummy_dist) - distinfo = tmp_path / "dummy_dist.dist-info" - - distinfo.mkdir() - (distinfo / "METADATA").write_text("name: helloworld", encoding="utf-8") - - # We don't control the metadata. According to PEP-517, "The hook MAY also - # create other files inside this directory, and a build frontend MUST - # preserve". - (distinfo / "FOO").write_text("bar", encoding="utf-8") - - bdist_wheel_cmd(bdist_dir=str(tmp_path), dist_info_dir=str(distinfo)).run() - expected = { - "dummy_dist-1.0.dist-info/FOO", - "dummy_dist-1.0.dist-info/RECORD", - } - with ZipFile("dist/dummy_dist-1.0-py3-none-any.whl") as wf: - files_found = set(wf.namelist()) - # Check that all expected files are there. - assert expected - files_found == set() - # Make sure there is no accidental egg-info bleeding into the wheel. - assert not [path for path in files_found if 'egg-info' in str(path)] - - -def test_allow_grace_period_parent_directory_license(monkeypatch, tmp_path): - # Motivation: https://github.com/pypa/setuptools/issues/4892 - # TODO: Remove this test after deprecation period is over - files = { - "LICENSE.txt": "parent license", # <---- the license files are outside - "NOTICE.txt": "parent notice", - "python": { - "pyproject.toml": cleandoc( - """ - [project] - name = "test-proj" - dynamic = ["version"] # <---- testing dynamic will not break - [tool.setuptools.dynamic] - version.file = "VERSION" - """ - ), - "setup.cfg": cleandoc( - """ - [metadata] - license_files = - ../LICENSE.txt - ../NOTICE.txt - """ - ), - "VERSION": "42", - }, - } - jaraco.path.build(files, prefix=str(tmp_path)) - monkeypatch.chdir(tmp_path / "python") - msg = "Pattern '../.*.txt' cannot contain '..'" - with pytest.warns(SetuptoolsDeprecationWarning, match=msg): - bdist_wheel_cmd().run() - with ZipFile("dist/test_proj-42-py3-none-any.whl") as wf: - files_found = set(wf.namelist()) - expected_files = { - "test_proj-42.dist-info/licenses/LICENSE.txt", - "test_proj-42.dist-info/licenses/NOTICE.txt", - } - assert expected_files <= files_found - - metadata = wf.read("test_proj-42.dist-info/METADATA").decode("utf8") - assert "License-File: LICENSE.txt" in metadata - assert "License-File: NOTICE.txt" in metadata diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build.py deleted file mode 100644 index f0f1d9d..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build.py +++ /dev/null @@ -1,33 +0,0 @@ -from setuptools import Command -from setuptools.command.build import build -from setuptools.dist import Distribution - - -def test_distribution_gives_setuptools_build_obj(tmpdir_cwd): - """ - Check that the setuptools Distribution uses the - setuptools specific build object. - """ - - dist = Distribution( - dict( - script_name='setup.py', - script_args=['build'], - packages=[], - package_data={'': ['path/*']}, - ) - ) - assert isinstance(dist.get_command_obj("build"), build) - - -class Subcommand(Command): - """Dummy command to be used in tests""" - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - raise NotImplementedError("just to check if the command runs") diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_clib.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_clib.py deleted file mode 100644 index b5315df..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_clib.py +++ /dev/null @@ -1,84 +0,0 @@ -import random -from unittest import mock - -import pytest - -from setuptools.command.build_clib import build_clib -from setuptools.dist import Distribution - -from distutils.errors import DistutilsSetupError - - -class TestBuildCLib: - @mock.patch('setuptools.command.build_clib.newer_pairwise_group') - def test_build_libraries(self, mock_newer): - dist = Distribution() - cmd = build_clib(dist) - - # this will be a long section, just making sure all - # exceptions are properly raised - libs = [('example', {'sources': 'broken.c'})] - with pytest.raises(DistutilsSetupError): - cmd.build_libraries(libs) - - obj_deps = 'some_string' - libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})] - with pytest.raises(DistutilsSetupError): - cmd.build_libraries(libs) - - obj_deps = {'': ''} - libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})] - with pytest.raises(DistutilsSetupError): - cmd.build_libraries(libs) - - obj_deps = {'source.c': ''} - libs = [('example', {'sources': ['source.c'], 'obj_deps': obj_deps})] - with pytest.raises(DistutilsSetupError): - cmd.build_libraries(libs) - - # with that out of the way, let's see if the crude dependency - # system works - cmd.compiler = mock.MagicMock(spec=cmd.compiler) - mock_newer.return_value = ([], []) - - obj_deps = {'': ('global.h',), 'example.c': ('example.h',)} - libs = [('example', {'sources': ['example.c'], 'obj_deps': obj_deps})] - - cmd.build_libraries(libs) - assert [['example.c', 'global.h', 'example.h']] in mock_newer.call_args[0] - assert not cmd.compiler.compile.called - assert cmd.compiler.create_static_lib.call_count == 1 - - # reset the call numbers so we can test again - cmd.compiler.reset_mock() - - mock_newer.return_value = '' # anything as long as it's not ([],[]) - cmd.build_libraries(libs) - assert cmd.compiler.compile.call_count == 1 - assert cmd.compiler.create_static_lib.call_count == 1 - - @mock.patch('setuptools.command.build_clib.newer_pairwise_group') - def test_build_libraries_reproducible(self, mock_newer): - dist = Distribution() - cmd = build_clib(dist) - - # with that out of the way, let's see if the crude dependency - # system works - cmd.compiler = mock.MagicMock(spec=cmd.compiler) - mock_newer.return_value = ([], []) - - original_sources = ['a-example.c', 'example.c'] - sources = original_sources - - obj_deps = {'': ('global.h',), 'example.c': ('example.h',)} - libs = [('example', {'sources': sources, 'obj_deps': obj_deps})] - - cmd.build_libraries(libs) - computed_call_args = mock_newer.call_args[0] - - while sources == original_sources: - sources = random.sample(original_sources, len(original_sources)) - libs = [('example', {'sources': sources, 'obj_deps': obj_deps})] - - cmd.build_libraries(libs) - assert computed_call_args == mock_newer.call_args[0] diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_ext.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_ext.py deleted file mode 100644 index c7b60ac..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_ext.py +++ /dev/null @@ -1,293 +0,0 @@ -from __future__ import annotations - -import os -import sys -from importlib.util import cache_from_source as _compiled_file_name - -import pytest -from jaraco import path - -from setuptools.command.build_ext import build_ext, get_abi3_suffix -from setuptools.dist import Distribution -from setuptools.errors import CompileError -from setuptools.extension import Extension - -from . import environment -from .textwrap import DALS - -import distutils.command.build_ext as orig -from distutils.sysconfig import get_config_var - -IS_PYPY = '__pypy__' in sys.builtin_module_names - - -class TestBuildExt: - def test_get_ext_filename(self): - """ - Setuptools needs to give back the same - result as distutils, even if the fullname - is not in ext_map. - """ - dist = Distribution() - cmd = build_ext(dist) - cmd.ext_map['foo/bar'] = '' - res = cmd.get_ext_filename('foo') - wanted = orig.build_ext.get_ext_filename(cmd, 'foo') - assert res == wanted - - def test_abi3_filename(self): - """ - Filename needs to be loadable by several versions - of Python 3 if 'is_abi3' is truthy on Extension() - """ - print(get_abi3_suffix()) - - extension = Extension('spam.eggs', ['eggs.c'], py_limited_api=True) - dist = Distribution(dict(ext_modules=[extension])) - cmd = build_ext(dist) - cmd.finalize_options() - assert 'spam.eggs' in cmd.ext_map - res = cmd.get_ext_filename('spam.eggs') - - if not get_abi3_suffix(): - assert res.endswith(get_config_var('EXT_SUFFIX')) - elif sys.platform == 'win32': - assert res.endswith('eggs.pyd') - else: - assert 'abi3' in res - - def test_ext_suffix_override(self): - """ - SETUPTOOLS_EXT_SUFFIX variable always overrides - default extension options. - """ - dist = Distribution() - cmd = build_ext(dist) - cmd.ext_map['for_abi3'] = ext = Extension( - 'for_abi3', - ['s.c'], - # Override shouldn't affect abi3 modules - py_limited_api=True, - ) - # Mock value needed to pass tests - ext._links_to_dynamic = False - - if not IS_PYPY: - expect = cmd.get_ext_filename('for_abi3') - else: - # PyPy builds do not use ABI3 tag, so they will - # also get the overridden suffix. - expect = 'for_abi3.test-suffix' - - try: - os.environ['SETUPTOOLS_EXT_SUFFIX'] = '.test-suffix' - res = cmd.get_ext_filename('normal') - assert 'normal.test-suffix' == res - res = cmd.get_ext_filename('for_abi3') - assert expect == res - finally: - del os.environ['SETUPTOOLS_EXT_SUFFIX'] - - def dist_with_example(self): - files = { - "src": {"mypkg": {"subpkg": {"ext2.c": ""}}}, - "c-extensions": {"ext1": {"main.c": ""}}, - } - - ext1 = Extension("mypkg.ext1", ["c-extensions/ext1/main.c"]) - ext2 = Extension("mypkg.subpkg.ext2", ["src/mypkg/subpkg/ext2.c"]) - ext3 = Extension("ext3", ["c-extension/ext3.c"]) - - path.build(files) - return Distribution({ - "script_name": "%test%", - "ext_modules": [ext1, ext2, ext3], - "package_dir": {"": "src"}, - }) - - def test_get_outputs(self, tmpdir_cwd, monkeypatch): - monkeypatch.setenv('SETUPTOOLS_EXT_SUFFIX', '.mp3') # make test OS-independent - monkeypatch.setattr('setuptools.command.build_ext.use_stubs', False) - dist = self.dist_with_example() - - # Regular build: get_outputs not empty, but get_output_mappings is empty - build_ext = dist.get_command_obj("build_ext") - build_ext.editable_mode = False - build_ext.ensure_finalized() - build_lib = build_ext.build_lib.replace(os.sep, "/") - outputs = [x.replace(os.sep, "/") for x in build_ext.get_outputs()] - assert outputs == [ - f"{build_lib}/ext3.mp3", - f"{build_lib}/mypkg/ext1.mp3", - f"{build_lib}/mypkg/subpkg/ext2.mp3", - ] - assert build_ext.get_output_mapping() == {} - - # Editable build: get_output_mappings should contain everything in get_outputs - dist.reinitialize_command("build_ext") - build_ext.editable_mode = True - build_ext.ensure_finalized() - mapping = { - k.replace(os.sep, "/"): v.replace(os.sep, "/") - for k, v in build_ext.get_output_mapping().items() - } - assert mapping == { - f"{build_lib}/ext3.mp3": "src/ext3.mp3", - f"{build_lib}/mypkg/ext1.mp3": "src/mypkg/ext1.mp3", - f"{build_lib}/mypkg/subpkg/ext2.mp3": "src/mypkg/subpkg/ext2.mp3", - } - - def test_get_output_mapping_with_stub(self, tmpdir_cwd, monkeypatch): - monkeypatch.setenv('SETUPTOOLS_EXT_SUFFIX', '.mp3') # make test OS-independent - monkeypatch.setattr('setuptools.command.build_ext.use_stubs', True) - dist = self.dist_with_example() - - # Editable build should create compiled stubs (.pyc files only, no .py) - build_ext = dist.get_command_obj("build_ext") - build_ext.editable_mode = True - build_ext.ensure_finalized() - for ext in build_ext.extensions: - monkeypatch.setattr(ext, "_needs_stub", True) - - build_lib = build_ext.build_lib.replace(os.sep, "/") - mapping = { - k.replace(os.sep, "/"): v.replace(os.sep, "/") - for k, v in build_ext.get_output_mapping().items() - } - - def C(file): - """Make it possible to do comparisons and tests in a OS-independent way""" - return _compiled_file_name(file).replace(os.sep, "/") - - assert mapping == { - C(f"{build_lib}/ext3.py"): C("src/ext3.py"), - f"{build_lib}/ext3.mp3": "src/ext3.mp3", - C(f"{build_lib}/mypkg/ext1.py"): C("src/mypkg/ext1.py"), - f"{build_lib}/mypkg/ext1.mp3": "src/mypkg/ext1.mp3", - C(f"{build_lib}/mypkg/subpkg/ext2.py"): C("src/mypkg/subpkg/ext2.py"), - f"{build_lib}/mypkg/subpkg/ext2.mp3": "src/mypkg/subpkg/ext2.mp3", - } - - # Ensure only the compiled stubs are present not the raw .py stub - assert f"{build_lib}/mypkg/ext1.py" not in mapping - assert f"{build_lib}/mypkg/subpkg/ext2.py" not in mapping - - # Visualize what the cached stub files look like - example_stub = C(f"{build_lib}/mypkg/ext1.py") - assert example_stub in mapping - assert example_stub.startswith(f"{build_lib}/mypkg/__pycache__/ext1") - assert example_stub.endswith(".pyc") - - -class TestBuildExtInplace: - def get_build_ext_cmd(self, optional: bool, **opts) -> build_ext: - files: dict[str, str | dict[str, dict[str, str]]] = { - "eggs.c": "#include missingheader.h\n", - ".build": {"lib": {}, "tmp": {}}, - } - path.build(files) - extension = Extension('spam.eggs', ['eggs.c'], optional=optional) - dist = Distribution(dict(ext_modules=[extension])) - dist.script_name = 'setup.py' - cmd = build_ext(dist) - vars(cmd).update(build_lib=".build/lib", build_temp=".build/tmp", **opts) - cmd.ensure_finalized() - return cmd - - def get_log_messages(self, caplog, capsys): - """ - Historically, distutils "logged" by printing to sys.std*. - Later versions adopted the logging framework. Grab - messages regardless of how they were captured. - """ - std = capsys.readouterr() - return std.out.splitlines() + std.err.splitlines() + caplog.messages - - def test_optional(self, tmpdir_cwd, caplog, capsys): - """ - If optional extensions fail to build, setuptools should show the error - in the logs but not fail to build - """ - cmd = self.get_build_ext_cmd(optional=True, inplace=True) - cmd.run() - assert any( - 'build_ext: building extension "spam.eggs" failed' - for msg in self.get_log_messages(caplog, capsys) - ) - # No compile error exception should be raised - - def test_non_optional(self, tmpdir_cwd): - # Non-optional extensions should raise an exception - cmd = self.get_build_ext_cmd(optional=False, inplace=True) - with pytest.raises(CompileError): - cmd.run() - - -def test_build_ext_config_handling(tmpdir_cwd): - files = { - 'setup.py': DALS( - """ - from setuptools import Extension, setup - setup( - name='foo', - version='0.0.0', - ext_modules=[Extension('foo', ['foo.c'])], - ) - """ - ), - 'foo.c': DALS( - """ - #include "Python.h" - - #if PY_MAJOR_VERSION >= 3 - - static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, - "foo", - NULL, - 0, - NULL, - NULL, - NULL, - NULL, - NULL - }; - - #define INITERROR return NULL - - PyMODINIT_FUNC PyInit_foo(void) - - #else - - #define INITERROR return - - void initfoo(void) - - #endif - { - #if PY_MAJOR_VERSION >= 3 - PyObject *module = PyModule_Create(&moduledef); - #else - PyObject *module = Py_InitModule("extension", NULL); - #endif - if (module == NULL) - INITERROR; - #if PY_MAJOR_VERSION >= 3 - return module; - #endif - } - """ - ), - 'setup.cfg': DALS( - """ - [build] - build_base = foo_build - """ - ), - } - path.build(files) - code, (stdout, stderr) = environment.run_setup_py( - cmd=['build'], - data_stream=(0, 2), - ) - assert code == 0, f'\nSTDOUT:\n{stdout}\nSTDERR:\n{stderr}' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_meta.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_meta.py deleted file mode 100644 index 57162fd..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_meta.py +++ /dev/null @@ -1,959 +0,0 @@ -import contextlib -import importlib -import os -import re -import shutil -import signal -import sys -import tarfile -import warnings -from concurrent import futures -from pathlib import Path -from typing import Any, Callable -from zipfile import ZipFile - -import pytest -from jaraco import path -from packaging.requirements import Requirement - -from setuptools.warnings import SetuptoolsDeprecationWarning - -from .textwrap import DALS - -SETUP_SCRIPT_STUB = "__import__('setuptools').setup()" - - -TIMEOUT = int(os.getenv("TIMEOUT_BACKEND_TEST", "180")) # in seconds -IS_PYPY = '__pypy__' in sys.builtin_module_names - - -pytestmark = pytest.mark.skipif( - sys.platform == "win32" and IS_PYPY, - reason="The combination of PyPy + Windows + pytest-xdist + ProcessPoolExecutor " - "is flaky and problematic", -) - - -class BuildBackendBase: - def __init__(self, cwd='.', env=None, backend_name='setuptools.build_meta'): - self.cwd = cwd - self.env = env or {} - self.backend_name = backend_name - - -class BuildBackend(BuildBackendBase): - """PEP 517 Build Backend""" - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.pool = futures.ProcessPoolExecutor(max_workers=1) - - def __getattr__(self, name: str) -> Callable[..., Any]: - """Handles arbitrary function invocations on the build backend.""" - - def method(*args, **kw): - root = os.path.abspath(self.cwd) - caller = BuildBackendCaller(root, self.env, self.backend_name) - pid = None - try: - pid = self.pool.submit(os.getpid).result(TIMEOUT) - return self.pool.submit(caller, name, *args, **kw).result(TIMEOUT) - except futures.TimeoutError: - self.pool.shutdown(wait=False) # doesn't stop already running processes - self._kill(pid) - pytest.xfail(f"Backend did not respond before timeout ({TIMEOUT} s)") - except (futures.process.BrokenProcessPool, MemoryError, OSError): - if IS_PYPY: - pytest.xfail("PyPy frequently fails tests with ProcessPoolExector") - raise - - return method - - def _kill(self, pid): - if pid is None: - return - with contextlib.suppress(ProcessLookupError, OSError): - os.kill(pid, signal.SIGTERM if os.name == "nt" else signal.SIGKILL) - - -class BuildBackendCaller(BuildBackendBase): - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - (self.backend_name, _, self.backend_obj) = self.backend_name.partition(':') - - def __call__(self, name, *args, **kw): - """Handles arbitrary function invocations on the build backend.""" - os.chdir(self.cwd) - os.environ.update(self.env) - mod = importlib.import_module(self.backend_name) - - if self.backend_obj: - backend = getattr(mod, self.backend_obj) - else: - backend = mod - - return getattr(backend, name)(*args, **kw) - - -defns = [ - { # simple setup.py script - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'], - setup_requires=['six'], - ) - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }, - { # setup.py that relies on __name__ - 'setup.py': DALS( - """ - assert __name__ == '__main__' - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'], - setup_requires=['six'], - ) - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }, - { # setup.py script that runs arbitrary code - 'setup.py': DALS( - """ - variable = True - def function(): - return variable - assert variable - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'], - setup_requires=['six'], - ) - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }, - { # setup.py script that constructs temp files to be included in the distribution - 'setup.py': DALS( - """ - # Some packages construct files on the fly, include them in the package, - # and immediately remove them after `setup()` (e.g. pybind11==2.9.1). - # Therefore, we cannot use `distutils.core.run_setup(..., stop_after=...)` - # to obtain a distribution object first, and then run the distutils - # commands later, because these files will be removed in the meantime. - - with open('world.py', 'w', encoding="utf-8") as f: - f.write('x = 42') - - try: - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['world'], - setup_requires=['six'], - ) - finally: - # Some packages will clean temporary files - __import__('os').unlink('world.py') - """ - ), - }, - { # setup.cfg only - 'setup.cfg': DALS( - """ - [metadata] - name = foo - version = 0.0.0 - - [options] - py_modules=hello - setup_requires=six - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }, - { # setup.cfg and setup.py - 'setup.cfg': DALS( - """ - [metadata] - name = foo - version = 0.0.0 - - [options] - py_modules=hello - setup_requires=six - """ - ), - 'setup.py': "__import__('setuptools').setup()", - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }, -] - - -class TestBuildMetaBackend: - backend_name = 'setuptools.build_meta' - - def get_build_backend(self): - return BuildBackend(backend_name=self.backend_name) - - @pytest.fixture(params=defns) - def build_backend(self, tmpdir, request): - path.build(request.param, prefix=str(tmpdir)) - with tmpdir.as_cwd(): - yield self.get_build_backend() - - def test_get_requires_for_build_wheel(self, build_backend): - actual = build_backend.get_requires_for_build_wheel() - expected = ['six'] - assert sorted(actual) == sorted(expected) - - def test_get_requires_for_build_sdist(self, build_backend): - actual = build_backend.get_requires_for_build_sdist() - expected = ['six'] - assert sorted(actual) == sorted(expected) - - def test_build_wheel(self, build_backend): - dist_dir = os.path.abspath('pip-wheel') - os.makedirs(dist_dir) - wheel_name = build_backend.build_wheel(dist_dir) - - wheel_file = os.path.join(dist_dir, wheel_name) - assert os.path.isfile(wheel_file) - - # Temporary files should be removed - assert not os.path.isfile('world.py') - - with ZipFile(wheel_file) as zipfile: - wheel_contents = set(zipfile.namelist()) - - # Each one of the examples have a single module - # that should be included in the distribution - python_scripts = (f for f in wheel_contents if f.endswith('.py')) - modules = [f for f in python_scripts if not f.endswith('setup.py')] - assert len(modules) == 1 - - @pytest.mark.parametrize('build_type', ('wheel', 'sdist')) - def test_build_with_existing_file_present(self, build_type, tmpdir_cwd): - # Building a sdist/wheel should still succeed if there's - # already a sdist/wheel in the destination directory. - files = { - 'setup.py': "from setuptools import setup\nsetup()", - 'VERSION': "0.0.1", - 'setup.cfg': DALS( - """ - [metadata] - name = foo - version = file: VERSION - """ - ), - 'pyproject.toml': DALS( - """ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - """ - ), - } - - path.build(files) - - dist_dir = os.path.abspath('preexisting-' + build_type) - - build_backend = self.get_build_backend() - build_method = getattr(build_backend, 'build_' + build_type) - - # Build a first sdist/wheel. - # Note: this also check the destination directory is - # successfully created if it does not exist already. - first_result = build_method(dist_dir) - - # Change version. - with open("VERSION", "wt", encoding="utf-8") as version_file: - version_file.write("0.0.2") - - # Build a *second* sdist/wheel. - second_result = build_method(dist_dir) - - assert os.path.isfile(os.path.join(dist_dir, first_result)) - assert first_result != second_result - - # And if rebuilding the exact same sdist/wheel? - open(os.path.join(dist_dir, second_result), 'wb').close() - third_result = build_method(dist_dir) - assert third_result == second_result - assert os.path.getsize(os.path.join(dist_dir, third_result)) > 0 - - @pytest.mark.parametrize("setup_script", [None, SETUP_SCRIPT_STUB]) - def test_build_with_pyproject_config(self, tmpdir, setup_script): - files = { - 'pyproject.toml': DALS( - """ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "foo" - license = {text = "MIT"} - description = "This is a Python package" - dynamic = ["version", "readme"] - classifiers = [ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers" - ] - urls = {Homepage = "http://github.com"} - dependencies = [ - "appdirs", - ] - - [project.optional-dependencies] - all = [ - "tomli>=1", - "pyscaffold>=4,<5", - 'importlib; python_version == "2.6"', - ] - - [project.scripts] - foo = "foo.cli:main" - - [tool.setuptools] - zip-safe = false - package-dir = {"" = "src"} - packages = {find = {where = ["src"]}} - license-files = ["LICENSE*"] - - [tool.setuptools.dynamic] - version = {attr = "foo.__version__"} - readme = {file = "README.rst"} - - [tool.distutils.sdist] - formats = "gztar" - """ - ), - "MANIFEST.in": DALS( - """ - global-include *.py *.txt - global-exclude *.py[cod] - """ - ), - "README.rst": "This is a ``README``", - "LICENSE.txt": "---- placeholder MIT license ----", - "src": { - "foo": { - "__init__.py": "__version__ = '0.1'", - "__init__.pyi": "__version__: str", - "cli.py": "def main(): print('hello world')", - "data.txt": "def main(): print('hello world')", - "py.typed": "", - } - }, - } - if setup_script: - files["setup.py"] = setup_script - - build_backend = self.get_build_backend() - with tmpdir.as_cwd(): - path.build(files) - msgs = [ - "'tool.setuptools.license-files' is deprecated in favor of 'project.license-files'", - "`project.license` as a TOML table is deprecated", - ] - with warnings.catch_warnings(): - for msg in msgs: - warnings.filterwarnings("ignore", msg, SetuptoolsDeprecationWarning) - sdist_path = build_backend.build_sdist("temp") - wheel_file = build_backend.build_wheel("temp") - - with tarfile.open(os.path.join(tmpdir, "temp", sdist_path)) as tar: - sdist_contents = set(tar.getnames()) - - with ZipFile(os.path.join(tmpdir, "temp", wheel_file)) as zipfile: - wheel_contents = set(zipfile.namelist()) - metadata = str(zipfile.read("foo-0.1.dist-info/METADATA"), "utf-8") - license = str( - zipfile.read("foo-0.1.dist-info/licenses/LICENSE.txt"), "utf-8" - ) - epoints = str(zipfile.read("foo-0.1.dist-info/entry_points.txt"), "utf-8") - - assert sdist_contents - {"foo-0.1/setup.py"} == { - 'foo-0.1', - 'foo-0.1/LICENSE.txt', - 'foo-0.1/MANIFEST.in', - 'foo-0.1/PKG-INFO', - 'foo-0.1/README.rst', - 'foo-0.1/pyproject.toml', - 'foo-0.1/setup.cfg', - 'foo-0.1/src', - 'foo-0.1/src/foo', - 'foo-0.1/src/foo/__init__.py', - 'foo-0.1/src/foo/__init__.pyi', - 'foo-0.1/src/foo/cli.py', - 'foo-0.1/src/foo/data.txt', - 'foo-0.1/src/foo/py.typed', - 'foo-0.1/src/foo.egg-info', - 'foo-0.1/src/foo.egg-info/PKG-INFO', - 'foo-0.1/src/foo.egg-info/SOURCES.txt', - 'foo-0.1/src/foo.egg-info/dependency_links.txt', - 'foo-0.1/src/foo.egg-info/entry_points.txt', - 'foo-0.1/src/foo.egg-info/requires.txt', - 'foo-0.1/src/foo.egg-info/top_level.txt', - 'foo-0.1/src/foo.egg-info/not-zip-safe', - } - assert wheel_contents == { - "foo/__init__.py", - "foo/__init__.pyi", # include type information by default - "foo/cli.py", - "foo/data.txt", # include_package_data defaults to True - "foo/py.typed", # include type information by default - "foo-0.1.dist-info/licenses/LICENSE.txt", - "foo-0.1.dist-info/METADATA", - "foo-0.1.dist-info/WHEEL", - "foo-0.1.dist-info/entry_points.txt", - "foo-0.1.dist-info/top_level.txt", - "foo-0.1.dist-info/RECORD", - } - assert license == "---- placeholder MIT license ----" - - for line in ( - "Summary: This is a Python package", - "License: MIT", - "License-File: LICENSE.txt", - "Classifier: Intended Audience :: Developers", - "Requires-Dist: appdirs", - "Requires-Dist: " + str(Requirement('tomli>=1 ; extra == "all"')), - "Requires-Dist: " - + str(Requirement('importlib; python_version=="2.6" and extra =="all"')), - ): - assert line in metadata, (line, metadata) - - assert metadata.strip().endswith("This is a ``README``") - assert epoints.strip() == "[console_scripts]\nfoo = foo.cli:main" - - def test_static_metadata_in_pyproject_config(self, tmpdir): - # Make sure static metadata in pyproject.toml is not overwritten by setup.py - # as required by PEP 621 - files = { - 'pyproject.toml': DALS( - """ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "foo" - description = "This is a Python package" - version = "42" - dependencies = ["six"] - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='bar', - version='13', - ) - """ - ), - } - build_backend = self.get_build_backend() - with tmpdir.as_cwd(): - path.build(files) - sdist_path = build_backend.build_sdist("temp") - wheel_file = build_backend.build_wheel("temp") - - assert (tmpdir / "temp/foo-42.tar.gz").exists() - assert (tmpdir / "temp/foo-42-py3-none-any.whl").exists() - assert not (tmpdir / "temp/bar-13.tar.gz").exists() - assert not (tmpdir / "temp/bar-42.tar.gz").exists() - assert not (tmpdir / "temp/foo-13.tar.gz").exists() - assert not (tmpdir / "temp/bar-13-py3-none-any.whl").exists() - assert not (tmpdir / "temp/bar-42-py3-none-any.whl").exists() - assert not (tmpdir / "temp/foo-13-py3-none-any.whl").exists() - - with tarfile.open(os.path.join(tmpdir, "temp", sdist_path)) as tar: - pkg_info = str(tar.extractfile('foo-42/PKG-INFO').read(), "utf-8") - members = tar.getnames() - assert "bar-13/PKG-INFO" not in members - - with ZipFile(os.path.join(tmpdir, "temp", wheel_file)) as zipfile: - metadata = str(zipfile.read("foo-42.dist-info/METADATA"), "utf-8") - members = zipfile.namelist() - assert "bar-13.dist-info/METADATA" not in members - - for file in pkg_info, metadata: - for line in ("Name: foo", "Version: 42"): - assert line in file - for line in ("Name: bar", "Version: 13"): - assert line not in file - - def test_build_sdist(self, build_backend): - dist_dir = os.path.abspath('pip-sdist') - os.makedirs(dist_dir) - sdist_name = build_backend.build_sdist(dist_dir) - - assert os.path.isfile(os.path.join(dist_dir, sdist_name)) - - def test_prepare_metadata_for_build_wheel(self, build_backend): - dist_dir = os.path.abspath('pip-dist-info') - os.makedirs(dist_dir) - - dist_info = build_backend.prepare_metadata_for_build_wheel(dist_dir) - - assert os.path.isfile(os.path.join(dist_dir, dist_info, 'METADATA')) - - def test_prepare_metadata_inplace(self, build_backend): - """ - Some users might pass metadata_directory pre-populated with `.tox` or `.venv`. - See issue #3523. - """ - for pre_existing in [ - ".tox/python/lib/python3.10/site-packages/attrs-22.1.0.dist-info", - ".tox/python/lib/python3.10/site-packages/autocommand-2.2.1.dist-info", - ".nox/python/lib/python3.10/site-packages/build-0.8.0.dist-info", - ".venv/python3.10/site-packages/click-8.1.3.dist-info", - "venv/python3.10/site-packages/distlib-0.3.5.dist-info", - "env/python3.10/site-packages/docutils-0.19.dist-info", - ]: - os.makedirs(pre_existing, exist_ok=True) - dist_info = build_backend.prepare_metadata_for_build_wheel(".") - assert os.path.isfile(os.path.join(dist_info, 'METADATA')) - - def test_build_sdist_explicit_dist(self, build_backend): - # explicitly specifying the dist folder should work - # the folder sdist_directory and the ``--dist-dir`` can be the same - dist_dir = os.path.abspath('dist') - sdist_name = build_backend.build_sdist(dist_dir) - assert os.path.isfile(os.path.join(dist_dir, sdist_name)) - - def test_build_sdist_version_change(self, build_backend): - sdist_into_directory = os.path.abspath("out_sdist") - os.makedirs(sdist_into_directory) - - sdist_name = build_backend.build_sdist(sdist_into_directory) - assert os.path.isfile(os.path.join(sdist_into_directory, sdist_name)) - - # if the setup.py changes subsequent call of the build meta - # should still succeed, given the - # sdist_directory the frontend specifies is empty - setup_loc = os.path.abspath("setup.py") - if not os.path.exists(setup_loc): - setup_loc = os.path.abspath("setup.cfg") - - with open(setup_loc, 'rt', encoding="utf-8") as file_handler: - content = file_handler.read() - with open(setup_loc, 'wt', encoding="utf-8") as file_handler: - file_handler.write(content.replace("version='0.0.0'", "version='0.0.1'")) - - shutil.rmtree(sdist_into_directory) - os.makedirs(sdist_into_directory) - - sdist_name = build_backend.build_sdist("out_sdist") - assert os.path.isfile(os.path.join(os.path.abspath("out_sdist"), sdist_name)) - - def test_build_sdist_pyproject_toml_exists(self, tmpdir_cwd): - files = { - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'] - )""" - ), - 'hello.py': '', - 'pyproject.toml': DALS( - """ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - """ - ), - } - path.build(files) - build_backend = self.get_build_backend() - targz_path = build_backend.build_sdist("temp") - with tarfile.open(os.path.join("temp", targz_path)) as tar: - assert any('pyproject.toml' in name for name in tar.getnames()) - - def test_build_sdist_setup_py_exists(self, tmpdir_cwd): - # If build_sdist is called from a script other than setup.py, - # ensure setup.py is included - path.build(defns[0]) - - build_backend = self.get_build_backend() - targz_path = build_backend.build_sdist("temp") - with tarfile.open(os.path.join("temp", targz_path)) as tar: - assert any('setup.py' in name for name in tar.getnames()) - - def test_build_sdist_setup_py_manifest_excluded(self, tmpdir_cwd): - # Ensure that MANIFEST.in can exclude setup.py - files = { - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'] - )""" - ), - 'hello.py': '', - 'MANIFEST.in': DALS( - """ - exclude setup.py - """ - ), - } - - path.build(files) - - build_backend = self.get_build_backend() - targz_path = build_backend.build_sdist("temp") - with tarfile.open(os.path.join("temp", targz_path)) as tar: - assert not any('setup.py' in name for name in tar.getnames()) - - def test_build_sdist_builds_targz_even_if_zip_indicated(self, tmpdir_cwd): - files = { - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'] - )""" - ), - 'hello.py': '', - 'setup.cfg': DALS( - """ - [sdist] - formats=zip - """ - ), - } - - path.build(files) - - build_backend = self.get_build_backend() - build_backend.build_sdist("temp") - - _relative_path_import_files = { - 'setup.py': DALS( - """ - __import__('setuptools').setup( - name='foo', - version=__import__('hello').__version__, - py_modules=['hello'] - )""" - ), - 'hello.py': '__version__ = "0.0.0"', - 'setup.cfg': DALS( - """ - [sdist] - formats=zip - """ - ), - } - - def test_build_sdist_relative_path_import(self, tmpdir_cwd): - path.build(self._relative_path_import_files) - build_backend = self.get_build_backend() - with pytest.raises(ImportError, match="^No module named 'hello'$"): - build_backend.build_sdist("temp") - - _simple_pyproject_example = { - "pyproject.toml": DALS( - """ - [project] - name = "proj" - version = "42" - """ - ), - "src": {"proj": {"__init__.py": ""}}, - } - - def _assert_link_tree(self, parent_dir): - """All files in the directory should be either links or hard links""" - files = list(Path(parent_dir).glob("**/*")) - assert files # Should not be empty - for file in files: - assert file.is_symlink() or os.stat(file).st_nlink > 0 - - def test_editable_without_config_settings(self, tmpdir_cwd): - """ - Sanity check to ensure tests with --mode=strict are different from the ones - without --mode. - - --mode=strict should create a local directory with a package tree. - The directory should not get created otherwise. - """ - path.build(self._simple_pyproject_example) - build_backend = self.get_build_backend() - assert not Path("build").exists() - build_backend.build_editable("temp") - assert not Path("build").exists() - - def test_build_wheel_inplace(self, tmpdir_cwd): - config_settings = {"--build-option": ["build_ext", "--inplace"]} - path.build(self._simple_pyproject_example) - build_backend = self.get_build_backend() - assert not Path("build").exists() - Path("build").mkdir() - build_backend.prepare_metadata_for_build_wheel("build", config_settings) - build_backend.build_wheel("build", config_settings) - assert Path("build/proj-42-py3-none-any.whl").exists() - - @pytest.mark.parametrize("config_settings", [{"editable-mode": "strict"}]) - def test_editable_with_config_settings(self, tmpdir_cwd, config_settings): - path.build({**self._simple_pyproject_example, '_meta': {}}) - assert not Path("build").exists() - build_backend = self.get_build_backend() - build_backend.prepare_metadata_for_build_editable("_meta", config_settings) - build_backend.build_editable("temp", config_settings, "_meta") - self._assert_link_tree(next(Path("build").glob("__editable__.*"))) - - @pytest.mark.parametrize( - ("setup_literal", "requirements"), - [ - ("'foo'", ['foo']), - ("['foo']", ['foo']), - (r"'foo\n'", ['foo']), - (r"'foo\n\n'", ['foo']), - ("['foo', 'bar']", ['foo', 'bar']), - (r"'# Has a comment line\nfoo'", ['foo']), - (r"'foo # Has an inline comment'", ['foo']), - (r"'foo \\\n >=3.0'", ['foo>=3.0']), - (r"'foo\nbar'", ['foo', 'bar']), - (r"'foo\nbar\n'", ['foo', 'bar']), - (r"['foo\n', 'bar\n']", ['foo', 'bar']), - ], - ) - @pytest.mark.parametrize('use_wheel', [True, False]) - def test_setup_requires(self, setup_literal, requirements, use_wheel, tmpdir_cwd): - files = { - 'setup.py': DALS( - """ - from setuptools import setup - - setup( - name="qux", - version="0.0.0", - py_modules=["hello"], - setup_requires={setup_literal}, - ) - """ - ).format(setup_literal=setup_literal), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - } - - path.build(files) - - build_backend = self.get_build_backend() - - if use_wheel: - get_requires = build_backend.get_requires_for_build_wheel - else: - get_requires = build_backend.get_requires_for_build_sdist - - # Ensure that the build requirements are properly parsed - expected = sorted(requirements) - actual = get_requires() - - assert expected == sorted(actual) - - def test_setup_requires_with_auto_discovery(self, tmpdir_cwd): - # Make sure patches introduced to retrieve setup_requires don't accidentally - # activate auto-discovery and cause problems due to the incomplete set of - # attributes passed to MinimalDistribution - files = { - 'pyproject.toml': DALS( - """ - [project] - name = "proj" - version = "42" - """ - ), - "setup.py": DALS( - """ - __import__('setuptools').setup( - setup_requires=["foo"], - py_modules = ["hello", "world"] - ) - """ - ), - 'hello.py': "'hello'", - 'world.py': "'world'", - } - path.build(files) - build_backend = self.get_build_backend() - setup_requires = build_backend.get_requires_for_build_wheel() - assert setup_requires == ["foo"] - - def test_dont_install_setup_requires(self, tmpdir_cwd): - files = { - 'setup.py': DALS( - """ - from setuptools import setup - - setup( - name="qux", - version="0.0.0", - py_modules=["hello"], - setup_requires=["does-not-exist >99"], - ) - """ - ), - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - } - - path.build(files) - - build_backend = self.get_build_backend() - - dist_dir = os.path.abspath('pip-dist-info') - os.makedirs(dist_dir) - - # does-not-exist can't be satisfied, so if it attempts to install - # setup_requires, it will fail. - build_backend.prepare_metadata_for_build_wheel(dist_dir) - - _sys_argv_0_passthrough = { - 'setup.py': DALS( - """ - import os - import sys - - __import__('setuptools').setup( - name='foo', - version='0.0.0', - ) - - sys_argv = os.path.abspath(sys.argv[0]) - file_path = os.path.abspath('setup.py') - assert sys_argv == file_path - """ - ) - } - - def test_sys_argv_passthrough(self, tmpdir_cwd): - path.build(self._sys_argv_0_passthrough) - build_backend = self.get_build_backend() - with pytest.raises(AssertionError): - build_backend.build_sdist("temp") - - _setup_py_file_abspath = { - 'setup.py': DALS( - """ - import os - assert os.path.isabs(__file__) - __import__('setuptools').setup( - name='foo', - version='0.0.0', - py_modules=['hello'], - setup_requires=['six'], - ) - """ - ) - } - - def test_setup_py_file_abspath(self, tmpdir_cwd): - path.build(self._setup_py_file_abspath) - build_backend = self.get_build_backend() - build_backend.build_sdist("temp") - - @pytest.mark.parametrize('build_hook', ('build_sdist', 'build_wheel')) - def test_build_with_empty_setuppy(self, build_backend, build_hook): - files = {'setup.py': ''} - path.build(files) - - msg = re.escape('No distribution was found.') - with pytest.raises(ValueError, match=msg): - getattr(build_backend, build_hook)("temp") - - -class TestBuildMetaLegacyBackend(TestBuildMetaBackend): - backend_name = 'setuptools.build_meta:__legacy__' - - # build_meta_legacy-specific tests - def test_build_sdist_relative_path_import(self, tmpdir_cwd): - # This must fail in build_meta, but must pass in build_meta_legacy - path.build(self._relative_path_import_files) - - build_backend = self.get_build_backend() - build_backend.build_sdist("temp") - - def test_sys_argv_passthrough(self, tmpdir_cwd): - path.build(self._sys_argv_0_passthrough) - - build_backend = self.get_build_backend() - build_backend.build_sdist("temp") - - -@pytest.mark.filterwarnings("ignore::setuptools.SetuptoolsDeprecationWarning") -def test_sys_exit_0_in_setuppy(monkeypatch, tmp_path): - """Setuptools should be resilient to setup.py with ``sys.exit(0)`` (#3973).""" - monkeypatch.chdir(tmp_path) - setuppy = """ - import sys, setuptools - setuptools.setup(name='foo', version='0.0.0') - sys.exit(0) - """ - (tmp_path / "setup.py").write_text(DALS(setuppy), encoding="utf-8") - backend = BuildBackend(backend_name="setuptools.build_meta") - assert backend.get_requires_for_build_wheel() == [] - - -def test_system_exit_in_setuppy(monkeypatch, tmp_path): - monkeypatch.chdir(tmp_path) - setuppy = "import sys; sys.exit('some error')" - (tmp_path / "setup.py").write_text(setuppy, encoding="utf-8") - with pytest.raises(SystemExit, match="some error"): - backend = BuildBackend(backend_name="setuptools.build_meta") - backend.get_requires_for_build_wheel() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_py.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_py.py deleted file mode 100644 index 1e3a660..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_build_py.py +++ /dev/null @@ -1,480 +0,0 @@ -import os -import shutil -import stat -import warnings -from pathlib import Path -from unittest.mock import Mock - -import jaraco.path -import pytest - -from setuptools import SetuptoolsDeprecationWarning -from setuptools.dist import Distribution - -from .textwrap import DALS - - -def test_directories_in_package_data_glob(tmpdir_cwd): - """ - Directories matching the glob in package_data should - not be included in the package data. - - Regression test for #261. - """ - dist = Distribution( - dict( - script_name='setup.py', - script_args=['build_py'], - packages=[''], - package_data={'': ['path/*']}, - ) - ) - os.makedirs('path/subpath') - dist.parse_command_line() - dist.run_commands() - - -def test_recursive_in_package_data_glob(tmpdir_cwd): - """ - Files matching recursive globs (**) in package_data should - be included in the package data. - - #1806 - """ - dist = Distribution( - dict( - script_name='setup.py', - script_args=['build_py'], - packages=[''], - package_data={'': ['path/**/data']}, - ) - ) - os.makedirs('path/subpath/subsubpath') - open('path/subpath/subsubpath/data', 'wb').close() - - dist.parse_command_line() - dist.run_commands() - - assert stat.S_ISREG(os.stat('build/lib/path/subpath/subsubpath/data').st_mode), ( - "File is not included" - ) - - -def test_read_only(tmpdir_cwd): - """ - Ensure read-only flag is not preserved in copy - for package modules and package data, as that - causes problems with deleting read-only files on - Windows. - - #1451 - """ - dist = Distribution( - dict( - script_name='setup.py', - script_args=['build_py'], - packages=['pkg'], - package_data={'pkg': ['data.dat']}, - ) - ) - os.makedirs('pkg') - open('pkg/__init__.py', 'wb').close() - open('pkg/data.dat', 'wb').close() - os.chmod('pkg/__init__.py', stat.S_IREAD) - os.chmod('pkg/data.dat', stat.S_IREAD) - dist.parse_command_line() - dist.run_commands() - shutil.rmtree('build') - - -@pytest.mark.xfail( - 'platform.system() == "Windows"', - reason="On Windows, files do not have executable bits", - raises=AssertionError, - strict=True, -) -def test_executable_data(tmpdir_cwd): - """ - Ensure executable bit is preserved in copy for - package data, as users rely on it for scripts. - - #2041 - """ - dist = Distribution( - dict( - script_name='setup.py', - script_args=['build_py'], - packages=['pkg'], - package_data={'pkg': ['run-me']}, - ) - ) - os.makedirs('pkg') - open('pkg/__init__.py', 'wb').close() - open('pkg/run-me', 'wb').close() - os.chmod('pkg/run-me', 0o700) - - dist.parse_command_line() - dist.run_commands() - - assert os.stat('build/lib/pkg/run-me').st_mode & stat.S_IEXEC, ( - "Script is not executable" - ) - - -EXAMPLE_WITH_MANIFEST = { - "setup.cfg": DALS( - """ - [metadata] - name = mypkg - version = 42 - - [options] - include_package_data = True - packages = find: - - [options.packages.find] - exclude = *.tests* - """ - ), - "mypkg": { - "__init__.py": "", - "resource_file.txt": "", - "tests": { - "__init__.py": "", - "test_mypkg.py": "", - "test_file.txt": "", - }, - }, - "MANIFEST.in": DALS( - """ - global-include *.py *.txt - global-exclude *.py[cod] - prune dist - prune build - prune *.egg-info - """ - ), -} - - -def test_excluded_subpackages(tmpdir_cwd): - jaraco.path.build(EXAMPLE_WITH_MANIFEST) - dist = Distribution({"script_name": "%PEP 517%"}) - dist.parse_config_files() - - build_py = dist.get_command_obj("build_py") - - msg = r"Python recognizes 'mypkg\.tests' as an importable package" - with pytest.warns(SetuptoolsDeprecationWarning, match=msg): - # TODO: To fix #3260 we need some transition period to deprecate the - # existing behavior of `include_package_data`. After the transition, we - # should remove the warning and fix the behavior. - - if os.getenv("SETUPTOOLS_USE_DISTUTILS") == "stdlib": - # pytest.warns reset the warning filter temporarily - # https://github.com/pytest-dev/pytest/issues/4011#issuecomment-423494810 - warnings.filterwarnings( - "ignore", - "'encoding' argument not specified", - module="distutils.text_file", - # This warning is already fixed in pypa/distutils but not in stdlib - ) - - build_py.finalize_options() - build_py.run() - - build_dir = Path(dist.get_command_obj("build_py").build_lib) - assert (build_dir / "mypkg/__init__.py").exists() - assert (build_dir / "mypkg/resource_file.txt").exists() - - # Setuptools is configured to ignore `mypkg.tests`, therefore the following - # files/dirs should not be included in the distribution. - for f in [ - "mypkg/tests/__init__.py", - "mypkg/tests/test_mypkg.py", - "mypkg/tests/test_file.txt", - "mypkg/tests", - ]: - with pytest.raises(AssertionError): - # TODO: Enforce the following assertion once #3260 is fixed - # (remove context manager and the following xfail). - assert not (build_dir / f).exists() - - pytest.xfail("#3260") - - -@pytest.mark.filterwarnings("ignore::setuptools.SetuptoolsDeprecationWarning") -def test_existing_egg_info(tmpdir_cwd, monkeypatch): - """When provided with the ``existing_egg_info_dir`` attribute, build_py should not - attempt to run egg_info again. - """ - # == Pre-condition == - # Generate an egg-info dir - jaraco.path.build(EXAMPLE_WITH_MANIFEST) - dist = Distribution({"script_name": "%PEP 517%"}) - dist.parse_config_files() - assert dist.include_package_data - - egg_info = dist.get_command_obj("egg_info") - dist.run_command("egg_info") - egg_info_dir = next(Path(egg_info.egg_base).glob("*.egg-info")) - assert egg_info_dir.is_dir() - - # == Setup == - build_py = dist.get_command_obj("build_py") - build_py.finalize_options() - egg_info = dist.get_command_obj("egg_info") - egg_info_run = Mock(side_effect=egg_info.run) - monkeypatch.setattr(egg_info, "run", egg_info_run) - - # == Remove caches == - # egg_info is called when build_py looks for data_files, which gets cached. - # We need to ensure it is not cached yet, otherwise it may impact on the tests - build_py.__dict__.pop('data_files', None) - dist.reinitialize_command(egg_info) - - # == Sanity check == - # Ensure that if existing_egg_info is not given, build_py attempts to run egg_info - build_py.existing_egg_info_dir = None - build_py.run() - egg_info_run.assert_called() - - # == Remove caches == - egg_info_run.reset_mock() - build_py.__dict__.pop('data_files', None) - dist.reinitialize_command(egg_info) - - # == Actual test == - # Ensure that if existing_egg_info_dir is given, egg_info doesn't run - build_py.existing_egg_info_dir = egg_info_dir - build_py.run() - egg_info_run.assert_not_called() - assert build_py.data_files - - # Make sure the list of outputs is actually OK - outputs = map(lambda x: x.replace(os.sep, "/"), build_py.get_outputs()) - assert outputs - example = str(Path(build_py.build_lib, "mypkg/__init__.py")).replace(os.sep, "/") - assert example in outputs - - -EXAMPLE_ARBITRARY_MAPPING = { - "pyproject.toml": DALS( - """ - [project] - name = "mypkg" - version = "42" - - [tool.setuptools] - packages = ["mypkg", "mypkg.sub1", "mypkg.sub2", "mypkg.sub2.nested"] - - [tool.setuptools.package-dir] - "" = "src" - "mypkg.sub2" = "src/mypkg/_sub2" - "mypkg.sub2.nested" = "other" - """ - ), - "src": { - "mypkg": { - "__init__.py": "", - "resource_file.txt": "", - "sub1": { - "__init__.py": "", - "mod1.py": "", - }, - "_sub2": { - "mod2.py": "", - }, - }, - }, - "other": { - "__init__.py": "", - "mod3.py": "", - }, - "MANIFEST.in": DALS( - """ - global-include *.py *.txt - global-exclude *.py[cod] - """ - ), -} - - -def test_get_outputs(tmpdir_cwd): - jaraco.path.build(EXAMPLE_ARBITRARY_MAPPING) - dist = Distribution({"script_name": "%test%"}) - dist.parse_config_files() - - build_py = dist.get_command_obj("build_py") - build_py.editable_mode = True - build_py.ensure_finalized() - build_lib = build_py.build_lib.replace(os.sep, "/") - outputs = {x.replace(os.sep, "/") for x in build_py.get_outputs()} - assert outputs == { - f"{build_lib}/mypkg/__init__.py", - f"{build_lib}/mypkg/resource_file.txt", - f"{build_lib}/mypkg/sub1/__init__.py", - f"{build_lib}/mypkg/sub1/mod1.py", - f"{build_lib}/mypkg/sub2/mod2.py", - f"{build_lib}/mypkg/sub2/nested/__init__.py", - f"{build_lib}/mypkg/sub2/nested/mod3.py", - } - mapping = { - k.replace(os.sep, "/"): v.replace(os.sep, "/") - for k, v in build_py.get_output_mapping().items() - } - assert mapping == { - f"{build_lib}/mypkg/__init__.py": "src/mypkg/__init__.py", - f"{build_lib}/mypkg/resource_file.txt": "src/mypkg/resource_file.txt", - f"{build_lib}/mypkg/sub1/__init__.py": "src/mypkg/sub1/__init__.py", - f"{build_lib}/mypkg/sub1/mod1.py": "src/mypkg/sub1/mod1.py", - f"{build_lib}/mypkg/sub2/mod2.py": "src/mypkg/_sub2/mod2.py", - f"{build_lib}/mypkg/sub2/nested/__init__.py": "other/__init__.py", - f"{build_lib}/mypkg/sub2/nested/mod3.py": "other/mod3.py", - } - - -class TestTypeInfoFiles: - PYPROJECTS = { - "default_pyproject": DALS( - """ - [project] - name = "foo" - version = "1" - """ - ), - "dont_include_package_data": DALS( - """ - [project] - name = "foo" - version = "1" - - [tool.setuptools] - include-package-data = false - """ - ), - "exclude_type_info": DALS( - """ - [project] - name = "foo" - version = "1" - - [tool.setuptools] - include-package-data = false - - [tool.setuptools.exclude-package-data] - "*" = ["py.typed", "*.pyi"] - """ - ), - } - - EXAMPLES = { - "simple_namespace": { - "directory_structure": { - "foo": { - "bar.pyi": "", - "py.typed": "", - "__init__.py": "", - } - }, - "expected_type_files": {"foo/bar.pyi", "foo/py.typed"}, - }, - "nested_inside_namespace": { - "directory_structure": { - "foo": { - "bar": { - "py.typed": "", - "mod.pyi": "", - } - } - }, - "expected_type_files": {"foo/bar/mod.pyi", "foo/bar/py.typed"}, - }, - "namespace_nested_inside_regular": { - "directory_structure": { - "foo": { - "namespace": { - "foo.pyi": "", - }, - "__init__.pyi": "", - "py.typed": "", - } - }, - "expected_type_files": { - "foo/namespace/foo.pyi", - "foo/__init__.pyi", - "foo/py.typed", - }, - }, - } - - @pytest.mark.parametrize( - "pyproject", - [ - "default_pyproject", - pytest.param( - "dont_include_package_data", - marks=pytest.mark.xfail(reason="pypa/setuptools#4350"), - ), - ], - ) - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_type_files_included_by_default(self, tmpdir_cwd, pyproject, example): - structure = { - **self.EXAMPLES[example]["directory_structure"], - "pyproject.toml": self.PYPROJECTS[pyproject], - } - expected_type_files = self.EXAMPLES[example]["expected_type_files"] - jaraco.path.build(structure) - - build_py = get_finalized_build_py() - outputs = get_outputs(build_py) - assert expected_type_files <= outputs - - @pytest.mark.parametrize("pyproject", ["exclude_type_info"]) - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_type_files_can_be_excluded(self, tmpdir_cwd, pyproject, example): - structure = { - **self.EXAMPLES[example]["directory_structure"], - "pyproject.toml": self.PYPROJECTS[pyproject], - } - expected_type_files = self.EXAMPLES[example]["expected_type_files"] - jaraco.path.build(structure) - - build_py = get_finalized_build_py() - outputs = get_outputs(build_py) - assert expected_type_files.isdisjoint(outputs) - - def test_stub_only_package(self, tmpdir_cwd): - structure = { - "pyproject.toml": DALS( - """ - [project] - name = "foo-stubs" - version = "1" - """ - ), - "foo-stubs": {"__init__.pyi": "", "bar.pyi": ""}, - } - expected_type_files = {"foo-stubs/__init__.pyi", "foo-stubs/bar.pyi"} - jaraco.path.build(structure) - - build_py = get_finalized_build_py() - outputs = get_outputs(build_py) - assert expected_type_files <= outputs - - -def get_finalized_build_py(script_name="%build_py-test%"): - dist = Distribution({"script_name": script_name}) - dist.parse_config_files() - build_py = dist.get_command_obj("build_py") - build_py.finalize_options() - return build_py - - -def get_outputs(build_py): - build_dir = Path(build_py.build_lib) - return { - os.path.relpath(x, build_dir).replace(os.sep, "/") - for x in build_py.get_outputs() - } diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_config_discovery.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_config_discovery.py deleted file mode 100644 index b5df820..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_config_discovery.py +++ /dev/null @@ -1,647 +0,0 @@ -import os -import sys -from configparser import ConfigParser -from itertools import product -from typing import cast - -import jaraco.path -import pytest -from path import Path - -import setuptools # noqa: F401 # force distutils.core to be patched -from setuptools.command.sdist import sdist -from setuptools.discovery import find_package_path, find_parent_package -from setuptools.dist import Distribution -from setuptools.errors import PackageDiscoveryError - -from .contexts import quiet -from .integration.helpers import get_sdist_members, get_wheel_members, run -from .textwrap import DALS - -import distutils.core - - -class TestFindParentPackage: - def test_single_package(self, tmp_path): - # find_parent_package should find a non-namespace parent package - (tmp_path / "src/namespace/pkg/nested").mkdir(exist_ok=True, parents=True) - (tmp_path / "src/namespace/pkg/nested/__init__.py").touch() - (tmp_path / "src/namespace/pkg/__init__.py").touch() - packages = ["namespace", "namespace.pkg", "namespace.pkg.nested"] - assert find_parent_package(packages, {"": "src"}, tmp_path) == "namespace.pkg" - - def test_multiple_toplevel(self, tmp_path): - # find_parent_package should return null if the given list of packages does not - # have a single parent package - multiple = ["pkg", "pkg1", "pkg2"] - for name in multiple: - (tmp_path / f"src/{name}").mkdir(exist_ok=True, parents=True) - (tmp_path / f"src/{name}/__init__.py").touch() - assert find_parent_package(multiple, {"": "src"}, tmp_path) is None - - -class TestDiscoverPackagesAndPyModules: - """Make sure discovered values for ``packages`` and ``py_modules`` work - similarly to explicit configuration for the simple scenarios. - """ - - OPTIONS = { - # Different options according to the circumstance being tested - "explicit-src": {"package_dir": {"": "src"}, "packages": ["pkg"]}, - "variation-lib": { - "package_dir": {"": "lib"}, # variation of the source-layout - }, - "explicit-flat": {"packages": ["pkg"]}, - "explicit-single_module": {"py_modules": ["pkg"]}, - "explicit-namespace": {"packages": ["ns", "ns.pkg"]}, - "automatic-src": {}, - "automatic-flat": {}, - "automatic-single_module": {}, - "automatic-namespace": {}, - } - FILES = { - "src": ["src/pkg/__init__.py", "src/pkg/main.py"], - "lib": ["lib/pkg/__init__.py", "lib/pkg/main.py"], - "flat": ["pkg/__init__.py", "pkg/main.py"], - "single_module": ["pkg.py"], - "namespace": ["ns/pkg/__init__.py"], - } - - def _get_info(self, circumstance): - _, _, layout = circumstance.partition("-") - files = self.FILES[layout] - options = self.OPTIONS[circumstance] - return files, options - - @pytest.mark.parametrize("circumstance", OPTIONS.keys()) - def test_sdist_filelist(self, tmp_path, circumstance): - files, options = self._get_info(circumstance) - _populate_project_dir(tmp_path, files, options) - - _, cmd = _run_sdist_programatically(tmp_path, options) - - manifest = [f.replace(os.sep, "/") for f in cmd.filelist.files] - for file in files: - assert any(f.endswith(file) for f in manifest) - - @pytest.mark.parametrize("circumstance", OPTIONS.keys()) - def test_project(self, tmp_path, circumstance): - files, options = self._get_info(circumstance) - _populate_project_dir(tmp_path, files, options) - - # Simulate a pre-existing `build` directory - (tmp_path / "build").mkdir() - (tmp_path / "build/lib").mkdir() - (tmp_path / "build/bdist.linux-x86_64").mkdir() - (tmp_path / "build/bdist.linux-x86_64/file.py").touch() - (tmp_path / "build/lib/__init__.py").touch() - (tmp_path / "build/lib/file.py").touch() - (tmp_path / "dist").mkdir() - (tmp_path / "dist/file.py").touch() - - _run_build(tmp_path) - - sdist_files = get_sdist_members(next(tmp_path.glob("dist/*.tar.gz"))) - print("~~~~~ sdist_members ~~~~~") - print('\n'.join(sdist_files)) - assert sdist_files >= set(files) - - wheel_files = get_wheel_members(next(tmp_path.glob("dist/*.whl"))) - print("~~~~~ wheel_members ~~~~~") - print('\n'.join(wheel_files)) - orig_files = {f.replace("src/", "").replace("lib/", "") for f in files} - assert wheel_files >= orig_files - - # Make sure build files are not included by mistake - for file in wheel_files: - assert "build" not in files - assert "dist" not in files - - PURPOSEFULLY_EMPY = { - "setup.cfg": DALS( - """ - [metadata] - name = myproj - version = 0.0.0 - - [options] - {param} = - """ - ), - "setup.py": DALS( - """ - __import__('setuptools').setup( - name="myproj", - version="0.0.0", - {param}=[] - ) - """ - ), - "pyproject.toml": DALS( - """ - [build-system] - requires = [] - build-backend = 'setuptools.build_meta' - - [project] - name = "myproj" - version = "0.0.0" - - [tool.setuptools] - {param} = [] - """ - ), - "template-pyproject.toml": DALS( - """ - [build-system] - requires = [] - build-backend = 'setuptools.build_meta' - """ - ), - } - - @pytest.mark.parametrize( - ("config_file", "param", "circumstance"), - product( - ["setup.cfg", "setup.py", "pyproject.toml"], - ["packages", "py_modules"], - FILES.keys(), - ), - ) - def test_purposefully_empty(self, tmp_path, config_file, param, circumstance): - files = self.FILES[circumstance] + ["mod.py", "other.py", "src/pkg/__init__.py"] - _populate_project_dir(tmp_path, files, {}) - - if config_file == "pyproject.toml": - template_param = param.replace("_", "-") - else: - # Make sure build works with or without setup.cfg - pyproject = self.PURPOSEFULLY_EMPY["template-pyproject.toml"] - (tmp_path / "pyproject.toml").write_text(pyproject, encoding="utf-8") - template_param = param - - config = self.PURPOSEFULLY_EMPY[config_file].format(param=template_param) - (tmp_path / config_file).write_text(config, encoding="utf-8") - - dist = _get_dist(tmp_path, {}) - # When either parameter package or py_modules is an empty list, - # then there should be no discovery - assert getattr(dist, param) == [] - other = {"py_modules": "packages", "packages": "py_modules"}[param] - assert getattr(dist, other) is None - - @pytest.mark.parametrize( - ("extra_files", "pkgs"), - [ - (["venv/bin/simulate_venv"], {"pkg"}), - (["pkg-stubs/__init__.pyi"], {"pkg", "pkg-stubs"}), - (["other-stubs/__init__.pyi"], {"pkg", "other-stubs"}), - ( - # Type stubs can also be namespaced - ["namespace-stubs/pkg/__init__.pyi"], - {"pkg", "namespace-stubs", "namespace-stubs.pkg"}, - ), - ( - # Just the top-level package can have `-stubs`, ignore nested ones - ["namespace-stubs/pkg-stubs/__init__.pyi"], - {"pkg", "namespace-stubs"}, - ), - (["_hidden/file.py"], {"pkg"}), - (["news/finalize.py"], {"pkg"}), - ], - ) - def test_flat_layout_with_extra_files(self, tmp_path, extra_files, pkgs): - files = self.FILES["flat"] + extra_files - _populate_project_dir(tmp_path, files, {}) - dist = _get_dist(tmp_path, {}) - assert set(dist.packages) == pkgs - - @pytest.mark.parametrize( - "extra_files", - [ - ["other/__init__.py"], - ["other/finalize.py"], - ], - ) - def test_flat_layout_with_dangerous_extra_files(self, tmp_path, extra_files): - files = self.FILES["flat"] + extra_files - _populate_project_dir(tmp_path, files, {}) - with pytest.raises(PackageDiscoveryError, match="multiple (packages|modules)"): - _get_dist(tmp_path, {}) - - def test_flat_layout_with_single_module(self, tmp_path): - files = self.FILES["single_module"] + ["invalid-module-name.py"] - _populate_project_dir(tmp_path, files, {}) - dist = _get_dist(tmp_path, {}) - assert set(dist.py_modules) == {"pkg"} - - def test_flat_layout_with_multiple_modules(self, tmp_path): - files = self.FILES["single_module"] + ["valid_module_name.py"] - _populate_project_dir(tmp_path, files, {}) - with pytest.raises(PackageDiscoveryError, match="multiple (packages|modules)"): - _get_dist(tmp_path, {}) - - def test_py_modules_when_wheel_dir_is_cwd(self, tmp_path): - """Regression for issue 3692""" - from setuptools import build_meta - - pyproject = '[project]\nname = "test"\nversion = "1"' - (tmp_path / "pyproject.toml").write_text(DALS(pyproject), encoding="utf-8") - (tmp_path / "foo.py").touch() - with jaraco.path.DirectoryStack().context(tmp_path): - build_meta.build_wheel(".") - # Ensure py_modules are found - wheel_files = get_wheel_members(next(tmp_path.glob("*.whl"))) - assert "foo.py" in wheel_files - - -class TestNoConfig: - DEFAULT_VERSION = "0.0.0" # Default version given by setuptools - - EXAMPLES = { - "pkg1": ["src/pkg1.py"], - "pkg2": ["src/pkg2/__init__.py"], - "pkg3": ["src/pkg3/__init__.py", "src/pkg3-stubs/__init__.py"], - "pkg4": ["pkg4/__init__.py", "pkg4-stubs/__init__.py"], - "ns.nested.pkg1": ["src/ns/nested/pkg1/__init__.py"], - "ns.nested.pkg2": ["ns/nested/pkg2/__init__.py"], - } - - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_discover_name(self, tmp_path, example): - _populate_project_dir(tmp_path, self.EXAMPLES[example], {}) - dist = _get_dist(tmp_path, {}) - assert dist.get_name() == example - - def test_build_with_discovered_name(self, tmp_path): - files = ["src/ns/nested/pkg/__init__.py"] - _populate_project_dir(tmp_path, files, {}) - _run_build(tmp_path, "--sdist") - # Expected distribution file - dist_file = tmp_path / f"dist/ns_nested_pkg-{self.DEFAULT_VERSION}.tar.gz" - assert dist_file.is_file() - - -class TestWithAttrDirective: - @pytest.mark.parametrize( - ("folder", "opts"), - [ - ("src", {}), - ("lib", {"packages": "find:", "packages.find": {"where": "lib"}}), - ], - ) - def test_setupcfg_metadata(self, tmp_path, folder, opts): - files = [f"{folder}/pkg/__init__.py", "setup.cfg"] - _populate_project_dir(tmp_path, files, opts) - - config = (tmp_path / "setup.cfg").read_text(encoding="utf-8") - overwrite = { - folder: {"pkg": {"__init__.py": "version = 42"}}, - "setup.cfg": "[metadata]\nversion = attr: pkg.version\n" + config, - } - jaraco.path.build(overwrite, prefix=tmp_path) - - dist = _get_dist(tmp_path, {}) - assert dist.get_name() == "pkg" - assert dist.get_version() == "42" - assert dist.package_dir - package_path = find_package_path("pkg", dist.package_dir, tmp_path) - assert os.path.exists(package_path) - assert folder in Path(package_path).parts() - - _run_build(tmp_path, "--sdist") - dist_file = tmp_path / "dist/pkg-42.tar.gz" - assert dist_file.is_file() - - def test_pyproject_metadata(self, tmp_path): - _populate_project_dir(tmp_path, ["src/pkg/__init__.py"], {}) - - overwrite = { - "src": {"pkg": {"__init__.py": "version = 42"}}, - "pyproject.toml": ( - "[project]\nname = 'pkg'\ndynamic = ['version']\n" - "[tool.setuptools.dynamic]\nversion = {attr = 'pkg.version'}\n" - ), - } - jaraco.path.build(overwrite, prefix=tmp_path) - - dist = _get_dist(tmp_path, {}) - assert dist.get_version() == "42" - assert dist.package_dir == {"": "src"} - - -class TestWithCExtension: - def _simulate_package_with_extension(self, tmp_path): - # This example is based on: https://github.com/nucleic/kiwi/tree/1.4.0 - files = [ - "benchmarks/file.py", - "docs/Makefile", - "docs/requirements.txt", - "docs/source/conf.py", - "proj/header.h", - "proj/file.py", - "py/proj.cpp", - "py/other.cpp", - "py/file.py", - "py/py.typed", - "py/tests/test_proj.py", - "README.rst", - ] - _populate_project_dir(tmp_path, files, {}) - - setup_script = """ - from setuptools import Extension, setup - - ext_modules = [ - Extension( - "proj", - ["py/proj.cpp", "py/other.cpp"], - include_dirs=["."], - language="c++", - ), - ] - setup(ext_modules=ext_modules) - """ - (tmp_path / "setup.py").write_text(DALS(setup_script), encoding="utf-8") - - def test_skip_discovery_with_setupcfg_metadata(self, tmp_path): - """Ensure that auto-discovery is not triggered when the project is based on - C-extensions only, for backward compatibility. - """ - self._simulate_package_with_extension(tmp_path) - - pyproject = """ - [build-system] - requires = [] - build-backend = 'setuptools.build_meta' - """ - (tmp_path / "pyproject.toml").write_text(DALS(pyproject), encoding="utf-8") - - setupcfg = """ - [metadata] - name = proj - version = 42 - """ - (tmp_path / "setup.cfg").write_text(DALS(setupcfg), encoding="utf-8") - - dist = _get_dist(tmp_path, {}) - assert dist.get_name() == "proj" - assert dist.get_version() == "42" - assert dist.py_modules is None - assert dist.packages is None - assert len(dist.ext_modules) == 1 - assert dist.ext_modules[0].name == "proj" - - def test_dont_skip_discovery_with_pyproject_metadata(self, tmp_path): - """When opting-in to pyproject.toml metadata, auto-discovery will be active if - the package lists C-extensions, but does not configure py-modules or packages. - - This way we ensure users with complex package layouts that would lead to the - discovery of multiple top-level modules/packages see errors and are forced to - explicitly set ``packages`` or ``py-modules``. - """ - self._simulate_package_with_extension(tmp_path) - - pyproject = """ - [project] - name = 'proj' - version = '42' - """ - (tmp_path / "pyproject.toml").write_text(DALS(pyproject), encoding="utf-8") - with pytest.raises(PackageDiscoveryError, match="multiple (packages|modules)"): - _get_dist(tmp_path, {}) - - -class TestWithPackageData: - def _simulate_package_with_data_files(self, tmp_path, src_root): - files = [ - f"{src_root}/proj/__init__.py", - f"{src_root}/proj/file1.txt", - f"{src_root}/proj/nested/file2.txt", - ] - _populate_project_dir(tmp_path, files, {}) - - manifest = """ - global-include *.py *.txt - """ - (tmp_path / "MANIFEST.in").write_text(DALS(manifest), encoding="utf-8") - - EXAMPLE_SETUPCFG = """ - [metadata] - name = proj - version = 42 - - [options] - include_package_data = True - """ - EXAMPLE_PYPROJECT = """ - [project] - name = "proj" - version = "42" - """ - - PYPROJECT_PACKAGE_DIR = """ - [tool.setuptools] - package-dir = {"" = "src"} - """ - - @pytest.mark.parametrize( - ("src_root", "files"), - [ - (".", {"setup.cfg": DALS(EXAMPLE_SETUPCFG)}), - (".", {"pyproject.toml": DALS(EXAMPLE_PYPROJECT)}), - ("src", {"setup.cfg": DALS(EXAMPLE_SETUPCFG)}), - ("src", {"pyproject.toml": DALS(EXAMPLE_PYPROJECT)}), - ( - "src", - { - "setup.cfg": DALS(EXAMPLE_SETUPCFG) - + DALS( - """ - packages = find: - package_dir = - =src - - [options.packages.find] - where = src - """ - ) - }, - ), - ( - "src", - { - "pyproject.toml": DALS(EXAMPLE_PYPROJECT) - + DALS( - """ - [tool.setuptools] - package-dir = {"" = "src"} - """ - ) - }, - ), - ], - ) - def test_include_package_data(self, tmp_path, src_root, files): - """ - Make sure auto-discovery does not affect package include_package_data. - See issue #3196. - """ - jaraco.path.build(files, prefix=str(tmp_path)) - self._simulate_package_with_data_files(tmp_path, src_root) - - expected = { - os.path.normpath(f"{src_root}/proj/file1.txt").replace(os.sep, "/"), - os.path.normpath(f"{src_root}/proj/nested/file2.txt").replace(os.sep, "/"), - } - - _run_build(tmp_path) - - sdist_files = get_sdist_members(next(tmp_path.glob("dist/*.tar.gz"))) - print("~~~~~ sdist_members ~~~~~") - print('\n'.join(sdist_files)) - assert sdist_files >= expected - - wheel_files = get_wheel_members(next(tmp_path.glob("dist/*.whl"))) - print("~~~~~ wheel_members ~~~~~") - print('\n'.join(wheel_files)) - orig_files = {f.replace("src/", "").replace("lib/", "") for f in expected} - assert wheel_files >= orig_files - - -def test_compatible_with_numpy_configuration(tmp_path): - files = [ - "dir1/__init__.py", - "dir2/__init__.py", - "file.py", - ] - _populate_project_dir(tmp_path, files, {}) - dist = Distribution({}) - dist.configuration = object() - dist.set_defaults() - assert dist.py_modules is None - assert dist.packages is None - - -def test_name_discovery_doesnt_break_cli(tmpdir_cwd): - jaraco.path.build({"pkg.py": ""}) - dist = Distribution({}) - dist.script_args = ["--name"] - dist.set_defaults() - dist.parse_command_line() # <-- no exception should be raised here. - assert dist.get_name() == "pkg" - - -def test_preserve_explicit_name_with_dynamic_version(tmpdir_cwd, monkeypatch): - """According to #3545 it seems that ``name`` discovery is running, - even when the project already explicitly sets it. - This seems to be related to parsing of dynamic versions (via ``attr`` directive), - which requires the auto-discovery of ``package_dir``. - """ - files = { - "src": { - "pkg": {"__init__.py": "__version__ = 42\n"}, - }, - "pyproject.toml": DALS( - """ - [project] - name = "myproj" # purposefully different from package name - dynamic = ["version"] - [tool.setuptools.dynamic] - version = {"attr" = "pkg.__version__"} - """ - ), - } - jaraco.path.build(files) - dist = Distribution({}) - orig_analyse_name = dist.set_defaults.analyse_name - - def spy_analyse_name(): - # We can check if name discovery was triggered by ensuring the original - # name remains instead of the package name. - orig_analyse_name() - assert dist.get_name() == "myproj" - - monkeypatch.setattr(dist.set_defaults, "analyse_name", spy_analyse_name) - dist.parse_config_files() - assert dist.get_version() == "42" - assert set(dist.packages) == {"pkg"} - - -def _populate_project_dir(root, files, options): - # NOTE: Currently pypa/build will refuse to build the project if no - # `pyproject.toml` or `setup.py` is found. So it is impossible to do - # completely "config-less" projects. - basic = { - "setup.py": "import setuptools\nsetuptools.setup()", - "README.md": "# Example Package", - "LICENSE": "Copyright (c) 2018", - } - jaraco.path.build(basic, prefix=root) - _write_setupcfg(root, options) - paths = (root / f for f in files) - for path in paths: - path.parent.mkdir(exist_ok=True, parents=True) - path.touch() - - -def _write_setupcfg(root, options): - if not options: - print("~~~~~ **NO** setup.cfg ~~~~~") - return - setupcfg = ConfigParser() - setupcfg.add_section("options") - for key, value in options.items(): - if key == "packages.find": - setupcfg.add_section(f"options.{key}") - setupcfg[f"options.{key}"].update(value) - elif isinstance(value, list): - setupcfg["options"][key] = ", ".join(value) - elif isinstance(value, dict): - str_value = "\n".join(f"\t{k} = {v}" for k, v in value.items()) - setupcfg["options"][key] = "\n" + str_value - else: - setupcfg["options"][key] = str(value) - with open(root / "setup.cfg", "w", encoding="utf-8") as f: - setupcfg.write(f) - print("~~~~~ setup.cfg ~~~~~") - print((root / "setup.cfg").read_text(encoding="utf-8")) - - -def _run_build(path, *flags): - cmd = [sys.executable, "-m", "build", "--no-isolation", *flags, str(path)] - return run(cmd, env={'DISTUTILS_DEBUG': ''}) - - -def _get_dist(dist_path, attrs): - root = "/".join(os.path.split(dist_path)) # POSIX-style - - script = dist_path / 'setup.py' - if script.exists(): - with Path(dist_path): - dist = cast( - Distribution, - distutils.core.run_setup("setup.py", {}, stop_after="init"), - ) - else: - dist = Distribution(attrs) - - dist.src_root = root - dist.script_name = "setup.py" - with Path(dist_path): - dist.parse_config_files() - - dist.set_defaults() - return dist - - -def _run_sdist_programatically(dist_path, attrs): - dist = _get_dist(dist_path, attrs) - cmd = sdist(dist) - cmd.ensure_finalized() - assert cmd.distribution.packages or cmd.distribution.py_modules - - with quiet(), Path(dist_path): - cmd.run() - - return dist, cmd diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_core_metadata.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_core_metadata.py deleted file mode 100644 index 0d92511..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_core_metadata.py +++ /dev/null @@ -1,622 +0,0 @@ -from __future__ import annotations - -import functools -import importlib -import io -from email import message_from_string -from email.generator import Generator -from email.message import EmailMessage, Message -from email.parser import Parser -from email.policy import EmailPolicy -from inspect import cleandoc -from pathlib import Path -from unittest.mock import Mock - -import jaraco.path -import pytest -from packaging.metadata import Metadata -from packaging.requirements import Requirement - -from setuptools import _reqs, sic -from setuptools._core_metadata import rfc822_escape, rfc822_unescape -from setuptools.command.egg_info import egg_info, write_requirements -from setuptools.config import expand, setupcfg -from setuptools.dist import Distribution - -from .config.downloads import retrieve_file, urls_from_file - -EXAMPLE_BASE_INFO = dict( - name="package", - version="0.0.1", - author="Foo Bar", - author_email="foo@bar.net", - long_description="Long\ndescription", - description="Short description", - keywords=["one", "two"], -) - - -@pytest.mark.parametrize( - ("content", "result"), - ( - pytest.param( - "Just a single line", - None, - id="single_line", - ), - pytest.param( - "Multiline\nText\nwithout\nextra indents\n", - None, - id="multiline", - ), - pytest.param( - "Multiline\n With\n\nadditional\n indentation", - None, - id="multiline_with_indentation", - ), - pytest.param( - " Leading whitespace", - "Leading whitespace", - id="remove_leading_whitespace", - ), - pytest.param( - " Leading whitespace\nIn\n Multiline comment", - "Leading whitespace\nIn\n Multiline comment", - id="remove_leading_whitespace_multiline", - ), - ), -) -def test_rfc822_unescape(content, result): - assert (result or content) == rfc822_unescape(rfc822_escape(content)) - - -def __read_test_cases(): - base = EXAMPLE_BASE_INFO - - params = functools.partial(dict, base) - - return [ - ('Metadata version 1.0', params()), - ( - 'Metadata Version 1.0: Short long description', - params( - long_description='Short long description', - ), - ), - ( - 'Metadata version 1.1: Classifiers', - params( - classifiers=[ - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'License :: OSI Approved :: MIT License', - ], - ), - ), - ( - 'Metadata version 1.1: Download URL', - params( - download_url='https://example.com', - ), - ), - ( - 'Metadata Version 1.2: Requires-Python', - params( - python_requires='>=3.7', - ), - ), - pytest.param( - 'Metadata Version 1.2: Project-Url', - params(project_urls=dict(Foo='https://example.bar')), - marks=pytest.mark.xfail( - reason="Issue #1578: project_urls not read", - ), - ), - ( - 'Metadata Version 2.1: Long Description Content Type', - params( - long_description_content_type='text/x-rst; charset=UTF-8', - ), - ), - ( - 'License', - params( - license='MIT', - ), - ), - ( - 'License multiline', - params( - license='This is a long license \nover multiple lines', - ), - ), - pytest.param( - 'Metadata Version 2.1: Provides Extra', - params(provides_extras=['foo', 'bar']), - marks=pytest.mark.xfail(reason="provides_extras not read"), - ), - ( - 'Missing author', - dict( - name='foo', - version='1.0.0', - author_email='snorri@sturluson.name', - ), - ), - ( - 'Missing author e-mail', - dict( - name='foo', - version='1.0.0', - author='Snorri Sturluson', - ), - ), - ( - 'Missing author and e-mail', - dict( - name='foo', - version='1.0.0', - ), - ), - ( - 'Bypass normalized version', - dict( - name='foo', - version=sic('1.0.0a'), - ), - ), - ] - - -@pytest.mark.parametrize(("name", "attrs"), __read_test_cases()) -def test_read_metadata(name, attrs): - dist = Distribution(attrs) - metadata_out = dist.metadata - dist_class = metadata_out.__class__ - - # Write to PKG_INFO and then load into a new metadata object - PKG_INFO = io.StringIO() - - metadata_out.write_pkg_file(PKG_INFO) - PKG_INFO.seek(0) - pkg_info = PKG_INFO.read() - assert _valid_metadata(pkg_info) - - PKG_INFO.seek(0) - metadata_in = dist_class() - metadata_in.read_pkg_file(PKG_INFO) - - tested_attrs = [ - ('name', dist_class.get_name), - ('version', dist_class.get_version), - ('author', dist_class.get_contact), - ('author_email', dist_class.get_contact_email), - ('metadata_version', dist_class.get_metadata_version), - ('provides', dist_class.get_provides), - ('description', dist_class.get_description), - ('long_description', dist_class.get_long_description), - ('download_url', dist_class.get_download_url), - ('keywords', dist_class.get_keywords), - ('platforms', dist_class.get_platforms), - ('obsoletes', dist_class.get_obsoletes), - ('requires', dist_class.get_requires), - ('classifiers', dist_class.get_classifiers), - ('project_urls', lambda s: getattr(s, 'project_urls', {})), - ('provides_extras', lambda s: getattr(s, 'provides_extras', {})), - ] - - for attr, getter in tested_attrs: - assert getter(metadata_in) == getter(metadata_out) - - -def __maintainer_test_cases(): - attrs = {"name": "package", "version": "1.0", "description": "xxx"} - - def merge_dicts(d1, d2): - d1 = d1.copy() - d1.update(d2) - - return d1 - - return [ - ('No author, no maintainer', attrs.copy()), - ( - 'Author (no e-mail), no maintainer', - merge_dicts(attrs, {'author': 'Author Name'}), - ), - ( - 'Author (e-mail), no maintainer', - merge_dicts( - attrs, {'author': 'Author Name', 'author_email': 'author@name.com'} - ), - ), - ( - 'No author, maintainer (no e-mail)', - merge_dicts(attrs, {'maintainer': 'Maintainer Name'}), - ), - ( - 'No author, maintainer (e-mail)', - merge_dicts( - attrs, - { - 'maintainer': 'Maintainer Name', - 'maintainer_email': 'maintainer@name.com', - }, - ), - ), - ( - 'Author (no e-mail), Maintainer (no-email)', - merge_dicts( - attrs, {'author': 'Author Name', 'maintainer': 'Maintainer Name'} - ), - ), - ( - 'Author (e-mail), Maintainer (e-mail)', - merge_dicts( - attrs, - { - 'author': 'Author Name', - 'author_email': 'author@name.com', - 'maintainer': 'Maintainer Name', - 'maintainer_email': 'maintainer@name.com', - }, - ), - ), - ( - 'No author (e-mail), no maintainer (e-mail)', - merge_dicts( - attrs, - { - 'author_email': 'author@name.com', - 'maintainer_email': 'maintainer@name.com', - }, - ), - ), - ('Author unicode', merge_dicts(attrs, {'author': '鉄沢寛'})), - ('Maintainer unicode', merge_dicts(attrs, {'maintainer': 'Jan Łukasiewicz'})), - ] - - -@pytest.mark.parametrize(("name", "attrs"), __maintainer_test_cases()) -def test_maintainer_author(name, attrs, tmpdir): - tested_keys = { - 'author': 'Author', - 'author_email': 'Author-email', - 'maintainer': 'Maintainer', - 'maintainer_email': 'Maintainer-email', - } - - # Generate a PKG-INFO file - dist = Distribution(attrs) - fn = tmpdir.mkdir('pkg_info') - fn_s = str(fn) - - dist.metadata.write_pkg_info(fn_s) - - with open(str(fn.join('PKG-INFO')), 'r', encoding='utf-8') as f: - pkg_info = f.read() - - assert _valid_metadata(pkg_info) - - # Drop blank lines and strip lines from default description - raw_pkg_lines = pkg_info.splitlines() - pkg_lines = list(filter(None, raw_pkg_lines[:-2])) - - pkg_lines_set = set(pkg_lines) - - # Duplicate lines should not be generated - assert len(pkg_lines) == len(pkg_lines_set) - - for fkey, dkey in tested_keys.items(): - val = attrs.get(dkey, None) - if val is None: - for line in pkg_lines: - assert not line.startswith(fkey + ':') - else: - line = f'{fkey}: {val}' - assert line in pkg_lines_set - - -class TestParityWithMetadataFromPyPaWheel: - def base_example(self): - attrs = dict( - **EXAMPLE_BASE_INFO, - # Example with complex requirement definition - python_requires=">=3.8", - install_requires=""" - packaging==23.2 - more-itertools==8.8.0; extra == "other" - jaraco.text==3.7.0 - importlib-resources==5.10.2; python_version<"3.8" - importlib-metadata==6.0.0 ; python_version<"3.8" - colorama>=0.4.4; sys_platform == "win32" - """, - extras_require={ - "testing": """ - pytest >= 6 - pytest-checkdocs >= 2.4 - tomli ; \\ - # Using stdlib when possible - python_version < "3.11" - ini2toml[lite]>=0.9 - """, - "other": [], - }, - ) - # Generate a PKG-INFO file using setuptools - return Distribution(attrs) - - def test_requires_dist(self, tmp_path): - dist = self.base_example() - pkg_info = _get_pkginfo(dist) - assert _valid_metadata(pkg_info) - - # Ensure Requires-Dist is present - expected = [ - 'Metadata-Version:', - 'Requires-Python: >=3.8', - 'Provides-Extra: other', - 'Provides-Extra: testing', - 'Requires-Dist: tomli; python_version < "3.11" and extra == "testing"', - 'Requires-Dist: more-itertools==8.8.0; extra == "other"', - 'Requires-Dist: ini2toml[lite]>=0.9; extra == "testing"', - ] - for line in expected: - assert line in pkg_info - - HERE = Path(__file__).parent - EXAMPLES_FILE = HERE / "config/setupcfg_examples.txt" - - @pytest.fixture(params=[None, *urls_from_file(EXAMPLES_FILE)]) - def dist(self, request, monkeypatch, tmp_path): - """Example of distribution with arbitrary configuration""" - monkeypatch.chdir(tmp_path) - monkeypatch.setattr(expand, "read_attr", Mock(return_value="0.42")) - monkeypatch.setattr(expand, "read_files", Mock(return_value="hello world")) - monkeypatch.setattr( - Distribution, "_finalize_license_files", Mock(return_value=None) - ) - if request.param is None: - yield self.base_example() - else: - # Real-world usage - config = retrieve_file(request.param) - yield setupcfg.apply_configuration(Distribution({}), config) - - @pytest.mark.uses_network - def test_equivalent_output(self, tmp_path, dist): - """Ensure output from setuptools is equivalent to the one from `pypa/wheel`""" - # Generate a METADATA file using pypa/wheel for comparison - wheel_metadata = importlib.import_module("wheel.metadata") - pkginfo_to_metadata = getattr(wheel_metadata, "pkginfo_to_metadata", None) - - if pkginfo_to_metadata is None: # pragma: nocover - pytest.xfail( - "wheel.metadata.pkginfo_to_metadata is undefined, " - "(this is likely to be caused by API changes in pypa/wheel" - ) - - # Generate an simplified "egg-info" dir for pypa/wheel to convert - pkg_info = _get_pkginfo(dist) - egg_info_dir = tmp_path / "pkg.egg-info" - egg_info_dir.mkdir(parents=True) - (egg_info_dir / "PKG-INFO").write_text(pkg_info, encoding="utf-8") - write_requirements(egg_info(dist), egg_info_dir, egg_info_dir / "requires.txt") - - # Get pypa/wheel generated METADATA but normalize requirements formatting - metadata_msg = pkginfo_to_metadata(egg_info_dir, egg_info_dir / "PKG-INFO") - metadata_str = _normalize_metadata(metadata_msg) - pkg_info_msg = message_from_string(pkg_info) - pkg_info_str = _normalize_metadata(pkg_info_msg) - - # Compare setuptools PKG-INFO x pypa/wheel METADATA - assert metadata_str == pkg_info_str - - # Make sure it parses/serializes well in pypa/wheel - _assert_roundtrip_message(pkg_info) - - -class TestPEP643: - STATIC_CONFIG = { - "setup.cfg": cleandoc( - """ - [metadata] - name = package - version = 0.0.1 - author = Foo Bar - author_email = foo@bar.net - long_description = Long - description - description = Short description - keywords = one, two - platforms = abcd - [options] - install_requires = requests - """ - ), - "pyproject.toml": cleandoc( - """ - [project] - name = "package" - version = "0.0.1" - authors = [ - {name = "Foo Bar", email = "foo@bar.net"} - ] - description = "Short description" - readme = {text = "Long\\ndescription", content-type = "text/plain"} - keywords = ["one", "two"] - dependencies = ["requests"] - license = "AGPL-3.0-or-later" - [tool.setuptools] - provides = ["abcd"] - obsoletes = ["abcd"] - """ - ), - } - - @pytest.mark.parametrize("file", STATIC_CONFIG.keys()) - def test_static_config_has_no_dynamic(self, file, tmpdir_cwd): - Path(file).write_text(self.STATIC_CONFIG[file], encoding="utf-8") - metadata = _get_metadata() - assert metadata.get_all("Dynamic") is None - assert metadata.get_all("dynamic") is None - - @pytest.mark.parametrize("file", STATIC_CONFIG.keys()) - @pytest.mark.parametrize( - "fields", - [ - # Single dynamic field - {"requires-python": ("python_requires", ">=3.12")}, - {"author-email": ("author_email", "snoopy@peanuts.com")}, - {"keywords": ("keywords", ["hello", "world"])}, - {"platform": ("platforms", ["abcd"])}, - # Multiple dynamic fields - { - "summary": ("description", "hello world"), - "description": ("long_description", "bla bla bla bla"), - "requires-dist": ("install_requires", ["hello-world"]), - }, - ], - ) - def test_modified_fields_marked_as_dynamic(self, file, fields, tmpdir_cwd): - # We start with a static config - Path(file).write_text(self.STATIC_CONFIG[file], encoding="utf-8") - dist = _makedist() - - # ... but then we simulate the effects of a plugin modifying the distribution - for attr, value in fields.values(): - # `dist` and `dist.metadata` are complicated... - # Some attributes work when set on `dist`, others on `dist.metadata`... - # Here we set in both just in case (this also avoids calling `_finalize_*`) - setattr(dist, attr, value) - setattr(dist.metadata, attr, value) - - # Then we should be able to list the modified fields as Dynamic - metadata = _get_metadata(dist) - assert set(metadata.get_all("Dynamic")) == set(fields) - - @pytest.mark.parametrize( - "extra_toml", - [ - "# Let setuptools autofill license-files", - "license-files = ['LICENSE*', 'AUTHORS*', 'NOTICE']", - ], - ) - def test_license_files_dynamic(self, extra_toml, tmpdir_cwd): - # For simplicity (and for the time being) setuptools is not making - # any special handling to guarantee `License-File` is considered static. - # Instead we rely in the fact that, although suboptimal, it is OK to have - # it as dynamics, as per: - # https://github.com/pypa/setuptools/issues/4629#issuecomment-2331233677 - files = { - "pyproject.toml": self.STATIC_CONFIG["pyproject.toml"].replace( - 'license = "AGPL-3.0-or-later"', - f"dynamic = ['license']\n{extra_toml}", - ), - "LICENSE.md": "--- mock license ---", - "NOTICE": "--- mock notice ---", - "AUTHORS.txt": "--- me ---", - } - # Sanity checks: - assert extra_toml in files["pyproject.toml"] - assert 'license = "AGPL-3.0-or-later"' not in extra_toml - - jaraco.path.build(files) - dist = _makedist(license_expression="AGPL-3.0-or-later") - metadata = _get_metadata(dist) - assert set(metadata.get_all("Dynamic")) == { - 'license-file', - 'license-expression', - } - assert metadata.get("License-Expression") == "AGPL-3.0-or-later" - assert set(metadata.get_all("License-File")) == { - "NOTICE", - "AUTHORS.txt", - "LICENSE.md", - } - - -def _makedist(**attrs): - dist = Distribution(attrs) - dist.parse_config_files() - return dist - - -def _assert_roundtrip_message(metadata: str) -> None: - """Emulate the way wheel.bdist_wheel parses and regenerates the message, - then ensures the metadata generated by setuptools is compatible. - """ - with io.StringIO(metadata) as buffer: - msg = Parser(EmailMessage).parse(buffer) - - serialization_policy = EmailPolicy( - utf8=True, - mangle_from_=False, - max_line_length=0, - ) - with io.BytesIO() as buffer: - out = io.TextIOWrapper(buffer, encoding="utf-8") - Generator(out, policy=serialization_policy).flatten(msg) - out.flush() - regenerated = buffer.getvalue() - - raw_metadata = bytes(metadata, "utf-8") - # Normalise newlines to avoid test errors on Windows: - raw_metadata = b"\n".join(raw_metadata.splitlines()) - regenerated = b"\n".join(regenerated.splitlines()) - assert regenerated == raw_metadata - - -def _normalize_metadata(msg: Message) -> str: - """Allow equivalent metadata to be compared directly""" - # The main challenge regards the requirements and extras. - # Both setuptools and wheel already apply some level of normalization - # but they differ regarding which character is chosen, according to the - # following spec it should be "-": - # https://packaging.python.org/en/latest/specifications/name-normalization/ - - # Related issues: - # https://github.com/pypa/packaging/issues/845 - # https://github.com/pypa/packaging/issues/644#issuecomment-2429813968 - - extras = {x.replace("_", "-"): x for x in msg.get_all("Provides-Extra", [])} - reqs = [ - _normalize_req(req, extras) - for req in _reqs.parse(msg.get_all("Requires-Dist", [])) - ] - del msg["Requires-Dist"] - del msg["Provides-Extra"] - - # Ensure consistent ord - for req in sorted(reqs): - msg["Requires-Dist"] = req - for extra in sorted(extras): - msg["Provides-Extra"] = extra - - # TODO: Handle lack of PEP 643 implementation in pypa/wheel? - del msg["Metadata-Version"] - - return msg.as_string() - - -def _normalize_req(req: Requirement, extras: dict[str, str]) -> str: - """Allow equivalent requirement objects to be compared directly""" - as_str = str(req).replace(req.name, req.name.replace("_", "-")) - for norm, orig in extras.items(): - as_str = as_str.replace(orig, norm) - return as_str - - -def _get_pkginfo(dist: Distribution): - with io.StringIO() as fp: - dist.metadata.write_pkg_file(fp) - return fp.getvalue() - - -def _get_metadata(dist: Distribution | None = None): - return message_from_string(_get_pkginfo(dist or _makedist())) - - -def _valid_metadata(text: str) -> bool: - metadata = Metadata.from_email(text, validate=True) # can raise exceptions - return metadata is not None diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_depends.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_depends.py deleted file mode 100644 index 1714c04..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_depends.py +++ /dev/null @@ -1,15 +0,0 @@ -import sys - -from setuptools import depends - - -class TestGetModuleConstant: - def test_basic(self): - """ - Invoke get_module_constant on a module in - the test package. - """ - mod_name = 'setuptools.tests.mod_with_constant' - val = depends.get_module_constant(mod_name, 'value') - assert val == 'three, sir!' - assert 'setuptools.tests.mod_with_constant' not in sys.modules diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_develop.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_develop.py deleted file mode 100644 index 929fa9c..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_develop.py +++ /dev/null @@ -1,175 +0,0 @@ -"""develop tests""" - -import os -import pathlib -import platform -import subprocess -import sys - -import pytest - -from setuptools._path import paths_on_pythonpath -from setuptools.command.develop import develop -from setuptools.dist import Distribution - -from . import contexts, namespaces - -SETUP_PY = """\ -from setuptools import setup - -setup(name='foo', - packages=['foo'], -) -""" - -INIT_PY = """print "foo" -""" - - -@pytest.fixture -def temp_user(monkeypatch): - with contexts.tempdir() as user_base: - with contexts.tempdir() as user_site: - monkeypatch.setattr('site.USER_BASE', user_base) - monkeypatch.setattr('site.USER_SITE', user_site) - yield - - -@pytest.fixture -def test_env(tmpdir, temp_user): - target = tmpdir - foo = target.mkdir('foo') - setup = target / 'setup.py' - if setup.isfile(): - raise ValueError(dir(target)) - with setup.open('w') as f: - f.write(SETUP_PY) - init = foo / '__init__.py' - with init.open('w') as f: - f.write(INIT_PY) - with target.as_cwd(): - yield target - - -class TestDevelop: - in_virtualenv = hasattr(sys, 'real_prefix') - in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix - - def test_console_scripts(self, tmpdir): - """ - Test that console scripts are installed and that they reference - only the project by name and not the current version. - """ - pytest.skip( - "TODO: needs a fixture to cause 'develop' " - "to be invoked without mutating environment." - ) - settings = dict( - name='foo', - packages=['foo'], - version='0.0', - entry_points={ - 'console_scripts': [ - 'foocmd = foo:foo', - ], - }, - ) - dist = Distribution(settings) - dist.script_name = 'setup.py' - cmd = develop(dist) - cmd.ensure_finalized() - cmd.install_dir = tmpdir - cmd.run() - # assert '0.0' not in foocmd_text - - @pytest.mark.xfail(reason="legacy behavior retained for compatibility #4167") - def test_egg_link_filename(self): - settings = dict( - name='Foo $$$ Bar_baz-bing', - ) - dist = Distribution(settings) - cmd = develop(dist) - cmd.ensure_finalized() - link = pathlib.Path(cmd.egg_link) - assert link.suffix == '.egg-link' - assert link.stem == 'Foo_Bar_baz_bing' - - -class TestResolver: - """ - TODO: These tests were written with a minimal understanding - of what _resolve_setup_path is intending to do. Come up with - more meaningful cases that look like real-world scenarios. - """ - - def test_resolve_setup_path_cwd(self): - assert develop._resolve_setup_path('.', '.', '.') == '.' - - def test_resolve_setup_path_one_dir(self): - assert develop._resolve_setup_path('pkgs', '.', 'pkgs') == '../' - - def test_resolve_setup_path_one_dir_trailing_slash(self): - assert develop._resolve_setup_path('pkgs/', '.', 'pkgs') == '../' - - -class TestNamespaces: - @staticmethod - def install_develop(src_dir, target): - develop_cmd = [ - sys.executable, - 'setup.py', - 'develop', - '--install-dir', - str(target), - ] - with src_dir.as_cwd(): - with paths_on_pythonpath([str(target)]): - subprocess.check_call(develop_cmd) - - @pytest.mark.skipif( - bool(os.environ.get("APPVEYOR")), - reason="https://github.com/pypa/setuptools/issues/851", - ) - @pytest.mark.skipif( - platform.python_implementation() == 'PyPy', - reason="https://github.com/pypa/setuptools/issues/1202", - ) - def test_namespace_package_importable(self, tmpdir): - """ - Installing two packages sharing the same namespace, one installed - naturally using pip or `--single-version-externally-managed` - and the other installed using `develop` should leave the namespace - in tact and both packages reachable by import. - """ - pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA') - pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB') - target = tmpdir / 'packages' - # use pip to install to the target directory - install_cmd = [ - sys.executable, - '-m', - 'pip', - 'install', - str(pkg_A), - '-t', - str(target), - ] - subprocess.check_call(install_cmd) - self.install_develop(pkg_B, target) - namespaces.make_site_dir(target) - try_import = [ - sys.executable, - '-c', - 'import myns.pkgA; import myns.pkgB', - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(try_import) - - # additionally ensure that pkg_resources import works - pkg_resources_imp = [ - sys.executable, - '-c', - 'import pkg_resources', - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(pkg_resources_imp) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist.py deleted file mode 100644 index e65ab31..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist.py +++ /dev/null @@ -1,278 +0,0 @@ -import os -import re -import urllib.parse -import urllib.request - -import pytest - -from setuptools import Distribution -from setuptools.dist import check_package_data, check_specifier - -from .test_easy_install import make_trivial_sdist -from .test_find_packages import ensure_files -from .textwrap import DALS - -from distutils.errors import DistutilsSetupError - - -def test_dist_fetch_build_egg(tmpdir): - """ - Check multiple calls to `Distribution.fetch_build_egg` work as expected. - """ - index = tmpdir.mkdir('index') - index_url = urllib.parse.urljoin('file://', urllib.request.pathname2url(str(index))) - - def sdist_with_index(distname, version): - dist_dir = index.mkdir(distname) - dist_sdist = f'{distname}-{version}.tar.gz' - make_trivial_sdist(str(dist_dir.join(dist_sdist)), distname, version) - with dist_dir.join('index.html').open('w') as fp: - fp.write( - DALS( - """ - - {dist_sdist}
- - """ - ).format(dist_sdist=dist_sdist) - ) - - sdist_with_index('barbazquux', '3.2.0') - sdist_with_index('barbazquux-runner', '2.11.1') - with tmpdir.join('setup.cfg').open('w') as fp: - fp.write( - DALS( - """ - [easy_install] - index_url = {index_url} - """ - ).format(index_url=index_url) - ) - reqs = """ - barbazquux-runner - barbazquux - """.split() - with tmpdir.as_cwd(): - dist = Distribution() - dist.parse_config_files() - resolved_dists = [dist.fetch_build_egg(r) for r in reqs] - assert [dist.key for dist in resolved_dists if dist] == reqs - - -EXAMPLE_BASE_INFO = dict( - name="package", - version="0.0.1", - author="Foo Bar", - author_email="foo@bar.net", - long_description="Long\ndescription", - description="Short description", - keywords=["one", "two"], -) - - -def test_provides_extras_deterministic_order(): - attrs = dict(extras_require=dict(a=['foo'], b=['bar'])) - dist = Distribution(attrs) - assert list(dist.metadata.provides_extras) == ['a', 'b'] - attrs['extras_require'] = dict(reversed(attrs['extras_require'].items())) - dist = Distribution(attrs) - assert list(dist.metadata.provides_extras) == ['b', 'a'] - - -CHECK_PACKAGE_DATA_TESTS = ( - # Valid. - ( - { - '': ['*.txt', '*.rst'], - 'hello': ['*.msg'], - }, - None, - ), - # Not a dictionary. - ( - ( - ('', ['*.txt', '*.rst']), - ('hello', ['*.msg']), - ), - ( - "'package_data' must be a dictionary mapping package" - " names to lists of string wildcard patterns" - ), - ), - # Invalid key type. - ( - { - 400: ['*.txt', '*.rst'], - }, - ("keys of 'package_data' dict must be strings (got 400)"), - ), - # Invalid value type. - ( - { - 'hello': '*.msg', - }, - ( - "\"values of 'package_data' dict\" must be of type " - " (got '*.msg')" - ), - ), - # Invalid value type (generators are single use) - ( - { - 'hello': (x for x in "generator"), - }, - ( - "\"values of 'package_data' dict\" must be of type " - " (got =3.0, !=3.1'} - dist = Distribution(attrs) - check_specifier(dist, attrs, attrs['python_requires']) - - attrs = {'name': 'foo', 'python_requires': ['>=3.0', '!=3.1']} - dist = Distribution(attrs) - check_specifier(dist, attrs, attrs['python_requires']) - - # invalid specifier value - attrs = {'name': 'foo', 'python_requires': '>=invalid-version'} - with pytest.raises(DistutilsSetupError): - dist = Distribution(attrs) - - -def test_metadata_name(): - with pytest.raises(DistutilsSetupError, match='missing.*name'): - Distribution()._validate_metadata() - - -@pytest.mark.parametrize( - ('dist_name', 'py_module'), - [ - ("my.pkg", "my_pkg"), - ("my-pkg", "my_pkg"), - ("my_pkg", "my_pkg"), - ("pkg", "pkg"), - ], -) -def test_dist_default_py_modules(tmp_path, dist_name, py_module): - (tmp_path / f"{py_module}.py").touch() - - (tmp_path / "setup.py").touch() - (tmp_path / "noxfile.py").touch() - # ^-- make sure common tool files are ignored - - attrs = {**EXAMPLE_BASE_INFO, "name": dist_name, "src_root": str(tmp_path)} - # Find `py_modules` corresponding to dist_name if not given - dist = Distribution(attrs) - dist.set_defaults() - assert dist.py_modules == [py_module] - # When `py_modules` is given, don't do anything - dist = Distribution({**attrs, "py_modules": ["explicity_py_module"]}) - dist.set_defaults() - assert dist.py_modules == ["explicity_py_module"] - # When `packages` is given, don't do anything - dist = Distribution({**attrs, "packages": ["explicity_package"]}) - dist.set_defaults() - assert not dist.py_modules - - -@pytest.mark.parametrize( - ('dist_name', 'package_dir', 'package_files', 'packages'), - [ - ("my.pkg", None, ["my_pkg/__init__.py", "my_pkg/mod.py"], ["my_pkg"]), - ("my-pkg", None, ["my_pkg/__init__.py", "my_pkg/mod.py"], ["my_pkg"]), - ("my_pkg", None, ["my_pkg/__init__.py", "my_pkg/mod.py"], ["my_pkg"]), - ("my.pkg", None, ["my/pkg/__init__.py"], ["my", "my.pkg"]), - ( - "my_pkg", - None, - ["src/my_pkg/__init__.py", "src/my_pkg2/__init__.py"], - ["my_pkg", "my_pkg2"], - ), - ( - "my_pkg", - {"pkg": "lib", "pkg2": "lib2"}, - ["lib/__init__.py", "lib/nested/__init__.pyt", "lib2/__init__.py"], - ["pkg", "pkg.nested", "pkg2"], - ), - ], -) -def test_dist_default_packages( - tmp_path, dist_name, package_dir, package_files, packages -): - ensure_files(tmp_path, package_files) - - (tmp_path / "setup.py").touch() - (tmp_path / "noxfile.py").touch() - # ^-- should not be included by default - - attrs = { - **EXAMPLE_BASE_INFO, - "name": dist_name, - "src_root": str(tmp_path), - "package_dir": package_dir, - } - # Find `packages` either corresponding to dist_name or inside src - dist = Distribution(attrs) - dist.set_defaults() - assert not dist.py_modules - assert not dist.py_modules - assert set(dist.packages) == set(packages) - # When `py_modules` is given, don't do anything - dist = Distribution({**attrs, "py_modules": ["explicit_py_module"]}) - dist.set_defaults() - assert not dist.packages - assert set(dist.py_modules) == {"explicit_py_module"} - # When `packages` is given, don't do anything - dist = Distribution({**attrs, "packages": ["explicit_package"]}) - dist.set_defaults() - assert not dist.py_modules - assert set(dist.packages) == {"explicit_package"} - - -@pytest.mark.parametrize( - ('dist_name', 'package_dir', 'package_files'), - [ - ("my.pkg.nested", None, ["my/pkg/nested/__init__.py"]), - ("my.pkg", None, ["my/pkg/__init__.py", "my/pkg/file.py"]), - ("my_pkg", None, ["my_pkg.py"]), - ("my_pkg", None, ["my_pkg/__init__.py", "my_pkg/nested/__init__.py"]), - ("my_pkg", None, ["src/my_pkg/__init__.py", "src/my_pkg/nested/__init__.py"]), - ( - "my_pkg", - {"my_pkg": "lib", "my_pkg.lib2": "lib2"}, - ["lib/__init__.py", "lib/nested/__init__.pyt", "lib2/__init__.py"], - ), - # Should not try to guess a name from multiple py_modules/packages - ("UNKNOWN", None, ["src/mod1.py", "src/mod2.py"]), - ("UNKNOWN", None, ["src/pkg1/__ini__.py", "src/pkg2/__init__.py"]), - ], -) -def test_dist_default_name(tmp_path, dist_name, package_dir, package_files): - """Make sure dist.name is discovered from packages/py_modules""" - ensure_files(tmp_path, package_files) - attrs = { - **EXAMPLE_BASE_INFO, - "src_root": "/".join(os.path.split(tmp_path)), # POSIX-style - "package_dir": package_dir, - } - del attrs["name"] - - dist = Distribution(attrs) - dist.set_defaults() - assert dist.py_modules or dist.packages - assert dist.get_name() == dist_name diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist_info.py deleted file mode 100644 index 426694e..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_dist_info.py +++ /dev/null @@ -1,210 +0,0 @@ -"""Test .dist-info style distributions.""" - -import pathlib -import re -import shutil -import subprocess -import sys -from functools import partial - -import pytest - -import pkg_resources -from setuptools.archive_util import unpack_archive - -from .textwrap import DALS - -read = partial(pathlib.Path.read_text, encoding="utf-8") - - -class TestDistInfo: - metadata_base = DALS( - """ - Metadata-Version: 1.2 - Requires-Dist: splort (==4) - Provides-Extra: baz - Requires-Dist: quux (>=1.1); extra == 'baz' - """ - ) - - @classmethod - def build_metadata(cls, **kwargs): - lines = ('{key}: {value}\n'.format(**locals()) for key, value in kwargs.items()) - return cls.metadata_base + ''.join(lines) - - @pytest.fixture - def metadata(self, tmpdir): - dist_info_name = 'VersionedDistribution-2.718.dist-info' - versioned = tmpdir / dist_info_name - versioned.mkdir() - filename = versioned / 'METADATA' - content = self.build_metadata( - Name='VersionedDistribution', - ) - filename.write_text(content, encoding='utf-8') - - dist_info_name = 'UnversionedDistribution.dist-info' - unversioned = tmpdir / dist_info_name - unversioned.mkdir() - filename = unversioned / 'METADATA' - content = self.build_metadata( - Name='UnversionedDistribution', - Version='0.3', - ) - filename.write_text(content, encoding='utf-8') - - return str(tmpdir) - - def test_distinfo(self, metadata): - dists = dict( - (d.project_name, d) for d in pkg_resources.find_distributions(metadata) - ) - - assert len(dists) == 2, dists - - unversioned = dists['UnversionedDistribution'] - versioned = dists['VersionedDistribution'] - - assert versioned.version == '2.718' # from filename - assert unversioned.version == '0.3' # from METADATA - - def test_conditional_dependencies(self, metadata): - specs = 'splort==4', 'quux>=1.1' - requires = list(map(pkg_resources.Requirement.parse, specs)) - - for d in pkg_resources.find_distributions(metadata): - assert d.requires() == requires[:1] - assert d.requires(extras=('baz',)) == [ - requires[0], - pkg_resources.Requirement.parse('quux>=1.1;extra=="baz"'), - ] - assert d.extras == ['baz'] - - def test_invalid_version(self, tmp_path): - """ - Supplying an invalid version crashes dist_info. - """ - config = "[metadata]\nname=proj\nversion=42\n[egg_info]\ntag_build=invalid!!!\n" - (tmp_path / "setup.cfg").write_text(config, encoding="utf-8") - msg = re.compile("invalid version", re.M | re.I) - proc = run_command_inner("dist_info", cwd=tmp_path, check=False) - assert proc.returncode - assert msg.search(proc.stdout) - assert not list(tmp_path.glob("*.dist-info")) - - def test_tag_arguments(self, tmp_path): - config = """ - [metadata] - name=proj - version=42 - [egg_info] - tag_date=1 - tag_build=.post - """ - (tmp_path / "setup.cfg").write_text(config, encoding="utf-8") - - print(run_command("dist_info", "--no-date", cwd=tmp_path)) - dist_info = next(tmp_path.glob("*.dist-info")) - assert dist_info.name.startswith("proj-42") - shutil.rmtree(dist_info) - - print(run_command("dist_info", "--tag-build", ".a", cwd=tmp_path)) - dist_info = next(tmp_path.glob("*.dist-info")) - assert dist_info.name.startswith("proj-42a") - - @pytest.mark.parametrize("keep_egg_info", (False, True)) - def test_output_dir(self, tmp_path, keep_egg_info): - config = "[metadata]\nname=proj\nversion=42\n" - (tmp_path / "setup.cfg").write_text(config, encoding="utf-8") - out = tmp_path / "__out" - out.mkdir() - opts = ["--keep-egg-info"] if keep_egg_info else [] - run_command("dist_info", "--output-dir", out, *opts, cwd=tmp_path) - assert len(list(out.glob("*.dist-info"))) == 1 - assert len(list(tmp_path.glob("*.dist-info"))) == 0 - expected_egg_info = int(keep_egg_info) - assert len(list(out.glob("*.egg-info"))) == expected_egg_info - assert len(list(tmp_path.glob("*.egg-info"))) == 0 - assert len(list(out.glob("*.__bkp__"))) == 0 - assert len(list(tmp_path.glob("*.__bkp__"))) == 0 - - -class TestWheelCompatibility: - """Make sure the .dist-info directory produced with the ``dist_info`` command - is the same as the one produced by ``bdist_wheel``. - """ - - SETUPCFG = DALS( - """ - [metadata] - name = {name} - version = {version} - - [options] - install_requires = - foo>=12; sys_platform != "linux" - - [options.extras_require] - test = pytest - - [options.entry_points] - console_scripts = - executable-name = my_package.module:function - discover = - myproj = my_package.other_module:function - """ - ) - - EGG_INFO_OPTS = [ - # Related: #3088 #2872 - ("", ""), - (".post", "[egg_info]\ntag_build = post\n"), - (".post", "[egg_info]\ntag_build = .post\n"), - (".post", "[egg_info]\ntag_build = post\ntag_date = 1\n"), - (".dev", "[egg_info]\ntag_build = .dev\n"), - (".dev", "[egg_info]\ntag_build = .dev\ntag_date = 1\n"), - ("a1", "[egg_info]\ntag_build = .a1\n"), - ("+local", "[egg_info]\ntag_build = +local\n"), - ] - - @pytest.mark.parametrize("name", "my-proj my_proj my.proj My.Proj".split()) - @pytest.mark.parametrize("version", ["0.42.13"]) - @pytest.mark.parametrize(("suffix", "cfg"), EGG_INFO_OPTS) - def test_dist_info_is_the_same_as_in_wheel( - self, name, version, tmp_path, suffix, cfg - ): - config = self.SETUPCFG.format(name=name, version=version) + cfg - - for i in "dir_wheel", "dir_dist": - (tmp_path / i).mkdir() - (tmp_path / i / "setup.cfg").write_text(config, encoding="utf-8") - - run_command("bdist_wheel", cwd=tmp_path / "dir_wheel") - wheel = next(tmp_path.glob("dir_wheel/dist/*.whl")) - unpack_archive(wheel, tmp_path / "unpack") - wheel_dist_info = next(tmp_path.glob("unpack/*.dist-info")) - - run_command("dist_info", cwd=tmp_path / "dir_dist") - dist_info = next(tmp_path.glob("dir_dist/*.dist-info")) - - assert dist_info.name == wheel_dist_info.name - assert dist_info.name.startswith(f"my_proj-{version}{suffix}") - for file in "METADATA", "entry_points.txt": - assert read(dist_info / file) == read(wheel_dist_info / file) - - -def run_command_inner(*cmd, **kwargs): - opts = { - "stderr": subprocess.STDOUT, - "stdout": subprocess.PIPE, - "text": True, - "encoding": "utf-8", - "check": True, - **kwargs, - } - cmd = [sys.executable, "-c", "__import__('setuptools').setup()", *map(str, cmd)] - return subprocess.run(cmd, **opts) - - -def run_command(*args, **kwargs): - return run_command_inner(*args, **kwargs).stdout diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_distutils_adoption.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_distutils_adoption.py deleted file mode 100644 index f99a588..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_distutils_adoption.py +++ /dev/null @@ -1,198 +0,0 @@ -import os -import platform -import sys -import textwrap - -import pytest - -IS_PYPY = '__pypy__' in sys.builtin_module_names - -_TEXT_KWARGS = {"text": True, "encoding": "utf-8"} # For subprocess.run - - -def win_sr(env): - """ - On Windows, SYSTEMROOT must be present to avoid - - > Fatal Python error: _Py_HashRandomization_Init: failed to - > get random numbers to initialize Python - """ - if env and platform.system() == 'Windows': - env['SYSTEMROOT'] = os.environ['SYSTEMROOT'] - return env - - -def find_distutils(venv, imports='distutils', env=None, **kwargs): - py_cmd = 'import {imports}; print(distutils.__file__)'.format(**locals()) - cmd = ['python', '-c', py_cmd] - return venv.run(cmd, env=win_sr(env), **_TEXT_KWARGS, **kwargs) - - -def count_meta_path(venv, env=None): - py_cmd = textwrap.dedent( - """ - import sys - is_distutils = lambda finder: finder.__class__.__name__ == "DistutilsMetaFinder" - print(len(list(filter(is_distutils, sys.meta_path)))) - """ - ) - cmd = ['python', '-c', py_cmd] - return int(venv.run(cmd, env=win_sr(env), **_TEXT_KWARGS)) - - -skip_without_stdlib_distutils = pytest.mark.skipif( - sys.version_info >= (3, 12), - reason='stdlib distutils is removed from Python 3.12+', -) - - -@skip_without_stdlib_distutils -def test_distutils_stdlib(venv): - """ - Ensure stdlib distutils is used when appropriate. - """ - env = dict(SETUPTOOLS_USE_DISTUTILS='stdlib') - assert venv.name not in find_distutils(venv, env=env).split(os.sep) - assert count_meta_path(venv, env=env) == 0 - - -def test_distutils_local_with_setuptools(venv): - """ - Ensure local distutils is used when appropriate. - """ - env = dict(SETUPTOOLS_USE_DISTUTILS='local') - loc = find_distutils(venv, imports='setuptools, distutils', env=env) - assert venv.name in loc.split(os.sep) - assert count_meta_path(venv, env=env) <= 1 - - -@pytest.mark.xfail('IS_PYPY', reason='pypy imports distutils on startup') -def test_distutils_local(venv): - """ - Even without importing, the setuptools-local copy of distutils is - preferred. - """ - env = dict(SETUPTOOLS_USE_DISTUTILS='local') - assert venv.name in find_distutils(venv, env=env).split(os.sep) - assert count_meta_path(venv, env=env) <= 1 - - -def test_pip_import(venv): - """ - Ensure pip can be imported. - Regression test for #3002. - """ - cmd = ['python', '-c', 'import pip'] - venv.run(cmd, **_TEXT_KWARGS) - - -def test_distutils_has_origin(): - """ - Distutils module spec should have an origin. #2990. - """ - assert __import__('distutils').__spec__.origin - - -ENSURE_IMPORTS_ARE_NOT_DUPLICATED = r""" -# Depending on the importlib machinery and _distutils_hack, some imports are -# duplicated resulting in different module objects being loaded, which prevents -# patches as shown in #3042. -# This script provides a way of verifying if this duplication is happening. - -from distutils import cmd -import distutils.command.sdist as sdist - -# import last to prevent caching -from distutils import {imported_module} - -for mod in (cmd, sdist): - assert mod.{imported_module} == {imported_module}, ( - f"\n{{mod.dir_util}}\n!=\n{{{imported_module}}}" - ) - -print("success") -""" - - -@pytest.mark.usefixtures("tmpdir_cwd") -@pytest.mark.parametrize( - ('distutils_version', 'imported_module'), - [ - pytest.param("stdlib", "dir_util", marks=skip_without_stdlib_distutils), - pytest.param("stdlib", "file_util", marks=skip_without_stdlib_distutils), - pytest.param("stdlib", "archive_util", marks=skip_without_stdlib_distutils), - ("local", "dir_util"), - ("local", "file_util"), - ("local", "archive_util"), - ], -) -def test_modules_are_not_duplicated_on_import(distutils_version, imported_module, venv): - env = dict(SETUPTOOLS_USE_DISTUTILS=distutils_version) - script = ENSURE_IMPORTS_ARE_NOT_DUPLICATED.format(imported_module=imported_module) - cmd = ['python', '-c', script] - output = venv.run(cmd, env=win_sr(env), **_TEXT_KWARGS).strip() - assert output == "success" - - -ENSURE_LOG_IMPORT_IS_NOT_DUPLICATED = r""" -import types -import distutils.dist as dist -from distutils import log -if isinstance(dist.log, types.ModuleType): - assert dist.log == log, f"\n{dist.log}\n!=\n{log}" -print("success") -""" - - -@pytest.mark.usefixtures("tmpdir_cwd") -@pytest.mark.parametrize( - "distutils_version", - [ - "local", - pytest.param("stdlib", marks=skip_without_stdlib_distutils), - ], -) -def test_log_module_is_not_duplicated_on_import(distutils_version, venv): - env = dict(SETUPTOOLS_USE_DISTUTILS=distutils_version) - cmd = ['python', '-c', ENSURE_LOG_IMPORT_IS_NOT_DUPLICATED] - output = venv.run(cmd, env=win_sr(env), **_TEXT_KWARGS).strip() - assert output == "success" - - -ENSURE_CONSISTENT_ERROR_FROM_MODIFIED_PY = r""" -from setuptools.modified import newer -from {imported_module}.errors import DistutilsError - -# Can't use pytest.raises in this context -try: - newer("", "") -except DistutilsError: - print("success") -else: - raise AssertionError("Expected to raise") -""" - - -@pytest.mark.usefixtures("tmpdir_cwd") -@pytest.mark.parametrize( - ('distutils_version', 'imported_module'), - [ - ("local", "distutils"), - # Unfortunately we still get ._distutils.errors.DistutilsError with SETUPTOOLS_USE_DISTUTILS=stdlib - # But that's a deprecated use-case we don't mind not fully supporting in newer code - pytest.param( - "stdlib", "setuptools._distutils", marks=skip_without_stdlib_distutils - ), - ], -) -def test_consistent_error_from_modified_py(distutils_version, imported_module, venv): - env = dict(SETUPTOOLS_USE_DISTUTILS=distutils_version) - cmd = [ - 'python', - '-c', - ENSURE_CONSISTENT_ERROR_FROM_MODIFIED_PY.format( - imported_module=imported_module - ), - ] - output = venv.run(cmd, env=win_sr(env), **_TEXT_KWARGS).strip() - assert output == "success" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_easy_install.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_easy_install.py deleted file mode 100644 index b58b0b6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_easy_install.py +++ /dev/null @@ -1,1476 +0,0 @@ -"""Easy install Tests""" - -import contextlib -import io -import itertools -import logging -import os -import pathlib -import re -import site -import subprocess -import sys -import tarfile -import tempfile -import time -import warnings -import zipfile -from pathlib import Path -from typing import NamedTuple -from unittest import mock - -import pytest -from jaraco import path - -import pkg_resources -import setuptools.command.easy_install as ei -from pkg_resources import Distribution as PRDistribution, normalize_path, working_set -from setuptools import sandbox -from setuptools._normalization import safer_name -from setuptools.command.easy_install import PthDistributions -from setuptools.dist import Distribution -from setuptools.sandbox import run_setup -from setuptools.tests import fail_on_ascii -from setuptools.tests.server import MockServer, path_to_url - -from . import contexts -from .textwrap import DALS - -import distutils.errors - - -@pytest.fixture(autouse=True) -def pip_disable_index(monkeypatch): - """ - Important: Disable the default index for pip to avoid - querying packages in the index and potentially resolving - and installing packages there. - """ - monkeypatch.setenv('PIP_NO_INDEX', 'true') - - -class FakeDist: - def get_entry_map(self, group): - if group != 'console_scripts': - return {} - return {'name': 'ep'} - - def as_requirement(self): - return 'spec' - - -SETUP_PY = DALS( - """ - from setuptools import setup - - setup() - """ -) - - -class TestEasyInstallTest: - def test_get_script_args(self): - header = ei.CommandSpec.best().from_environment().as_header() - dist = FakeDist() - args = next(ei.ScriptWriter.get_args(dist)) - _name, script = itertools.islice(args, 2) - assert script.startswith(header) - assert "'spec'" in script - assert "'console_scripts'" in script - assert "'name'" in script - assert re.search('^# EASY-INSTALL-ENTRY-SCRIPT', script, flags=re.MULTILINE) - - def test_no_find_links(self): - # new option '--no-find-links', that blocks find-links added at - # the project level - dist = Distribution() - cmd = ei.easy_install(dist) - cmd.check_pth_processing = lambda: True - cmd.no_find_links = True - cmd.find_links = ['link1', 'link2'] - cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok') - cmd.args = ['ok'] - cmd.ensure_finalized() - assert cmd.package_index.scanned_urls == {} - - # let's try without it (default behavior) - cmd = ei.easy_install(dist) - cmd.check_pth_processing = lambda: True - cmd.find_links = ['link1', 'link2'] - cmd.install_dir = os.path.join(tempfile.mkdtemp(), 'ok') - cmd.args = ['ok'] - cmd.ensure_finalized() - keys = sorted(cmd.package_index.scanned_urls.keys()) - assert keys == ['link1', 'link2'] - - def test_write_exception(self): - """ - Test that `cant_write_to_target` is rendered as a DistutilsError. - """ - dist = Distribution() - cmd = ei.easy_install(dist) - cmd.install_dir = os.getcwd() - with pytest.raises(distutils.errors.DistutilsError): - cmd.cant_write_to_target() - - def test_all_site_dirs(self, monkeypatch): - """ - get_site_dirs should always return site dirs reported by - site.getsitepackages. - """ - path = normalize_path('/setuptools/test/site-packages') - - def mock_gsp(): - return [path] - - monkeypatch.setattr(site, 'getsitepackages', mock_gsp, raising=False) - assert path in ei.get_site_dirs() - - def test_all_site_dirs_works_without_getsitepackages(self, monkeypatch): - monkeypatch.delattr(site, 'getsitepackages', raising=False) - assert ei.get_site_dirs() - - @pytest.fixture - def sdist_unicode(self, tmpdir): - files = [ - ( - 'setup.py', - DALS( - """ - import setuptools - setuptools.setup( - name="setuptools-test-unicode", - version="1.0", - packages=["mypkg"], - include_package_data=True, - ) - """ - ), - ), - ( - 'mypkg/__init__.py', - "", - ), - ( - 'mypkg/☃.txt', - "", - ), - ] - sdist_name = 'setuptools-test-unicode-1.0.zip' - sdist = tmpdir / sdist_name - # can't use make_sdist, because the issue only occurs - # with zip sdists. - sdist_zip = zipfile.ZipFile(str(sdist), 'w') - for filename, content in files: - sdist_zip.writestr(filename, content) - sdist_zip.close() - return str(sdist) - - @fail_on_ascii - def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch): - """ - The install command should execute correctly even if - the package has unicode filenames. - """ - dist = Distribution({'script_args': ['easy_install']}) - target = (tmpdir / 'target').ensure_dir() - cmd = ei.easy_install( - dist, - install_dir=str(target), - args=['x'], - ) - monkeypatch.setitem(os.environ, 'PYTHONPATH', str(target)) - cmd.ensure_finalized() - cmd.easy_install(sdist_unicode) - - @pytest.fixture - def sdist_unicode_in_script(self, tmpdir): - files = [ - ( - "setup.py", - DALS( - """ - import setuptools - setuptools.setup( - name="setuptools-test-unicode", - version="1.0", - packages=["mypkg"], - include_package_data=True, - scripts=['mypkg/unicode_in_script'], - ) - """ - ), - ), - ("mypkg/__init__.py", ""), - ( - "mypkg/unicode_in_script", - DALS( - """ - #!/bin/sh - # á - - non_python_fn() { - } - """ - ), - ), - ] - sdist_name = "setuptools-test-unicode-script-1.0.zip" - sdist = tmpdir / sdist_name - # can't use make_sdist, because the issue only occurs - # with zip sdists. - sdist_zip = zipfile.ZipFile(str(sdist), "w") - for filename, content in files: - sdist_zip.writestr(filename, content.encode('utf-8')) - sdist_zip.close() - return str(sdist) - - @fail_on_ascii - def test_unicode_content_in_sdist( - self, sdist_unicode_in_script, tmpdir, monkeypatch - ): - """ - The install command should execute correctly even if - the package has unicode in scripts. - """ - dist = Distribution({"script_args": ["easy_install"]}) - target = (tmpdir / "target").ensure_dir() - cmd = ei.easy_install(dist, install_dir=str(target), args=["x"]) - monkeypatch.setitem(os.environ, "PYTHONPATH", str(target)) - cmd.ensure_finalized() - cmd.easy_install(sdist_unicode_in_script) - - @pytest.fixture - def sdist_script(self, tmpdir): - files = [ - ( - 'setup.py', - DALS( - """ - import setuptools - setuptools.setup( - name="setuptools-test-script", - version="1.0", - scripts=["mypkg_script"], - ) - """ - ), - ), - ( - 'mypkg_script', - DALS( - """ - #/usr/bin/python - print('mypkg_script') - """ - ), - ), - ] - sdist_name = 'setuptools-test-script-1.0.zip' - sdist = str(tmpdir / sdist_name) - make_sdist(sdist, files) - return sdist - - @pytest.mark.skipif( - not sys.platform.startswith('linux'), reason="Test can only be run on Linux" - ) - def test_script_install(self, sdist_script, tmpdir, monkeypatch): - """ - Check scripts are installed. - """ - dist = Distribution({'script_args': ['easy_install']}) - target = (tmpdir / 'target').ensure_dir() - cmd = ei.easy_install( - dist, - install_dir=str(target), - args=['x'], - ) - monkeypatch.setitem(os.environ, 'PYTHONPATH', str(target)) - cmd.ensure_finalized() - cmd.easy_install(sdist_script) - assert (target / 'mypkg_script').exists() - - -@pytest.mark.filterwarnings('ignore:Unbuilt egg') -class TestPTHFileWriter: - def test_add_from_cwd_site_sets_dirty(self): - """a pth file manager should set dirty - if a distribution is in site but also the cwd - """ - pth = PthDistributions('does-not_exist', [os.getcwd()]) - assert not pth.dirty - pth.add(PRDistribution(os.getcwd())) - assert pth.dirty - - def test_add_from_site_is_ignored(self): - location = '/test/location/does-not-have-to-exist' - # PthDistributions expects all locations to be normalized - location = pkg_resources.normalize_path(location) - pth = PthDistributions( - 'does-not_exist', - [ - location, - ], - ) - assert not pth.dirty - pth.add(PRDistribution(location)) - assert not pth.dirty - - def test_many_pth_distributions_merge_together(self, tmpdir): - """ - If the pth file is modified under the hood, then PthDistribution - will refresh its content before saving, merging contents when - necessary. - """ - # putting the pth file in a dedicated sub-folder, - pth_subdir = tmpdir.join("pth_subdir") - pth_subdir.mkdir() - pth_path = str(pth_subdir.join("file1.pth")) - pth1 = PthDistributions(pth_path) - pth2 = PthDistributions(pth_path) - assert pth1.paths == pth2.paths == [], ( - "unless there would be some default added at some point" - ) - # and so putting the src_subdir in folder distinct than the pth one, - # so to keep it absolute by PthDistributions - new_src_path = tmpdir.join("src_subdir") - new_src_path.mkdir() # must exist to be accounted - new_src_path_str = str(new_src_path) - pth1.paths.append(new_src_path_str) - pth1.save() - assert pth1.paths, ( - "the new_src_path added must still be present/valid in pth1 after save" - ) - # now, - assert new_src_path_str not in pth2.paths, ( - "right before we save the entry should still not be present" - ) - pth2.save() - assert new_src_path_str in pth2.paths, ( - "the new_src_path entry should have been added by pth2 with its save() call" - ) - assert pth2.paths[-1] == new_src_path, ( - "and it should match exactly on the last entry actually " - "given we append to it in save()" - ) - # finally, - assert PthDistributions(pth_path).paths == pth2.paths, ( - "and we should have the exact same list at the end " - "with a fresh PthDistributions instance" - ) - - -@pytest.fixture -def setup_context(tmpdir): - with (tmpdir / 'setup.py').open('w', encoding="utf-8") as f: - f.write(SETUP_PY) - with tmpdir.as_cwd(): - yield tmpdir - - -@pytest.mark.usefixtures("user_override") -@pytest.mark.usefixtures("setup_context") -class TestUserInstallTest: - # prevent check that site-packages is writable. easy_install - # shouldn't be writing to system site-packages during finalize - # options, but while it does, bypass the behavior. - prev_sp_write = mock.patch( - 'setuptools.command.easy_install.easy_install.check_site_dir', - mock.Mock(), - ) - - # simulate setuptools installed in user site packages - @mock.patch('setuptools.command.easy_install.__file__', site.USER_SITE) - @mock.patch('site.ENABLE_USER_SITE', True) - @prev_sp_write - def test_user_install_not_implied_user_site_enabled(self): - self.assert_not_user_site() - - @mock.patch('site.ENABLE_USER_SITE', False) - @prev_sp_write - def test_user_install_not_implied_user_site_disabled(self): - self.assert_not_user_site() - - @staticmethod - def assert_not_user_site(): - # create a finalized easy_install command - dist = Distribution() - dist.script_name = 'setup.py' - cmd = ei.easy_install(dist) - cmd.args = ['py'] - cmd.ensure_finalized() - assert not cmd.user, 'user should not be implied' - - def test_multiproc_atexit(self): - pytest.importorskip('multiprocessing') - - log = logging.getLogger('test_easy_install') - logging.basicConfig(level=logging.INFO, stream=sys.stderr) - log.info('this should not break') - - @pytest.fixture - def foo_package(self, tmpdir): - egg_file = tmpdir / 'foo-1.0.egg-info' - with egg_file.open('w') as f: - f.write('Name: foo\n') - return str(tmpdir) - - @pytest.fixture - def install_target(self, tmpdir): - target = str(tmpdir) - with mock.patch('sys.path', sys.path + [target]): - python_path = os.path.pathsep.join(sys.path) - with mock.patch.dict(os.environ, PYTHONPATH=python_path): - yield target - - def test_local_index(self, foo_package, install_target): - """ - The local index must be used when easy_install locates installed - packages. - """ - dist = Distribution() - dist.script_name = 'setup.py' - cmd = ei.easy_install(dist) - cmd.install_dir = install_target - cmd.args = ['foo'] - cmd.ensure_finalized() - cmd.local_index.scan([foo_package]) - res = cmd.easy_install('foo') - actual = os.path.normcase(os.path.realpath(res.location)) - expected = os.path.normcase(os.path.realpath(foo_package)) - assert actual == expected - - @contextlib.contextmanager - def user_install_setup_context(self, *args, **kwargs): - """ - Wrap sandbox.setup_context to patch easy_install in that context to - appear as user-installed. - """ - with self.orig_context(*args, **kwargs): - import setuptools.command.easy_install as ei - - ei.__file__ = site.USER_SITE - yield - - def patched_setup_context(self): - self.orig_context = sandbox.setup_context - - return mock.patch( - 'setuptools.sandbox.setup_context', - self.user_install_setup_context, - ) - - -@pytest.fixture -def distutils_package(): - distutils_setup_py = SETUP_PY.replace( - 'from setuptools import setup', - 'from distutils.core import setup', - ) - with contexts.tempdir(cd=os.chdir): - with open('setup.py', 'w', encoding="utf-8") as f: - f.write(distutils_setup_py) - yield - - -@pytest.mark.usefixtures("distutils_package") -class TestDistutilsPackage: - def test_bdist_egg_available_on_distutils_pkg(self): - run_setup('setup.py', ['bdist_egg']) - - -@pytest.fixture -def mock_index(): - # set up a server which will simulate an alternate package index. - p_index = MockServer() - if p_index.server_port == 0: - # Some platforms (Jython) don't find a port to which to bind, - # so skip test for them. - pytest.skip("could not find a valid port") - p_index.start() - return p_index - - -class TestInstallRequires: - def test_setup_install_includes_dependencies(self, tmp_path, mock_index): - """ - When ``python setup.py install`` is called directly, it will use easy_install - to fetch dependencies. - """ - # TODO: Remove these tests once `setup.py install` is completely removed - project_root = tmp_path / "project" - project_root.mkdir(exist_ok=True) - install_root = tmp_path / "install" - install_root.mkdir(exist_ok=True) - - self.create_project(project_root) - cmd = [ - sys.executable, - '-c', - '__import__("setuptools").setup()', - 'install', - '--install-base', - str(install_root), - '--install-lib', - str(install_root), - '--install-headers', - str(install_root), - '--install-scripts', - str(install_root), - '--install-data', - str(install_root), - '--install-purelib', - str(install_root), - '--install-platlib', - str(install_root), - ] - env = {**os.environ, "__EASYINSTALL_INDEX": mock_index.url} - cp = subprocess.run( - cmd, - cwd=str(project_root), - env=env, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - encoding="utf-8", - ) - assert cp.returncode != 0 - try: - assert '/does-not-exist/' in {r.path for r in mock_index.requests} - assert next( - line - for line in cp.stdout.splitlines() - if "not find suitable distribution for" in line - and "does-not-exist" in line - ) - except Exception: - if "failed to get random numbers" in cp.stdout: - pytest.xfail(f"{sys.platform} failure - {cp.stdout}") - raise - - def create_project(self, root): - config = """ - [metadata] - name = project - version = 42 - - [options] - install_requires = does-not-exist - py_modules = mod - """ - (root / 'setup.cfg').write_text(DALS(config), encoding="utf-8") - (root / 'mod.py').touch() - - -class TestSetupRequires: - def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch): - """ - When easy_install installs a source distribution which specifies - setup_requires, it should honor the fetch parameters (such as - index-url, and find-links). - """ - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - monkeypatch.setenv('PIP_NO_INDEX', 'false') - with contexts.quiet(): - # create an sdist that has a build-time dependency. - with TestSetupRequires.create_sdist() as dist_file: - with contexts.tempdir() as temp_install_dir: - with contexts.environment(PYTHONPATH=temp_install_dir): - cmd = [ - sys.executable, - '-c', - '__import__("setuptools").setup()', - 'easy_install', - '--index-url', - mock_index.url, - '--exclude-scripts', - '--install-dir', - temp_install_dir, - dist_file, - ] - subprocess.Popen(cmd).wait() - # there should have been one requests to the server - assert [r.path for r in mock_index.requests] == ['/does-not-exist/'] - - @staticmethod - @contextlib.contextmanager - def create_sdist(): - """ - Return an sdist with a setup_requires dependency (of something that - doesn't exist) - """ - with contexts.tempdir() as dir: - dist_path = os.path.join(dir, 'setuptools-test-fetcher-1.0.tar.gz') - make_sdist( - dist_path, - [ - ( - 'setup.py', - DALS( - """ - import setuptools - setuptools.setup( - name="setuptools-test-fetcher", - version="1.0", - setup_requires = ['does-not-exist'], - ) - """ - ), - ), - ('setup.cfg', ''), - ], - ) - yield dist_path - - use_setup_cfg = ( - (), - ('dependency_links',), - ('setup_requires',), - ('dependency_links', 'setup_requires'), - ) - - @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg) - def test_setup_requires_overrides_version_conflict(self, use_setup_cfg): - """ - Regression test for distribution issue 323: - https://bitbucket.org/tarek/distribute/issues/323 - - Ensures that a distribution's setup_requires requirements can still be - installed and used locally even if a conflicting version of that - requirement is already on the path. - """ - - fake_dist = PRDistribution( - 'does-not-matter', project_name='foobar', version='0.0' - ) - working_set.add(fake_dist) - - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - test_pkg = create_setup_requires_package( - temp_dir, use_setup_cfg=use_setup_cfg - ) - test_setup_py = os.path.join(test_pkg, 'setup.py') - with contexts.quiet() as (stdout, _stderr): - # Don't even need to install the package, just - # running the setup.py at all is sufficient - run_setup(test_setup_py, ['--name']) - - lines = stdout.readlines() - assert len(lines) > 0 - assert lines[-1].strip() == 'test_pkg' - - @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg) - def test_setup_requires_override_nspkg(self, use_setup_cfg): - """ - Like ``test_setup_requires_overrides_version_conflict`` but where the - ``setup_requires`` package is part of a namespace package that has - *already* been imported. - """ - - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - foobar_1_archive = os.path.join(temp_dir, 'foo_bar-0.1.tar.gz') - make_nspkg_sdist(foobar_1_archive, 'foo.bar', '0.1') - # Now actually go ahead an extract to the temp dir and add the - # extracted path to sys.path so foo.bar v0.1 is importable - foobar_1_dir = os.path.join(temp_dir, 'foo_bar-0.1') - os.mkdir(foobar_1_dir) - with tarfile.open(foobar_1_archive) as tf: - tf.extraction_filter = lambda member, path: member - tf.extractall(foobar_1_dir) - sys.path.insert(1, foobar_1_dir) - - dist = PRDistribution( - foobar_1_dir, project_name='foo.bar', version='0.1' - ) - working_set.add(dist) - - template = DALS( - """\ - import foo # Even with foo imported first the - # setup_requires package should override - import setuptools - setuptools.setup(**%r) - - if not (hasattr(foo, '__path__') and - len(foo.__path__) == 2): - print('FAIL') - - if 'foo_bar-0.2' not in foo.__path__[0]: - print('FAIL') - """ - ) - - test_pkg = create_setup_requires_package( - temp_dir, - 'foo.bar', - '0.2', - make_nspkg_sdist, - template, - use_setup_cfg=use_setup_cfg, - ) - - test_setup_py = os.path.join(test_pkg, 'setup.py') - - with contexts.quiet() as (stdout, _stderr): - try: - # Don't even need to install the package, just - # running the setup.py at all is sufficient - run_setup(test_setup_py, ['--name']) - except pkg_resources.VersionConflict: # pragma: nocover - pytest.fail( - 'Installing setup.py requirements caused a VersionConflict' - ) - - assert 'FAIL' not in stdout.getvalue() - lines = stdout.readlines() - assert len(lines) > 0 - assert lines[-1].strip() == 'test_pkg' - - @pytest.mark.parametrize('use_setup_cfg', use_setup_cfg) - def test_setup_requires_with_attr_version(self, use_setup_cfg): - def make_dependency_sdist(dist_path, distname, version): - files = [ - ( - 'setup.py', - DALS( - f""" - import setuptools - setuptools.setup( - name={distname!r}, - version={version!r}, - py_modules=[{distname!r}], - ) - """ - ), - ), - ( - distname + '.py', - DALS( - """ - version = 42 - """ - ), - ), - ] - make_sdist(dist_path, files) - - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - test_pkg = create_setup_requires_package( - temp_dir, - setup_attrs=dict(version='attr: foobar.version'), - make_package=make_dependency_sdist, - use_setup_cfg=use_setup_cfg + ('version',), - ) - test_setup_py = os.path.join(test_pkg, 'setup.py') - with contexts.quiet() as (stdout, _stderr): - run_setup(test_setup_py, ['--version']) - lines = stdout.readlines() - assert len(lines) > 0 - assert lines[-1].strip() == '42' - - def test_setup_requires_honors_pip_env(self, mock_index, monkeypatch): - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - monkeypatch.setenv('PIP_NO_INDEX', 'false') - monkeypatch.setenv('PIP_INDEX_URL', mock_index.url) - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - test_pkg = create_setup_requires_package( - temp_dir, - 'python-xlib', - '0.19', - setup_attrs=dict(dependency_links=[]), - ) - test_setup_cfg = os.path.join(test_pkg, 'setup.cfg') - with open(test_setup_cfg, 'w', encoding="utf-8") as fp: - fp.write( - DALS( - """ - [easy_install] - index_url = https://pypi.org/legacy/ - """ - ) - ) - test_setup_py = os.path.join(test_pkg, 'setup.py') - with pytest.raises(distutils.errors.DistutilsError): - run_setup(test_setup_py, ['--version']) - assert len(mock_index.requests) == 1 - assert mock_index.requests[0].path == '/python-xlib/' - - def test_setup_requires_with_pep508_url(self, mock_index, monkeypatch): - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - monkeypatch.setenv('PIP_INDEX_URL', mock_index.url) - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - dep_sdist = os.path.join(temp_dir, 'dep.tar.gz') - make_trivial_sdist(dep_sdist, 'dependency', '42') - dep_url = path_to_url(dep_sdist, authority='localhost') - test_pkg = create_setup_requires_package( - temp_dir, - # Ignored (overridden by setup_attrs) - 'python-xlib', - '0.19', - setup_attrs=dict(setup_requires=f'dependency @ {dep_url}'), - ) - test_setup_py = os.path.join(test_pkg, 'setup.py') - run_setup(test_setup_py, ['--version']) - assert len(mock_index.requests) == 0 - - def test_setup_requires_with_allow_hosts(self, mock_index): - """The `allow-hosts` option in not supported anymore.""" - files = { - 'test_pkg': { - 'setup.py': DALS( - """ - from setuptools import setup - setup(setup_requires='python-xlib') - """ - ), - 'setup.cfg': DALS( - """ - [easy_install] - allow_hosts = * - """ - ), - } - } - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - path.build(files, prefix=temp_dir) - setup_py = str(pathlib.Path(temp_dir, 'test_pkg', 'setup.py')) - with pytest.raises(distutils.errors.DistutilsError): - run_setup(setup_py, ['--version']) - assert len(mock_index.requests) == 0 - - def test_setup_requires_with_python_requires(self, monkeypatch, tmpdir): - """Check `python_requires` is honored.""" - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - monkeypatch.setenv('PIP_NO_INDEX', '1') - monkeypatch.setenv('PIP_VERBOSE', '1') - dep_1_0_sdist = 'dep-1.0.tar.gz' - dep_1_0_url = path_to_url(str(tmpdir / dep_1_0_sdist)) - dep_1_0_python_requires = '>=2.7' - make_python_requires_sdist( - str(tmpdir / dep_1_0_sdist), 'dep', '1.0', dep_1_0_python_requires - ) - dep_2_0_sdist = 'dep-2.0.tar.gz' - dep_2_0_url = path_to_url(str(tmpdir / dep_2_0_sdist)) - dep_2_0_python_requires = ( - f'!={sys.version_info.major}.{sys.version_info.minor}.*' - ) - make_python_requires_sdist( - str(tmpdir / dep_2_0_sdist), 'dep', '2.0', dep_2_0_python_requires - ) - index = tmpdir / 'index.html' - index.write_text( - DALS( - """ - - Links for dep - -

Links for dep

- {dep_1_0_sdist}
- {dep_2_0_sdist}
- - - """ - ).format( - dep_1_0_url=dep_1_0_url, - dep_1_0_sdist=dep_1_0_sdist, - dep_1_0_python_requires=dep_1_0_python_requires, - dep_2_0_url=dep_2_0_url, - dep_2_0_sdist=dep_2_0_sdist, - dep_2_0_python_requires=dep_2_0_python_requires, - ), - 'utf-8', - ) - index_url = path_to_url(str(index)) - with contexts.save_pkg_resources_state(): - test_pkg = create_setup_requires_package( - str(tmpdir), - 'python-xlib', - '0.19', # Ignored (overridden by setup_attrs). - setup_attrs=dict(setup_requires='dep', dependency_links=[index_url]), - ) - test_setup_py = os.path.join(test_pkg, 'setup.py') - run_setup(test_setup_py, ['--version']) - eggs = list( - map(str, pkg_resources.find_distributions(os.path.join(test_pkg, '.eggs'))) - ) - assert eggs == ['dep 1.0'] - - @pytest.mark.parametrize('with_dependency_links_in_setup_py', (False, True)) - def test_setup_requires_with_find_links_in_setup_cfg( - self, monkeypatch, with_dependency_links_in_setup_py - ): - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - make_trivial_sdist( - os.path.join(temp_dir, 'python-xlib-42.tar.gz'), 'python-xlib', '42' - ) - test_pkg = os.path.join(temp_dir, 'test_pkg') - test_setup_py = os.path.join(test_pkg, 'setup.py') - test_setup_cfg = os.path.join(test_pkg, 'setup.cfg') - os.mkdir(test_pkg) - with open(test_setup_py, 'w', encoding="utf-8") as fp: - if with_dependency_links_in_setup_py: - dependency_links = [os.path.join(temp_dir, 'links')] - else: - dependency_links = [] - fp.write( - DALS( - """ - from setuptools import installer, setup - setup(setup_requires='python-xlib==42', - dependency_links={dependency_links!r}) - """ - ).format(dependency_links=dependency_links) - ) - with open(test_setup_cfg, 'w', encoding="utf-8") as fp: - fp.write( - DALS( - """ - [easy_install] - index_url = {index_url} - find_links = {find_links} - """ - ).format( - index_url=os.path.join(temp_dir, 'index'), - find_links=temp_dir, - ) - ) - run_setup(test_setup_py, ['--version']) - - def test_setup_requires_with_transitive_extra_dependency(self, monkeypatch): - """ - Use case: installing a package with a build dependency on - an already installed `dep[extra]`, which in turn depends - on `extra_dep` (whose is not already installed). - """ - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - # Create source distribution for `extra_dep`. - make_trivial_sdist( - os.path.join(temp_dir, 'extra_dep-1.0.tar.gz'), 'extra_dep', '1.0' - ) - # Create source tree for `dep`. - dep_pkg = os.path.join(temp_dir, 'dep') - os.mkdir(dep_pkg) - path.build( - { - 'setup.py': DALS( - """ - import setuptools - setuptools.setup( - name='dep', version='2.0', - extras_require={'extra': ['extra_dep']}, - ) - """ - ), - 'setup.cfg': '', - }, - prefix=dep_pkg, - ) - # "Install" dep. - run_setup(os.path.join(dep_pkg, 'setup.py'), ['dist_info']) - working_set.add_entry(dep_pkg) - # Create source tree for test package. - test_pkg = os.path.join(temp_dir, 'test_pkg') - test_setup_py = os.path.join(test_pkg, 'setup.py') - os.mkdir(test_pkg) - with open(test_setup_py, 'w', encoding="utf-8") as fp: - fp.write( - DALS( - """ - from setuptools import installer, setup - setup(setup_requires='dep[extra]') - """ - ) - ) - # Check... - monkeypatch.setenv('PIP_FIND_LINKS', str(temp_dir)) - monkeypatch.setenv('PIP_NO_INDEX', '1') - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - run_setup(test_setup_py, ['--version']) - - def test_setup_requires_with_distutils_command_dep(self, monkeypatch): - """ - Use case: ensure build requirements' extras - are properly installed and activated. - """ - with contexts.save_pkg_resources_state(): - with contexts.tempdir() as temp_dir: - # Create source distribution for `extra_dep`. - make_sdist( - os.path.join(temp_dir, 'extra_dep-1.0.tar.gz'), - [ - ( - 'setup.py', - DALS( - """ - import setuptools - setuptools.setup( - name='extra_dep', - version='1.0', - py_modules=['extra_dep'], - ) - """ - ), - ), - ('setup.cfg', ''), - ('extra_dep.py', ''), - ], - ) - # Create source tree for `epdep`. - dep_pkg = os.path.join(temp_dir, 'epdep') - os.mkdir(dep_pkg) - path.build( - { - 'setup.py': DALS( - """ - import setuptools - setuptools.setup( - name='dep', version='2.0', - py_modules=['epcmd'], - extras_require={'extra': ['extra_dep']}, - entry_points=''' - [distutils.commands] - epcmd = epcmd:epcmd [extra] - ''', - ) - """ - ), - 'setup.cfg': '', - 'epcmd.py': DALS( - """ - from distutils.command.build_py import build_py - - import extra_dep - - class epcmd(build_py): - pass - """ - ), - }, - prefix=dep_pkg, - ) - # "Install" dep. - run_setup(os.path.join(dep_pkg, 'setup.py'), ['dist_info']) - working_set.add_entry(dep_pkg) - # Create source tree for test package. - test_pkg = os.path.join(temp_dir, 'test_pkg') - test_setup_py = os.path.join(test_pkg, 'setup.py') - os.mkdir(test_pkg) - with open(test_setup_py, 'w', encoding="utf-8") as fp: - fp.write( - DALS( - """ - from setuptools import installer, setup - setup(setup_requires='dep[extra]') - """ - ) - ) - # Check... - monkeypatch.setenv('PIP_FIND_LINKS', str(temp_dir)) - monkeypatch.setenv('PIP_NO_INDEX', '1') - monkeypatch.setenv('PIP_RETRIES', '0') - monkeypatch.setenv('PIP_TIMEOUT', '0') - run_setup(test_setup_py, ['epcmd']) - - -def make_trivial_sdist(dist_path, distname, version): - """ - Create a simple sdist tarball at dist_path, containing just a simple - setup.py. - """ - - make_sdist( - dist_path, - [ - ( - 'setup.py', - DALS( - f"""\ - import setuptools - setuptools.setup( - name={distname!r}, - version={version!r} - ) - """ - ), - ), - ('setup.cfg', ''), - ], - ) - - -def make_nspkg_sdist(dist_path, distname, version): - """ - Make an sdist tarball with distname and version which also contains one - package with the same name as distname. The top-level package is - designated a namespace package). - """ - # Assert that the distname contains at least one period - assert '.' in distname - - parts = distname.split('.') - nspackage = parts[0] - - packages = ['.'.join(parts[:idx]) for idx in range(1, len(parts) + 1)] - - setup_py = DALS( - f"""\ - import setuptools - setuptools.setup( - name={distname!r}, - version={version!r}, - packages={packages!r}, - namespace_packages=[{nspackage!r}] - ) - """ - ) - - init = "__import__('pkg_resources').declare_namespace(__name__)" - - files = [('setup.py', setup_py), (os.path.join(nspackage, '__init__.py'), init)] - for package in packages[1:]: - filename = os.path.join(*(package.split('.') + ['__init__.py'])) - files.append((filename, '')) - - make_sdist(dist_path, files) - - -def make_python_requires_sdist(dist_path, distname, version, python_requires): - make_sdist( - dist_path, - [ - ( - 'setup.py', - DALS( - """\ - import setuptools - setuptools.setup( - name={name!r}, - version={version!r}, - python_requires={python_requires!r}, - ) - """ - ).format( - name=distname, version=version, python_requires=python_requires - ), - ), - ('setup.cfg', ''), - ], - ) - - -def make_sdist(dist_path, files): - """ - Create a simple sdist tarball at dist_path, containing the files - listed in ``files`` as ``(filename, content)`` tuples. - """ - - # Distributions with only one file don't play well with pip. - assert len(files) > 1 - with tarfile.open(dist_path, 'w:gz') as dist: - for filename, content in files: - file_bytes = io.BytesIO(content.encode('utf-8')) - file_info = tarfile.TarInfo(name=filename) - file_info.size = len(file_bytes.getvalue()) - file_info.mtime = int(time.time()) - dist.addfile(file_info, fileobj=file_bytes) - - -def create_setup_requires_package( - path, - distname='foobar', - version='0.1', - make_package=make_trivial_sdist, - setup_py_template=None, - setup_attrs=None, - use_setup_cfg=(), -): - """Creates a source tree under path for a trivial test package that has a - single requirement in setup_requires--a tarball for that requirement is - also created and added to the dependency_links argument. - - ``distname`` and ``version`` refer to the name/version of the package that - the test package requires via ``setup_requires``. The name of the test - package itself is just 'test_pkg'. - """ - - normalized_distname = safer_name(distname) - test_setup_attrs = { - 'name': 'test_pkg', - 'version': '0.0', - 'setup_requires': [f'{normalized_distname}=={version}'], - 'dependency_links': [os.path.abspath(path)], - } - if setup_attrs: - test_setup_attrs.update(setup_attrs) - - test_pkg = os.path.join(path, 'test_pkg') - os.mkdir(test_pkg) - - # setup.cfg - if use_setup_cfg: - options = [] - metadata = [] - for name in use_setup_cfg: - value = test_setup_attrs.pop(name) - if name in 'name version'.split(): - section = metadata - else: - section = options - if isinstance(value, (tuple, list)): - value = ';'.join(value) - section.append(f'{name}: {value}') - test_setup_cfg_contents = DALS( - """ - [metadata] - {metadata} - [options] - {options} - """ - ).format( - options='\n'.join(options), - metadata='\n'.join(metadata), - ) - else: - test_setup_cfg_contents = '' - with open(os.path.join(test_pkg, 'setup.cfg'), 'w', encoding="utf-8") as f: - f.write(test_setup_cfg_contents) - - # setup.py - if setup_py_template is None: - setup_py_template = DALS( - """\ - import setuptools - setuptools.setup(**%r) - """ - ) - with open(os.path.join(test_pkg, 'setup.py'), 'w', encoding="utf-8") as f: - f.write(setup_py_template % test_setup_attrs) - - foobar_path = os.path.join(path, f'{normalized_distname}-{version}.tar.gz') - make_package(foobar_path, distname, version) - - return test_pkg - - -@pytest.mark.skipif( - sys.platform.startswith('java') and ei.is_sh(sys.executable), - reason="Test cannot run under java when executable is sh", -) -class TestScriptHeader: - non_ascii_exe = '/Users/José/bin/python' - exe_with_spaces = r'C:\Program Files\Python36\python.exe' - - def test_get_script_header(self): - expected = f'#!{ei.nt_quote_arg(os.path.normpath(sys.executable))}\n' - actual = ei.ScriptWriter.get_header('#!/usr/local/bin/python') - assert actual == expected - - def test_get_script_header_args(self): - expected = f'#!{ei.nt_quote_arg(os.path.normpath(sys.executable))} -x\n' - actual = ei.ScriptWriter.get_header('#!/usr/bin/python -x') - assert actual == expected - - def test_get_script_header_non_ascii_exe(self): - actual = ei.ScriptWriter.get_header( - '#!/usr/bin/python', executable=self.non_ascii_exe - ) - expected = f'#!{self.non_ascii_exe} -x\n' - assert actual == expected - - def test_get_script_header_exe_with_spaces(self): - actual = ei.ScriptWriter.get_header( - '#!/usr/bin/python', executable='"' + self.exe_with_spaces + '"' - ) - expected = f'#!"{self.exe_with_spaces}"\n' - assert actual == expected - - -class TestCommandSpec: - def test_custom_launch_command(self): - """ - Show how a custom CommandSpec could be used to specify a #! executable - which takes parameters. - """ - cmd = ei.CommandSpec(['/usr/bin/env', 'python3']) - assert cmd.as_header() == '#!/usr/bin/env python3\n' - - def test_from_param_for_CommandSpec_is_passthrough(self): - """ - from_param should return an instance of a CommandSpec - """ - cmd = ei.CommandSpec(['python']) - cmd_new = ei.CommandSpec.from_param(cmd) - assert cmd is cmd_new - - @mock.patch('sys.executable', TestScriptHeader.exe_with_spaces) - @mock.patch.dict(os.environ) - def test_from_environment_with_spaces_in_executable(self): - os.environ.pop('__PYVENV_LAUNCHER__', None) - cmd = ei.CommandSpec.from_environment() - assert len(cmd) == 1 - assert cmd.as_header().startswith('#!"') - - def test_from_simple_string_uses_shlex(self): - """ - In order to support `executable = /usr/bin/env my-python`, make sure - from_param invokes shlex on that input. - """ - cmd = ei.CommandSpec.from_param('/usr/bin/env my-python') - assert len(cmd) == 2 - assert '"' not in cmd.as_header() - - def test_from_param_raises_expected_error(self) -> None: - """ - from_param should raise its own TypeError when the argument's type is unsupported - """ - with pytest.raises(TypeError) as exc_info: - ei.CommandSpec.from_param(object()) # type: ignore[arg-type] # We want a type error here - assert ( - str(exc_info.value) == "Argument has an unsupported type " - ), exc_info.value - - -class TestWindowsScriptWriter: - def test_header(self): - hdr = ei.WindowsScriptWriter.get_header('') - assert hdr.startswith('#!') - assert hdr.endswith('\n') - hdr = hdr.lstrip('#!') - hdr = hdr.rstrip('\n') - # header should not start with an escaped quote - assert not hdr.startswith('\\"') - - -class VersionStub(NamedTuple): - major: int - minor: int - micro: int - releaselevel: str - serial: int - - -def test_use_correct_python_version_string(tmpdir, tmpdir_cwd, monkeypatch): - # In issue #3001, easy_install wrongly uses the `python3.1` directory - # when the interpreter is `python3.10` and the `--user` option is given. - # See pypa/setuptools#3001. - dist = Distribution() - cmd = dist.get_command_obj('easy_install') - cmd.args = ['ok'] - cmd.optimize = 0 - cmd.user = True - cmd.install_userbase = str(tmpdir) - cmd.install_usersite = None - install_cmd = dist.get_command_obj('install') - install_cmd.install_userbase = str(tmpdir) - install_cmd.install_usersite = None - - with monkeypatch.context() as patch, warnings.catch_warnings(): - warnings.simplefilter("ignore") - version = '3.10.1 (main, Dec 21 2021, 09:17:12) [GCC 10.2.1 20210110]' - info = VersionStub(3, 10, 1, "final", 0) - patch.setattr('site.ENABLE_USER_SITE', True) - patch.setattr('sys.version', version) - patch.setattr('sys.version_info', info) - patch.setattr(cmd, 'create_home_path', mock.Mock()) - cmd.finalize_options() - - name = "pypy" if hasattr(sys, 'pypy_version_info') else "python" - install_dir = cmd.install_dir.lower() - - # In some platforms (e.g. Windows), install_dir is mostly determined - # via `sysconfig`, which define constants eagerly at module creation. - # This means that monkeypatching `sys.version` to emulate 3.10 for testing - # may have no effect. - # The safest test here is to rely on the fact that 3.1 is no longer - # supported/tested, and make sure that if 'python3.1' ever appears in the string - # it is followed by another digit (e.g. 'python3.10'). - if re.search(name + r'3\.?1', install_dir): - assert re.search(name + r'3\.?1\d', install_dir) - - # The following "variables" are used for interpolation in distutils - # installation schemes, so it should be fair to treat them as "semi-public", - # or at least public enough so we can have a test to make sure they are correct - assert cmd.config_vars['py_version'] == '3.10.1' - assert cmd.config_vars['py_version_short'] == '3.10' - assert cmd.config_vars['py_version_nodot'] == '310' - - -@pytest.mark.xfail( - sys.platform == "darwin", - reason="https://github.com/pypa/setuptools/pull/4716#issuecomment-2447624418", -) -def test_editable_user_and_build_isolation(setup_context, monkeypatch, tmp_path): - """`setup.py develop` should honor `--user` even under build isolation""" - - # == Arrange == - # Pretend that build isolation was enabled - # e.g pip sets the environment variable PYTHONNOUSERSITE=1 - monkeypatch.setattr('site.ENABLE_USER_SITE', False) - - # Patching $HOME for 2 reasons: - # 1. setuptools/command/easy_install.py:create_home_path - # tries creating directories in $HOME. - # Given:: - # self.config_vars['DESTDIRS'] = ( - # "/home/user/.pyenv/versions/3.9.10 " - # "/home/user/.pyenv/versions/3.9.10/lib " - # "/home/user/.pyenv/versions/3.9.10/lib/python3.9 " - # "/home/user/.pyenv/versions/3.9.10/lib/python3.9/lib-dynload") - # `create_home_path` will:: - # makedirs( - # "/home/user/.pyenv/versions/3.9.10 " - # "/home/user/.pyenv/versions/3.9.10/lib " - # "/home/user/.pyenv/versions/3.9.10/lib/python3.9 " - # "/home/user/.pyenv/versions/3.9.10/lib/python3.9/lib-dynload") - # - # 2. We are going to force `site` to update site.USER_BASE and site.USER_SITE - # To point inside our new home - monkeypatch.setenv('HOME', str(tmp_path / '.home')) - monkeypatch.setenv('USERPROFILE', str(tmp_path / '.home')) - monkeypatch.setenv('APPDATA', str(tmp_path / '.home')) - monkeypatch.setattr('site.USER_BASE', None) - monkeypatch.setattr('site.USER_SITE', None) - user_site = Path(site.getusersitepackages()) - user_site.mkdir(parents=True, exist_ok=True) - - sys_prefix = tmp_path / '.sys_prefix' - sys_prefix.mkdir(parents=True, exist_ok=True) - monkeypatch.setattr('sys.prefix', str(sys_prefix)) - - setup_script = ( - "__import__('setuptools').setup(name='aproj', version=42, packages=[])\n" - ) - (tmp_path / "setup.py").write_text(setup_script, encoding="utf-8") - - # == Sanity check == - assert list(sys_prefix.glob("*")) == [] - assert list(user_site.glob("*")) == [] - - # == Act == - run_setup('setup.py', ['develop', '--user']) - - # == Assert == - # Should not install to sys.prefix - assert list(sys_prefix.glob("*")) == [] - # Should install to user site - installed = {f.name for f in user_site.glob("*")} - # sometimes easy-install.pth is created and sometimes not - installed = installed - {"easy-install.pth"} - assert installed == {'aproj.egg-link'} diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_editable_install.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_editable_install.py deleted file mode 100644 index 038dcad..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_editable_install.py +++ /dev/null @@ -1,1289 +0,0 @@ -from __future__ import annotations - -import os -import platform -import stat -import subprocess -import sys -from copy import deepcopy -from importlib import import_module -from importlib.machinery import EXTENSION_SUFFIXES -from pathlib import Path -from textwrap import dedent -from typing import Any -from unittest.mock import Mock -from uuid import uuid4 - -import jaraco.envs -import jaraco.path -import pytest -from path import Path as _Path - -from setuptools._importlib import resources as importlib_resources -from setuptools.command.editable_wheel import ( - _DebuggingTips, - _encode_pth, - _find_namespaces, - _find_package_roots, - _find_virtual_namespaces, - _finder_template, - _LinkTree, - _TopLevelFinder, - editable_wheel, -) -from setuptools.dist import Distribution -from setuptools.extension import Extension -from setuptools.warnings import SetuptoolsDeprecationWarning - -from . import contexts, namespaces - -from distutils.core import run_setup - - -@pytest.fixture(params=["strict", "lenient"]) -def editable_opts(request): - if request.param == "strict": - return ["--config-settings", "editable-mode=strict"] - return [] - - -EXAMPLE = { - 'pyproject.toml': dedent( - """\ - [build-system] - requires = ["setuptools"] - build-backend = "setuptools.build_meta" - - [project] - name = "mypkg" - version = "3.14159" - license = {text = "MIT"} - description = "This is a Python package" - dynamic = ["readme"] - classifiers = [ - "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers" - ] - urls = {Homepage = "https://github.com"} - - [tool.setuptools] - package-dir = {"" = "src"} - packages = {find = {where = ["src"]}} - license-files = ["LICENSE*"] - - [tool.setuptools.dynamic] - readme = {file = "README.rst"} - - [tool.distutils.egg_info] - tag-build = ".post0" - """ - ), - "MANIFEST.in": dedent( - """\ - global-include *.py *.txt - global-exclude *.py[cod] - prune dist - prune build - """ - ).strip(), - "README.rst": "This is a ``README``", - "LICENSE.txt": "---- placeholder MIT license ----", - "src": { - "mypkg": { - "__init__.py": dedent( - """\ - import sys - from importlib.metadata import PackageNotFoundError, version - - try: - __version__ = version(__name__) - except PackageNotFoundError: - __version__ = "unknown" - """ - ), - "__main__.py": dedent( - """\ - from importlib.resources import read_text - from . import __version__, __name__ as parent - from .mod import x - - data = read_text(parent, "data.txt") - print(__version__, data, x) - """ - ), - "mod.py": "x = ''", - "data.txt": "Hello World", - } - }, -} - - -SETUP_SCRIPT_STUB = "__import__('setuptools').setup()" - - -@pytest.mark.xfail(sys.platform == "darwin", reason="pypa/setuptools#4328") -@pytest.mark.parametrize( - "files", - [ - {**EXAMPLE, "setup.py": SETUP_SCRIPT_STUB}, - EXAMPLE, # No setup.py script - ], -) -def test_editable_with_pyproject(tmp_path, venv, files, editable_opts): - project = tmp_path / "mypkg" - project.mkdir() - jaraco.path.build(files, prefix=project) - - cmd = [ - "python", - "-m", - "pip", - "install", - "--no-build-isolation", # required to force current version of setuptools - "-e", - str(project), - *editable_opts, - ] - print(venv.run(cmd)) - - cmd = ["python", "-m", "mypkg"] - assert venv.run(cmd).strip() == "3.14159.post0 Hello World" - - (project / "src/mypkg/data.txt").write_text("foobar", encoding="utf-8") - (project / "src/mypkg/mod.py").write_text("x = 42", encoding="utf-8") - assert venv.run(cmd).strip() == "3.14159.post0 foobar 42" - - -def test_editable_with_flat_layout(tmp_path, venv, editable_opts): - files = { - "mypkg": { - "pyproject.toml": dedent( - """\ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "mypkg" - version = "3.14159" - - [tool.setuptools] - packages = ["pkg"] - py-modules = ["mod"] - """ - ), - "pkg": {"__init__.py": "a = 4"}, - "mod.py": "b = 2", - }, - } - jaraco.path.build(files, prefix=tmp_path) - project = tmp_path / "mypkg" - - cmd = [ - "python", - "-m", - "pip", - "install", - "--no-build-isolation", # required to force current version of setuptools - "-e", - str(project), - *editable_opts, - ] - print(venv.run(cmd)) - cmd = ["python", "-c", "import pkg, mod; print(pkg.a, mod.b)"] - assert venv.run(cmd).strip() == "4 2" - - -def test_editable_with_single_module(tmp_path, venv, editable_opts): - files = { - "mypkg": { - "pyproject.toml": dedent( - """\ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "mod" - version = "3.14159" - - [tool.setuptools] - py-modules = ["mod"] - """ - ), - "mod.py": "b = 2", - }, - } - jaraco.path.build(files, prefix=tmp_path) - project = tmp_path / "mypkg" - - cmd = [ - "python", - "-m", - "pip", - "install", - "--no-build-isolation", # required to force current version of setuptools - "-e", - str(project), - *editable_opts, - ] - print(venv.run(cmd)) - cmd = ["python", "-c", "import mod; print(mod.b)"] - assert venv.run(cmd).strip() == "2" - - -class TestLegacyNamespaces: - # legacy => pkg_resources.declare_namespace(...) + setup(namespace_packages=...) - - def test_nspkg_file_is_unique(self, tmp_path, monkeypatch): - deprecation = pytest.warns( - SetuptoolsDeprecationWarning, match=".*namespace_packages parameter.*" - ) - installation_dir = tmp_path / ".installation_dir" - installation_dir.mkdir() - examples = ( - "myns.pkgA", - "myns.pkgB", - "myns.n.pkgA", - "myns.n.pkgB", - ) - - for name in examples: - pkg = namespaces.build_namespace_package(tmp_path, name, version="42") - with deprecation, monkeypatch.context() as ctx: - ctx.chdir(pkg) - dist = run_setup("setup.py", stop_after="config") - cmd = editable_wheel(dist) - cmd.finalize_options() - editable_name = cmd.get_finalized_command("dist_info").name - cmd._install_namespaces(installation_dir, editable_name) - - files = list(installation_dir.glob("*-nspkg.pth")) - assert len(files) == len(examples) - - @pytest.mark.parametrize( - "impl", - ( - "pkg_resources", - # "pkgutil", => does not work - ), - ) - @pytest.mark.parametrize("ns", ("myns.n",)) - def test_namespace_package_importable( - self, venv, tmp_path, ns, impl, editable_opts - ): - """ - Installing two packages sharing the same namespace, one installed - naturally using pip or `--single-version-externally-managed` - and the other installed in editable mode should leave the namespace - intact and both packages reachable by import. - (Ported from test_develop). - """ - build_system = """\ - [build-system] - requires = ["setuptools"] - build-backend = "setuptools.build_meta" - """ - pkg_A = namespaces.build_namespace_package(tmp_path, f"{ns}.pkgA", impl=impl) - pkg_B = namespaces.build_namespace_package(tmp_path, f"{ns}.pkgB", impl=impl) - (pkg_A / "pyproject.toml").write_text(build_system, encoding="utf-8") - (pkg_B / "pyproject.toml").write_text(build_system, encoding="utf-8") - # use pip to install to the target directory - opts = editable_opts[:] - opts.append("--no-build-isolation") # force current version of setuptools - venv.run(["python", "-m", "pip", "install", str(pkg_A), *opts]) - venv.run(["python", "-m", "pip", "install", "-e", str(pkg_B), *opts]) - venv.run(["python", "-c", f"import {ns}.pkgA; import {ns}.pkgB"]) - # additionally ensure that pkg_resources import works - venv.run(["python", "-c", "import pkg_resources"]) - - -class TestPep420Namespaces: - def test_namespace_package_importable(self, venv, tmp_path, editable_opts): - """ - Installing two packages sharing the same namespace, one installed - normally using pip and the other installed in editable mode - should allow importing both packages. - """ - pkg_A = namespaces.build_pep420_namespace_package(tmp_path, 'myns.n.pkgA') - pkg_B = namespaces.build_pep420_namespace_package(tmp_path, 'myns.n.pkgB') - # use pip to install to the target directory - opts = editable_opts[:] - opts.append("--no-build-isolation") # force current version of setuptools - venv.run(["python", "-m", "pip", "install", str(pkg_A), *opts]) - venv.run(["python", "-m", "pip", "install", "-e", str(pkg_B), *opts]) - venv.run(["python", "-c", "import myns.n.pkgA; import myns.n.pkgB"]) - - def test_namespace_created_via_package_dir(self, venv, tmp_path, editable_opts): - """Currently users can create a namespace by tweaking `package_dir`""" - files = { - "pkgA": { - "pyproject.toml": dedent( - """\ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "pkgA" - version = "3.14159" - - [tool.setuptools] - package-dir = {"myns.n.pkgA" = "src"} - """ - ), - "src": {"__init__.py": "a = 1"}, - }, - } - jaraco.path.build(files, prefix=tmp_path) - pkg_A = tmp_path / "pkgA" - pkg_B = namespaces.build_pep420_namespace_package(tmp_path, 'myns.n.pkgB') - pkg_C = namespaces.build_pep420_namespace_package(tmp_path, 'myns.n.pkgC') - - # use pip to install to the target directory - opts = editable_opts[:] - opts.append("--no-build-isolation") # force current version of setuptools - venv.run(["python", "-m", "pip", "install", str(pkg_A), *opts]) - venv.run(["python", "-m", "pip", "install", "-e", str(pkg_B), *opts]) - venv.run(["python", "-m", "pip", "install", "-e", str(pkg_C), *opts]) - venv.run(["python", "-c", "from myns.n import pkgA, pkgB, pkgC"]) - - def test_namespace_accidental_config_in_lenient_mode(self, venv, tmp_path): - """Sometimes users might specify an ``include`` pattern that ignores parent - packages. In a normal installation this would ignore all modules inside the - parent packages, and make them namespaces (reported in issue #3504), - so the editable mode should preserve this behaviour. - """ - files = { - "pkgA": { - "pyproject.toml": dedent( - """\ - [build-system] - requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] - name = "pkgA" - version = "3.14159" - - [tool.setuptools] - packages.find.include = ["mypkg.*"] - """ - ), - "mypkg": { - "__init__.py": "", - "other.py": "b = 1", - "n": { - "__init__.py": "", - "pkgA.py": "a = 1", - }, - }, - "MANIFEST.in": EXAMPLE["MANIFEST.in"], - }, - } - jaraco.path.build(files, prefix=tmp_path) - pkg_A = tmp_path / "pkgA" - - # use pip to install to the target directory - opts = ["--no-build-isolation"] # force current version of setuptools - venv.run(["python", "-m", "pip", "-v", "install", "-e", str(pkg_A), *opts]) - out = venv.run(["python", "-c", "from mypkg.n import pkgA; print(pkgA.a)"]) - assert out.strip() == "1" - cmd = """\ - try: - import mypkg.other - except ImportError: - print("mypkg.other not defined") - """ - out = venv.run(["python", "-c", dedent(cmd)]) - assert "mypkg.other not defined" in out - - -def test_editable_with_prefix(tmp_path, sample_project, editable_opts): - """ - Editable install to a prefix should be discoverable. - """ - prefix = tmp_path / 'prefix' - - # figure out where pip will likely install the package - site_packages_all = [ - prefix / Path(path).relative_to(sys.prefix) - for path in sys.path - if 'site-packages' in path and path.startswith(sys.prefix) - ] - - for sp in site_packages_all: - sp.mkdir(parents=True) - - # install workaround - _addsitedirs(site_packages_all) - - env = dict(os.environ, PYTHONPATH=os.pathsep.join(map(str, site_packages_all))) - cmd = [ - sys.executable, - '-m', - 'pip', - 'install', - '--editable', - str(sample_project), - '--prefix', - str(prefix), - '--no-build-isolation', - *editable_opts, - ] - subprocess.check_call(cmd, env=env) - - # now run 'sample' with the prefix on the PYTHONPATH - bin = 'Scripts' if platform.system() == 'Windows' else 'bin' - exe = prefix / bin / 'sample' - subprocess.check_call([exe], env=env) - - -class TestFinderTemplate: - """This test focus in getting a particular implementation detail right. - If at some point in time the implementation is changed for something different, - this test can be modified or even excluded. - """ - - def install_finder(self, finder): - loc = {} - exec(finder, loc, loc) - loc["install"]() - - def test_packages(self, tmp_path): - files = { - "src1": { - "pkg1": { - "__init__.py": "", - "subpkg": {"mod1.py": "a = 42"}, - }, - }, - "src2": {"mod2.py": "a = 43"}, - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = { - "pkg1": str(tmp_path / "src1/pkg1"), - "mod2": str(tmp_path / "src2/mod2"), - } - template = _finder_template(str(uuid4()), mapping, {}) - - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ("pkg1", "pkg1.subpkg", "pkg1.subpkg.mod1", "mod2"): - sys.modules.pop(mod, None) - - self.install_finder(template) - mod1 = import_module("pkg1.subpkg.mod1") - mod2 = import_module("mod2") - subpkg = import_module("pkg1.subpkg") - - assert mod1.a == 42 - assert mod2.a == 43 - expected = str((tmp_path / "src1/pkg1/subpkg").resolve()) - assert_path(subpkg, expected) - - def test_namespace(self, tmp_path): - files = {"pkg": {"__init__.py": "a = 13", "text.txt": "abc"}} - jaraco.path.build(files, prefix=tmp_path) - - mapping = {"ns.othername": str(tmp_path / "pkg")} - namespaces = {"ns": []} - - template = _finder_template(str(uuid4()), mapping, namespaces) - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ("ns", "ns.othername"): - sys.modules.pop(mod, None) - - self.install_finder(template) - pkg = import_module("ns.othername") - text = importlib_resources.files(pkg) / "text.txt" - - expected = str((tmp_path / "pkg").resolve()) - assert_path(pkg, expected) - assert pkg.a == 13 - - # Make sure resources can also be found - assert text.read_text(encoding="utf-8") == "abc" - - def test_combine_namespaces(self, tmp_path): - files = { - "src1": {"ns": {"pkg1": {"__init__.py": "a = 13"}}}, - "src2": {"ns": {"mod2.py": "b = 37"}}, - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = { - "ns.pkgA": str(tmp_path / "src1/ns/pkg1"), - "ns": str(tmp_path / "src2/ns"), - } - namespaces_ = {"ns": [str(tmp_path / "src1"), str(tmp_path / "src2")]} - template = _finder_template(str(uuid4()), mapping, namespaces_) - - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ("ns", "ns.pkgA", "ns.mod2"): - sys.modules.pop(mod, None) - - self.install_finder(template) - pkgA = import_module("ns.pkgA") - mod2 = import_module("ns.mod2") - - expected = str((tmp_path / "src1/ns/pkg1").resolve()) - assert_path(pkgA, expected) - assert pkgA.a == 13 - assert mod2.b == 37 - - def test_combine_namespaces_nested(self, tmp_path): - """ - Users may attempt to combine namespace packages in a nested way via - ``package_dir`` as shown in pypa/setuptools#4248. - """ - - files = { - "src": {"my_package": {"my_module.py": "a = 13"}}, - "src2": {"my_package2": {"my_module2.py": "b = 37"}}, - } - - stack = jaraco.path.DirectoryStack() - with stack.context(tmp_path): - jaraco.path.build(files) - attrs = { - "script_name": "%PEP 517%", - "package_dir": { - "different_name": "src/my_package", - "different_name.subpkg": "src2/my_package2", - }, - "packages": ["different_name", "different_name.subpkg"], - } - dist = Distribution(attrs) - finder = _TopLevelFinder(dist, str(uuid4())) - code = next(v for k, v in finder.get_implementation() if k.endswith(".py")) - - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in attrs["packages"]: - sys.modules.pop(mod, None) - - self.install_finder(code) - mod1 = import_module("different_name.my_module") - mod2 = import_module("different_name.subpkg.my_module2") - - expected = str((tmp_path / "src/my_package/my_module.py").resolve()) - assert str(Path(mod1.__file__).resolve()) == expected - - expected = str((tmp_path / "src2/my_package2/my_module2.py").resolve()) - assert str(Path(mod2.__file__).resolve()) == expected - - assert mod1.a == 13 - assert mod2.b == 37 - - def test_dynamic_path_computation(self, tmp_path): - # Follows the example in PEP 420 - files = { - "project1": {"parent": {"child": {"one.py": "x = 1"}}}, - "project2": {"parent": {"child": {"two.py": "x = 2"}}}, - "project3": {"parent": {"child": {"three.py": "x = 3"}}}, - } - jaraco.path.build(files, prefix=tmp_path) - mapping = {} - namespaces_ = {"parent": [str(tmp_path / "project1/parent")]} - template = _finder_template(str(uuid4()), mapping, namespaces_) - - mods = (f"parent.child.{name}" for name in ("one", "two", "three")) - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ("parent", "parent.child", "parent.child", *mods): - sys.modules.pop(mod, None) - - self.install_finder(template) - - one = import_module("parent.child.one") - assert one.x == 1 - - with pytest.raises(ImportError): - import_module("parent.child.two") - - sys.path.append(str(tmp_path / "project2")) - two = import_module("parent.child.two") - assert two.x == 2 - - with pytest.raises(ImportError): - import_module("parent.child.three") - - sys.path.append(str(tmp_path / "project3")) - three = import_module("parent.child.three") - assert three.x == 3 - - def test_no_recursion(self, tmp_path): - # See issue #3550 - files = { - "pkg": { - "__init__.py": "from . import pkg", - }, - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = { - "pkg": str(tmp_path / "pkg"), - } - template = _finder_template(str(uuid4()), mapping, {}) - - with contexts.save_paths(), contexts.save_sys_modules(): - sys.modules.pop("pkg", None) - - self.install_finder(template) - with pytest.raises(ImportError, match="pkg"): - import_module("pkg") - - def test_similar_name(self, tmp_path): - files = { - "foo": { - "__init__.py": "", - "bar": { - "__init__.py": "", - }, - }, - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = { - "foo": str(tmp_path / "foo"), - } - template = _finder_template(str(uuid4()), mapping, {}) - - with contexts.save_paths(), contexts.save_sys_modules(): - sys.modules.pop("foo", None) - sys.modules.pop("foo.bar", None) - - self.install_finder(template) - with pytest.raises(ImportError, match="foobar"): - import_module("foobar") - - def test_case_sensitivity(self, tmp_path): - files = { - "foo": { - "__init__.py": "", - "lowercase.py": "x = 1", - "bar": { - "__init__.py": "", - "lowercase.py": "x = 2", - }, - }, - } - jaraco.path.build(files, prefix=tmp_path) - mapping = { - "foo": str(tmp_path / "foo"), - } - template = _finder_template(str(uuid4()), mapping, {}) - with contexts.save_paths(), contexts.save_sys_modules(): - sys.modules.pop("foo", None) - - self.install_finder(template) - with pytest.raises(ImportError, match="'FOO'"): - import_module("FOO") - - with pytest.raises(ImportError, match="'foo\\.LOWERCASE'"): - import_module("foo.LOWERCASE") - - with pytest.raises(ImportError, match="'foo\\.bar\\.Lowercase'"): - import_module("foo.bar.Lowercase") - - with pytest.raises(ImportError, match="'foo\\.BAR'"): - import_module("foo.BAR.lowercase") - - with pytest.raises(ImportError, match="'FOO'"): - import_module("FOO.bar.lowercase") - - mod = import_module("foo.lowercase") - assert mod.x == 1 - - mod = import_module("foo.bar.lowercase") - assert mod.x == 2 - - def test_namespace_case_sensitivity(self, tmp_path): - files = { - "pkg": { - "__init__.py": "a = 13", - "foo": { - "__init__.py": "b = 37", - "bar.py": "c = 42", - }, - }, - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = {"ns.othername": str(tmp_path / "pkg")} - namespaces = {"ns": []} - - template = _finder_template(str(uuid4()), mapping, namespaces) - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ("ns", "ns.othername"): - sys.modules.pop(mod, None) - - self.install_finder(template) - pkg = import_module("ns.othername") - expected = str((tmp_path / "pkg").resolve()) - assert_path(pkg, expected) - assert pkg.a == 13 - - foo = import_module("ns.othername.foo") - assert foo.b == 37 - - bar = import_module("ns.othername.foo.bar") - assert bar.c == 42 - - with pytest.raises(ImportError, match="'NS'"): - import_module("NS.othername.foo") - - with pytest.raises(ImportError, match="'ns\\.othername\\.FOO\\'"): - import_module("ns.othername.FOO") - - with pytest.raises(ImportError, match="'ns\\.othername\\.foo\\.BAR\\'"): - import_module("ns.othername.foo.BAR") - - def test_intermediate_packages(self, tmp_path): - """ - The finder should not import ``fullname`` if the intermediate segments - don't exist (see pypa/setuptools#4019). - """ - files = { - "src": { - "mypkg": { - "__init__.py": "", - "config.py": "a = 13", - "helloworld.py": "b = 13", - "components": { - "config.py": "a = 37", - }, - }, - } - } - jaraco.path.build(files, prefix=tmp_path) - - mapping = {"mypkg": str(tmp_path / "src/mypkg")} - template = _finder_template(str(uuid4()), mapping, {}) - - with contexts.save_paths(), contexts.save_sys_modules(): - for mod in ( - "mypkg", - "mypkg.config", - "mypkg.helloworld", - "mypkg.components", - "mypkg.components.config", - "mypkg.components.helloworld", - ): - sys.modules.pop(mod, None) - - self.install_finder(template) - - config = import_module("mypkg.components.config") - assert config.a == 37 - - helloworld = import_module("mypkg.helloworld") - assert helloworld.b == 13 - - with pytest.raises(ImportError): - import_module("mypkg.components.helloworld") - - -def test_pkg_roots(tmp_path): - """This test focus in getting a particular implementation detail right. - If at some point in time the implementation is changed for something different, - this test can be modified or even excluded. - """ - files = { - "a": {"b": {"__init__.py": "ab = 1"}, "__init__.py": "a = 1"}, - "d": {"__init__.py": "d = 1", "e": {"__init__.py": "de = 1"}}, - "f": {"g": {"h": {"__init__.py": "fgh = 1"}}}, - "other": {"__init__.py": "abc = 1"}, - "another": {"__init__.py": "abcxyz = 1"}, - "yet_another": {"__init__.py": "mnopq = 1"}, - } - jaraco.path.build(files, prefix=tmp_path) - package_dir = { - "a.b.c": "other", - "a.b.c.x.y.z": "another", - "m.n.o.p.q": "yet_another", - } - packages = [ - "a", - "a.b", - "a.b.c", - "a.b.c.x.y", - "a.b.c.x.y.z", - "d", - "d.e", - "f", - "f.g", - "f.g.h", - "m.n.o.p.q", - ] - roots = _find_package_roots(packages, package_dir, tmp_path) - assert roots == { - "a": str(tmp_path / "a"), - "a.b.c": str(tmp_path / "other"), - "a.b.c.x.y.z": str(tmp_path / "another"), - "d": str(tmp_path / "d"), - "f": str(tmp_path / "f"), - "m.n.o.p.q": str(tmp_path / "yet_another"), - } - - ns = set(dict(_find_namespaces(packages, roots))) - assert ns == {"f", "f.g"} - - ns = set(_find_virtual_namespaces(roots)) - assert ns == {"a.b", "a.b.c.x", "a.b.c.x.y", "m", "m.n", "m.n.o", "m.n.o.p"} - - -class TestOverallBehaviour: - PYPROJECT = """\ - [build-system] - requires = ["setuptools"] - build-backend = "setuptools.build_meta" - - [project] - name = "mypkg" - version = "3.14159" - """ - - # Any: Would need a TypedDict. Keep it simple for tests - FLAT_LAYOUT: dict[str, Any] = { - "pyproject.toml": dedent(PYPROJECT), - "MANIFEST.in": EXAMPLE["MANIFEST.in"], - "otherfile.py": "", - "mypkg": { - "__init__.py": "", - "mod1.py": "var = 42", - "subpackage": { - "__init__.py": "", - "mod2.py": "var = 13", - "resource_file.txt": "resource 39", - }, - }, - } - - EXAMPLES = { - "flat-layout": FLAT_LAYOUT, - "src-layout": { - "pyproject.toml": dedent(PYPROJECT), - "MANIFEST.in": EXAMPLE["MANIFEST.in"], - "otherfile.py": "", - "src": {"mypkg": FLAT_LAYOUT["mypkg"]}, - }, - "custom-layout": { - "pyproject.toml": dedent(PYPROJECT) - + dedent( - """\ - [tool.setuptools] - packages = ["mypkg", "mypkg.subpackage"] - - [tool.setuptools.package-dir] - "mypkg.subpackage" = "other" - """ - ), - "MANIFEST.in": EXAMPLE["MANIFEST.in"], - "otherfile.py": "", - "mypkg": { - "__init__.py": "", - "mod1.py": FLAT_LAYOUT["mypkg"]["mod1.py"], - }, - "other": FLAT_LAYOUT["mypkg"]["subpackage"], - }, - "namespace": { - "pyproject.toml": dedent(PYPROJECT), - "MANIFEST.in": EXAMPLE["MANIFEST.in"], - "otherfile.py": "", - "src": { - "mypkg": { - "mod1.py": FLAT_LAYOUT["mypkg"]["mod1.py"], - "subpackage": FLAT_LAYOUT["mypkg"]["subpackage"], - }, - }, - }, - } - - @pytest.mark.xfail(sys.platform == "darwin", reason="pypa/setuptools#4328") - @pytest.mark.parametrize("layout", EXAMPLES.keys()) - def test_editable_install(self, tmp_path, venv, layout, editable_opts): - project, _ = install_project( - "mypkg", venv, tmp_path, self.EXAMPLES[layout], *editable_opts - ) - - # Ensure stray files are not importable - cmd_import_error = """\ - try: - import otherfile - except ImportError as ex: - print(ex) - """ - out = venv.run(["python", "-c", dedent(cmd_import_error)]) - assert "No module named 'otherfile'" in out - - # Ensure the modules are importable - cmd_get_vars = """\ - import mypkg, mypkg.mod1, mypkg.subpackage.mod2 - print(mypkg.mod1.var, mypkg.subpackage.mod2.var) - """ - out = venv.run(["python", "-c", dedent(cmd_get_vars)]) - assert "42 13" in out - - # Ensure resources are reachable - cmd_get_resource = """\ - import mypkg.subpackage - from setuptools._importlib import resources as importlib_resources - text = importlib_resources.files(mypkg.subpackage) / "resource_file.txt" - print(text.read_text(encoding="utf-8")) - """ - out = venv.run(["python", "-c", dedent(cmd_get_resource)]) - assert "resource 39" in out - - # Ensure files are editable - mod1 = next(project.glob("**/mod1.py")) - mod2 = next(project.glob("**/mod2.py")) - resource_file = next(project.glob("**/resource_file.txt")) - - mod1.write_text("var = 17", encoding="utf-8") - mod2.write_text("var = 781", encoding="utf-8") - resource_file.write_text("resource 374", encoding="utf-8") - - out = venv.run(["python", "-c", dedent(cmd_get_vars)]) - assert "42 13" not in out - assert "17 781" in out - - out = venv.run(["python", "-c", dedent(cmd_get_resource)]) - assert "resource 39" not in out - assert "resource 374" in out - - -class TestLinkTree: - FILES = deepcopy(TestOverallBehaviour.EXAMPLES["src-layout"]) - FILES["pyproject.toml"] += dedent( - """\ - [tool.setuptools] - # Temporary workaround: both `include-package-data` and `package-data` configs - # can be removed after #3260 is fixed. - include-package-data = false - package-data = {"*" = ["*.txt"]} - - [tool.setuptools.packages.find] - where = ["src"] - exclude = ["*.subpackage*"] - """ - ) - FILES["src"]["mypkg"]["resource.not_in_manifest"] = "abc" - - def test_generated_tree(self, tmp_path): - jaraco.path.build(self.FILES, prefix=tmp_path) - - with _Path(tmp_path): - name = "mypkg-3.14159" - dist = Distribution({"script_name": "%PEP 517%"}) - dist.parse_config_files() - - wheel = Mock() - aux = tmp_path / ".aux" - build = tmp_path / ".build" - aux.mkdir() - build.mkdir() - - build_py = dist.get_command_obj("build_py") - build_py.editable_mode = True - build_py.build_lib = str(build) - build_py.ensure_finalized() - outputs = build_py.get_outputs() - output_mapping = build_py.get_output_mapping() - - make_tree = _LinkTree(dist, name, aux, build) - make_tree(wheel, outputs, output_mapping) - - mod1 = next(aux.glob("**/mod1.py")) - expected = tmp_path / "src/mypkg/mod1.py" - assert_link_to(mod1, expected) - - assert next(aux.glob("**/subpackage"), None) is None - assert next(aux.glob("**/mod2.py"), None) is None - assert next(aux.glob("**/resource_file.txt"), None) is None - - assert next(aux.glob("**/resource.not_in_manifest"), None) is None - - def test_strict_install(self, tmp_path, venv): - opts = ["--config-settings", "editable-mode=strict"] - install_project("mypkg", venv, tmp_path, self.FILES, *opts) - - out = venv.run(["python", "-c", "import mypkg.mod1; print(mypkg.mod1.var)"]) - assert "42" in out - - # Ensure packages excluded from distribution are not importable - cmd_import_error = """\ - try: - from mypkg import subpackage - except ImportError as ex: - print(ex) - """ - out = venv.run(["python", "-c", dedent(cmd_import_error)]) - assert "cannot import name 'subpackage'" in out - - # Ensure resource files excluded from distribution are not reachable - cmd_get_resource = """\ - import mypkg - from setuptools._importlib import resources as importlib_resources - try: - text = importlib_resources.files(mypkg) / "resource.not_in_manifest" - print(text.read_text(encoding="utf-8")) - except FileNotFoundError as ex: - print(ex) - """ - out = venv.run(["python", "-c", dedent(cmd_get_resource)]) - assert "No such file or directory" in out - assert "resource.not_in_manifest" in out - - -@pytest.mark.filterwarnings("ignore:.*compat.*:setuptools.SetuptoolsDeprecationWarning") -def test_compat_install(tmp_path, venv): - # TODO: Remove `compat` after Dec/2022. - opts = ["--config-settings", "editable-mode=compat"] - files = TestOverallBehaviour.EXAMPLES["custom-layout"] - install_project("mypkg", venv, tmp_path, files, *opts) - - out = venv.run(["python", "-c", "import mypkg.mod1; print(mypkg.mod1.var)"]) - assert "42" in out - - expected_path = comparable_path(str(tmp_path)) - - # Compatible behaviour will make spurious modules and excluded - # files importable directly from the original path - for cmd in ( - "import otherfile; print(otherfile)", - "import other; print(other)", - "import mypkg; print(mypkg)", - ): - out = comparable_path(venv.run(["python", "-c", cmd])) - assert expected_path in out - - # Compatible behaviour will not consider custom mappings - cmd = """\ - try: - from mypkg import subpackage; - except ImportError as ex: - print(ex) - """ - out = venv.run(["python", "-c", dedent(cmd)]) - assert "cannot import name 'subpackage'" in out - - -def test_pbr_integration(tmp_path, venv, editable_opts): - """Ensure editable installs work with pbr, issue #3500""" - files = { - "pyproject.toml": dedent( - """\ - [build-system] - requires = ["setuptools"] - build-backend = "setuptools.build_meta" - """ - ), - "setup.py": dedent( - """\ - __import__('setuptools').setup( - pbr=True, - setup_requires=["pbr"], - ) - """ - ), - "setup.cfg": dedent( - """\ - [metadata] - name = mypkg - - [files] - packages = - mypkg - """ - ), - "mypkg": { - "__init__.py": "", - "hello.py": "print('Hello world!')", - }, - "other": {"test.txt": "Another file in here."}, - } - venv.run(["python", "-m", "pip", "install", "pbr"]) - - with contexts.environment(PBR_VERSION="0.42"): - install_project("mypkg", venv, tmp_path, files, *editable_opts) - - out = venv.run(["python", "-c", "import mypkg.hello"]) - assert "Hello world!" in out - - -class TestCustomBuildPy: - """ - Issue #3501 indicates that some plugins/customizations might rely on: - - 1. ``build_py`` not running - 2. ``build_py`` always copying files to ``build_lib`` - - During the transition period setuptools should prevent potential errors from - happening due to those assumptions. - """ - - # TODO: Remove tests after _run_build_steps is removed. - - FILES = { - **TestOverallBehaviour.EXAMPLES["flat-layout"], - "setup.py": dedent( - """\ - import pathlib - from setuptools import setup - from setuptools.command.build_py import build_py as orig - - class my_build_py(orig): - def run(self): - super().run() - raise ValueError("TEST_RAISE") - - setup(cmdclass={"build_py": my_build_py}) - """ - ), - } - - def test_safeguarded_from_errors(self, tmp_path, venv): - """Ensure that errors in custom build_py are reported as warnings""" - # Warnings should show up - _, out = install_project("mypkg", venv, tmp_path, self.FILES) - assert "SetuptoolsDeprecationWarning" in out - assert "ValueError: TEST_RAISE" in out - # but installation should be successful - out = venv.run(["python", "-c", "import mypkg.mod1; print(mypkg.mod1.var)"]) - assert "42" in out - - -class TestCustomBuildWheel: - def install_custom_build_wheel(self, dist): - bdist_wheel_cls = dist.get_command_class("bdist_wheel") - - class MyBdistWheel(bdist_wheel_cls): - def get_tag(self): - # In issue #3513, we can see that some extensions may try to access - # the `plat_name` property in bdist_wheel - if self.plat_name.startswith("macosx-"): - _ = "macOS platform" - return super().get_tag() - - dist.cmdclass["bdist_wheel"] = MyBdistWheel - - def test_access_plat_name(self, tmpdir_cwd): - # Even when a custom bdist_wheel tries to access plat_name the build should - # be successful - jaraco.path.build({"module.py": "x = 42"}) - dist = Distribution() - dist.script_name = "setup.py" - dist.set_defaults() - self.install_custom_build_wheel(dist) - cmd = editable_wheel(dist) - cmd.ensure_finalized() - cmd.run() - wheel_file = str(next(Path().glob('dist/*.whl'))) - assert "editable" in wheel_file - - -class TestCustomBuildExt: - def install_custom_build_ext_distutils(self, dist): - from distutils.command.build_ext import build_ext as build_ext_cls - - class MyBuildExt(build_ext_cls): - pass - - dist.cmdclass["build_ext"] = MyBuildExt - - @pytest.mark.skipif( - sys.platform != "linux", reason="compilers may fail without correct setup" - ) - def test_distutils_leave_inplace_files(self, tmpdir_cwd): - jaraco.path.build({"module.c": ""}) - attrs = { - "ext_modules": [Extension("module", ["module.c"])], - } - dist = Distribution(attrs) - dist.script_name = "setup.py" - dist.set_defaults() - self.install_custom_build_ext_distutils(dist) - cmd = editable_wheel(dist) - cmd.ensure_finalized() - cmd.run() - wheel_file = str(next(Path().glob('dist/*.whl'))) - assert "editable" in wheel_file - files = [p for p in Path().glob("module.*") if p.suffix != ".c"] - assert len(files) == 1 - name = files[0].name - assert any(name.endswith(ext) for ext in EXTENSION_SUFFIXES) - - -def test_debugging_tips(tmpdir_cwd, monkeypatch): - """Make sure to display useful debugging tips to the user.""" - jaraco.path.build({"module.py": "x = 42"}) - dist = Distribution() - dist.script_name = "setup.py" - dist.set_defaults() - cmd = editable_wheel(dist) - cmd.ensure_finalized() - - SimulatedErr = type("SimulatedErr", (Exception,), {}) - simulated_failure = Mock(side_effect=SimulatedErr()) - monkeypatch.setattr(cmd, "get_finalized_command", simulated_failure) - - expected_msg = "following steps are recommended to help debug" - with pytest.raises(SimulatedErr), pytest.warns(_DebuggingTips, match=expected_msg): - cmd.run() - - -@pytest.mark.filterwarnings("error") -def test_encode_pth(): - """Ensure _encode_pth function does not produce encoding warnings""" - content = _encode_pth("tkmilan_ç_utf8") # no warnings (would be turned into errors) - assert isinstance(content, bytes) - - -def install_project(name, venv, tmp_path, files, *opts): - project = tmp_path / name - project.mkdir() - jaraco.path.build(files, prefix=project) - opts = [*opts, "--no-build-isolation"] # force current version of setuptools - out = venv.run( - ["python", "-m", "pip", "-v", "install", "-e", str(project), *opts], - stderr=subprocess.STDOUT, - ) - return project, out - - -def _addsitedirs(new_dirs): - """To use this function, it is necessary to insert new_dir in front of sys.path. - The Python process will try to import a ``sitecustomize`` module on startup. - If we manipulate sys.path/PYTHONPATH, we can force it to run our code, - which invokes ``addsitedir`` and ensure ``.pth`` files are loaded. - """ - content = '\n'.join( - ("import site",) - + tuple(f"site.addsitedir({os.fspath(new_dir)!r})" for new_dir in new_dirs) - ) - (new_dirs[0] / "sitecustomize.py").write_text(content, encoding="utf-8") - - -# ---- Assertion Helpers ---- - - -def assert_path(pkg, expected): - # __path__ is not guaranteed to exist, so we have to account for that - if pkg.__path__: - path = next(iter(pkg.__path__), None) - if path: - assert str(Path(path).resolve()) == expected - - -def assert_link_to(file: Path, other: Path) -> None: - if file.is_symlink(): - assert str(file.resolve()) == str(other.resolve()) - else: - file_stat = file.stat() - other_stat = other.stat() - assert file_stat[stat.ST_INO] == other_stat[stat.ST_INO] - assert file_stat[stat.ST_DEV] == other_stat[stat.ST_DEV] - - -def comparable_path(str_with_path: str) -> str: - return str_with_path.lower().replace(os.sep, "/").replace("//", "/") diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_egg_info.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_egg_info.py deleted file mode 100644 index 528e2c1..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_egg_info.py +++ /dev/null @@ -1,1305 +0,0 @@ -from __future__ import annotations - -import ast -import glob -import os -import re -import stat -import sys -import time -from pathlib import Path -from unittest import mock - -import pytest -from jaraco import path - -from setuptools import errors -from setuptools.command.egg_info import egg_info, manifest_maker, write_entries -from setuptools.dist import Distribution - -from . import contexts, environment -from .textwrap import DALS - - -class Environment(str): - pass - - -@pytest.fixture -def env(): - with contexts.tempdir(prefix='setuptools-test.') as env_dir: - env = Environment(env_dir) - os.chmod(env_dir, stat.S_IRWXU) - subs = 'home', 'lib', 'scripts', 'data', 'egg-base' - env.paths = dict((dirname, os.path.join(env_dir, dirname)) for dirname in subs) - list(map(os.mkdir, env.paths.values())) - path.build({ - env.paths['home']: { - '.pydistutils.cfg': DALS( - """ - [egg_info] - egg-base = {egg-base} - """.format(**env.paths) - ) - } - }) - yield env - - -class TestEggInfo: - setup_script = DALS( - """ - from setuptools import setup - - setup( - name='foo', - py_modules=['hello'], - entry_points={'console_scripts': ['hi = hello.run']}, - zip_safe=False, - ) - """ - ) - - def _create_project(self): - path.build({ - 'setup.py': self.setup_script, - 'hello.py': DALS( - """ - def run(): - print('hello') - """ - ), - }) - - @staticmethod - def _extract_mv_version(pkg_info_lines: list[str]) -> tuple[int, int]: - version_str = pkg_info_lines[0].split(' ')[1] - major, minor = map(int, version_str.split('.')[:2]) - return major, minor - - def test_egg_info_save_version_info_setup_empty(self, tmpdir_cwd, env): - """ - When the egg_info section is empty or not present, running - save_version_info should add the settings to the setup.cfg - in a deterministic order. - """ - setup_cfg = os.path.join(env.paths['home'], 'setup.cfg') - dist = Distribution() - ei = egg_info(dist) - ei.initialize_options() - ei.save_version_info(setup_cfg) - - with open(setup_cfg, 'r', encoding="utf-8") as f: - content = f.read() - - assert '[egg_info]' in content - assert 'tag_build =' in content - assert 'tag_date = 0' in content - - expected_order = ( - 'tag_build', - 'tag_date', - ) - - self._validate_content_order(content, expected_order) - - @staticmethod - def _validate_content_order(content, expected): - """ - Assert that the strings in expected appear in content - in order. - """ - pattern = '.*'.join(expected) - flags = re.MULTILINE | re.DOTALL - assert re.search(pattern, content, flags) - - def test_egg_info_save_version_info_setup_defaults(self, tmpdir_cwd, env): - """ - When running save_version_info on an existing setup.cfg - with the 'default' values present from a previous run, - the file should remain unchanged. - """ - setup_cfg = os.path.join(env.paths['home'], 'setup.cfg') - path.build({ - setup_cfg: DALS( - """ - [egg_info] - tag_build = - tag_date = 0 - """ - ), - }) - dist = Distribution() - ei = egg_info(dist) - ei.initialize_options() - ei.save_version_info(setup_cfg) - - with open(setup_cfg, 'r', encoding="utf-8") as f: - content = f.read() - - assert '[egg_info]' in content - assert 'tag_build =' in content - assert 'tag_date = 0' in content - - expected_order = ( - 'tag_build', - 'tag_date', - ) - - self._validate_content_order(content, expected_order) - - def test_expected_files_produced(self, tmpdir_cwd, env): - self._create_project() - - self._run_egg_info_command(tmpdir_cwd, env) - actual = os.listdir('foo.egg-info') - - expected = [ - 'PKG-INFO', - 'SOURCES.txt', - 'dependency_links.txt', - 'entry_points.txt', - 'not-zip-safe', - 'top_level.txt', - ] - assert sorted(actual) == expected - - def test_handling_utime_error(self, tmpdir_cwd, env): - dist = Distribution() - ei = egg_info(dist) - utime_patch = mock.patch('os.utime', side_effect=OSError("TEST")) - mkpath_patch = mock.patch( - 'setuptools.command.egg_info.egg_info.mkpath', return_val=None - ) - - with utime_patch, mkpath_patch: - import distutils.errors - - msg = r"Cannot update time stamp of directory 'None'" - with pytest.raises(distutils.errors.DistutilsFileError, match=msg): - ei.run() - - def test_license_is_a_string(self, tmpdir_cwd, env): - setup_config = DALS( - """ - [metadata] - name=foo - version=0.0.1 - license=file:MIT - """ - ) - - setup_script = DALS( - """ - from setuptools import setup - - setup() - """ - ) - - path.build({ - 'setup.py': setup_script, - 'setup.cfg': setup_config, - }) - - # This command should fail with a ValueError, but because it's - # currently configured to use a subprocess, the actual traceback - # object is lost and we need to parse it from stderr - with pytest.raises(AssertionError) as exc: - self._run_egg_info_command(tmpdir_cwd, env) - - # The only argument to the assertion error should be a traceback - # containing a ValueError - assert 'ValueError' in exc.value.args[0] - - def test_rebuilt(self, tmpdir_cwd, env): - """Ensure timestamps are updated when the command is re-run.""" - self._create_project() - - self._run_egg_info_command(tmpdir_cwd, env) - timestamp_a = os.path.getmtime('foo.egg-info') - - # arbitrary sleep just to handle *really* fast systems - time.sleep(0.001) - - self._run_egg_info_command(tmpdir_cwd, env) - timestamp_b = os.path.getmtime('foo.egg-info') - - assert timestamp_a != timestamp_b - - def test_manifest_template_is_read(self, tmpdir_cwd, env): - self._create_project() - path.build({ - 'MANIFEST.in': DALS( - """ - recursive-include docs *.rst - """ - ), - 'docs': { - 'usage.rst': "Run 'hi'", - }, - }) - self._run_egg_info_command(tmpdir_cwd, env) - egg_info_dir = os.path.join('.', 'foo.egg-info') - sources_txt = os.path.join(egg_info_dir, 'SOURCES.txt') - with open(sources_txt, encoding="utf-8") as f: - assert 'docs/usage.rst' in f.read().split('\n') - - def _setup_script_with_requires(self, requires, use_setup_cfg=False): - setup_script = DALS( - """ - from setuptools import setup - - setup(name='foo', zip_safe=False, %s) - """ - ) % ('' if use_setup_cfg else requires) - setup_config = requires if use_setup_cfg else '' - path.build({ - 'setup.py': setup_script, - 'setup.cfg': setup_config, - }) - - mismatch_marker = f"python_version<'{sys.version_info[0]}'" - # Alternate equivalent syntax. - mismatch_marker_alternate = f'python_version < "{sys.version_info[0]}"' - invalid_marker = "<=>++" - - class RequiresTestHelper: - @staticmethod - def parametrize(*test_list, **format_dict): - idlist = [] - argvalues = [] - for test in test_list: - test_params = test.lstrip().split('\n\n', 3) - name_kwargs = test_params.pop(0).split('\n') - if len(name_kwargs) > 1: - val = name_kwargs[1].strip() - install_cmd_kwargs = ast.literal_eval(val) - else: - install_cmd_kwargs = {} - name = name_kwargs[0].strip() - setup_py_requires, setup_cfg_requires, expected_requires = [ - DALS(a).format(**format_dict) for a in test_params - ] - for id_, requires, use_cfg in ( - (name, setup_py_requires, False), - (name + '_in_setup_cfg', setup_cfg_requires, True), - ): - idlist.append(id_) - marks = () - if requires.startswith('@xfail\n'): - requires = requires[7:] - marks = pytest.mark.xfail - argvalues.append( - pytest.param( - requires, - use_cfg, - expected_requires, - install_cmd_kwargs, - marks=marks, - ) - ) - return pytest.mark.parametrize( - ( - "requires", - "use_setup_cfg", - "expected_requires", - "install_cmd_kwargs", - ), - argvalues, - ids=idlist, - ) - - @RequiresTestHelper.parametrize( - # Format of a test: - # - # id - # install_cmd_kwargs [optional] - # - # requires block (when used in setup.py) - # - # requires block (when used in setup.cfg) - # - # expected contents of requires.txt - """ - install_requires_deterministic - - install_requires=["wheel>=0.5", "pytest"] - - [options] - install_requires = - wheel>=0.5 - pytest - - wheel>=0.5 - pytest - """, - """ - install_requires_ordered - - install_requires=["pytest>=3.0.2,!=10.9999"] - - [options] - install_requires = - pytest>=3.0.2,!=10.9999 - - pytest!=10.9999,>=3.0.2 - """, - """ - install_requires_with_marker - - install_requires=["barbazquux;{mismatch_marker}"], - - [options] - install_requires = - barbazquux; {mismatch_marker} - - [:{mismatch_marker_alternate}] - barbazquux - """, - """ - install_requires_with_extra - {'cmd': ['egg_info']} - - install_requires=["barbazquux [test]"], - - [options] - install_requires = - barbazquux [test] - - barbazquux[test] - """, - """ - install_requires_with_extra_and_marker - - install_requires=["barbazquux [test]; {mismatch_marker}"], - - [options] - install_requires = - barbazquux [test]; {mismatch_marker} - - [:{mismatch_marker_alternate}] - barbazquux[test] - """, - """ - setup_requires_with_markers - - setup_requires=["barbazquux;{mismatch_marker}"], - - [options] - setup_requires = - barbazquux; {mismatch_marker} - - """, - """ - extras_require_with_extra - {'cmd': ['egg_info']} - - extras_require={{"extra": ["barbazquux [test]"]}}, - - [options.extras_require] - extra = barbazquux [test] - - [extra] - barbazquux[test] - """, - """ - extras_require_with_extra_and_marker_in_req - - extras_require={{"extra": ["barbazquux [test]; {mismatch_marker}"]}}, - - [options.extras_require] - extra = - barbazquux [test]; {mismatch_marker} - - [extra] - - [extra:{mismatch_marker_alternate}] - barbazquux[test] - """, - # FIXME: ConfigParser does not allow : in key names! - """ - extras_require_with_marker - - extras_require={{":{mismatch_marker}": ["barbazquux"]}}, - - @xfail - [options.extras_require] - :{mismatch_marker} = barbazquux - - [:{mismatch_marker}] - barbazquux - """, - """ - extras_require_with_marker_in_req - - extras_require={{"extra": ["barbazquux; {mismatch_marker}"]}}, - - [options.extras_require] - extra = - barbazquux; {mismatch_marker} - - [extra] - - [extra:{mismatch_marker_alternate}] - barbazquux - """, - """ - extras_require_with_empty_section - - extras_require={{"empty": []}}, - - [options.extras_require] - empty = - - [empty] - """, - # Format arguments. - invalid_marker=invalid_marker, - mismatch_marker=mismatch_marker, - mismatch_marker_alternate=mismatch_marker_alternate, - ) - def test_requires( - self, - tmpdir_cwd, - env, - requires, - use_setup_cfg, - expected_requires, - install_cmd_kwargs, - ): - self._setup_script_with_requires(requires, use_setup_cfg) - self._run_egg_info_command(tmpdir_cwd, env, **install_cmd_kwargs) - egg_info_dir = os.path.join('.', 'foo.egg-info') - requires_txt = os.path.join(egg_info_dir, 'requires.txt') - if os.path.exists(requires_txt): - with open(requires_txt, encoding="utf-8") as fp: - install_requires = fp.read() - else: - install_requires = '' - assert install_requires.lstrip() == expected_requires - assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == [] - - def test_install_requires_unordered_disallowed(self, tmpdir_cwd, env): - """ - Packages that pass unordered install_requires sequences - should be rejected as they produce non-deterministic - builds. See #458. - """ - req = 'install_requires={"fake-factory==0.5.2", "pytz"}' - self._setup_script_with_requires(req) - with pytest.raises(AssertionError): - self._run_egg_info_command(tmpdir_cwd, env) - - def test_extras_require_with_invalid_marker(self, tmpdir_cwd, env): - tmpl = 'extras_require={{":{marker}": ["barbazquux"]}},' - req = tmpl.format(marker=self.invalid_marker) - self._setup_script_with_requires(req) - with pytest.raises(AssertionError): - self._run_egg_info_command(tmpdir_cwd, env) - assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == [] - - def test_extras_require_with_invalid_marker_in_req(self, tmpdir_cwd, env): - tmpl = 'extras_require={{"extra": ["barbazquux; {marker}"]}},' - req = tmpl.format(marker=self.invalid_marker) - self._setup_script_with_requires(req) - with pytest.raises(AssertionError): - self._run_egg_info_command(tmpdir_cwd, env) - assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == [] - - def test_provides_extra(self, tmpdir_cwd, env): - self._setup_script_with_requires('extras_require={"foobar": ["barbazquux"]},') - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - assert 'Provides-Extra: foobar' in pkg_info_lines - assert 'Metadata-Version: 2.4' in pkg_info_lines - - def test_doesnt_provides_extra(self, tmpdir_cwd, env): - self._setup_script_with_requires( - """install_requires=["spam ; python_version<'3.6'"]""" - ) - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_text = fp.read() - assert 'Provides-Extra:' not in pkg_info_text - - @pytest.mark.parametrize( - ('files', 'license_in_sources'), - [ - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE - """ - ), - 'LICENSE': "Test license", - }, - True, - ), # with license - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = INVALID_LICENSE - """ - ), - 'LICENSE': "Test license", - }, - False, - ), # with an invalid license - ( - { - 'setup.cfg': DALS( - """ - """ - ), - 'LICENSE': "Test license", - }, - True, - ), # no license_file attribute, LICENSE auto-included - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE - """ - ), - 'MANIFEST.in': "exclude LICENSE", - 'LICENSE': "Test license", - }, - True, - ), # manifest is overwritten by license_file - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICEN[CS]E* - """ - ), - 'LICENSE': "Test license", - }, - True, - id="glob_pattern", - ), - ], - ) - def test_setup_cfg_license_file(self, tmpdir_cwd, env, files, license_in_sources): - self._create_project() - path.build(files) - - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - - sources_text = Path(egg_info_dir, "SOURCES.txt").read_text(encoding="utf-8") - - if license_in_sources: - assert 'LICENSE' in sources_text - else: - assert 'LICENSE' not in sources_text - # for invalid license test - assert 'INVALID_LICENSE' not in sources_text - - @pytest.mark.parametrize( - ('files', 'incl_licenses', 'excl_licenses'), - [ - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE-ABC - LICENSE-XYZ - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - ['LICENSE-ABC', 'LICENSE-XYZ'], - [], - ), # with licenses - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = LICENSE-ABC, LICENSE-XYZ - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - ['LICENSE-ABC', 'LICENSE-XYZ'], - [], - ), # with commas - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE-ABC - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - ['LICENSE-ABC'], - ['LICENSE-XYZ'], - ), # with one license - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - [], - ['LICENSE-ABC', 'LICENSE-XYZ'], - ), # empty - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = LICENSE-XYZ - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - ['LICENSE-XYZ'], - ['LICENSE-ABC'], - ), # on same line - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE-ABC - INVALID_LICENSE - """ - ), - 'LICENSE-ABC': "Test license", - }, - ['LICENSE-ABC'], - ['INVALID_LICENSE'], - ), # with an invalid license - ( - { - 'setup.cfg': DALS( - """ - """ - ), - 'LICENSE': "Test license", - }, - ['LICENSE'], - [], - ), # no license_files attribute, LICENSE auto-included - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = LICENSE - """ - ), - 'MANIFEST.in': "exclude LICENSE", - 'LICENSE': "Test license", - }, - ['LICENSE'], - [], - ), # manifest is overwritten by license_files - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE-ABC - LICENSE-XYZ - """ - ), - 'MANIFEST.in': "exclude LICENSE-XYZ", - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - # manifest is overwritten by license_files - }, - ['LICENSE-ABC', 'LICENSE-XYZ'], - [], - ), - pytest.param( - { - 'setup.cfg': "", - 'LICENSE-ABC': "ABC license", - 'COPYING-ABC': "ABC copying", - 'NOTICE-ABC': "ABC notice", - 'AUTHORS-ABC': "ABC authors", - 'LICENCE-XYZ': "XYZ license", - 'LICENSE': "License", - 'INVALID-LICENSE': "Invalid license", - }, - [ - 'LICENSE-ABC', - 'COPYING-ABC', - 'NOTICE-ABC', - 'AUTHORS-ABC', - 'LICENCE-XYZ', - 'LICENSE', - ], - ['INVALID-LICENSE'], - # ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*') - id="default_glob_patterns", - ), - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE* - """ - ), - 'LICENSE-ABC': "ABC license", - 'NOTICE-XYZ': "XYZ notice", - }, - ['LICENSE-ABC'], - ['NOTICE-XYZ'], - id="no_default_glob_patterns", - ), - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = - LICENSE-ABC - LICENSE* - """ - ), - 'LICENSE-ABC': "ABC license", - }, - ['LICENSE-ABC'], - [], - id="files_only_added_once", - ), - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_files = **/LICENSE - """ - ), - 'LICENSE': "ABC license", - 'LICENSE-OTHER': "Don't include", - 'vendor': {'LICENSE': "Vendor license"}, - }, - ['LICENSE', 'vendor/LICENSE'], - ['LICENSE-OTHER'], - id="recursive_glob", - ), - ], - ) - def test_setup_cfg_license_files( - self, tmpdir_cwd, env, files, incl_licenses, excl_licenses - ): - self._create_project() - path.build(files) - - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - - sources_text = Path(egg_info_dir, "SOURCES.txt").read_text(encoding="utf-8") - sources_lines = [line.strip() for line in sources_text.splitlines()] - - for lf in incl_licenses: - assert sources_lines.count(lf) == 1 - - for lf in excl_licenses: - assert sources_lines.count(lf) == 0 - - @pytest.mark.parametrize( - ('files', 'incl_licenses', 'excl_licenses'), - [ - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = - license_files = - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - }, - [], - ['LICENSE-ABC', 'LICENSE-XYZ'], - ), # both empty - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = - LICENSE-ABC - LICENSE-XYZ - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-XYZ': "XYZ license", - # license_file is still singular - }, - [], - ['LICENSE-ABC', 'LICENSE-XYZ'], - ), - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE-ABC - license_files = - LICENSE-XYZ - LICENSE-PQR - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-PQR': "PQR license", - 'LICENSE-XYZ': "XYZ license", - }, - ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], - [], - ), # combined - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE-ABC - license_files = - LICENSE-ABC - LICENSE-XYZ - LICENSE-PQR - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-PQR': "PQR license", - 'LICENSE-XYZ': "XYZ license", - # duplicate license - }, - ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], - [], - ), - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE-ABC - license_files = - LICENSE-XYZ - """ - ), - 'LICENSE-ABC': "ABC license", - 'LICENSE-PQR': "PQR license", - 'LICENSE-XYZ': "XYZ license", - # combined subset - }, - ['LICENSE-ABC', 'LICENSE-XYZ'], - ['LICENSE-PQR'], - ), - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE-ABC - license_files = - LICENSE-XYZ - LICENSE-PQR - """ - ), - 'LICENSE-PQR': "Test license", - # with invalid licenses - }, - ['LICENSE-PQR'], - ['LICENSE-ABC', 'LICENSE-XYZ'], - ), - ( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE-ABC - license_files = - LICENSE-PQR - LICENSE-XYZ - """ - ), - 'MANIFEST.in': "exclude LICENSE-ABC\nexclude LICENSE-PQR", - 'LICENSE-ABC': "ABC license", - 'LICENSE-PQR': "PQR license", - 'LICENSE-XYZ': "XYZ license", - # manifest is overwritten - }, - ['LICENSE-ABC', 'LICENSE-PQR', 'LICENSE-XYZ'], - [], - ), - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE* - """ - ), - 'LICENSE-ABC': "ABC license", - 'NOTICE-XYZ': "XYZ notice", - }, - ['LICENSE-ABC'], - ['NOTICE-XYZ'], - id="no_default_glob_patterns", - ), - pytest.param( - { - 'setup.cfg': DALS( - """ - [metadata] - license_file = LICENSE* - license_files = - NOTICE* - """ - ), - 'LICENSE-ABC': "ABC license", - 'NOTICE-ABC': "ABC notice", - 'AUTHORS-ABC': "ABC authors", - }, - ['LICENSE-ABC', 'NOTICE-ABC'], - ['AUTHORS-ABC'], - id="combined_glob_patterrns", - ), - ], - ) - def test_setup_cfg_license_file_license_files( - self, tmpdir_cwd, env, files, incl_licenses, excl_licenses - ): - self._create_project() - path.build(files) - - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - - sources_text = Path(egg_info_dir, "SOURCES.txt").read_text(encoding="utf-8") - sources_lines = [line.strip() for line in sources_text.splitlines()] - - for lf in incl_licenses: - assert sources_lines.count(lf) == 1 - - for lf in excl_licenses: - assert sources_lines.count(lf) == 0 - - def test_license_file_attr_pkg_info(self, tmpdir_cwd, env): - """All matched license files should have a corresponding License-File.""" - self._create_project() - path.build({ - "setup.cfg": DALS( - """ - [metadata] - license_files = - NOTICE* - LICENSE* - **/LICENSE - """ - ), - "LICENSE-ABC": "ABC license", - "LICENSE-XYZ": "XYZ license", - "NOTICE": "included", - "IGNORE": "not include", - "vendor": {'LICENSE': "Vendor license"}, - }) - - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - license_file_lines = [ - line for line in pkg_info_lines if line.startswith('License-File:') - ] - - # Only 'NOTICE', LICENSE-ABC', and 'LICENSE-XYZ' should have been matched - # Also assert that order from license_files is keeped - assert len(license_file_lines) == 4 - assert "License-File: NOTICE" == license_file_lines[0] - assert "License-File: LICENSE-ABC" in license_file_lines[1:] - assert "License-File: LICENSE-XYZ" in license_file_lines[1:] - assert "License-File: vendor/LICENSE" in license_file_lines[3] - - def test_metadata_version(self, tmpdir_cwd, env): - """Make sure latest metadata version is used by default.""" - self._setup_script_with_requires("") - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - # Update metadata version if changed - assert self._extract_mv_version(pkg_info_lines) == (2, 4) - - def test_long_description_content_type(self, tmpdir_cwd, env): - # Test that specifying a `long_description_content_type` keyword arg to - # the `setup` function results in writing a `Description-Content-Type` - # line to the `PKG-INFO` file in the `.egg-info` - # directory. - # `Description-Content-Type` is described at - # https://github.com/pypa/python-packaging-user-guide/pull/258 - - self._setup_script_with_requires( - """long_description_content_type='text/markdown',""" - ) - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - expected_line = 'Description-Content-Type: text/markdown' - assert expected_line in pkg_info_lines - assert 'Metadata-Version: 2.4' in pkg_info_lines - - def test_long_description(self, tmpdir_cwd, env): - # Test that specifying `long_description` and `long_description_content_type` - # keyword args to the `setup` function results in writing - # the description in the message payload of the `PKG-INFO` file - # in the `.egg-info` directory. - self._setup_script_with_requires( - "long_description='This is a long description\\nover multiple lines'," - "long_description_content_type='text/markdown'," - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - assert 'Metadata-Version: 2.4' in pkg_info_lines - assert '' == pkg_info_lines[-1] # last line should be empty - long_desc_lines = pkg_info_lines[pkg_info_lines.index('') :] - assert 'This is a long description' in long_desc_lines - assert 'over multiple lines' in long_desc_lines - - def test_project_urls(self, tmpdir_cwd, env): - # Test that specifying a `project_urls` dict to the `setup` - # function results in writing multiple `Project-URL` lines to - # the `PKG-INFO` file in the `.egg-info` - # directory. - # `Project-URL` is described at https://packaging.python.org - # /specifications/core-metadata/#project-url-multiple-use - - self._setup_script_with_requires( - """project_urls={ - 'Link One': 'https://example.com/one/', - 'Link Two': 'https://example.com/two/', - },""" - ) - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - expected_line = 'Project-URL: Link One, https://example.com/one/' - assert expected_line in pkg_info_lines - expected_line = 'Project-URL: Link Two, https://example.com/two/' - assert expected_line in pkg_info_lines - assert self._extract_mv_version(pkg_info_lines) >= (1, 2) - - def test_license(self, tmpdir_cwd, env): - """Test single line license.""" - self._setup_script_with_requires("license='MIT',") - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - assert 'License: MIT' in pkg_info_lines - - def test_license_escape(self, tmpdir_cwd, env): - """Test license is escaped correctly if longer than one line.""" - self._setup_script_with_requires( - "license='This is a long license text \\nover multiple lines'," - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - - assert 'License: This is a long license text ' in pkg_info_lines - assert ' over multiple lines' in pkg_info_lines - assert 'text \n over multiple' in '\n'.join(pkg_info_lines) - - def test_python_requires_egg_info(self, tmpdir_cwd, env): - self._setup_script_with_requires("""python_requires='>=2.7.12',""") - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - environment.run_setup_py( - cmd=['egg_info'], - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - assert 'Requires-Python: >=2.7.12' in pkg_info_lines - assert self._extract_mv_version(pkg_info_lines) >= (1, 2) - - def test_manifest_maker_warning_suppression(self): - fixtures = [ - "standard file not found: should have one of foo.py, bar.py", - "standard file 'setup.py' not found", - ] - - for msg in fixtures: - assert manifest_maker._should_suppress_warning(msg) - - def test_egg_info_includes_setup_py(self, tmpdir_cwd): - self._create_project() - dist = Distribution({"name": "foo", "version": "0.0.1"}) - dist.script_name = "non_setup.py" - egg_info_instance = egg_info(dist) - egg_info_instance.finalize_options() - egg_info_instance.run() - - assert 'setup.py' in egg_info_instance.filelist.files - - with open(egg_info_instance.egg_info + "/SOURCES.txt", encoding="utf-8") as f: - sources = f.read().split('\n') - assert 'setup.py' in sources - - def _run_egg_info_command(self, tmpdir_cwd, env, cmd=None, output=None): - environ = os.environ.copy().update( - HOME=env.paths['home'], - ) - if cmd is None: - cmd = [ - 'egg_info', - ] - code, data = environment.run_setup_py( - cmd=cmd, - pypath=os.pathsep.join([env.paths['lib'], str(tmpdir_cwd)]), - data_stream=1, - env=environ, - ) - assert not code, data - - if output: - assert output in data - - def test_egg_info_tag_only_once(self, tmpdir_cwd, env): - self._create_project() - path.build({ - 'setup.cfg': DALS( - """ - [egg_info] - tag_build = dev - tag_date = 0 - tag_svn_revision = 0 - """ - ), - }) - self._run_egg_info_command(tmpdir_cwd, env) - egg_info_dir = os.path.join('.', 'foo.egg-info') - with open(os.path.join(egg_info_dir, 'PKG-INFO'), encoding="utf-8") as fp: - pkg_info_lines = fp.read().split('\n') - assert 'Version: 0.0.0.dev0' in pkg_info_lines - - -class TestWriteEntries: - def test_invalid_entry_point(self, tmpdir_cwd, env): - dist = Distribution({"name": "foo", "version": "0.0.1"}) - dist.entry_points = {"foo": "foo = invalid-identifier:foo"} - cmd = dist.get_command_obj("egg_info") - expected_msg = r"Problems to parse .*invalid-identifier.*" - with pytest.raises(errors.OptionError, match=expected_msg) as ex: - write_entries(cmd, "entry_points", "entry_points.txt") - assert "ensure entry-point follows the spec" in ex.value.args[0] - - def test_valid_entry_point(self, tmpdir_cwd, env): - dist = Distribution({"name": "foo", "version": "0.0.1"}) - dist.entry_points = { - "abc": "foo = bar:baz", - "def": ["faa = bor:boz"], - } - cmd = dist.get_command_obj("egg_info") - write_entries(cmd, "entry_points", "entry_points.txt") - content = Path("entry_points.txt").read_text(encoding="utf-8") - assert "[abc]\nfoo = bar:baz\n" in content - assert "[def]\nfaa = bor:boz\n" in content diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_extern.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_extern.py deleted file mode 100644 index d7eb3c6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_extern.py +++ /dev/null @@ -1,15 +0,0 @@ -import importlib -import pickle - -import packaging - -from setuptools import Distribution - - -def test_reimport_extern(): - packaging2 = importlib.import_module(packaging.__name__) - assert packaging is packaging2 - - -def test_distribution_picklable(): - pickle.loads(pickle.dumps(Distribution())) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_packages.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_packages.py deleted file mode 100644 index 9fd9f8f..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_packages.py +++ /dev/null @@ -1,218 +0,0 @@ -"""Tests for automatic package discovery""" - -import os -import shutil -import tempfile - -import pytest - -from setuptools import find_namespace_packages, find_packages -from setuptools.discovery import FlatLayoutPackageFinder - -from .compat.py39 import os_helper - - -class TestFindPackages: - def setup_method(self, method): - self.dist_dir = tempfile.mkdtemp() - self._make_pkg_structure() - - def teardown_method(self, method): - shutil.rmtree(self.dist_dir) - - def _make_pkg_structure(self): - """Make basic package structure. - - dist/ - docs/ - conf.py - pkg/ - __pycache__/ - nspkg/ - mod.py - subpkg/ - assets/ - asset - __init__.py - setup.py - - """ - self.docs_dir = self._mkdir('docs', self.dist_dir) - self._touch('conf.py', self.docs_dir) - self.pkg_dir = self._mkdir('pkg', self.dist_dir) - self._mkdir('__pycache__', self.pkg_dir) - self.ns_pkg_dir = self._mkdir('nspkg', self.pkg_dir) - self._touch('mod.py', self.ns_pkg_dir) - self.sub_pkg_dir = self._mkdir('subpkg', self.pkg_dir) - self.asset_dir = self._mkdir('assets', self.sub_pkg_dir) - self._touch('asset', self.asset_dir) - self._touch('__init__.py', self.sub_pkg_dir) - self._touch('setup.py', self.dist_dir) - - def _mkdir(self, path, parent_dir=None): - if parent_dir: - path = os.path.join(parent_dir, path) - os.mkdir(path) - return path - - def _touch(self, path, dir_=None): - if dir_: - path = os.path.join(dir_, path) - open(path, 'wb').close() - return path - - def test_regular_package(self): - self._touch('__init__.py', self.pkg_dir) - packages = find_packages(self.dist_dir) - assert packages == ['pkg', 'pkg.subpkg'] - - def test_exclude(self): - self._touch('__init__.py', self.pkg_dir) - packages = find_packages(self.dist_dir, exclude=('pkg.*',)) - assert packages == ['pkg'] - - def test_exclude_recursive(self): - """ - Excluding a parent package should not exclude child packages as well. - """ - self._touch('__init__.py', self.pkg_dir) - self._touch('__init__.py', self.sub_pkg_dir) - packages = find_packages(self.dist_dir, exclude=('pkg',)) - assert packages == ['pkg.subpkg'] - - def test_include_excludes_other(self): - """ - If include is specified, other packages should be excluded. - """ - self._touch('__init__.py', self.pkg_dir) - alt_dir = self._mkdir('other_pkg', self.dist_dir) - self._touch('__init__.py', alt_dir) - packages = find_packages(self.dist_dir, include=['other_pkg']) - assert packages == ['other_pkg'] - - def test_dir_with_dot_is_skipped(self): - shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets')) - data_dir = self._mkdir('some.data', self.pkg_dir) - self._touch('__init__.py', data_dir) - self._touch('file.dat', data_dir) - packages = find_packages(self.dist_dir) - assert 'pkg.some.data' not in packages - - def test_dir_with_packages_in_subdir_is_excluded(self): - """ - Ensure that a package in a non-package such as build/pkg/__init__.py - is excluded. - """ - build_dir = self._mkdir('build', self.dist_dir) - build_pkg_dir = self._mkdir('pkg', build_dir) - self._touch('__init__.py', build_pkg_dir) - packages = find_packages(self.dist_dir) - assert 'build.pkg' not in packages - - @pytest.mark.skipif(not os_helper.can_symlink(), reason='Symlink support required') - def test_symlinked_packages_are_included(self): - """ - A symbolically-linked directory should be treated like any other - directory when matched as a package. - - Create a link from lpkg -> pkg. - """ - self._touch('__init__.py', self.pkg_dir) - linked_pkg = os.path.join(self.dist_dir, 'lpkg') - os.symlink('pkg', linked_pkg) - assert os.path.isdir(linked_pkg) - packages = find_packages(self.dist_dir) - assert 'lpkg' in packages - - def _assert_packages(self, actual, expected): - assert set(actual) == set(expected) - - def test_pep420_ns_package(self): - packages = find_namespace_packages( - self.dist_dir, include=['pkg*'], exclude=['pkg.subpkg.assets'] - ) - self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) - - def test_pep420_ns_package_no_includes(self): - packages = find_namespace_packages(self.dist_dir, exclude=['pkg.subpkg.assets']) - self._assert_packages(packages, ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg']) - - def test_pep420_ns_package_no_includes_or_excludes(self): - packages = find_namespace_packages(self.dist_dir) - expected = ['docs', 'pkg', 'pkg.nspkg', 'pkg.subpkg', 'pkg.subpkg.assets'] - self._assert_packages(packages, expected) - - def test_regular_package_with_nested_pep420_ns_packages(self): - self._touch('__init__.py', self.pkg_dir) - packages = find_namespace_packages( - self.dist_dir, exclude=['docs', 'pkg.subpkg.assets'] - ) - self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) - - def test_pep420_ns_package_no_non_package_dirs(self): - shutil.rmtree(self.docs_dir) - shutil.rmtree(os.path.join(self.dist_dir, 'pkg/subpkg/assets')) - packages = find_namespace_packages(self.dist_dir) - self._assert_packages(packages, ['pkg', 'pkg.nspkg', 'pkg.subpkg']) - - -class TestFlatLayoutPackageFinder: - EXAMPLES = { - "hidden-folders": ( - [".pkg/__init__.py", "pkg/__init__.py", "pkg/nested/file.txt"], - ["pkg", "pkg.nested"], - ), - "private-packages": ( - ["_pkg/__init__.py", "pkg/_private/__init__.py"], - ["pkg", "pkg._private"], - ), - "invalid-name": ( - ["invalid-pkg/__init__.py", "other.pkg/__init__.py", "yet,another/file.py"], - [], - ), - "docs": (["pkg/__init__.py", "docs/conf.py", "docs/readme.rst"], ["pkg"]), - "tests": ( - ["pkg/__init__.py", "tests/test_pkg.py", "tests/__init__.py"], - ["pkg"], - ), - "examples": ( - [ - "pkg/__init__.py", - "examples/__init__.py", - "examples/file.py", - "example/other_file.py", - # Sub-packages should always be fine - "pkg/example/__init__.py", - "pkg/examples/__init__.py", - ], - ["pkg", "pkg.examples", "pkg.example"], - ), - "tool-specific": ( - [ - "htmlcov/index.html", - "pkg/__init__.py", - "tasks/__init__.py", - "tasks/subpackage/__init__.py", - "fabfile/__init__.py", - "fabfile/subpackage/__init__.py", - # Sub-packages should always be fine - "pkg/tasks/__init__.py", - "pkg/fabfile/__init__.py", - ], - ["pkg", "pkg.tasks", "pkg.fabfile"], - ), - } - - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_unwanted_directories_not_included(self, tmp_path, example): - files, expected_packages = self.EXAMPLES[example] - ensure_files(tmp_path, files) - found_packages = FlatLayoutPackageFinder.find(str(tmp_path)) - assert set(found_packages) == set(expected_packages) - - -def ensure_files(root_path, files): - for file in files: - path = root_path / file - path.parent.mkdir(parents=True, exist_ok=True) - path.touch() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_py_modules.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_py_modules.py deleted file mode 100644 index 8034b54..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_find_py_modules.py +++ /dev/null @@ -1,73 +0,0 @@ -"""Tests for automatic discovery of modules""" - -import os - -import pytest - -from setuptools.discovery import FlatLayoutModuleFinder, ModuleFinder - -from .compat.py39 import os_helper -from .test_find_packages import ensure_files - - -class TestModuleFinder: - def find(self, path, *args, **kwargs): - return set(ModuleFinder.find(str(path), *args, **kwargs)) - - EXAMPLES = { - # circumstance: (files, kwargs, expected_modules) - "simple_folder": ( - ["file.py", "other.py"], - {}, # kwargs - ["file", "other"], - ), - "exclude": ( - ["file.py", "other.py"], - {"exclude": ["f*"]}, - ["other"], - ), - "include": ( - ["file.py", "fole.py", "other.py"], - {"include": ["f*"], "exclude": ["fo*"]}, - ["file"], - ), - "invalid-name": (["my-file.py", "other.file.py"], {}, []), - } - - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_finder(self, tmp_path, example): - files, kwargs, expected_modules = self.EXAMPLES[example] - ensure_files(tmp_path, files) - assert self.find(tmp_path, **kwargs) == set(expected_modules) - - @pytest.mark.skipif(not os_helper.can_symlink(), reason='Symlink support required') - def test_symlinked_packages_are_included(self, tmp_path): - src = "_myfiles/file.py" - ensure_files(tmp_path, [src]) - os.symlink(tmp_path / src, tmp_path / "link.py") - assert self.find(tmp_path) == {"link"} - - -class TestFlatLayoutModuleFinder: - def find(self, path, *args, **kwargs): - return set(FlatLayoutModuleFinder.find(str(path))) - - EXAMPLES = { - # circumstance: (files, expected_modules) - "hidden-files": ([".module.py"], []), - "private-modules": (["_module.py"], []), - "common-names": ( - ["setup.py", "conftest.py", "test.py", "tests.py", "example.py", "mod.py"], - ["mod"], - ), - "tool-specific": ( - ["tasks.py", "fabfile.py", "noxfile.py", "dodo.py", "manage.py", "mod.py"], - ["mod"], - ), - } - - @pytest.mark.parametrize("example", EXAMPLES.keys()) - def test_unwanted_files_not_included(self, tmp_path, example): - files, expected_modules = self.EXAMPLES[example] - ensure_files(tmp_path, files) - assert self.find(tmp_path) == set(expected_modules) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_glob.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_glob.py deleted file mode 100644 index 8d225a4..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_glob.py +++ /dev/null @@ -1,45 +0,0 @@ -import pytest -from jaraco import path - -from setuptools.glob import glob - - -@pytest.mark.parametrize( - ('tree', 'pattern', 'matches'), - ( - ('', b'', []), - ('', '', []), - ( - """ - appveyor.yml - CHANGES.rst - LICENSE - MANIFEST.in - pyproject.toml - README.rst - setup.cfg - setup.py - """, - '*.rst', - ('CHANGES.rst', 'README.rst'), - ), - ( - """ - appveyor.yml - CHANGES.rst - LICENSE - MANIFEST.in - pyproject.toml - README.rst - setup.cfg - setup.py - """, - b'*.rst', - (b'CHANGES.rst', b'README.rst'), - ), - ), -) -def test_glob(monkeypatch, tmpdir, tree, pattern, matches): - monkeypatch.chdir(tmpdir) - path.build({name: '' for name in tree.split()}) - assert list(sorted(glob(pattern))) == list(sorted(matches)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_install_scripts.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_install_scripts.py deleted file mode 100644 index e62a6b7..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_install_scripts.py +++ /dev/null @@ -1,89 +0,0 @@ -"""install_scripts tests""" - -import sys - -import pytest - -from setuptools.command.install_scripts import install_scripts -from setuptools.dist import Distribution - -from . import contexts - - -class TestInstallScripts: - settings = dict( - name='foo', - entry_points={'console_scripts': ['foo=foo:foo']}, - version='0.0', - ) - unix_exe = '/usr/dummy-test-path/local/bin/python' - unix_spaces_exe = '/usr/bin/env dummy-test-python' - win32_exe = 'C:\\Dummy Test Path\\Program Files\\Python 3.6\\python.exe' - - def _run_install_scripts(self, install_dir, executable=None): - dist = Distribution(self.settings) - dist.script_name = 'setup.py' - cmd = install_scripts(dist) - cmd.install_dir = install_dir - if executable is not None: - bs = cmd.get_finalized_command('build_scripts') - bs.executable = executable - cmd.ensure_finalized() - with contexts.quiet(): - cmd.run() - - @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only') - def test_sys_executable_escaping_unix(self, tmpdir, monkeypatch): - """ - Ensure that shebang is not quoted on Unix when getting the Python exe - from sys.executable. - """ - expected = f'#!{self.unix_exe}\n' - monkeypatch.setattr('sys.executable', self.unix_exe) - with tmpdir.as_cwd(): - self._run_install_scripts(str(tmpdir)) - with open(str(tmpdir.join('foo')), 'r', encoding="utf-8") as f: - actual = f.readline() - assert actual == expected - - @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only') - def test_sys_executable_escaping_win32(self, tmpdir, monkeypatch): - """ - Ensure that shebang is quoted on Windows when getting the Python exe - from sys.executable and it contains a space. - """ - expected = f'#!"{self.win32_exe}"\n' - monkeypatch.setattr('sys.executable', self.win32_exe) - with tmpdir.as_cwd(): - self._run_install_scripts(str(tmpdir)) - with open(str(tmpdir.join('foo-script.py')), 'r', encoding="utf-8") as f: - actual = f.readline() - assert actual == expected - - @pytest.mark.skipif(sys.platform == 'win32', reason='non-Windows only') - def test_executable_with_spaces_escaping_unix(self, tmpdir): - """ - Ensure that shebang on Unix is not quoted, even when - a value with spaces - is specified using --executable. - """ - expected = f'#!{self.unix_spaces_exe}\n' - with tmpdir.as_cwd(): - self._run_install_scripts(str(tmpdir), self.unix_spaces_exe) - with open(str(tmpdir.join('foo')), 'r', encoding="utf-8") as f: - actual = f.readline() - assert actual == expected - - @pytest.mark.skipif(sys.platform != 'win32', reason='Windows only') - def test_executable_arg_escaping_win32(self, tmpdir): - """ - Ensure that shebang on Windows is quoted when - getting a path with spaces - from --executable, that is itself properly quoted. - """ - expected = f'#!"{self.win32_exe}"\n' - with tmpdir.as_cwd(): - self._run_install_scripts(str(tmpdir), '"' + self.win32_exe + '"') - with open(str(tmpdir.join('foo-script.py')), 'r', encoding="utf-8") as f: - actual = f.readline() - assert actual == expected diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_logging.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_logging.py deleted file mode 100644 index ea58001..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_logging.py +++ /dev/null @@ -1,76 +0,0 @@ -import functools -import inspect -import logging -import sys - -import pytest - -IS_PYPY = '__pypy__' in sys.builtin_module_names - - -setup_py = """\ -from setuptools import setup - -setup( - name="test_logging", - version="0.0" -) -""" - - -@pytest.mark.parametrize( - ('flag', 'expected_level'), [("--dry-run", "INFO"), ("--verbose", "DEBUG")] -) -def test_verbosity_level(tmp_path, monkeypatch, flag, expected_level): - """Make sure the correct verbosity level is set (issue #3038)""" - import setuptools # noqa: F401 # import setuptools to monkeypatch distutils - - import distutils # <- load distutils after all the patches take place - - logger = logging.Logger(__name__) - monkeypatch.setattr(logging, "root", logger) - unset_log_level = logger.getEffectiveLevel() - assert logging.getLevelName(unset_log_level) == "NOTSET" - - setup_script = tmp_path / "setup.py" - setup_script.write_text(setup_py, encoding="utf-8") - dist = distutils.core.run_setup(setup_script, stop_after="init") - dist.script_args = [flag, "sdist"] - dist.parse_command_line() # <- where the log level is set - log_level = logger.getEffectiveLevel() - log_level_name = logging.getLevelName(log_level) - assert log_level_name == expected_level - - -def flaky_on_pypy(func): - @functools.wraps(func) - def _func(): - try: - func() - except AssertionError: # pragma: no cover - if IS_PYPY: - msg = "Flaky monkeypatch on PyPy (#4124)" - pytest.xfail(f"{msg}. Original discussion in #3707, #3709.") - raise - - return _func - - -@flaky_on_pypy -def test_patching_does_not_cause_problems(): - # Ensure `dist.log` is only patched if necessary - - import _distutils_hack - - import setuptools.logging - - from distutils import dist - - setuptools.logging.configure() - - if _distutils_hack.enabled(): - # Modern logging infra, no problematic patching. - assert dist.__file__ is None or "setuptools" in dist.__file__ - assert isinstance(dist.log, logging.Logger) - else: - assert inspect.ismodule(dist.log) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_manifest.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_manifest.py deleted file mode 100644 index 903a528..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_manifest.py +++ /dev/null @@ -1,622 +0,0 @@ -"""sdist tests""" - -from __future__ import annotations - -import contextlib -import io -import itertools -import logging -import os -import shutil -import sys -import tempfile - -import pytest - -from setuptools.command.egg_info import FileList, egg_info, translate_pattern -from setuptools.dist import Distribution -from setuptools.tests.textwrap import DALS - -from distutils import log -from distutils.errors import DistutilsTemplateError - -IS_PYPY = '__pypy__' in sys.builtin_module_names - - -def make_local_path(s): - """Converts '/' in a string to os.sep""" - return s.replace('/', os.sep) - - -SETUP_ATTRS = { - 'name': 'app', - 'version': '0.0', - 'packages': ['app'], -} - -SETUP_PY = f"""\ -from setuptools import setup - -setup(**{SETUP_ATTRS!r}) -""" - - -@contextlib.contextmanager -def quiet(): - old_stdout, old_stderr = sys.stdout, sys.stderr - sys.stdout, sys.stderr = io.StringIO(), io.StringIO() - try: - yield - finally: - sys.stdout, sys.stderr = old_stdout, old_stderr - - -def touch(filename): - open(filename, 'wb').close() - - -# The set of files always in the manifest, including all files in the -# .egg-info directory -default_files = frozenset( - map( - make_local_path, - [ - 'README.rst', - 'MANIFEST.in', - 'setup.py', - 'app.egg-info/PKG-INFO', - 'app.egg-info/SOURCES.txt', - 'app.egg-info/dependency_links.txt', - 'app.egg-info/top_level.txt', - 'app/__init__.py', - ], - ) -) - - -translate_specs: list[tuple[str, list[str], list[str]]] = [ - ('foo', ['foo'], ['bar', 'foobar']), - ('foo/bar', ['foo/bar'], ['foo/bar/baz', './foo/bar', 'foo']), - # Glob matching - ('*.txt', ['foo.txt', 'bar.txt'], ['foo/foo.txt']), - ('dir/*.txt', ['dir/foo.txt', 'dir/bar.txt', 'dir/.txt'], ['notdir/foo.txt']), - ('*/*.py', ['bin/start.py'], []), - ('docs/page-?.txt', ['docs/page-9.txt'], ['docs/page-10.txt']), - # Globstars change what they mean depending upon where they are - ( - 'foo/**/bar', - ['foo/bing/bar', 'foo/bing/bang/bar', 'foo/bar'], - ['foo/abar'], - ), - ( - 'foo/**', - ['foo/bar/bing.py', 'foo/x'], - ['/foo/x'], - ), - ( - '**', - ['x', 'abc/xyz', '@nything'], - [], - ), - # Character classes - ( - 'pre[one]post', - ['preopost', 'prenpost', 'preepost'], - ['prepost', 'preonepost'], - ), - ( - 'hello[!one]world', - ['helloxworld', 'helloyworld'], - ['hellooworld', 'helloworld', 'hellooneworld'], - ), - ( - '[]one].txt', - ['o.txt', '].txt', 'e.txt'], - ['one].txt'], - ), - ( - 'foo[!]one]bar', - ['fooybar'], - ['foo]bar', 'fooobar', 'fooebar'], - ), -] -""" -A spec of inputs for 'translate_pattern' and matches and mismatches -for that input. -""" - -match_params = itertools.chain.from_iterable( - zip(itertools.repeat(pattern), matches) - for pattern, matches, mismatches in translate_specs -) - - -@pytest.fixture(params=match_params) -def pattern_match(request): - return map(make_local_path, request.param) - - -mismatch_params = itertools.chain.from_iterable( - zip(itertools.repeat(pattern), mismatches) - for pattern, matches, mismatches in translate_specs -) - - -@pytest.fixture(params=mismatch_params) -def pattern_mismatch(request): - return map(make_local_path, request.param) - - -def test_translated_pattern_match(pattern_match): - pattern, target = pattern_match - assert translate_pattern(pattern).match(target) - - -def test_translated_pattern_mismatch(pattern_mismatch): - pattern, target = pattern_mismatch - assert not translate_pattern(pattern).match(target) - - -class TempDirTestCase: - def setup_method(self, method): - self.temp_dir = tempfile.mkdtemp() - self.old_cwd = os.getcwd() - os.chdir(self.temp_dir) - - def teardown_method(self, method): - os.chdir(self.old_cwd) - shutil.rmtree(self.temp_dir) - - -class TestManifestTest(TempDirTestCase): - def setup_method(self, method): - super().setup_method(method) - - f = open(os.path.join(self.temp_dir, 'setup.py'), 'w', encoding="utf-8") - f.write(SETUP_PY) - f.close() - """ - Create a file tree like: - - LICENSE - - README.rst - - testing.rst - - .hidden.rst - - app/ - - __init__.py - - a.txt - - b.txt - - c.rst - - static/ - - app.js - - app.js.map - - app.css - - app.css.map - """ - - for fname in ['README.rst', '.hidden.rst', 'testing.rst', 'LICENSE']: - touch(os.path.join(self.temp_dir, fname)) - - # Set up the rest of the test package - test_pkg = os.path.join(self.temp_dir, 'app') - os.mkdir(test_pkg) - for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']: - touch(os.path.join(test_pkg, fname)) - - # Some compiled front-end assets to include - static = os.path.join(test_pkg, 'static') - os.mkdir(static) - for fname in ['app.js', 'app.js.map', 'app.css', 'app.css.map']: - touch(os.path.join(static, fname)) - - def make_manifest(self, contents): - """Write a MANIFEST.in.""" - manifest = os.path.join(self.temp_dir, 'MANIFEST.in') - with open(manifest, 'w', encoding="utf-8") as f: - f.write(DALS(contents)) - - def get_files(self): - """Run egg_info and get all the files to include, as a set""" - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = egg_info(dist) - cmd.ensure_finalized() - - cmd.run() - - return set(cmd.filelist.files) - - def test_no_manifest(self): - """Check a missing MANIFEST.in includes only the standard files.""" - assert (default_files - set(['MANIFEST.in'])) == self.get_files() - - def test_empty_files(self): - """Check an empty MANIFEST.in includes only the standard files.""" - self.make_manifest("") - assert default_files == self.get_files() - - def test_include(self): - """Include extra rst files in the project root.""" - self.make_manifest("include *.rst") - files = default_files | set(['testing.rst', '.hidden.rst']) - assert files == self.get_files() - - def test_exclude(self): - """Include everything in app/ except the text files""" - ml = make_local_path - self.make_manifest( - """ - include app/* - exclude app/*.txt - """ - ) - files = default_files | set([ml('app/c.rst')]) - assert files == self.get_files() - - def test_include_multiple(self): - """Include with multiple patterns.""" - ml = make_local_path - self.make_manifest("include app/*.txt app/static/*") - files = default_files | set([ - ml('app/a.txt'), - ml('app/b.txt'), - ml('app/static/app.js'), - ml('app/static/app.js.map'), - ml('app/static/app.css'), - ml('app/static/app.css.map'), - ]) - assert files == self.get_files() - - def test_graft(self): - """Include the whole app/static/ directory.""" - ml = make_local_path - self.make_manifest("graft app/static") - files = default_files | set([ - ml('app/static/app.js'), - ml('app/static/app.js.map'), - ml('app/static/app.css'), - ml('app/static/app.css.map'), - ]) - assert files == self.get_files() - - def test_graft_glob_syntax(self): - """Include the whole app/static/ directory.""" - ml = make_local_path - self.make_manifest("graft */static") - files = default_files | set([ - ml('app/static/app.js'), - ml('app/static/app.js.map'), - ml('app/static/app.css'), - ml('app/static/app.css.map'), - ]) - assert files == self.get_files() - - def test_graft_global_exclude(self): - """Exclude all *.map files in the project.""" - ml = make_local_path - self.make_manifest( - """ - graft app/static - global-exclude *.map - """ - ) - files = default_files | set([ml('app/static/app.js'), ml('app/static/app.css')]) - assert files == self.get_files() - - def test_global_include(self): - """Include all *.rst, *.js, and *.css files in the whole tree.""" - ml = make_local_path - self.make_manifest( - """ - global-include *.rst *.js *.css - """ - ) - files = default_files | set([ - '.hidden.rst', - 'testing.rst', - ml('app/c.rst'), - ml('app/static/app.js'), - ml('app/static/app.css'), - ]) - assert files == self.get_files() - - def test_graft_prune(self): - """Include all files in app/, except for the whole app/static/ dir.""" - ml = make_local_path - self.make_manifest( - """ - graft app - prune app/static - """ - ) - files = default_files | set([ml('app/a.txt'), ml('app/b.txt'), ml('app/c.rst')]) - assert files == self.get_files() - - -class TestFileListTest(TempDirTestCase): - """ - A copy of the relevant bits of distutils/tests/test_filelist.py, - to ensure setuptools' version of FileList keeps parity with distutils. - """ - - @pytest.fixture(autouse=os.getenv("SETUPTOOLS_USE_DISTUTILS") == "stdlib") - def _compat_record_logs(self, monkeypatch, caplog): - """Account for stdlib compatibility""" - - def _log(_logger, level, msg, args): - exc = sys.exc_info() - rec = logging.LogRecord("distutils", level, "", 0, msg, args, exc) - caplog.records.append(rec) - - monkeypatch.setattr(log.Log, "_log", _log) - - def get_records(self, caplog, *levels): - return [r for r in caplog.records if r.levelno in levels] - - def assertNoWarnings(self, caplog): - assert self.get_records(caplog, log.WARN) == [] - caplog.clear() - - def assertWarnings(self, caplog): - if IS_PYPY and not caplog.records: - pytest.xfail("caplog checks may not work well in PyPy") - else: - assert len(self.get_records(caplog, log.WARN)) > 0 - caplog.clear() - - def make_files(self, files): - for file in files: - file = os.path.join(self.temp_dir, file) - dirname, _basename = os.path.split(file) - os.makedirs(dirname, exist_ok=True) - touch(file) - - def test_process_template_line(self): - # testing all MANIFEST.in template patterns - file_list = FileList() - ml = make_local_path - - # simulated file list - self.make_files([ - 'foo.tmp', - 'ok', - 'xo', - 'four.txt', - 'buildout.cfg', - # filelist does not filter out VCS directories, - # it's sdist that does - ml('.hg/last-message.txt'), - ml('global/one.txt'), - ml('global/two.txt'), - ml('global/files.x'), - ml('global/here.tmp'), - ml('f/o/f.oo'), - ml('dir/graft-one'), - ml('dir/dir2/graft2'), - ml('dir3/ok'), - ml('dir3/sub/ok.txt'), - ]) - - MANIFEST_IN = DALS( - """\ - include ok - include xo - exclude xo - include foo.tmp - include buildout.cfg - global-include *.x - global-include *.txt - global-exclude *.tmp - recursive-include f *.oo - recursive-exclude global *.x - graft dir - prune dir3 - """ - ) - - for line in MANIFEST_IN.split('\n'): - if not line: - continue - file_list.process_template_line(line) - - wanted = [ - 'buildout.cfg', - 'four.txt', - 'ok', - ml('.hg/last-message.txt'), - ml('dir/graft-one'), - ml('dir/dir2/graft2'), - ml('f/o/f.oo'), - ml('global/one.txt'), - ml('global/two.txt'), - ] - - file_list.sort() - assert file_list.files == wanted - - def test_exclude_pattern(self): - # return False if no match - file_list = FileList() - assert not file_list.exclude_pattern('*.py') - - # return True if files match - file_list = FileList() - file_list.files = ['a.py', 'b.py'] - assert file_list.exclude_pattern('*.py') - - # test excludes - file_list = FileList() - file_list.files = ['a.py', 'a.txt'] - file_list.exclude_pattern('*.py') - file_list.sort() - assert file_list.files == ['a.txt'] - - def test_include_pattern(self): - # return False if no match - file_list = FileList() - self.make_files([]) - assert not file_list.include_pattern('*.py') - - # return True if files match - file_list = FileList() - self.make_files(['a.py', 'b.txt']) - assert file_list.include_pattern('*.py') - - # test * matches all files - file_list = FileList() - self.make_files(['a.py', 'b.txt']) - file_list.include_pattern('*') - file_list.sort() - assert file_list.files == ['a.py', 'b.txt'] - - def test_process_template_line_invalid(self): - # invalid lines - file_list = FileList() - for action in ( - 'include', - 'exclude', - 'global-include', - 'global-exclude', - 'recursive-include', - 'recursive-exclude', - 'graft', - 'prune', - 'blarg', - ): - with pytest.raises(DistutilsTemplateError): - file_list.process_template_line(action) - - def test_include(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # include - file_list = FileList() - self.make_files(['a.py', 'b.txt', ml('d/c.py')]) - - file_list.process_template_line('include *.py') - file_list.sort() - assert file_list.files == ['a.py'] - self.assertNoWarnings(caplog) - - file_list.process_template_line('include *.rb') - file_list.sort() - assert file_list.files == ['a.py'] - self.assertWarnings(caplog) - - def test_exclude(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # exclude - file_list = FileList() - file_list.files = ['a.py', 'b.txt', ml('d/c.py')] - - file_list.process_template_line('exclude *.py') - file_list.sort() - assert file_list.files == ['b.txt', ml('d/c.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('exclude *.rb') - file_list.sort() - assert file_list.files == ['b.txt', ml('d/c.py')] - self.assertWarnings(caplog) - - def test_global_include(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # global-include - file_list = FileList() - self.make_files(['a.py', 'b.txt', ml('d/c.py')]) - - file_list.process_template_line('global-include *.py') - file_list.sort() - assert file_list.files == ['a.py', ml('d/c.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('global-include *.rb') - file_list.sort() - assert file_list.files == ['a.py', ml('d/c.py')] - self.assertWarnings(caplog) - - def test_global_exclude(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # global-exclude - file_list = FileList() - file_list.files = ['a.py', 'b.txt', ml('d/c.py')] - - file_list.process_template_line('global-exclude *.py') - file_list.sort() - assert file_list.files == ['b.txt'] - self.assertNoWarnings(caplog) - - file_list.process_template_line('global-exclude *.rb') - file_list.sort() - assert file_list.files == ['b.txt'] - self.assertWarnings(caplog) - - def test_recursive_include(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # recursive-include - file_list = FileList() - self.make_files(['a.py', ml('d/b.py'), ml('d/c.txt'), ml('d/d/e.py')]) - - file_list.process_template_line('recursive-include d *.py') - file_list.sort() - assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('recursive-include e *.py') - file_list.sort() - assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')] - self.assertWarnings(caplog) - - def test_recursive_exclude(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # recursive-exclude - file_list = FileList() - file_list.files = ['a.py', ml('d/b.py'), ml('d/c.txt'), ml('d/d/e.py')] - - file_list.process_template_line('recursive-exclude d *.py') - file_list.sort() - assert file_list.files == ['a.py', ml('d/c.txt')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('recursive-exclude e *.py') - file_list.sort() - assert file_list.files == ['a.py', ml('d/c.txt')] - self.assertWarnings(caplog) - - def test_graft(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # graft - file_list = FileList() - self.make_files(['a.py', ml('d/b.py'), ml('d/d/e.py'), ml('f/f.py')]) - - file_list.process_template_line('graft d') - file_list.sort() - assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('graft e') - file_list.sort() - assert file_list.files == [ml('d/b.py'), ml('d/d/e.py')] - self.assertWarnings(caplog) - - def test_prune(self, caplog): - caplog.set_level(logging.DEBUG) - ml = make_local_path - # prune - file_list = FileList() - file_list.files = ['a.py', ml('d/b.py'), ml('d/d/e.py'), ml('f/f.py')] - - file_list.process_template_line('prune d') - file_list.sort() - assert file_list.files == ['a.py', ml('f/f.py')] - self.assertNoWarnings(caplog) - - file_list.process_template_line('prune e') - file_list.sort() - assert file_list.files == ['a.py', ml('f/f.py')] - self.assertWarnings(caplog) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_namespaces.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_namespaces.py deleted file mode 100644 index a0f4120..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_namespaces.py +++ /dev/null @@ -1,138 +0,0 @@ -import subprocess -import sys - -from setuptools._path import paths_on_pythonpath - -from . import namespaces - - -class TestNamespaces: - def test_mixed_site_and_non_site(self, tmpdir): - """ - Installing two packages sharing the same namespace, one installed - to a site dir and the other installed just to a path on PYTHONPATH - should leave the namespace in tact and both packages reachable by - import. - """ - pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA') - pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB') - site_packages = tmpdir / 'site-packages' - path_packages = tmpdir / 'path-packages' - targets = site_packages, path_packages - # use pip to install to the target directory - install_cmd = [ - sys.executable, - '-m', - 'pip.__main__', - 'install', - str(pkg_A), - '-t', - str(site_packages), - ] - subprocess.check_call(install_cmd) - namespaces.make_site_dir(site_packages) - install_cmd = [ - sys.executable, - '-m', - 'pip.__main__', - 'install', - str(pkg_B), - '-t', - str(path_packages), - ] - subprocess.check_call(install_cmd) - try_import = [ - sys.executable, - '-c', - 'import myns.pkgA; import myns.pkgB', - ] - with paths_on_pythonpath(map(str, targets)): - subprocess.check_call(try_import) - - def test_pkg_resources_import(self, tmpdir): - """ - Ensure that a namespace package doesn't break on import - of pkg_resources. - """ - pkg = namespaces.build_namespace_package(tmpdir, 'myns.pkgA') - target = tmpdir / 'packages' - target.mkdir() - install_cmd = [ - sys.executable, - '-m', - 'pip', - 'install', - '-t', - str(target), - str(pkg), - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(install_cmd) - namespaces.make_site_dir(target) - try_import = [ - sys.executable, - '-c', - 'import pkg_resources', - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(try_import) - - def test_namespace_package_installed_and_cwd(self, tmpdir): - """ - Installing a namespace packages but also having it in the current - working directory, only one version should take precedence. - """ - pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA') - target = tmpdir / 'packages' - # use pip to install to the target directory - install_cmd = [ - sys.executable, - '-m', - 'pip.__main__', - 'install', - str(pkg_A), - '-t', - str(target), - ] - subprocess.check_call(install_cmd) - namespaces.make_site_dir(target) - - # ensure that package imports and pkg_resources imports - pkg_resources_imp = [ - sys.executable, - '-c', - 'import pkg_resources; import myns.pkgA', - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(pkg_resources_imp, cwd=str(pkg_A)) - - def test_packages_in_the_same_namespace_installed_and_cwd(self, tmpdir): - """ - Installing one namespace package and also have another in the same - namespace in the current working directory, both of them must be - importable. - """ - pkg_A = namespaces.build_namespace_package(tmpdir, 'myns.pkgA') - pkg_B = namespaces.build_namespace_package(tmpdir, 'myns.pkgB') - target = tmpdir / 'packages' - # use pip to install to the target directory - install_cmd = [ - sys.executable, - '-m', - 'pip.__main__', - 'install', - str(pkg_A), - '-t', - str(target), - ] - subprocess.check_call(install_cmd) - namespaces.make_site_dir(target) - - # ensure that all packages import and pkg_resources imports - pkg_resources_imp = [ - sys.executable, - '-c', - 'import pkg_resources; import myns.pkgA; import myns.pkgB', - ] - with paths_on_pythonpath([str(target)]): - subprocess.check_call(pkg_resources_imp, cwd=str(pkg_B)) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_packageindex.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_packageindex.py deleted file mode 100644 index 2a6e591..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_packageindex.py +++ /dev/null @@ -1,267 +0,0 @@ -import http.client -import re -import urllib.error -import urllib.request -from inspect import cleandoc - -import pytest - -import setuptools.package_index - -import distutils.errors - - -class TestPackageIndex: - def test_regex(self): - hash_url = 'http://other_url?:action=show_md5&' - hash_url += 'digest=0123456789abcdef0123456789abcdef' - doc = """ - Name - (md5) - """.lstrip().format(**locals()) - assert setuptools.package_index.PYPI_MD5.match(doc) - - def test_bad_url_bad_port(self): - index = setuptools.package_index.PackageIndex() - url = 'http://127.0.0.1:0/nonesuch/test_package_index' - with pytest.raises(Exception, match=re.escape(url)): - v = index.open_url(url) - assert isinstance(v, urllib.error.HTTPError) - - def test_bad_url_typo(self): - # issue 16 - # easy_install inquant.contentmirror.plone breaks because of a typo - # in its home URL - index = setuptools.package_index.PackageIndex(hosts=('www.example.com',)) - - url = 'url:%20https://svn.plone.org/svn/collective/inquant.contentmirror.plone/trunk' - - with pytest.raises(Exception, match=re.escape(url)): - v = index.open_url(url) - assert isinstance(v, urllib.error.HTTPError) - - def test_bad_url_bad_status_line(self): - index = setuptools.package_index.PackageIndex(hosts=('www.example.com',)) - - def _urlopen(*args): - raise http.client.BadStatusLine('line') - - index.opener = _urlopen - url = 'http://example.com' - with pytest.raises(Exception, match=r'line'): - index.open_url(url) - - def test_bad_url_double_scheme(self): - """ - A bad URL with a double scheme should raise a DistutilsError. - """ - index = setuptools.package_index.PackageIndex(hosts=('www.example.com',)) - - # issue 20 - url = 'http://http://svn.pythonpaste.org/Paste/wphp/trunk' - try: - index.open_url(url) - except distutils.errors.DistutilsError as error: - msg = str(error) - assert ( - 'nonnumeric port' in msg - or 'getaddrinfo failed' in msg - or 'Name or service not known' in msg - ) - return - raise RuntimeError("Did not raise") - - def test_url_ok(self): - index = setuptools.package_index.PackageIndex(hosts=('www.example.com',)) - url = 'file:///tmp/test_package_index' - assert index.url_ok(url, True) - - def test_parse_bdist_wininst(self): - parse = setuptools.package_index.parse_bdist_wininst - - actual = parse('reportlab-2.5.win32-py2.4.exe') - expected = 'reportlab-2.5', '2.4', 'win32' - assert actual == expected - - actual = parse('reportlab-2.5.win32.exe') - expected = 'reportlab-2.5', None, 'win32' - assert actual == expected - - actual = parse('reportlab-2.5.win-amd64-py2.7.exe') - expected = 'reportlab-2.5', '2.7', 'win-amd64' - assert actual == expected - - actual = parse('reportlab-2.5.win-amd64.exe') - expected = 'reportlab-2.5', None, 'win-amd64' - assert actual == expected - - def test__vcs_split_rev_from_url(self): - """ - Test the basic usage of _vcs_split_rev_from_url - """ - vsrfu = setuptools.package_index.PackageIndex._vcs_split_rev_from_url - url, rev = vsrfu('https://example.com/bar@2995') - assert url == 'https://example.com/bar' - assert rev == '2995' - - def test_local_index(self, tmpdir): - """ - local_open should be able to read an index from the file system. - """ - index_file = tmpdir / 'index.html' - with index_file.open('w') as f: - f.write('
content
') - url = 'file:' + urllib.request.pathname2url(str(tmpdir)) + '/' - res = setuptools.package_index.local_open(url) - assert 'content' in res.read() - - def test_egg_fragment(self): - """ - EGG fragments must comply to PEP 440 - """ - epoch = [ - '', - '1!', - ] - releases = [ - '0', - '0.0', - '0.0.0', - ] - pre = [ - 'a0', - 'b0', - 'rc0', - ] - post = ['.post0'] - dev = [ - '.dev0', - ] - local = [ - ('', ''), - ('+ubuntu.0', '+ubuntu.0'), - ('+ubuntu-0', '+ubuntu.0'), - ('+ubuntu_0', '+ubuntu.0'), - ] - versions = [ - [''.join([e, r, p, loc]) for loc in locs] - for e in epoch - for r in releases - for p in sum([pre, post, dev], ['']) - for locs in local - ] - for v, vc in versions: - dists = list( - setuptools.package_index.distros_for_url( - 'http://example.com/example-foo.zip#egg=example-foo-' + v - ) - ) - assert dists[0].version == '' - assert dists[1].version == vc - - def test_download_git_with_rev(self, tmp_path, fp): - url = 'git+https://github.example/group/project@master#egg=foo' - index = setuptools.package_index.PackageIndex() - - expected_dir = tmp_path / 'project@master' - fp.register([ - 'git', - 'clone', - '--quiet', - 'https://github.example/group/project', - expected_dir, - ]) - fp.register(['git', '-C', expected_dir, 'checkout', '--quiet', 'master']) - - result = index.download(url, tmp_path) - - assert result == str(expected_dir) - assert len(fp.calls) == 2 - - def test_download_git_no_rev(self, tmp_path, fp): - url = 'git+https://github.example/group/project#egg=foo' - index = setuptools.package_index.PackageIndex() - - expected_dir = tmp_path / 'project' - fp.register([ - 'git', - 'clone', - '--quiet', - 'https://github.example/group/project', - expected_dir, - ]) - index.download(url, tmp_path) - - def test_download_svn(self, tmp_path): - url = 'svn+https://svn.example/project#egg=foo' - index = setuptools.package_index.PackageIndex() - - msg = r".*SVN download is not supported.*" - with pytest.raises(distutils.errors.DistutilsError, match=msg): - index.download(url, tmp_path) - - -class TestContentCheckers: - def test_md5(self): - checker = setuptools.package_index.HashChecker.from_url( - 'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478' - ) - checker.feed('You should probably not be using MD5'.encode('ascii')) - assert checker.hash.hexdigest() == 'f12895fdffbd45007040d2e44df98478' - assert checker.is_valid() - - def test_other_fragment(self): - "Content checks should succeed silently if no hash is present" - checker = setuptools.package_index.HashChecker.from_url( - 'http://foo/bar#something%20completely%20different' - ) - checker.feed('anything'.encode('ascii')) - assert checker.is_valid() - - def test_blank_md5(self): - "Content checks should succeed if a hash is empty" - checker = setuptools.package_index.HashChecker.from_url('http://foo/bar#md5=') - checker.feed('anything'.encode('ascii')) - assert checker.is_valid() - - def test_get_hash_name_md5(self): - checker = setuptools.package_index.HashChecker.from_url( - 'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478' - ) - assert checker.hash_name == 'md5' - - def test_report(self): - checker = setuptools.package_index.HashChecker.from_url( - 'http://foo/bar#md5=f12895fdffbd45007040d2e44df98478' - ) - rep = checker.report(lambda x: x, 'My message about %s') - assert rep == 'My message about md5' - - -class TestPyPIConfig: - def test_percent_in_password(self, tmp_home_dir): - pypirc = tmp_home_dir / '.pypirc' - pypirc.write_text( - cleandoc( - """ - [pypi] - repository=https://pypi.org - username=jaraco - password=pity% - """ - ), - encoding="utf-8", - ) - cfg = setuptools.package_index.PyPIConfig() - cred = cfg.creds_by_repository['https://pypi.org'] - assert cred.username == 'jaraco' - assert cred.password == 'pity%' - - -@pytest.mark.timeout(1) -def test_REL_DoS(): - """ - REL should not hang on a contrived attack string. - """ - setuptools.package_index.REL.search('< rel=' + ' ' * 2**12) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sandbox.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sandbox.py deleted file mode 100644 index a476b7c..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sandbox.py +++ /dev/null @@ -1,134 +0,0 @@ -"""develop tests""" - -import os -import types - -import pytest - -import pkg_resources -import setuptools.sandbox - - -class TestSandbox: - def test_devnull(self, tmpdir): - with setuptools.sandbox.DirectorySandbox(str(tmpdir)): - self._file_writer(os.devnull) - - @staticmethod - def _file_writer(path): - def do_write(): - with open(path, 'w', encoding="utf-8") as f: - f.write('xxx') - - return do_write - - def test_setup_py_with_BOM(self): - """ - It should be possible to execute a setup.py with a Byte Order Mark - """ - target = pkg_resources.resource_filename(__name__, 'script-with-bom.py') - namespace = types.ModuleType('namespace') - setuptools.sandbox._execfile(target, vars(namespace)) - assert namespace.result == 'passed' - - def test_setup_py_with_CRLF(self, tmpdir): - setup_py = tmpdir / 'setup.py' - with setup_py.open('wb') as stream: - stream.write(b'"degenerate script"\r\n') - setuptools.sandbox._execfile(str(setup_py), globals()) - - -class TestExceptionSaver: - def test_exception_trapped(self): - with setuptools.sandbox.ExceptionSaver(): - raise ValueError("details") - - def test_exception_resumed(self): - with setuptools.sandbox.ExceptionSaver() as saved_exc: - raise ValueError("details") - - with pytest.raises(ValueError) as caught: - saved_exc.resume() - - assert isinstance(caught.value, ValueError) - assert str(caught.value) == 'details' - - def test_exception_reconstructed(self): - orig_exc = ValueError("details") - - with setuptools.sandbox.ExceptionSaver() as saved_exc: - raise orig_exc - - with pytest.raises(ValueError) as caught: - saved_exc.resume() - - assert isinstance(caught.value, ValueError) - assert caught.value is not orig_exc - - def test_no_exception_passes_quietly(self): - with setuptools.sandbox.ExceptionSaver() as saved_exc: - pass - - saved_exc.resume() - - def test_unpickleable_exception(self): - class CantPickleThis(Exception): - "This Exception is unpickleable because it's not in globals" - - def __repr__(self) -> str: - return f'CantPickleThis{self.args!r}' - - with setuptools.sandbox.ExceptionSaver() as saved_exc: - raise CantPickleThis('detail') - - with pytest.raises(setuptools.sandbox.UnpickleableException) as caught: - saved_exc.resume() - - assert str(caught.value) == "CantPickleThis('detail',)" - - def test_unpickleable_exception_when_hiding_setuptools(self): - """ - As revealed in #440, an infinite recursion can occur if an unpickleable - exception while setuptools is hidden. Ensure this doesn't happen. - """ - - class ExceptionUnderTest(Exception): - """ - An unpickleable exception (not in globals). - """ - - with pytest.raises(setuptools.sandbox.UnpickleableException) as caught: - with setuptools.sandbox.save_modules(): - setuptools.sandbox.hide_setuptools() - raise ExceptionUnderTest - - (msg,) = caught.value.args - assert msg == 'ExceptionUnderTest()' - - def test_sandbox_violation_raised_hiding_setuptools(self, tmpdir): - """ - When in a sandbox with setuptools hidden, a SandboxViolation - should reflect a proper exception and not be wrapped in - an UnpickleableException. - """ - - def write_file(): - "Trigger a SandboxViolation by writing outside the sandbox" - with open('/etc/foo', 'w', encoding="utf-8"): - pass - - with pytest.raises(setuptools.sandbox.SandboxViolation) as caught: - with setuptools.sandbox.save_modules(): - setuptools.sandbox.hide_setuptools() - with setuptools.sandbox.DirectorySandbox(str(tmpdir)): - write_file() - - cmd, args, kwargs = caught.value.args - assert cmd == 'open' - assert args == ('/etc/foo', 'w') - assert kwargs == {"encoding": "utf-8"} - - msg = str(caught.value) - assert 'open' in msg - assert "('/etc/foo', 'w')" in msg - assert "{'encoding': 'utf-8'}" in msg diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sdist.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sdist.py deleted file mode 100644 index 19d8ddf..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_sdist.py +++ /dev/null @@ -1,984 +0,0 @@ -"""sdist tests""" - -import contextlib -import io -import logging -import os -import pathlib -import sys -import tarfile -import tempfile -import unicodedata -from inspect import cleandoc -from pathlib import Path -from unittest import mock - -import jaraco.path -import pytest - -from setuptools import Command, SetuptoolsDeprecationWarning -from setuptools._importlib import metadata -from setuptools.command.egg_info import manifest_maker -from setuptools.command.sdist import sdist -from setuptools.dist import Distribution -from setuptools.extension import Extension -from setuptools.tests import fail_on_ascii - -from .text import Filenames - -import distutils -from distutils.core import run_setup - -SETUP_ATTRS = { - 'name': 'sdist_test', - 'version': '0.0', - 'packages': ['sdist_test'], - 'package_data': {'sdist_test': ['*.txt']}, - 'data_files': [("data", [os.path.join("d", "e.dat")])], -} - -SETUP_PY = f"""\ -from setuptools import setup - -setup(**{SETUP_ATTRS!r}) -""" - -EXTENSION = Extension( - name="sdist_test.f", - sources=[os.path.join("sdist_test", "f.c")], - depends=[os.path.join("sdist_test", "f.h")], -) -EXTENSION_SOURCES = EXTENSION.sources + EXTENSION.depends - - -@contextlib.contextmanager -def quiet(): - old_stdout, old_stderr = sys.stdout, sys.stderr - sys.stdout, sys.stderr = io.StringIO(), io.StringIO() - try: - yield - finally: - sys.stdout, sys.stderr = old_stdout, old_stderr - - -# Convert to POSIX path -def posix(path): - if not isinstance(path, str): - return path.replace(os.sep.encode('ascii'), b'/') - else: - return path.replace(os.sep, '/') - - -# HFS Plus uses decomposed UTF-8 -def decompose(path): - if isinstance(path, str): - return unicodedata.normalize('NFD', path) - try: - path = path.decode('utf-8') - path = unicodedata.normalize('NFD', path) - path = path.encode('utf-8') - except UnicodeError: - pass # Not UTF-8 - return path - - -def read_all_bytes(filename): - with open(filename, 'rb') as fp: - return fp.read() - - -def latin1_fail(): - try: - desc, filename = tempfile.mkstemp(suffix=Filenames.latin_1) - os.close(desc) - os.remove(filename) - except Exception: - return True - - -fail_on_latin1_encoded_filenames = pytest.mark.xfail( - latin1_fail(), - reason="System does not support latin-1 filenames", -) - - -skip_under_xdist = pytest.mark.skipif( - "os.environ.get('PYTEST_XDIST_WORKER')", - reason="pytest-dev/pytest-xdist#843", -) -skip_under_stdlib_distutils = pytest.mark.skipif( - not distutils.__package__.startswith('setuptools'), - reason="the test is not supported with stdlib distutils", -) - - -def touch(path): - open(path, 'wb').close() - return path - - -def symlink_or_skip_test(src, dst): - try: - os.symlink(src, dst) - except (OSError, NotImplementedError): - pytest.skip("symlink not supported in OS") - return None - return dst - - -class TestSdistTest: - @pytest.fixture(autouse=True) - def source_dir(self, tmpdir): - tmpdir = tmpdir / "project_root" - tmpdir.mkdir() - - (tmpdir / 'setup.py').write_text(SETUP_PY, encoding='utf-8') - - # Set up the rest of the test package - test_pkg = tmpdir / 'sdist_test' - test_pkg.mkdir() - data_folder = tmpdir / 'd' - data_folder.mkdir() - # *.rst was not included in package_data, so c.rst should not be - # automatically added to the manifest when not under version control - for fname in ['__init__.py', 'a.txt', 'b.txt', 'c.rst']: - touch(test_pkg / fname) - touch(data_folder / 'e.dat') - # C sources are not included by default, but they will be, - # if an extension module uses them as sources or depends - for fname in EXTENSION_SOURCES: - touch(tmpdir / fname) - - with tmpdir.as_cwd(): - yield tmpdir - - def assert_package_data_in_manifest(self, cmd): - manifest = cmd.filelist.files - assert os.path.join('sdist_test', 'a.txt') in manifest - assert os.path.join('sdist_test', 'b.txt') in manifest - assert os.path.join('sdist_test', 'c.rst') not in manifest - assert os.path.join('d', 'e.dat') in manifest - - def setup_with_extension(self): - setup_attrs = {**SETUP_ATTRS, 'ext_modules': [EXTENSION]} - - dist = Distribution(setup_attrs) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - return cmd - - def test_package_data_in_sdist(self): - """Regression test for pull request #4: ensures that files listed in - package_data are included in the manifest even if they're not added to - version control. - """ - - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - self.assert_package_data_in_manifest(cmd) - - def test_package_data_and_include_package_data_in_sdist(self): - """ - Ensure package_data and include_package_data work - together. - """ - setup_attrs = {**SETUP_ATTRS, 'include_package_data': True} - assert setup_attrs['package_data'] - - dist = Distribution(setup_attrs) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - self.assert_package_data_in_manifest(cmd) - - def test_extension_sources_in_sdist(self): - """ - Ensure that the files listed in Extension.sources and Extension.depends - are automatically included in the manifest. - """ - cmd = self.setup_with_extension() - self.assert_package_data_in_manifest(cmd) - manifest = cmd.filelist.files - for path in EXTENSION_SOURCES: - assert path in manifest - - def test_missing_extension_sources(self): - """ - Similar to test_extension_sources_in_sdist but the referenced files don't exist. - Missing files should not be included in distribution (with no error raised). - """ - for path in EXTENSION_SOURCES: - os.remove(path) - - cmd = self.setup_with_extension() - self.assert_package_data_in_manifest(cmd) - manifest = cmd.filelist.files - for path in EXTENSION_SOURCES: - assert path not in manifest - - def test_symlinked_extension_sources(self): - """ - Similar to test_extension_sources_in_sdist but the referenced files are - instead symbolic links to project-local files. Referenced file paths - should be included. Symlink targets themselves should NOT be included. - """ - symlinked = [] - for path in EXTENSION_SOURCES: - base, ext = os.path.splitext(path) - target = base + "_target." + ext - - os.rename(path, target) - symlink_or_skip_test(os.path.basename(target), path) - symlinked.append(target) - - cmd = self.setup_with_extension() - self.assert_package_data_in_manifest(cmd) - manifest = cmd.filelist.files - for path in EXTENSION_SOURCES: - assert path in manifest - for path in symlinked: - assert path not in manifest - - _INVALID_PATHS = { - "must be relative": lambda: ( - os.path.abspath(os.path.join("sdist_test", "f.h")) - ), - "can't have `..` segments": lambda: ( - os.path.join("sdist_test", "..", "sdist_test", "f.h") - ), - "doesn't exist": lambda: ( - os.path.join("sdist_test", "this_file_does_not_exist.h") - ), - "must be inside the project root": lambda: ( - symlink_or_skip_test( - touch(os.path.join("..", "outside_of_project_root.h")), - "symlink.h", - ) - ), - } - - @skip_under_stdlib_distutils - @pytest.mark.parametrize("reason", _INVALID_PATHS.keys()) - def test_invalid_extension_depends(self, reason, caplog): - """ - Due to backwards compatibility reasons, `Extension.depends` should accept - invalid/weird paths, but then ignore them when building a sdist. - - This test verifies that the source distribution is still built - successfully with such paths, but that instead of adding these paths to - the manifest, we emit an informational message, notifying the user that - the invalid path won't be automatically included. - """ - invalid_path = self._INVALID_PATHS[reason]() - extension = Extension( - name="sdist_test.f", - sources=[], - depends=[invalid_path], - ) - setup_attrs = {**SETUP_ATTRS, 'ext_modules': [extension]} - - dist = Distribution(setup_attrs) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(), caplog.at_level(logging.INFO): - cmd.run() - - self.assert_package_data_in_manifest(cmd) - manifest = cmd.filelist.files - assert invalid_path not in manifest - - expected_message = [ - message - for (logger, level, message) in caplog.record_tuples - if ( - logger == "root" # - and level == logging.INFO # - and invalid_path in message # - ) - ] - assert len(expected_message) == 1 - (expected_message,) = expected_message - assert reason in expected_message - - def test_custom_build_py(self): - """ - Ensure projects defining custom build_py don't break - when creating sdists (issue #2849) - """ - from distutils.command.build_py import build_py as OrigBuildPy - - using_custom_command_guard = mock.Mock() - - class CustomBuildPy(OrigBuildPy): - """ - Some projects have custom commands inheriting from `distutils` - """ - - def get_data_files(self): - using_custom_command_guard() - return super().get_data_files() - - setup_attrs = {**SETUP_ATTRS, 'include_package_data': True} - assert setup_attrs['package_data'] - - dist = Distribution(setup_attrs) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - # Make sure we use the custom command - cmd.cmdclass = {'build_py': CustomBuildPy} - cmd.distribution.cmdclass = {'build_py': CustomBuildPy} - assert cmd.distribution.get_command_class('build_py') == CustomBuildPy - - msg = "setuptools instead of distutils" - with quiet(), pytest.warns(SetuptoolsDeprecationWarning, match=msg): - cmd.run() - - using_custom_command_guard.assert_called() - self.assert_package_data_in_manifest(cmd) - - def test_setup_py_exists(self): - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'foo.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - manifest = cmd.filelist.files - assert 'setup.py' in manifest - - def test_setup_py_missing(self): - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'foo.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - if os.path.exists("setup.py"): - os.remove("setup.py") - with quiet(): - cmd.run() - - manifest = cmd.filelist.files - assert 'setup.py' not in manifest - - def test_setup_py_excluded(self): - with open("MANIFEST.in", "w", encoding="utf-8") as manifest_file: - manifest_file.write("exclude setup.py") - - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'foo.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - manifest = cmd.filelist.files - assert 'setup.py' not in manifest - - def test_defaults_case_sensitivity(self, source_dir): - """ - Make sure default files (README.*, etc.) are added in a case-sensitive - way to avoid problems with packages built on Windows. - """ - - touch(source_dir / 'readme.rst') - touch(source_dir / 'SETUP.cfg') - - dist = Distribution(SETUP_ATTRS) - # the extension deliberately capitalized for this test - # to make sure the actual filename (not capitalized) gets added - # to the manifest - dist.script_name = 'setup.PY' - cmd = sdist(dist) - cmd.ensure_finalized() - - with quiet(): - cmd.run() - - # lowercase all names so we can test in a - # case-insensitive way to make sure the files - # are not included. - manifest = map(lambda x: x.lower(), cmd.filelist.files) - assert 'readme.rst' not in manifest, manifest - assert 'setup.py' not in manifest, manifest - assert 'setup.cfg' not in manifest, manifest - - def test_exclude_dev_only_cache_folders(self, source_dir): - included = { - # Emulate problem in https://github.com/pypa/setuptools/issues/4601 - "MANIFEST.in": ( - "global-include LICEN[CS]E* COPYING* NOTICE* AUTHORS*\n" - "global-include *.txt\n" - ), - # For the sake of being conservative and limiting unforeseen side-effects - # we just exclude dev-only cache folders at the root of the repository: - "test/.venv/lib/python3.9/site-packages/bar-2.dist-info/AUTHORS.rst": "", - "src/.nox/py/lib/python3.12/site-packages/bar-2.dist-info/COPYING.txt": "", - "doc/.tox/default/lib/python3.11/site-packages/foo-4.dist-info/LICENSE": "", - # Let's test against false positives with similarly named files: - ".venv-requirements.txt": "", - ".tox-coveragerc.txt": "", - ".noxy/coveragerc.txt": "", - } - - excluded = { - # .tox/.nox/.venv are well-know folders present at the root of Python repos - # and therefore should be excluded - ".tox/release/lib/python3.11/site-packages/foo-4.dist-info/LICENSE": "", - ".nox/py/lib/python3.12/site-packages/bar-2.dist-info/COPYING.txt": "", - ".venv/lib/python3.9/site-packages/bar-2.dist-info/AUTHORS.rst": "", - } - - for file, content in {**excluded, **included}.items(): - Path(source_dir, file).parent.mkdir(parents=True, exist_ok=True) - Path(source_dir, file).write_text(content, encoding="utf-8") - - cmd = self.setup_with_extension() - self.assert_package_data_in_manifest(cmd) - manifest = {f.replace(os.sep, '/') for f in cmd.filelist.files} - for path in excluded: - assert os.path.exists(path) - assert path not in manifest, (path, manifest) - for path in included: - assert os.path.exists(path) - assert path in manifest, (path, manifest) - - @fail_on_ascii - def test_manifest_is_written_with_utf8_encoding(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - mm = manifest_maker(dist) - mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt') - os.mkdir('sdist_test.egg-info') - - # UTF-8 filename - filename = os.path.join('sdist_test', 'smörbröd.py') - - # Must create the file or it will get stripped. - touch(filename) - - # Add UTF-8 filename and write manifest - with quiet(): - mm.run() - mm.filelist.append(filename) - mm.write_manifest() - - contents = read_all_bytes(mm.manifest) - - # The manifest should be UTF-8 encoded - u_contents = contents.decode('UTF-8') - - # The manifest should contain the UTF-8 filename - assert posix(filename) in u_contents - - @fail_on_ascii - def test_write_manifest_allows_utf8_filenames(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - mm = manifest_maker(dist) - mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt') - os.mkdir('sdist_test.egg-info') - - filename = os.path.join(b'sdist_test', Filenames.utf_8) - - # Must touch the file or risk removal - touch(filename) - - # Add filename and write manifest - with quiet(): - mm.run() - u_filename = filename.decode('utf-8') - mm.filelist.files.append(u_filename) - # Re-write manifest - mm.write_manifest() - - contents = read_all_bytes(mm.manifest) - - # The manifest should be UTF-8 encoded - contents.decode('UTF-8') - - # The manifest should contain the UTF-8 filename - assert posix(filename) in contents - - # The filelist should have been updated as well - assert u_filename in mm.filelist.files - - @skip_under_xdist - def test_write_manifest_skips_non_utf8_filenames(self): - """ - Files that cannot be encoded to UTF-8 (specifically, those that - weren't originally successfully decoded and have surrogate - escapes) should be omitted from the manifest. - See https://bitbucket.org/tarek/distribute/issue/303 for history. - """ - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - mm = manifest_maker(dist) - mm.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt') - os.mkdir('sdist_test.egg-info') - - # Latin-1 filename - filename = os.path.join(b'sdist_test', Filenames.latin_1) - - # Add filename with surrogates and write manifest - with quiet(): - mm.run() - u_filename = filename.decode('utf-8', 'surrogateescape') - mm.filelist.append(u_filename) - # Re-write manifest - mm.write_manifest() - - contents = read_all_bytes(mm.manifest) - - # The manifest should be UTF-8 encoded - contents.decode('UTF-8') - - # The Latin-1 filename should have been skipped - assert posix(filename) not in contents - - # The filelist should have been updated as well - assert u_filename not in mm.filelist.files - - @fail_on_ascii - def test_manifest_is_read_with_utf8_encoding(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - # Create manifest - with quiet(): - cmd.run() - - # Add UTF-8 filename to manifest - filename = os.path.join(b'sdist_test', Filenames.utf_8) - cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt') - manifest = open(cmd.manifest, 'ab') - manifest.write(b'\n' + filename) - manifest.close() - - # The file must exist to be included in the filelist - touch(filename) - - # Re-read manifest - cmd.filelist.files = [] - with quiet(): - cmd.read_manifest() - - # The filelist should contain the UTF-8 filename - filename = filename.decode('utf-8') - assert filename in cmd.filelist.files - - @fail_on_latin1_encoded_filenames - def test_read_manifest_skips_non_utf8_filenames(self): - # Test for #303. - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - # Create manifest - with quiet(): - cmd.run() - - # Add Latin-1 filename to manifest - filename = os.path.join(b'sdist_test', Filenames.latin_1) - cmd.manifest = os.path.join('sdist_test.egg-info', 'SOURCES.txt') - manifest = open(cmd.manifest, 'ab') - manifest.write(b'\n' + filename) - manifest.close() - - # The file must exist to be included in the filelist - touch(filename) - - # Re-read manifest - cmd.filelist.files = [] - with quiet(): - cmd.read_manifest() - - # The Latin-1 filename should have been skipped - filename = filename.decode('latin-1') - assert filename not in cmd.filelist.files - - @fail_on_ascii - @fail_on_latin1_encoded_filenames - def test_sdist_with_utf8_encoded_filename(self): - # Test for #303. - dist = Distribution(self.make_strings(SETUP_ATTRS)) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - filename = os.path.join(b'sdist_test', Filenames.utf_8) - touch(filename) - - with quiet(): - cmd.run() - - if sys.platform == 'darwin': - filename = decompose(filename) - - fs_enc = sys.getfilesystemencoding() - - if sys.platform == 'win32': - if fs_enc == 'cp1252': - # Python mangles the UTF-8 filename - filename = filename.decode('cp1252') - assert filename in cmd.filelist.files - else: - filename = filename.decode('mbcs') - assert filename in cmd.filelist.files - else: - filename = filename.decode('utf-8') - assert filename in cmd.filelist.files - - @classmethod - def make_strings(cls, item): - if isinstance(item, dict): - return {key: cls.make_strings(value) for key, value in item.items()} - if isinstance(item, list): - return list(map(cls.make_strings, item)) - return str(item) - - @fail_on_latin1_encoded_filenames - @skip_under_xdist - def test_sdist_with_latin1_encoded_filename(self): - # Test for #303. - dist = Distribution(self.make_strings(SETUP_ATTRS)) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - - # Latin-1 filename - filename = os.path.join(b'sdist_test', Filenames.latin_1) - touch(filename) - assert os.path.isfile(filename) - - with quiet(): - cmd.run() - - # not all windows systems have a default FS encoding of cp1252 - if sys.platform == 'win32': - # Latin-1 is similar to Windows-1252 however - # on mbcs filesys it is not in latin-1 encoding - fs_enc = sys.getfilesystemencoding() - if fs_enc != 'mbcs': - fs_enc = 'latin-1' - filename = filename.decode(fs_enc) - - assert filename in cmd.filelist.files - else: - # The Latin-1 filename should have been skipped - filename = filename.decode('latin-1') - assert filename not in cmd.filelist.files - - _EXAMPLE_DIRECTIVES = { - "setup.cfg - long_description and version": """ - [metadata] - name = testing - version = file: src/VERSION.txt - license_files = DOWHATYOUWANT - long_description = file: README.rst, USAGE.rst - """, - "pyproject.toml - static readme/license files and dynamic version": """ - [project] - name = "testing" - readme = "USAGE.rst" - license-files = ["DOWHATYOUWANT"] - dynamic = ["version"] - [tool.setuptools.dynamic] - version = {file = ["src/VERSION.txt"]} - """, - "pyproject.toml - directive with str instead of list": """ - [project] - name = "testing" - readme = "USAGE.rst" - license-files = ["DOWHATYOUWANT"] - dynamic = ["version"] - [tool.setuptools.dynamic] - version = {file = "src/VERSION.txt"} - """, - "pyproject.toml - deprecated license table with file entry": """ - [project] - name = "testing" - readme = "USAGE.rst" - license = {file = "DOWHATYOUWANT"} - dynamic = ["version"] - [tool.setuptools.dynamic] - version = {file = "src/VERSION.txt"} - """, - } - - @pytest.mark.parametrize("config", _EXAMPLE_DIRECTIVES.keys()) - @pytest.mark.filterwarnings( - "ignore:.project.license. as a TOML table is deprecated" - ) - def test_add_files_referenced_by_config_directives(self, source_dir, config): - config_file, _, _ = config.partition(" - ") - config_text = self._EXAMPLE_DIRECTIVES[config] - (source_dir / 'src').mkdir() - (source_dir / 'src/VERSION.txt').write_text("0.42", encoding="utf-8") - (source_dir / 'README.rst').write_text("hello world!", encoding="utf-8") - (source_dir / 'USAGE.rst').write_text("hello world!", encoding="utf-8") - (source_dir / 'DOWHATYOUWANT').write_text("hello world!", encoding="utf-8") - (source_dir / config_file).write_text(config_text, encoding="utf-8") - - dist = Distribution({"packages": []}) - dist.script_name = 'setup.py' - dist.parse_config_files() - - cmd = sdist(dist) - cmd.ensure_finalized() - with quiet(): - cmd.run() - - assert ( - 'src/VERSION.txt' in cmd.filelist.files - or 'src\\VERSION.txt' in cmd.filelist.files - ) - assert 'USAGE.rst' in cmd.filelist.files - assert 'DOWHATYOUWANT' in cmd.filelist.files - assert '/' not in cmd.filelist.files - assert '\\' not in cmd.filelist.files - - def test_pyproject_toml_in_sdist(self, source_dir): - """ - Check if pyproject.toml is included in source distribution if present - """ - touch(source_dir / 'pyproject.toml') - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - with quiet(): - cmd.run() - manifest = cmd.filelist.files - assert 'pyproject.toml' in manifest - - def test_pyproject_toml_excluded(self, source_dir): - """ - Check that pyproject.toml can excluded even if present - """ - touch(source_dir / 'pyproject.toml') - with open('MANIFEST.in', 'w', encoding="utf-8") as mts: - print('exclude pyproject.toml', file=mts) - dist = Distribution(SETUP_ATTRS) - dist.script_name = 'setup.py' - cmd = sdist(dist) - cmd.ensure_finalized() - with quiet(): - cmd.run() - manifest = cmd.filelist.files - assert 'pyproject.toml' not in manifest - - def test_build_subcommand_source_files(self, source_dir): - touch(source_dir / '.myfile~') - - # Sanity check: without custom commands file list should not be affected - dist = Distribution({**SETUP_ATTRS, "script_name": "setup.py"}) - cmd = sdist(dist) - cmd.ensure_finalized() - with quiet(): - cmd.run() - manifest = cmd.filelist.files - assert '.myfile~' not in manifest - - # Test: custom command should be able to augment file list - dist = Distribution({**SETUP_ATTRS, "script_name": "setup.py"}) - build = dist.get_command_obj("build") - build.sub_commands = [*build.sub_commands, ("build_custom", None)] - - class build_custom(Command): - def initialize_options(self): ... - - def finalize_options(self): ... - - def run(self): ... - - def get_source_files(self): - return ['.myfile~'] - - dist.cmdclass.update(build_custom=build_custom) - - cmd = sdist(dist) - cmd.use_defaults = True - cmd.ensure_finalized() - with quiet(): - cmd.run() - manifest = cmd.filelist.files - assert '.myfile~' in manifest - - @pytest.mark.skipif("os.environ.get('SETUPTOOLS_USE_DISTUTILS') == 'stdlib'") - def test_build_base_pathlib(self, source_dir): - """ - Ensure if build_base is a pathlib.Path, the build still succeeds. - """ - dist = Distribution({ - **SETUP_ATTRS, - "script_name": "setup.py", - "options": {"build": {"build_base": pathlib.Path('build')}}, - }) - cmd = sdist(dist) - cmd.ensure_finalized() - with quiet(): - cmd.run() - - -def test_default_revctrl(): - """ - When _default_revctrl was removed from the `setuptools.command.sdist` - module in 10.0, it broke some systems which keep an old install of - setuptools (Distribute) around. Those old versions require that the - setuptools package continue to implement that interface, so this - function provides that interface, stubbed. See #320 for details. - - This interface must be maintained until Ubuntu 12.04 is no longer - supported (by Setuptools). - """ - (ep,) = metadata.EntryPoints._from_text( - """ - [setuptools.file_finders] - svn_cvs = setuptools.command.sdist:_default_revctrl - """ - ) - res = ep.load() - assert hasattr(res, '__iter__') - - -class TestRegressions: - """ - Can be removed/changed if the project decides to change how it handles symlinks - or external files. - """ - - @staticmethod - def files_for_symlink_in_extension_depends(tmp_path, dep_path): - return { - "external": { - "dir": {"file.h": ""}, - }, - "project": { - "setup.py": cleandoc( - f""" - from setuptools import Extension, setup - setup( - name="myproj", - version="42", - ext_modules=[ - Extension( - "hello", sources=["hello.pyx"], - depends=[{dep_path!r}] - ) - ], - ) - """ - ), - "hello.pyx": "", - "MANIFEST.in": "global-include *.h", - }, - } - - @pytest.mark.parametrize( - "dep_path", ("myheaders/dir/file.h", "myheaders/dir/../dir/file.h") - ) - def test_symlink_in_extension_depends(self, monkeypatch, tmp_path, dep_path): - # Given a project with a symlinked dir and a "depends" targeting that dir - files = self.files_for_symlink_in_extension_depends(tmp_path, dep_path) - jaraco.path.build(files, prefix=str(tmp_path)) - symlink_or_skip_test(tmp_path / "external", tmp_path / "project/myheaders") - - # When `sdist` runs, there should be no error - members = run_sdist(monkeypatch, tmp_path / "project") - # and the sdist should contain the symlinked files - for expected in ( - "myproj-42/hello.pyx", - "myproj-42/myheaders/dir/file.h", - ): - assert expected in members - - @staticmethod - def files_for_external_path_in_extension_depends(tmp_path, dep_path): - head, _, tail = dep_path.partition("$tmp_path$/") - dep_path = tmp_path / tail if tail else head - - return { - "external": { - "dir": {"file.h": ""}, - }, - "project": { - "setup.py": cleandoc( - f""" - from setuptools import Extension, setup - setup( - name="myproj", - version="42", - ext_modules=[ - Extension( - "hello", sources=["hello.pyx"], - depends=[{str(dep_path)!r}] - ) - ], - ) - """ - ), - "hello.pyx": "", - "MANIFEST.in": "global-include *.h", - }, - } - - @pytest.mark.parametrize( - "dep_path", ("$tmp_path$/external/dir/file.h", "../external/dir/file.h") - ) - def test_external_path_in_extension_depends(self, monkeypatch, tmp_path, dep_path): - # Given a project with a "depends" targeting an external dir - files = self.files_for_external_path_in_extension_depends(tmp_path, dep_path) - jaraco.path.build(files, prefix=str(tmp_path)) - # When `sdist` runs, there should be no error - members = run_sdist(monkeypatch, tmp_path / "project") - # and the sdist should not contain the external file - for name in members: - assert "file.h" not in name - - -def run_sdist(monkeypatch, project): - """Given a project directory, run the sdist and return its contents""" - monkeypatch.chdir(project) - with quiet(): - run_setup("setup.py", ["sdist"]) - - archive = next((project / "dist").glob("*.tar.gz")) - with tarfile.open(str(archive)) as tar: - return set(tar.getnames()) - - -def test_sanity_check_setuptools_own_sdist(setuptools_sdist): - with tarfile.open(setuptools_sdist) as tar: - files = tar.getnames() - - # setuptools sdist should not include the .tox folder - tox_files = [name for name in files if ".tox" in name] - assert len(tox_files) == 0, f"not empty {tox_files}" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setopt.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setopt.py deleted file mode 100644 index ccf2561..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setopt.py +++ /dev/null @@ -1,40 +0,0 @@ -import configparser - -from setuptools.command import setopt - - -class TestEdit: - @staticmethod - def parse_config(filename): - parser = configparser.ConfigParser() - with open(filename, encoding='utf-8') as reader: - parser.read_file(reader) - return parser - - @staticmethod - def write_text(file, content): - with open(file, 'wb') as strm: - strm.write(content.encode('utf-8')) - - def test_utf8_encoding_retained(self, tmpdir): - """ - When editing a file, non-ASCII characters encoded in - UTF-8 should be retained. - """ - config = tmpdir.join('setup.cfg') - self.write_text(str(config), '[names]\njaraco=джарако') - setopt.edit_config(str(config), dict(names=dict(other='yes'))) - parser = self.parse_config(str(config)) - assert parser.get('names', 'jaraco') == 'джарако' - assert parser.get('names', 'other') == 'yes' - - def test_case_retained(self, tmpdir): - """ - When editing a file, case of keys should be retained. - """ - config = tmpdir.join('setup.cfg') - self.write_text(str(config), '[names]\nFoO=bAr') - setopt.edit_config(str(config), dict(names=dict(oTher='yes'))) - actual = config.read_text(encoding='ascii') - assert 'FoO' in actual - assert 'oTher' in actual diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setuptools.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setuptools.py deleted file mode 100644 index 1d56e1a..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_setuptools.py +++ /dev/null @@ -1,290 +0,0 @@ -"""Tests for the 'setuptools' package""" - -import os -import re -import sys -from zipfile import ZipFile - -import pytest -from packaging.version import Version - -import setuptools -import setuptools.depends as dep -import setuptools.dist -from setuptools.depends import Require - -import distutils.cmd -import distutils.core -from distutils.core import Extension -from distutils.errors import DistutilsSetupError - - -@pytest.fixture(autouse=True) -def isolated_dir(tmpdir_cwd): - return - - -def makeSetup(**args): - """Return distribution from 'setup(**args)', without executing commands""" - - distutils.core._setup_stop_after = "commandline" - - # Don't let system command line leak into tests! - args.setdefault('script_args', ['install']) - - try: - return setuptools.setup(**args) - finally: - distutils.core._setup_stop_after = None - - -needs_bytecode = pytest.mark.skipif( - not hasattr(dep, 'get_module_constant'), - reason="bytecode support not available", -) - - -class TestDepends: - def testExtractConst(self): - if not hasattr(dep, 'extract_constant'): - # skip on non-bytecode platforms - return - - def f1(): - global x, y, z - x = "test" - y = z # pyright: ignore[reportUnboundVariable] # Explicitly testing for this runtime issue - - fc = f1.__code__ - - # unrecognized name - assert dep.extract_constant(fc, 'q', -1) is None - - # constant assigned - assert dep.extract_constant(fc, 'x', -1) == "test" - - # expression assigned - assert dep.extract_constant(fc, 'y', -1) == -1 - - # recognized name, not assigned - assert dep.extract_constant(fc, 'z', -1) is None - - def testFindModule(self): - with pytest.raises(ImportError): - dep.find_module('no-such.-thing') - with pytest.raises(ImportError): - dep.find_module('setuptools.non-existent') - f, _p, _i = dep.find_module('setuptools.tests') - f.close() - - @needs_bytecode - def testModuleExtract(self): - from json import __version__ - - assert dep.get_module_constant('json', '__version__') == __version__ - assert dep.get_module_constant('sys', 'version') == sys.version - assert ( - dep.get_module_constant('setuptools.tests.test_setuptools', '__doc__') - == __doc__ - ) - - @needs_bytecode - def testRequire(self): - req = Require('Json', '1.0.3', 'json') - - assert req.name == 'Json' - assert req.module == 'json' - assert req.requested_version == Version('1.0.3') - assert req.attribute == '__version__' - assert req.full_name() == 'Json-1.0.3' - - from json import __version__ - - assert str(req.get_version()) == __version__ - assert req.version_ok('1.0.9') - assert not req.version_ok('0.9.1') - assert not req.version_ok('unknown') - - assert req.is_present() - assert req.is_current() - - req = Require('Do-what-I-mean', '1.0', 'd-w-i-m') - assert not req.is_present() - assert not req.is_current() - - @needs_bytecode - def test_require_present(self): - # In #1896, this test was failing for months with the only - # complaint coming from test runners (not end users). - # TODO: Evaluate if this code is needed at all. - req = Require('Tests', None, 'tests', homepage="http://example.com") - assert req.format is None - assert req.attribute is None - assert req.requested_version is None - assert req.full_name() == 'Tests' - assert req.homepage == 'http://example.com' - - from setuptools.tests import __path__ - - paths = [os.path.dirname(p) for p in __path__] - assert req.is_present(paths) - assert req.is_current(paths) - - -class TestDistro: - def setup_method(self, method): - self.e1 = Extension('bar.ext', ['bar.c']) - self.e2 = Extension('c.y', ['y.c']) - - self.dist = makeSetup( - packages=['a', 'a.b', 'a.b.c', 'b', 'c'], - py_modules=['b.d', 'x'], - ext_modules=(self.e1, self.e2), - package_dir={}, - ) - - def testDistroType(self): - assert isinstance(self.dist, setuptools.dist.Distribution) - - def testExcludePackage(self): - self.dist.exclude_package('a') - assert self.dist.packages == ['b', 'c'] - - self.dist.exclude_package('b') - assert self.dist.packages == ['c'] - assert self.dist.py_modules == ['x'] - assert self.dist.ext_modules == [self.e1, self.e2] - - self.dist.exclude_package('c') - assert self.dist.packages == [] - assert self.dist.py_modules == ['x'] - assert self.dist.ext_modules == [self.e1] - - # test removals from unspecified options - makeSetup().exclude_package('x') - - def testIncludeExclude(self): - # remove an extension - self.dist.exclude(ext_modules=[self.e1]) - assert self.dist.ext_modules == [self.e2] - - # add it back in - self.dist.include(ext_modules=[self.e1]) - assert self.dist.ext_modules == [self.e2, self.e1] - - # should not add duplicate - self.dist.include(ext_modules=[self.e1]) - assert self.dist.ext_modules == [self.e2, self.e1] - - def testExcludePackages(self): - self.dist.exclude(packages=['c', 'b', 'a']) - assert self.dist.packages == [] - assert self.dist.py_modules == ['x'] - assert self.dist.ext_modules == [self.e1] - - def testEmpty(self): - dist = makeSetup() - dist.include(packages=['a'], py_modules=['b'], ext_modules=[self.e2]) - dist = makeSetup() - dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2]) - - def testContents(self): - assert self.dist.has_contents_for('a') - self.dist.exclude_package('a') - assert not self.dist.has_contents_for('a') - - assert self.dist.has_contents_for('b') - self.dist.exclude_package('b') - assert not self.dist.has_contents_for('b') - - assert self.dist.has_contents_for('c') - self.dist.exclude_package('c') - assert not self.dist.has_contents_for('c') - - def testInvalidIncludeExclude(self): - with pytest.raises(DistutilsSetupError): - self.dist.include(nonexistent_option='x') - with pytest.raises(DistutilsSetupError): - self.dist.exclude(nonexistent_option='x') - with pytest.raises(DistutilsSetupError): - self.dist.include(packages={'x': 'y'}) - with pytest.raises(DistutilsSetupError): - self.dist.exclude(packages={'x': 'y'}) - with pytest.raises(DistutilsSetupError): - self.dist.include(ext_modules={'x': 'y'}) - with pytest.raises(DistutilsSetupError): - self.dist.exclude(ext_modules={'x': 'y'}) - - with pytest.raises(DistutilsSetupError): - self.dist.include(package_dir=['q']) - with pytest.raises(DistutilsSetupError): - self.dist.exclude(package_dir=['q']) - - -@pytest.fixture -def example_source(tmpdir): - tmpdir.mkdir('foo') - (tmpdir / 'foo/bar.py').write('') - (tmpdir / 'readme.txt').write('') - return tmpdir - - -def test_findall(example_source): - found = list(setuptools.findall(str(example_source))) - expected = ['readme.txt', 'foo/bar.py'] - expected = [example_source.join(fn) for fn in expected] - assert found == expected - - -def test_findall_curdir(example_source): - with example_source.as_cwd(): - found = list(setuptools.findall()) - expected = ['readme.txt', os.path.join('foo', 'bar.py')] - assert found == expected - - -@pytest.fixture -def can_symlink(tmpdir): - """ - Skip if cannot create a symbolic link - """ - link_fn = 'link' - target_fn = 'target' - try: - os.symlink(target_fn, link_fn) - except (OSError, NotImplementedError, AttributeError): - pytest.skip("Cannot create symbolic links") - os.remove(link_fn) - - -@pytest.mark.usefixtures("can_symlink") -def test_findall_missing_symlink(tmpdir): - with tmpdir.as_cwd(): - os.symlink('foo', 'bar') - found = list(setuptools.findall()) - assert found == [] - - -@pytest.mark.xfail(reason="unable to exclude tests; #4475 #3260") -def test_its_own_wheel_does_not_contain_tests(setuptools_wheel): - with ZipFile(setuptools_wheel) as zipfile: - contents = [f.replace(os.sep, '/') for f in zipfile.namelist()] - - for member in contents: - assert '/tests/' not in member - - -def test_wheel_includes_cli_scripts(setuptools_wheel): - with ZipFile(setuptools_wheel) as zipfile: - contents = [f.replace(os.sep, '/') for f in zipfile.namelist()] - - assert any('cli-64.exe' in member for member in contents) - - -def test_wheel_includes_vendored_metadata(setuptools_wheel): - with ZipFile(setuptools_wheel) as zipfile: - contents = [f.replace(os.sep, '/') for f in zipfile.namelist()] - - assert any( - re.search(r'_vendor/.*\.dist-info/METADATA', member) for member in contents - ) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_shutil_wrapper.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_shutil_wrapper.py deleted file mode 100644 index 74ff7e9..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_shutil_wrapper.py +++ /dev/null @@ -1,23 +0,0 @@ -import stat -import sys -from unittest.mock import Mock - -from setuptools import _shutil - - -def test_rmtree_readonly(monkeypatch, tmp_path): - """Verify onerr works as expected""" - - tmp_dir = tmp_path / "with_readonly" - tmp_dir.mkdir() - some_file = tmp_dir.joinpath("file.txt") - some_file.touch() - some_file.chmod(stat.S_IREAD) - - expected_count = 1 if sys.platform.startswith("win") else 0 - chmod_fn = Mock(wraps=_shutil.attempt_chmod_verbose) - monkeypatch.setattr(_shutil, "attempt_chmod_verbose", chmod_fn) - - _shutil.rmtree(tmp_dir) - assert chmod_fn.call_count == expected_count - assert not tmp_dir.is_dir() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_unicode_utils.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_unicode_utils.py deleted file mode 100644 index a24a9bd..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_unicode_utils.py +++ /dev/null @@ -1,10 +0,0 @@ -from setuptools import unicode_utils - - -def test_filesys_decode_fs_encoding_is_None(monkeypatch): - """ - Test filesys_decode does not raise TypeError when - getfilesystemencoding returns None. - """ - monkeypatch.setattr('sys.getfilesystemencoding', lambda: None) - unicode_utils.filesys_decode(b'test') diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_virtualenv.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_virtualenv.py deleted file mode 100644 index b02949b..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_virtualenv.py +++ /dev/null @@ -1,113 +0,0 @@ -import os -import subprocess -import sys -from urllib.error import URLError -from urllib.request import urlopen - -import pytest - - -@pytest.fixture(autouse=True) -def pytest_virtualenv_works(venv): - """ - pytest_virtualenv may not work. if it doesn't, skip these - tests. See #1284. - """ - venv_prefix = venv.run(["python", "-c", "import sys; print(sys.prefix)"]).strip() - if venv_prefix == sys.prefix: - pytest.skip("virtualenv is broken (see pypa/setuptools#1284)") - - -def test_clean_env_install(venv_without_setuptools, setuptools_wheel): - """ - Check setuptools can be installed in a clean environment. - """ - cmd = ["python", "-m", "pip", "install", str(setuptools_wheel)] - venv_without_setuptools.run(cmd) - - -def access_pypi(): - # Detect if tests are being run without connectivity - if not os.environ.get('NETWORK_REQUIRED', False): # pragma: nocover - try: - urlopen('https://pypi.org', timeout=1) - except URLError: - # No network, disable most of these tests - return False - - return True - - -@pytest.mark.skipif( - 'platform.python_implementation() == "PyPy"', - reason="https://github.com/pypa/setuptools/pull/2865#issuecomment-965834995", -) -@pytest.mark.skipif(not access_pypi(), reason="no network") -# ^-- Even when it is not necessary to install a different version of `pip` -# the build process will still try to download `wheel`, see #3147 and #2986. -@pytest.mark.parametrize( - 'pip_version', - [ - None, - pytest.param( - 'pip<20.1', - marks=pytest.mark.xfail( - 'sys.version_info >= (3, 12)', - reason="pip 23.1.2 required for Python 3.12 and later", - ), - ), - pytest.param( - 'pip<21', - marks=pytest.mark.xfail( - 'sys.version_info >= (3, 12)', - reason="pip 23.1.2 required for Python 3.12 and later", - ), - ), - pytest.param( - 'pip<22', - marks=pytest.mark.xfail( - 'sys.version_info >= (3, 12)', - reason="pip 23.1.2 required for Python 3.12 and later", - ), - ), - pytest.param( - 'pip<23', - marks=pytest.mark.xfail( - 'sys.version_info >= (3, 12)', - reason="pip 23.1.2 required for Python 3.12 and later", - ), - ), - pytest.param( - 'https://github.com/pypa/pip/archive/main.zip', - marks=pytest.mark.xfail(reason='#2975'), - ), - ], -) -def test_pip_upgrade_from_source( - pip_version, venv_without_setuptools, setuptools_wheel, setuptools_sdist -): - """ - Check pip can upgrade setuptools from source. - """ - # Install pip/wheel, in a venv without setuptools (as it - # should not be needed for bootstrapping from source) - venv = venv_without_setuptools - venv.run(["pip", "install", "-U", "wheel"]) - if pip_version is not None: - venv.run(["python", "-m", "pip", "install", "-U", pip_version, "--retries=1"]) - with pytest.raises(subprocess.CalledProcessError): - # Meta-test to make sure setuptools is not installed - venv.run(["python", "-c", "import setuptools"]) - - # Then install from wheel. - venv.run(["pip", "install", str(setuptools_wheel)]) - # And finally try to upgrade from source. - venv.run(["pip", "install", "--no-cache-dir", "--upgrade", str(setuptools_sdist)]) - - -def test_no_missing_dependencies(bare_venv, request): - """ - Quick and dirty test to ensure all external dependencies are vendored. - """ - setuptools_dir = request.config.rootdir - bare_venv.run(['python', 'setup.py', '--help'], cwd=setuptools_dir) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_warnings.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_warnings.py deleted file mode 100644 index 41193d4..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_warnings.py +++ /dev/null @@ -1,106 +0,0 @@ -from inspect import cleandoc - -import pytest - -from setuptools.warnings import SetuptoolsDeprecationWarning, SetuptoolsWarning - -_EXAMPLES = { - "default": dict( - args=("Hello {x}", "\n\t{target} {v:.1f}"), - kwargs={"x": 5, "v": 3, "target": "World"}, - expected=""" - Hello 5 - !! - - ******************************************************************************** - World 3.0 - ******************************************************************************** - - !! - """, - ), - "futue_due_date": dict( - args=("Summary", "Lorem ipsum"), - kwargs={"due_date": (9999, 11, 22)}, - expected=""" - Summary - !! - - ******************************************************************************** - Lorem ipsum - - By 9999-Nov-22, you need to update your project and remove deprecated calls - or your builds will no longer be supported. - ******************************************************************************** - - !! - """, - ), - "past_due_date_with_docs": dict( - args=("Summary", "Lorem ipsum"), - kwargs={"due_date": (2000, 11, 22), "see_docs": "some_page.html"}, - expected=""" - Summary - !! - - ******************************************************************************** - Lorem ipsum - - This deprecation is overdue, please update your project and remove deprecated - calls to avoid build errors in the future. - - See https://setuptools.pypa.io/en/latest/some_page.html for details. - ******************************************************************************** - - !! - """, - ), -} - - -@pytest.mark.parametrize("example_name", _EXAMPLES.keys()) -def test_formatting(monkeypatch, example_name): - """ - It should automatically handle indentation, interpolation and things like due date. - """ - args = _EXAMPLES[example_name]["args"] - kwargs = _EXAMPLES[example_name]["kwargs"] - expected = _EXAMPLES[example_name]["expected"] - - monkeypatch.setenv("SETUPTOOLS_ENFORCE_DEPRECATION", "false") - with pytest.warns(SetuptoolsWarning) as warn_info: - SetuptoolsWarning.emit(*args, **kwargs) - assert _get_message(warn_info) == cleandoc(expected) - - -def test_due_date_enforcement(monkeypatch): - class _MyDeprecation(SetuptoolsDeprecationWarning): - _SUMMARY = "Summary" - _DETAILS = "Lorem ipsum" - _DUE_DATE = (2000, 11, 22) - _SEE_DOCS = "some_page.html" - - monkeypatch.setenv("SETUPTOOLS_ENFORCE_DEPRECATION", "true") - with pytest.raises(SetuptoolsDeprecationWarning) as exc_info: - _MyDeprecation.emit() - - expected = """ - Summary - !! - - ******************************************************************************** - Lorem ipsum - - This deprecation is overdue, please update your project and remove deprecated - calls to avoid build errors in the future. - - See https://setuptools.pypa.io/en/latest/some_page.html for details. - ******************************************************************************** - - !! - """ - assert str(exc_info.value) == cleandoc(expected) - - -def _get_message(warn_info): - return next(warn.message.args[0] for warn in warn_info) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_wheel.py deleted file mode 100644 index 70165c6..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_wheel.py +++ /dev/null @@ -1,714 +0,0 @@ -"""wheel tests""" - -from __future__ import annotations - -import contextlib -import glob -import inspect -import os -import pathlib -import shutil -import stat -import subprocess -import sys -import zipfile -from typing import Any - -import pytest -from jaraco import path -from packaging.tags import parse_tag -from packaging.utils import canonicalize_name - -from pkg_resources import PY_MAJOR, Distribution, PathMetadata -from setuptools.wheel import Wheel - -from .contexts import tempdir -from .textwrap import DALS - -from distutils.sysconfig import get_config_var -from distutils.util import get_platform - -WHEEL_INFO_TESTS = ( - ('invalid.whl', ValueError), - ( - 'simplewheel-2.0-1-py2.py3-none-any.whl', - { - 'project_name': 'simplewheel', - 'version': '2.0', - 'build': '1', - 'py_version': 'py2.py3', - 'abi': 'none', - 'platform': 'any', - }, - ), - ( - 'simple.dist-0.1-py2.py3-none-any.whl', - { - 'project_name': 'simple.dist', - 'version': '0.1', - 'build': None, - 'py_version': 'py2.py3', - 'abi': 'none', - 'platform': 'any', - }, - ), - ( - 'example_pkg_a-1-py3-none-any.whl', - { - 'project_name': 'example_pkg_a', - 'version': '1', - 'build': None, - 'py_version': 'py3', - 'abi': 'none', - 'platform': 'any', - }, - ), - ( - 'PyQt5-5.9-5.9.1-cp35.cp36.cp37-abi3-manylinux1_x86_64.whl', - { - 'project_name': 'PyQt5', - 'version': '5.9', - 'build': '5.9.1', - 'py_version': 'cp35.cp36.cp37', - 'abi': 'abi3', - 'platform': 'manylinux1_x86_64', - }, - ), -) - - -@pytest.mark.parametrize( - ('filename', 'info'), WHEEL_INFO_TESTS, ids=[t[0] for t in WHEEL_INFO_TESTS] -) -def test_wheel_info(filename, info): - if inspect.isclass(info): - with pytest.raises(info): - Wheel(filename) - return - w = Wheel(filename) - assert {k: getattr(w, k) for k in info.keys()} == info - - -@contextlib.contextmanager -def build_wheel(extra_file_defs=None, **kwargs): - file_defs = { - 'setup.py': ( - DALS( - """ - # -*- coding: utf-8 -*- - from setuptools import setup - import setuptools - setup(**%r) - """ - ) - % kwargs - ).encode('utf-8'), - } - if extra_file_defs: - file_defs.update(extra_file_defs) - with tempdir() as source_dir: - path.build(file_defs, source_dir) - subprocess.check_call( - (sys.executable, 'setup.py', '-q', 'bdist_wheel'), cwd=source_dir - ) - yield glob.glob(os.path.join(source_dir, 'dist', '*.whl'))[0] - - -def tree_set(root): - contents = set() - for dirpath, dirnames, filenames in os.walk(root): - for filename in filenames: - contents.add(os.path.join(os.path.relpath(dirpath, root), filename)) - return contents - - -def flatten_tree(tree): - """Flatten nested dicts and lists into a full list of paths""" - output = set() - for node, contents in tree.items(): - if isinstance(contents, dict): - contents = flatten_tree(contents) - - for elem in contents: - if isinstance(elem, dict): - output |= {os.path.join(node, val) for val in flatten_tree(elem)} - else: - output.add(os.path.join(node, elem)) - return output - - -def format_install_tree(tree): - return { - x.format( - py_version=PY_MAJOR, - platform=get_platform(), - shlib_ext=get_config_var('EXT_SUFFIX') or get_config_var('SO'), - ) - for x in tree - } - - -def _check_wheel_install( - filename, install_dir, install_tree_includes, project_name, version, requires_txt -): - w = Wheel(filename) - egg_path = os.path.join(install_dir, w.egg_name()) - w.install_as_egg(egg_path) - if install_tree_includes is not None: - install_tree = format_install_tree(install_tree_includes) - exp = tree_set(install_dir) - assert install_tree.issubset(exp), install_tree - exp - - metadata = PathMetadata(egg_path, os.path.join(egg_path, 'EGG-INFO')) - dist = Distribution.from_filename(egg_path, metadata=metadata) - assert dist.project_name == project_name - assert dist.version == version - if requires_txt is None: - assert not dist.has_metadata('requires.txt') - else: - # Order must match to ensure reproducibility. - assert requires_txt == dist.get_metadata('requires.txt').lstrip() - - -class Record: - def __init__(self, id, **kwargs): - self._id = id - self._fields = kwargs - - def __repr__(self) -> str: - return f'{self._id}(**{self._fields!r})' - - -# Using Any to avoid possible type union issues later in test -# making a TypedDict is not worth in a test and anonymous/inline TypedDict are experimental -# https://github.com/python/mypy/issues/9884 -WHEEL_INSTALL_TESTS: tuple[dict[str, Any], ...] = ( - dict( - id='basic', - file_defs={'foo': {'__init__.py': ''}}, - setup_kwargs=dict( - packages=['foo'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': ['PKG-INFO', 'RECORD', 'WHEEL', 'top_level.txt'], - 'foo': ['__init__.py'], - } - }), - ), - dict( - id='utf-8', - setup_kwargs=dict( - description='Description accentuée', - ), - ), - dict( - id='data', - file_defs={ - 'data.txt': DALS( - """ - Some data... - """ - ), - }, - setup_kwargs=dict( - data_files=[('data_dir', ['data.txt'])], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': ['PKG-INFO', 'RECORD', 'WHEEL', 'top_level.txt'], - 'data_dir': ['data.txt'], - } - }), - ), - dict( - id='extension', - file_defs={ - 'extension.c': DALS( - """ - #include "Python.h" - - #if PY_MAJOR_VERSION >= 3 - - static struct PyModuleDef moduledef = { - PyModuleDef_HEAD_INIT, - "extension", - NULL, - 0, - NULL, - NULL, - NULL, - NULL, - NULL - }; - - #define INITERROR return NULL - - PyMODINIT_FUNC PyInit_extension(void) - - #else - - #define INITERROR return - - void initextension(void) - - #endif - { - #if PY_MAJOR_VERSION >= 3 - PyObject *module = PyModule_Create(&moduledef); - #else - PyObject *module = Py_InitModule("extension", NULL); - #endif - if (module == NULL) - INITERROR; - #if PY_MAJOR_VERSION >= 3 - return module; - #endif - } - """ - ), - }, - setup_kwargs=dict( - ext_modules=[ - Record( - 'setuptools.Extension', name='extension', sources=['extension.c'] - ) - ], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}-{platform}.egg': [ - 'extension{shlib_ext}', - { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'top_level.txt', - ] - }, - ] - }), - ), - dict( - id='header', - file_defs={ - 'header.h': DALS( - """ - """ - ), - }, - setup_kwargs=dict( - headers=['header.h'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': [ - 'header.h', - { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'top_level.txt', - ] - }, - ] - }), - ), - dict( - id='script', - file_defs={ - 'script.py': DALS( - """ - #/usr/bin/python - print('hello world!') - """ - ), - 'script.sh': DALS( - """ - #/bin/sh - echo 'hello world!' - """ - ), - }, - setup_kwargs=dict( - scripts=['script.py', 'script.sh'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'top_level.txt', - {'scripts': ['script.py', 'script.sh']}, - ] - } - }), - ), - dict( - id='requires1', - install_requires='foobar==2.0', - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'requires.txt', - 'top_level.txt', - ] - } - }), - requires_txt=DALS( - """ - foobar==2.0 - """ - ), - ), - dict( - id='requires2', - install_requires=f""" - bar - foo<=2.0; {sys.platform!r} in sys_platform - """, - requires_txt=DALS( - """ - bar - foo<=2.0 - """ - ), - ), - dict( - id='requires3', - install_requires=f""" - bar; {sys.platform!r} != sys_platform - """, - ), - dict( - id='requires4', - install_requires=""" - foo - """, - extras_require={ - 'extra': 'foobar>3', - }, - requires_txt=DALS( - """ - foo - - [extra] - foobar>3 - """ - ), - ), - dict( - id='requires5', - extras_require={ - 'extra': f'foobar; {sys.platform!r} != sys_platform', - }, - requires_txt=DALS( - """ - [extra] - """ - ), - ), - dict( - id='requires_ensure_order', - install_requires=""" - foo - bar - baz - qux - """, - extras_require={ - 'extra': """ - foobar>3 - barbaz>4 - bazqux>5 - quxzap>6 - """, - }, - requires_txt=DALS( - """ - foo - bar - baz - qux - - [extra] - foobar>3 - barbaz>4 - bazqux>5 - quxzap>6 - """ - ), - ), - dict( - id='namespace_package', - file_defs={ - 'foo': { - 'bar': {'__init__.py': ''}, - }, - }, - setup_kwargs=dict( - namespace_packages=['foo'], - packages=['foo.bar'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': [ - 'foo-1.0-py{py_version}-nspkg.pth', - { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'namespace_packages.txt', - 'top_level.txt', - ] - }, - { - 'foo': [ - '__init__.py', - {'bar': ['__init__.py']}, - ] - }, - ] - }), - ), - dict( - id='empty_namespace_package', - file_defs={ - 'foobar': { - '__init__.py': ( - "__import__('pkg_resources').declare_namespace(__name__)" - ) - }, - }, - setup_kwargs=dict( - namespace_packages=['foobar'], - packages=['foobar'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': [ - 'foo-1.0-py{py_version}-nspkg.pth', - { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'namespace_packages.txt', - 'top_level.txt', - ] - }, - { - 'foobar': [ - '__init__.py', - ] - }, - ] - }), - ), - dict( - id='data_in_package', - file_defs={ - 'foo': { - '__init__.py': '', - 'data_dir': { - 'data.txt': DALS( - """ - Some data... - """ - ), - }, - } - }, - setup_kwargs=dict( - packages=['foo'], - data_files=[('foo/data_dir', ['foo/data_dir/data.txt'])], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'top_level.txt', - ], - 'foo': [ - '__init__.py', - { - 'data_dir': [ - 'data.txt', - ] - }, - ], - } - }), - ), -) - - -@pytest.mark.parametrize( - 'params', - WHEEL_INSTALL_TESTS, - ids=[params['id'] for params in WHEEL_INSTALL_TESTS], -) -def test_wheel_install(params): - project_name = params.get('name', 'foo') - version = params.get('version', '1.0') - install_requires = params.get('install_requires', []) - extras_require = params.get('extras_require', {}) - requires_txt = params.get('requires_txt', None) - install_tree = params.get('install_tree') - file_defs = params.get('file_defs', {}) - setup_kwargs = params.get('setup_kwargs', {}) - with ( - build_wheel( - name=project_name, - version=version, - install_requires=install_requires, - extras_require=extras_require, - extra_file_defs=file_defs, - **setup_kwargs, - ) as filename, - tempdir() as install_dir, - ): - _check_wheel_install( - filename, install_dir, install_tree, project_name, version, requires_txt - ) - - -def test_wheel_install_pep_503(): - project_name = 'Foo_Bar' # PEP 503 canonicalized name is "foo-bar" - version = '1.0' - with ( - build_wheel( - name=project_name, - version=version, - ) as filename, - tempdir() as install_dir, - ): - new_filename = filename.replace(project_name, canonicalize_name(project_name)) - shutil.move(filename, new_filename) - _check_wheel_install( - new_filename, - install_dir, - None, - canonicalize_name(project_name), - version, - None, - ) - - -def test_wheel_no_dist_dir(): - project_name = 'nodistinfo' - version = '1.0' - wheel_name = f'{project_name}-{version}-py2.py3-none-any.whl' - with tempdir() as source_dir: - wheel_path = os.path.join(source_dir, wheel_name) - # create an empty zip file - zipfile.ZipFile(wheel_path, 'w').close() - with tempdir() as install_dir: - with pytest.raises(ValueError): - _check_wheel_install( - wheel_path, install_dir, None, project_name, version, None - ) - - -def test_wheel_is_compatible(monkeypatch): - def sys_tags(): - return { - (t.interpreter, t.abi, t.platform) - for t in parse_tag('cp36-cp36m-manylinux1_x86_64') - } - - monkeypatch.setattr('setuptools.wheel._get_supported_tags', sys_tags) - assert Wheel('onnxruntime-0.1.2-cp36-cp36m-manylinux1_x86_64.whl').is_compatible() - - -def test_wheel_mode(): - @contextlib.contextmanager - def build_wheel(extra_file_defs=None, **kwargs): - file_defs = { - 'setup.py': ( - DALS( - """ - # -*- coding: utf-8 -*- - from setuptools import setup - import setuptools - setup(**%r) - """ - ) - % kwargs - ).encode('utf-8'), - } - if extra_file_defs: - file_defs.update(extra_file_defs) - with tempdir() as source_dir: - path.build(file_defs, source_dir) - runsh = pathlib.Path(source_dir) / "script.sh" - os.chmod(runsh, 0o777) - subprocess.check_call( - (sys.executable, 'setup.py', '-q', 'bdist_wheel'), cwd=source_dir - ) - yield glob.glob(os.path.join(source_dir, 'dist', '*.whl'))[0] - - params = dict( - id='script', - file_defs={ - 'script.py': DALS( - """ - #/usr/bin/python - print('hello world!') - """ - ), - 'script.sh': DALS( - """ - #/bin/sh - echo 'hello world!' - """ - ), - }, - setup_kwargs=dict( - scripts=['script.py', 'script.sh'], - ), - install_tree=flatten_tree({ - 'foo-1.0-py{py_version}.egg': { - 'EGG-INFO': [ - 'PKG-INFO', - 'RECORD', - 'WHEEL', - 'top_level.txt', - {'scripts': ['script.py', 'script.sh']}, - ] - } - }), - ) - - project_name = params.get('name', 'foo') - version = params.get('version', '1.0') - install_tree = params.get('install_tree') - file_defs = params.get('file_defs', {}) - setup_kwargs = params.get('setup_kwargs', {}) - - with ( - build_wheel( - name=project_name, - version=version, - install_requires=[], - extras_require={}, - extra_file_defs=file_defs, - **setup_kwargs, - ) as filename, - tempdir() as install_dir, - ): - _check_wheel_install( - filename, install_dir, install_tree, project_name, version, None - ) - w = Wheel(filename) - base = pathlib.Path(install_dir) / w.egg_name() - script_sh = base / "EGG-INFO" / "scripts" / "script.sh" - assert script_sh.exists() - if sys.platform != 'win32': - # Editable file mode has no effect on Windows - assert oct(stat.S_IMODE(script_sh.stat().st_mode)) == "0o777" diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_windows_wrappers.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_windows_wrappers.py deleted file mode 100644 index f895485..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/test_windows_wrappers.py +++ /dev/null @@ -1,259 +0,0 @@ -""" -Python Script Wrapper for Windows -================================= - -setuptools includes wrappers for Python scripts that allows them to be -executed like regular windows programs. There are 2 wrappers, one -for command-line programs, cli.exe, and one for graphical programs, -gui.exe. These programs are almost identical, function pretty much -the same way, and are generated from the same source file. The -wrapper programs are used by copying them to the directory containing -the script they are to wrap and with the same name as the script they -are to wrap. -""" - -import pathlib -import platform -import subprocess -import sys -import textwrap - -import pytest - -import pkg_resources -from setuptools.command.easy_install import nt_quote_arg - -pytestmark = pytest.mark.skipif(sys.platform != 'win32', reason="Windows only") - - -class WrapperTester: - @classmethod - def prep_script(cls, template): - python_exe = nt_quote_arg(sys.executable) - return template % locals() - - @classmethod - def create_script(cls, tmpdir): - """ - Create a simple script, foo-script.py - - Note that the script starts with a Unix-style '#!' line saying which - Python executable to run. The wrapper will use this line to find the - correct Python executable. - """ - - script = cls.prep_script(cls.script_tmpl) - - with (tmpdir / cls.script_name).open('w') as f: - f.write(script) - - # also copy cli.exe to the sample directory - with (tmpdir / cls.wrapper_name).open('wb') as f: - w = pkg_resources.resource_string('setuptools', cls.wrapper_source) - f.write(w) - - -def win_launcher_exe(prefix): - """A simple routine to select launcher script based on platform.""" - assert prefix in ('cli', 'gui') - if platform.machine() == "ARM64": - return f"{prefix}-arm64.exe" - else: - return f"{prefix}-32.exe" - - -class TestCLI(WrapperTester): - script_name = 'foo-script.py' - wrapper_name = 'foo.exe' - wrapper_source = win_launcher_exe('cli') - - script_tmpl = textwrap.dedent( - """ - #!%(python_exe)s - import sys - input = repr(sys.stdin.read()) - print(sys.argv[0][-14:]) - print(sys.argv[1:]) - print(input) - if __debug__: - print('non-optimized') - """ - ).lstrip() - - def test_basic(self, tmpdir): - """ - When the copy of cli.exe, foo.exe in this example, runs, it examines - the path name it was run with and computes a Python script path name - by removing the '.exe' suffix and adding the '-script.py' suffix. (For - GUI programs, the suffix '-script.pyw' is added.) This is why we - named out script the way we did. Now we can run out script by running - the wrapper: - - This example was a little pathological in that it exercised windows - (MS C runtime) quoting rules: - - - Strings containing spaces are surrounded by double quotes. - - - Double quotes in strings need to be escaped by preceding them with - back slashes. - - - One or more backslashes preceding double quotes need to be escaped - by preceding each of them with back slashes. - """ - self.create_script(tmpdir) - cmd = [ - str(tmpdir / 'foo.exe'), - 'arg1', - 'arg 2', - 'arg "2\\"', - 'arg 4\\', - 'arg5 a\\\\b', - ] - proc = subprocess.Popen( - cmd, - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - text=True, - encoding="utf-8", - ) - stdout, _stderr = proc.communicate('hello\nworld\n') - actual = stdout.replace('\r\n', '\n') - expected = textwrap.dedent( - r""" - \foo-script.py - ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b'] - 'hello\nworld\n' - non-optimized - """ - ).lstrip() - assert actual == expected - - def test_symlink(self, tmpdir): - """ - Ensure that symlink for the foo.exe is working correctly. - """ - script_dir = tmpdir / "script_dir" - script_dir.mkdir() - self.create_script(script_dir) - symlink = pathlib.Path(tmpdir / "foo.exe") - symlink.symlink_to(script_dir / "foo.exe") - - cmd = [ - str(tmpdir / 'foo.exe'), - 'arg1', - 'arg 2', - 'arg "2\\"', - 'arg 4\\', - 'arg5 a\\\\b', - ] - proc = subprocess.Popen( - cmd, - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - text=True, - encoding="utf-8", - ) - stdout, _stderr = proc.communicate('hello\nworld\n') - actual = stdout.replace('\r\n', '\n') - expected = textwrap.dedent( - r""" - \foo-script.py - ['arg1', 'arg 2', 'arg "2\\"', 'arg 4\\', 'arg5 a\\\\b'] - 'hello\nworld\n' - non-optimized - """ - ).lstrip() - assert actual == expected - - def test_with_options(self, tmpdir): - """ - Specifying Python Command-line Options - -------------------------------------- - - You can specify a single argument on the '#!' line. This can be used - to specify Python options like -O, to run in optimized mode or -i - to start the interactive interpreter. You can combine multiple - options as usual. For example, to run in optimized mode and - enter the interpreter after running the script, you could use -Oi: - """ - self.create_script(tmpdir) - tmpl = textwrap.dedent( - """ - #!%(python_exe)s -Oi - import sys - input = repr(sys.stdin.read()) - print(sys.argv[0][-14:]) - print(sys.argv[1:]) - print(input) - if __debug__: - print('non-optimized') - sys.ps1 = '---' - """ - ).lstrip() - with (tmpdir / 'foo-script.py').open('w') as f: - f.write(self.prep_script(tmpl)) - cmd = [str(tmpdir / 'foo.exe')] - proc = subprocess.Popen( - cmd, - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - encoding="utf-8", - ) - stdout, _stderr = proc.communicate() - actual = stdout.replace('\r\n', '\n') - expected = textwrap.dedent( - r""" - \foo-script.py - [] - '' - --- - """ - ).lstrip() - assert actual == expected - - -class TestGUI(WrapperTester): - """ - Testing the GUI Version - ----------------------- - """ - - script_name = 'bar-script.pyw' - wrapper_source = win_launcher_exe('gui') - wrapper_name = 'bar.exe' - - script_tmpl = textwrap.dedent( - """ - #!%(python_exe)s - import sys - f = open(sys.argv[1], 'wb') - bytes_written = f.write(repr(sys.argv[2]).encode('utf-8')) - f.close() - """ - ).strip() - - def test_basic(self, tmpdir): - """Test the GUI version with the simple script, bar-script.py""" - self.create_script(tmpdir) - - cmd = [ - str(tmpdir / 'bar.exe'), - str(tmpdir / 'test_output.txt'), - 'Test Argument', - ] - proc = subprocess.Popen( - cmd, - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - stderr=subprocess.STDOUT, - text=True, - encoding="utf-8", - ) - stdout, stderr = proc.communicate() - assert not stdout - assert not stderr - with (tmpdir / 'test_output.txt').open('rb') as f_out: - actual = f_out.read().decode('ascii') - assert actual == repr('Test Argument') diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/text.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/text.py deleted file mode 100644 index e05cc63..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/text.py +++ /dev/null @@ -1,4 +0,0 @@ -class Filenames: - unicode = 'smörbröd.py' - latin_1 = unicode.encode('latin-1') - utf_8 = unicode.encode('utf-8') diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/tests/textwrap.py b/server/.venv/lib/python3.11/site-packages/setuptools/tests/textwrap.py deleted file mode 100644 index 5e39618..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/tests/textwrap.py +++ /dev/null @@ -1,6 +0,0 @@ -import textwrap - - -def DALS(s): - "dedent and left-strip" - return textwrap.dedent(s).lstrip() diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/unicode_utils.py b/server/.venv/lib/python3.11/site-packages/setuptools/unicode_utils.py index f502f5b..e84e65e 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/unicode_utils.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/unicode_utils.py @@ -1,9 +1,5 @@ -import sys import unicodedata -from configparser import RawConfigParser - -from .compat import py39 -from .warnings import SetuptoolsDeprecationWarning +import sys # HFS Plus uses decomposed UTF-8 @@ -22,7 +18,7 @@ def decompose(path): def filesys_decode(path): """ Ensure that the given path is decoded, - ``None`` when no expected encoding works + NONE when no expected encoding works """ if isinstance(path, str): @@ -37,8 +33,6 @@ def filesys_decode(path): except UnicodeDecodeError: continue - return None - def try_encode(string, enc): "turn unicode encoding into a functional routine" @@ -46,57 +40,3 @@ def try_encode(string, enc): return string.encode(enc) except UnicodeEncodeError: return None - - -def _read_utf8_with_fallback(file: str, fallback_encoding=py39.LOCALE_ENCODING) -> str: - """ - First try to read the file with UTF-8, if there is an error fallback to a - different encoding ("locale" by default). Returns the content of the file. - Also useful when reading files that might have been produced by an older version of - setuptools. - """ - try: - with open(file, "r", encoding="utf-8") as f: - return f.read() - except UnicodeDecodeError: # pragma: no cover - _Utf8EncodingNeeded.emit(file=file, fallback_encoding=fallback_encoding) - with open(file, "r", encoding=fallback_encoding) as f: - return f.read() - - -def _cfg_read_utf8_with_fallback( - cfg: RawConfigParser, file: str, fallback_encoding=py39.LOCALE_ENCODING -) -> None: - """Same idea as :func:`_read_utf8_with_fallback`, but for the - :meth:`RawConfigParser.read` method. - - This method may call ``cfg.clear()``. - """ - try: - cfg.read(file, encoding="utf-8") - except UnicodeDecodeError: # pragma: no cover - _Utf8EncodingNeeded.emit(file=file, fallback_encoding=fallback_encoding) - cfg.clear() - cfg.read(file, encoding=fallback_encoding) - - -class _Utf8EncodingNeeded(SetuptoolsDeprecationWarning): - _SUMMARY = """ - `encoding="utf-8"` fails with {file!r}, trying `encoding={fallback_encoding!r}`. - """ - - _DETAILS = """ - Fallback behavior for UTF-8 is considered **deprecated** and future versions of - `setuptools` may not implement it. - - Please encode {file!r} with "utf-8" to ensure future builds will succeed. - - If this file was produced by `setuptools` itself, cleaning up the cached files - and re-building/re-installing the package with a newer version of `setuptools` - (e.g. by updating `build-system.requires` in its `pyproject.toml`) - might solve the problem. - """ - # TODO: Add a deadline? - # Will we be able to remove this? - # The question comes to mind mainly because of sdists that have been produced - # by old versions of setuptools and published to PyPI... diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/version.py b/server/.venv/lib/python3.11/site-packages/setuptools/version.py index ec253c4..95e1869 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/version.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/version.py @@ -1,6 +1,6 @@ -from ._importlib import metadata +import pkg_resources try: - __version__ = metadata.version('setuptools') or '0.dev0+unknown' + __version__ = pkg_resources.get_distribution('setuptools').version except Exception: - __version__ = '0.dev0+unknown' + __version__ = 'unknown' diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/warnings.py b/server/.venv/lib/python3.11/site-packages/setuptools/warnings.py deleted file mode 100644 index 9646778..0000000 --- a/server/.venv/lib/python3.11/site-packages/setuptools/warnings.py +++ /dev/null @@ -1,110 +0,0 @@ -"""Provide basic warnings used by setuptools modules. - -Using custom classes (other than ``UserWarning``) allow users to set -``PYTHONWARNINGS`` filters to run tests and prepare for upcoming changes in -setuptools. -""" - -from __future__ import annotations - -import os -import warnings -from datetime import date -from inspect import cleandoc -from textwrap import indent -from typing import TYPE_CHECKING - -if TYPE_CHECKING: - from typing_extensions import TypeAlias - -_DueDate: TypeAlias = tuple[int, int, int] # time tuple -_INDENT = 8 * " " -_TEMPLATE = f"""{80 * '*'}\n{{details}}\n{80 * '*'}""" - - -class SetuptoolsWarning(UserWarning): - """Base class in ``setuptools`` warning hierarchy.""" - - @classmethod - def emit( - cls, - summary: str | None = None, - details: str | None = None, - due_date: _DueDate | None = None, - see_docs: str | None = None, - see_url: str | None = None, - stacklevel: int = 2, - **kwargs, - ) -> None: - """Private: reserved for ``setuptools`` internal use only""" - # Default values: - summary_ = summary or getattr(cls, "_SUMMARY", None) or "" - details_ = details or getattr(cls, "_DETAILS", None) or "" - due_date = due_date or getattr(cls, "_DUE_DATE", None) - docs_ref = see_docs or getattr(cls, "_SEE_DOCS", None) - docs_url = docs_ref and f"https://setuptools.pypa.io/en/latest/{docs_ref}" - see_url = see_url or getattr(cls, "_SEE_URL", None) - due = date(*due_date) if due_date else None - - text = cls._format(summary_, details_, due, see_url or docs_url, kwargs) - if due and due < date.today() and _should_enforce(): - raise cls(text) - warnings.warn(text, cls, stacklevel=stacklevel + 1) - - @classmethod - def _format( - cls, - summary: str, - details: str, - due_date: date | None = None, - see_url: str | None = None, - format_args: dict | None = None, - ) -> str: - """Private: reserved for ``setuptools`` internal use only""" - today = date.today() - summary = cleandoc(summary).format_map(format_args or {}) - possible_parts = [ - cleandoc(details).format_map(format_args or {}), - ( - f"\nBy {due_date:%Y-%b-%d}, you need to update your project and remove " - "deprecated calls\nor your builds will no longer be supported." - if due_date and due_date > today - else None - ), - ( - "\nThis deprecation is overdue, please update your project and remove " - "deprecated\ncalls to avoid build errors in the future." - if due_date and due_date < today - else None - ), - (f"\nSee {see_url} for details." if see_url else None), - ] - parts = [x for x in possible_parts if x] - if parts: - body = indent(_TEMPLATE.format(details="\n".join(parts)), _INDENT) - return "\n".join([summary, "!!\n", body, "\n!!"]) - return summary - - -class InformationOnly(SetuptoolsWarning): - """Currently there is no clear way of displaying messages to the users - that use the setuptools backend directly via ``pip``. - The only thing that might work is a warning, although it is not the - most appropriate tool for the job... - - See pypa/packaging-problems#558. - """ - - -class SetuptoolsDeprecationWarning(SetuptoolsWarning): - """ - Base class for warning deprecations in ``setuptools`` - - This class is not derived from ``DeprecationWarning``, and as such is - visible by default. - """ - - -def _should_enforce(): - enforce = os.getenv("SETUPTOOLS_ENFORCE_DEPRECATION", "false").lower() - return enforce in ("true", "on", "ok", "1") diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/wheel.py b/server/.venv/lib/python3.11/site-packages/setuptools/wheel.py index c7ca43b..527ed3b 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/wheel.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/wheel.py @@ -1,46 +1,36 @@ """Wheels support.""" -import contextlib import email -import functools import itertools import os import posixpath import re import zipfile - -from packaging.tags import sys_tags -from packaging.utils import canonicalize_name -from packaging.version import Version as parse_version - -import setuptools -from setuptools.archive_util import _unpack_zipfile_obj -from setuptools.command.egg_info import _egg_basename, write_requirements - -from .unicode_utils import _read_utf8_with_fallback +import contextlib from distutils.util import get_platform +import pkg_resources +import setuptools +from pkg_resources import parse_version +from setuptools.extern.packaging.tags import sys_tags +from setuptools.extern.packaging.utils import canonicalize_name +from setuptools.command.egg_info import write_requirements +from setuptools.archive_util import _unpack_zipfile_obj + + WHEEL_NAME = re.compile( r"""^(?P.+?)-(?P\d.*?) ((-(?P\d.*?))?-(?P.+?)-(?P.+?)-(?P.+?) )\.whl$""", - re.VERBOSE, -).match + re.VERBOSE).match -NAMESPACE_PACKAGE_INIT = "__import__('pkg_resources').declare_namespace(__name__)\n" +NAMESPACE_PACKAGE_INIT = \ + "__import__('pkg_resources').declare_namespace(__name__)\n" -@functools.cache -def _get_supported_tags(): - # We calculate the supported tags only once, otherwise calling - # this method on thousands of wheels takes seconds instead of - # milliseconds. - return {(t.interpreter, t.abi, t.platform) for t in sys_tags()} - - -def unpack(src_dir, dst_dir) -> None: - """Move everything under `src_dir` to `dst_dir`, and delete the former.""" +def unpack(src_dir, dst_dir): + '''Move everything under `src_dir` to `dst_dir`, and delete the former.''' for dirpath, dirnames, filenames in os.walk(src_dir): subdir = os.path.relpath(dirpath, src_dir) for f in filenames: @@ -67,7 +57,6 @@ def disable_info_traces(): Temporarily disable info traces. """ from distutils import log - saved = log.set_threshold(log.WARN) try: yield @@ -76,16 +65,17 @@ def disable_info_traces(): class Wheel: - def __init__(self, filename) -> None: + + def __init__(self, filename): match = WHEEL_NAME(os.path.basename(filename)) if match is None: - raise ValueError(f'invalid wheel name: {filename!r}') + raise ValueError('invalid wheel name: %r' % filename) self.filename = filename for k, v in match.groupdict().items(): setattr(self, k, v) def tags(self): - """List tags (py_version, abi, platform) supported by this wheel.""" + '''List tags (py_version, abi, platform) supported by this wheel.''' return itertools.product( self.py_version.split('.'), self.abi.split('.'), @@ -93,38 +83,36 @@ class Wheel: ) def is_compatible(self): - """Is the wheel compatible with the current platform?""" - return next((True for t in self.tags() if t in _get_supported_tags()), False) + '''Is the wheel is compatible with the current platform?''' + supported_tags = set( + (t.interpreter, t.abi, t.platform) for t in sys_tags()) + return next((True for t in self.tags() if t in supported_tags), False) def egg_name(self): - return ( - _egg_basename( - self.project_name, - self.version, - platform=(None if self.platform == 'any' else get_platform()), - ) - + ".egg" - ) + return pkg_resources.Distribution( + project_name=self.project_name, version=self.version, + platform=(None if self.platform == 'any' else get_platform()), + ).egg_name() + '.egg' def get_dist_info(self, zf): # find the correct name of the .dist-info dir in the wheel file for member in zf.namelist(): dirname = posixpath.dirname(member) - if dirname.endswith('.dist-info') and canonicalize_name(dirname).startswith( - canonicalize_name(self.project_name) - ): + if (dirname.endswith('.dist-info') and + canonicalize_name(dirname).startswith( + canonicalize_name(self.project_name))): return dirname raise ValueError("unsupported wheel format. .dist-info not found") - def install_as_egg(self, destination_eggdir) -> None: - """Install wheel as an egg directory.""" + def install_as_egg(self, destination_eggdir): + '''Install wheel as an egg directory.''' with zipfile.ZipFile(self.filename) as zf: self._install_as_egg(destination_eggdir, zf) def _install_as_egg(self, destination_eggdir, zf): - dist_basename = f'{self.project_name}-{self.version}' + dist_basename = '%s-%s' % (self.project_name, self.version) dist_info = self.get_dist_info(zf) - dist_data = f'{dist_basename}.data' + dist_data = '%s.data' % dist_basename egg_info = os.path.join(destination_eggdir, 'EGG-INFO') self._convert_metadata(zf, destination_eggdir, dist_info, egg_info) @@ -133,8 +121,6 @@ class Wheel: @staticmethod def _convert_metadata(zf, destination_eggdir, dist_info, egg_info): - import pkg_resources - def get_metadata(name): with zf.open(posixpath.join(dist_info, name)) as fp: value = fp.read().decode('utf-8') @@ -143,16 +129,18 @@ class Wheel: wheel_metadata = get_metadata('WHEEL') # Check wheel format version is supported. wheel_version = parse_version(wheel_metadata.get('Wheel-Version')) - wheel_v1 = parse_version('1.0') <= wheel_version < parse_version('2.0dev0') + wheel_v1 = ( + parse_version('1.0') <= wheel_version < parse_version('2.0dev0') + ) if not wheel_v1: - raise ValueError(f'unsupported wheel format version: {wheel_version}') + raise ValueError( + 'unsupported wheel format version: %s' % wheel_version) # Extract to target directory. _unpack_zipfile_obj(zf, destination_eggdir) # Convert metadata. dist_info = os.path.join(destination_eggdir, dist_info) dist = pkg_resources.Distribution.from_location( - destination_eggdir, - dist_info, + destination_eggdir, dist_info, metadata=pkg_resources.PathMetadata(destination_eggdir, dist_info), ) @@ -162,7 +150,6 @@ class Wheel: def raw_req(req): req.marker = None return str(req) - install_requires = list(map(raw_req, dist.requires())) extras_require = { extra: [ @@ -196,7 +183,8 @@ class Wheel: dist_data = os.path.join(destination_eggdir, dist_data) dist_data_scripts = os.path.join(dist_data, 'scripts') if os.path.exists(dist_data_scripts): - egg_info_scripts = os.path.join(destination_eggdir, 'EGG-INFO', 'scripts') + egg_info_scripts = os.path.join( + destination_eggdir, 'EGG-INFO', 'scripts') os.mkdir(egg_info_scripts) for entry in os.listdir(dist_data_scripts): # Remove bytecode, as it's not properly handled @@ -209,28 +197,26 @@ class Wheel: os.path.join(egg_info_scripts, entry), ) os.rmdir(dist_data_scripts) - for subdir in filter( - os.path.exists, - ( - os.path.join(dist_data, d) - for d in ('data', 'headers', 'purelib', 'platlib') - ), - ): + for subdir in filter(os.path.exists, ( + os.path.join(dist_data, d) + for d in ('data', 'headers', 'purelib', 'platlib') + )): unpack(subdir, destination_eggdir) if os.path.exists(dist_data): os.rmdir(dist_data) @staticmethod def _fix_namespace_packages(egg_info, destination_eggdir): - namespace_packages = os.path.join(egg_info, 'namespace_packages.txt') + namespace_packages = os.path.join( + egg_info, 'namespace_packages.txt') if os.path.exists(namespace_packages): - namespace_packages = _read_utf8_with_fallback(namespace_packages).split() - + with open(namespace_packages) as fp: + namespace_packages = fp.read().split() for mod in namespace_packages: mod_dir = os.path.join(destination_eggdir, *mod.split('.')) mod_init = os.path.join(mod_dir, '__init__.py') if not os.path.exists(mod_dir): os.mkdir(mod_dir) if not os.path.exists(mod_init): - with open(mod_init, 'w', encoding="utf-8") as fp: + with open(mod_init, 'w') as fp: fp.write(NAMESPACE_PACKAGE_INIT) diff --git a/server/.venv/lib/python3.11/site-packages/setuptools/windows_support.py b/server/.venv/lib/python3.11/site-packages/setuptools/windows_support.py index 7a2b53a..1ca64fb 100644 --- a/server/.venv/lib/python3.11/site-packages/setuptools/windows_support.py +++ b/server/.venv/lib/python3.11/site-packages/setuptools/windows_support.py @@ -8,17 +8,16 @@ def windows_only(func): @windows_only -def hide_file(path: str) -> None: +def hide_file(path): """ Set the hidden attribute on a file or directory. - From https://stackoverflow.com/questions/19622133/ + From http://stackoverflow.com/questions/19622133/ `path` must be text. """ import ctypes - import ctypes.wintypes - + __import__('ctypes.wintypes') SetFileAttributes = ctypes.windll.kernel32.SetFileAttributesW SetFileAttributes.argtypes = ctypes.wintypes.LPWSTR, ctypes.wintypes.DWORD SetFileAttributes.restype = ctypes.wintypes.BOOL diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/__init__.cpython-311.pyc index 3530083..641822e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/events.cpython-311.pyc index 41dc5d9..1058f19 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/exc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/exc.cpython-311.pyc index 7ad31d6..ab770f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/exc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/exc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/inspection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/inspection.cpython-311.pyc index f0619bc..7a57b5e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/inspection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/inspection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/log.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/log.cpython-311.pyc index a7e2b82..54364ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/log.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/log.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/schema.cpython-311.pyc index 7aff98d..c1c6669 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/types.cpython-311.pyc index 1e105b0..b0f7c57 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/__init__.cpython-311.pyc index 989b4f8..3c8ccb5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/aioodbc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/aioodbc.cpython-311.pyc index c546863..9b5e53a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/aioodbc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/aioodbc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/asyncio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/asyncio.cpython-311.pyc index e862c45..056e5fb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/asyncio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/asyncio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/pyodbc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/pyodbc.cpython-311.pyc index e1b419c..fbaca89 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/pyodbc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/connectors/__pycache__/pyodbc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/__init__.cpython-311.pyc index 77b65d0..65d684e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/_typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/_typing.cpython-311.pyc index e9c1dcb..c2c1cc8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/_typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/__pycache__/_typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/__init__.cpython-311.pyc index f734f76..9819a05 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/aioodbc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/aioodbc.cpython-311.pyc index b8c5c44..db3e1c2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/aioodbc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/aioodbc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/base.cpython-311.pyc index 8a9d732..d41947e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/information_schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/information_schema.cpython-311.pyc index 81652dd..e6789b2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/information_schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/information_schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/json.cpython-311.pyc index 585c1e4..5ed65f2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/mssqlpython.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/mssqlpython.cpython-311.pyc index a810135..72546e9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/mssqlpython.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/mssqlpython.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/provision.cpython-311.pyc index c8a6936..ef2575a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pymssql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pymssql.cpython-311.pyc index 6975425..65bbcd2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pymssql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pymssql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pyodbc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pyodbc.cpython-311.pyc index 055767a..a690134 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pyodbc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mssql/__pycache__/pyodbc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/__init__.cpython-311.pyc index b9a8e58..a946c30 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/_mariadb_shim.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/_mariadb_shim.cpython-311.pyc index 5458d80..2f3d5f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/_mariadb_shim.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/_mariadb_shim.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/aiomysql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/aiomysql.cpython-311.pyc index 4e8ac4a..018e7b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/aiomysql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/aiomysql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/asyncmy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/asyncmy.cpython-311.pyc index c4bd6d4..c947a83 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/asyncmy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/asyncmy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/base.cpython-311.pyc index b8c8e20..d3e0430 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/cymysql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/cymysql.cpython-311.pyc index bd68377..9d44745 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/cymysql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/cymysql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/dml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/dml.cpython-311.pyc index b75dcfb..45bb0a5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/dml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/dml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/enumerated.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/enumerated.cpython-311.pyc index 61c75e6..726aede 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/enumerated.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/enumerated.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/expression.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/expression.cpython-311.pyc index 38c1920..a6d6034 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/expression.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/expression.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/json.cpython-311.pyc index 548c238..1d23706 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadb.cpython-311.pyc index 1bd56b8..884965a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadbconnector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadbconnector.cpython-311.pyc index c1edaec..94e9544 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadbconnector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mariadbconnector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqlconnector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqlconnector.cpython-311.pyc index a5bbce0..5c9ed6b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqlconnector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqlconnector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqldb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqldb.cpython-311.pyc index 8742dce..96a0b28 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqldb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/mysqldb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/provision.cpython-311.pyc index 61980d2..2dfb1dd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pymysql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pymysql.cpython-311.pyc index 7526560..263985c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pymysql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pymysql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pyodbc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pyodbc.cpython-311.pyc index b537007..de016a3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pyodbc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/pyodbc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reflection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reflection.cpython-311.pyc index 6796546..02a8588 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reflection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reflection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reserved_words.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reserved_words.cpython-311.pyc index 3d11fdb..438f42c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reserved_words.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/reserved_words.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/types.cpython-311.pyc index 5abeab6..f8dbbdb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/mysql/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/__init__.cpython-311.pyc index 53e3c37..dbcb106 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/base.cpython-311.pyc index 56f44d4..a135239 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/cx_oracle.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/cx_oracle.cpython-311.pyc index 6fad4dd..90f860c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/cx_oracle.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/cx_oracle.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/dictionary.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/dictionary.cpython-311.pyc index 9743a6d..8d5b809 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/dictionary.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/dictionary.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/json.cpython-311.pyc index 4297d5d..d855eeb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/oracledb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/oracledb.cpython-311.pyc index d095ca0..cc2de29 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/oracledb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/oracledb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/provision.cpython-311.pyc index 8b68c2a..366297d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/types.cpython-311.pyc index 25adc86..dba378f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/vector.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/vector.cpython-311.pyc index 24f5180..8e6bc9e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/vector.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/oracle/__pycache__/vector.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/__init__.cpython-311.pyc index 29b4770..71b1449 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/_psycopg_common.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/_psycopg_common.cpython-311.pyc index 04e924a..fd72061 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/_psycopg_common.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/_psycopg_common.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/array.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/array.cpython-311.pyc index 3f900fc..37305c0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/array.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/array.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/asyncpg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/asyncpg.cpython-311.pyc index d937c1a..83a9996 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/asyncpg.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/asyncpg.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/base.cpython-311.pyc index aa12c8e..e176742 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/bitstring.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/bitstring.cpython-311.pyc index 1697310..c84a6d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/bitstring.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/bitstring.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/dml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/dml.cpython-311.pyc index 7061119..7e097e5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/dml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/dml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ext.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ext.cpython-311.pyc index b91bbba..fd506ec 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ext.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ext.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/hstore.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/hstore.cpython-311.pyc index c6908dd..ee1b94e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/hstore.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/hstore.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/json.cpython-311.pyc index da5c88d..9d721d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/named_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/named_types.cpython-311.pyc index 5655dc3..e03fd7d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/named_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/named_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/operators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/operators.cpython-311.pyc index a88d1f2..c5f1c6d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/operators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/operators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg8000.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg8000.cpython-311.pyc index 3ff719d..0e641b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg8000.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg8000.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg_catalog.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg_catalog.cpython-311.pyc index 50aedeb..ca351bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg_catalog.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/pg_catalog.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/provision.cpython-311.pyc index 2663681..4671c94 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg.cpython-311.pyc index 03db4ee..8ed83b2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2.cpython-311.pyc index dc1bf51..5fd8fba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2cffi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2cffi.cpython-311.pyc index 81206b7..23a67f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2cffi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/psycopg2cffi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ranges.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ranges.cpython-311.pyc index e38abdd..04eccde 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ranges.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/ranges.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/types.cpython-311.pyc index c9b6246..9a23824 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/postgresql/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/__init__.cpython-311.pyc index ae68111..a9ca294 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/aiosqlite.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/aiosqlite.cpython-311.pyc index 7322195..ecd8860 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/aiosqlite.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/aiosqlite.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/base.cpython-311.pyc index 244227b..030795f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/dml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/dml.cpython-311.pyc index b31e631..fca3b0f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/dml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/dml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/json.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/json.cpython-311.pyc index 4e0c975..d47166d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/json.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/json.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/provision.cpython-311.pyc index f806497..36ebf11 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlcipher.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlcipher.cpython-311.pyc index d29792c..24aa94d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlcipher.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlcipher.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlite.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlite.cpython-311.pyc index 76bf160..d279894 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlite.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/dialects/sqlite/__pycache__/pysqlite.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/__init__.cpython-311.pyc index df04447..c41de62 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_processors_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_processors_cy.cpython-311.pyc index a932268..4ac93ec 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_processors_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_processors_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_result_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_result_cy.cpython-311.pyc index ce6ebd3..df06128 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_result_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_result_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_row_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_row_cy.cpython-311.pyc index 7931f52..37a4805 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_row_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_row_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_util_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_util_cy.cpython-311.pyc index 33e15fd..3f64ec6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_util_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/_util_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/base.cpython-311.pyc index 974edd3..b67ddfa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/characteristics.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/characteristics.cpython-311.pyc index 1200395..0195482 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/characteristics.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/characteristics.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/create.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/create.cpython-311.pyc index ec362c8..37d2b37 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/create.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/create.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/cursor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/cursor.cpython-311.pyc index feddb1c..6460fa3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/cursor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/cursor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/default.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/default.cpython-311.pyc index df6fe3e..50c4097 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/default.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/default.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/events.cpython-311.pyc index 5603db8..c855629 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/interfaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/interfaces.cpython-311.pyc index 30377d9..e1fec5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/interfaces.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/interfaces.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/mock.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/mock.cpython-311.pyc index a3848ed..d2fcd02 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/mock.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/mock.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/processors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/processors.cpython-311.pyc index 2161b20..797bbaf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/processors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/processors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/reflection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/reflection.cpython-311.pyc index 1d65b93..09f3514 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/reflection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/reflection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/result.cpython-311.pyc index 1517422..391b2f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/row.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/row.cpython-311.pyc index ff2ae51..0681d18 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/row.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/row.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/strategies.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/strategies.cpython-311.pyc index 930c76b..5292942 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/strategies.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/strategies.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/url.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/url.cpython-311.pyc index ed15cc6..acb7e8f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/url.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/url.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/util.cpython-311.pyc index 95cf512..5b6b5d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/engine/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/__init__.cpython-311.pyc index ef58753..3556ec3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/api.cpython-311.pyc index 168e18e..7308786 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/attr.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/attr.cpython-311.pyc index b415494..857a31d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/attr.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/attr.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/base.cpython-311.pyc index 0d0e2bd..46c78c2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/legacy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/legacy.cpython-311.pyc index d801e03..281870b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/legacy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/legacy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/registry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/registry.cpython-311.pyc index f9e6380..01f2db7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/registry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/event/__pycache__/registry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/__init__.cpython-311.pyc index ff959b9..067b8dc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/associationproxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/associationproxy.cpython-311.pyc index 4b0be17..c75b3fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/associationproxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/associationproxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/automap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/automap.cpython-311.pyc index 06308c2..44c606b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/automap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/automap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/baked.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/baked.cpython-311.pyc index b233385..c5024c9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/baked.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/baked.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/compiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/compiler.cpython-311.pyc index f4ba224..466f0bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/compiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/compiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/horizontal_shard.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/horizontal_shard.cpython-311.pyc index b01ccc4..d1e1c3a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/horizontal_shard.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/horizontal_shard.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/hybrid.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/hybrid.cpython-311.pyc index 6be9502..52ac998 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/hybrid.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/hybrid.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/indexable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/indexable.cpython-311.pyc index 276132a..b25db22 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/indexable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/indexable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/instrumentation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/instrumentation.cpython-311.pyc index b4ccdc5..95febe4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/instrumentation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/instrumentation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/mutable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/mutable.cpython-311.pyc index 84fed94..78b47b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/mutable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/mutable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/orderinglist.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/orderinglist.cpython-311.pyc index 7f99610..11f0d04 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/orderinglist.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/orderinglist.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/serializer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/serializer.cpython-311.pyc index 82cd5c8..e5c5a5f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/serializer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/__pycache__/serializer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/__init__.cpython-311.pyc index 8fda491..c5b8cea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/base.cpython-311.pyc index 75cca16..b131786 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/engine.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/engine.cpython-311.pyc index 1041e77..310b664 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/engine.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/engine.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/exc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/exc.cpython-311.pyc index 4c880c9..a43a13b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/exc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/exc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/result.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/result.cpython-311.pyc index 682deb0..8c8dcaf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/result.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/result.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/scoping.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/scoping.cpython-311.pyc index d6dd90b..e888116 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/scoping.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/scoping.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/session.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/session.cpython-311.pyc index 529b92d..182a0e8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/session.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/asyncio/__pycache__/session.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/__init__.cpython-311.pyc index a30d68c..b495fc5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/extensions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/extensions.cpython-311.pyc index 263f64d..6c7ca5a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/extensions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/ext/declarative/__pycache__/extensions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/__init__.cpython-311.pyc index dbb6696..5403f1e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/engine.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/engine.cpython-311.pyc index 09c0479..3870b02 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/engine.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/future/__pycache__/engine.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/__init__.cpython-311.pyc index ca58840..0b1531a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_orm_constructors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_orm_constructors.cpython-311.pyc index 2f7655c..c9513f8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_orm_constructors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_orm_constructors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_typing.cpython-311.pyc index dfae852..4a887b9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/_typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/attributes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/attributes.cpython-311.pyc index 37f62d2..0267173 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/attributes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/attributes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/base.cpython-311.pyc index afa6dd2..f5cb302 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/bulk_persistence.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/bulk_persistence.cpython-311.pyc index 49ed286..3fba8cc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/bulk_persistence.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/bulk_persistence.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/clsregistry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/clsregistry.cpython-311.pyc index 1f6841f..d0ca900 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/clsregistry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/clsregistry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/collections.cpython-311.pyc index 7ab551a..7d09785 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/context.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/context.cpython-311.pyc index feb6db9..a5e9e82 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/context.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/context.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_api.cpython-311.pyc index 912b1f7..d80ac66 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_base.cpython-311.pyc index 391ba49..bd71df1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/decl_base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dependency.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dependency.cpython-311.pyc index 488a338..d902603 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dependency.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dependency.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/descriptor_props.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/descriptor_props.cpython-311.pyc index 57fbd5d..9da97c4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/descriptor_props.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/descriptor_props.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dynamic.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dynamic.cpython-311.pyc index c4c097f..ba1c941 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dynamic.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/dynamic.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/evaluator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/evaluator.cpython-311.pyc index 58f83ae..081c2d1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/evaluator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/evaluator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/events.cpython-311.pyc index 0dab020..8607384 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/exc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/exc.cpython-311.pyc index 47129e9..b6c8c5e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/exc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/exc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/identity.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/identity.cpython-311.pyc index 65af892..77a607f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/identity.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/identity.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/instrumentation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/instrumentation.cpython-311.pyc index 9304e81..ed6441b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/instrumentation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/instrumentation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/interfaces.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/interfaces.cpython-311.pyc index 5574288..a337b87 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/interfaces.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/interfaces.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/loading.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/loading.cpython-311.pyc index 9adeb31..8353eed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/loading.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/loading.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapped_collection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapped_collection.cpython-311.pyc index 02858b7..dc76850 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapped_collection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapped_collection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapper.cpython-311.pyc index 321f405..e02495f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/mapper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/path_registry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/path_registry.cpython-311.pyc index 5205ccd..666639c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/path_registry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/path_registry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/persistence.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/persistence.cpython-311.pyc index 0e3fb3e..933da3b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/persistence.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/persistence.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/properties.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/properties.cpython-311.pyc index 228aa70..219afa5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/properties.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/properties.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/query.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/query.cpython-311.pyc index a360bc8..e9cbd2d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/query.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/query.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/relationships.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/relationships.cpython-311.pyc index 7b86427..f786989 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/relationships.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/relationships.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/scoping.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/scoping.cpython-311.pyc index 8450cf1..6846537 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/scoping.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/scoping.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/session.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/session.cpython-311.pyc index f6306c6..e702c45 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/session.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/session.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state.cpython-311.pyc index 8ff4899..c6ca609 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state_changes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state_changes.cpython-311.pyc index 2b3d0b2..080aebd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state_changes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/state_changes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategies.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategies.cpython-311.pyc index 3d64901..2ff9d8e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategies.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategies.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategy_options.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategy_options.cpython-311.pyc index 7bee58d..acab864 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategy_options.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/strategy_options.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/sync.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/sync.cpython-311.pyc index fd694ba..836e8ae 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/sync.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/sync.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/unitofwork.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/unitofwork.cpython-311.pyc index d9d234f..2500d26 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/unitofwork.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/unitofwork.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/util.cpython-311.pyc index 2710372..4d03b10 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/writeonly.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/writeonly.cpython-311.pyc index 3f97e40..bb37e38 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/writeonly.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/orm/__pycache__/writeonly.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/__init__.cpython-311.pyc index 99e74df..612d4a2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/base.cpython-311.pyc index b946161..9996a65 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/events.cpython-311.pyc index 9b30495..de47095 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/impl.cpython-311.pyc index 726b8f2..4b522df 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/pool/__pycache__/impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/__init__.cpython-311.pyc index a1b9859..f84eec0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_annotated_cols.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_annotated_cols.cpython-311.pyc index 0bb5fb8..1a0972b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_annotated_cols.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_annotated_cols.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_cache_key_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_cache_key_cy.cpython-311.pyc index 8e55466..e413e92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_cache_key_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_cache_key_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_dml_constructors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_dml_constructors.cpython-311.pyc index fd926ae..38f27ba 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_dml_constructors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_dml_constructors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_elements_constructors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_elements_constructors.cpython-311.pyc index 8bc55a0..3b3b9bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_elements_constructors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_elements_constructors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_orm_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_orm_types.cpython-311.pyc index 89ef9ba..c3067c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_orm_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_orm_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_selectable_constructors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_selectable_constructors.cpython-311.pyc index 3dd8e4e..af05c9d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_selectable_constructors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_selectable_constructors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_typing.cpython-311.pyc index 30154fa..6e7d673 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_util_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_util_cy.cpython-311.pyc index 7ccb111..9f24913 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_util_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/_util_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/annotation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/annotation.cpython-311.pyc index 76e4a74..a47e1d5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/annotation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/annotation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/base.cpython-311.pyc index f42f29f..d653691 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/cache_key.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/cache_key.cpython-311.pyc index 17ca2de..018b66b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/cache_key.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/cache_key.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/coercions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/coercions.cpython-311.pyc index 1a8bd9f..7d18898 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/coercions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/coercions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/compiler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/compiler.cpython-311.pyc index 433fe74..3f2629f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/compiler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/compiler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/crud.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/crud.cpython-311.pyc index ab22f0c..c993d3c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/crud.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/crud.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/ddl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/ddl.cpython-311.pyc index 567f3e0..897ba92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/ddl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/ddl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/default_comparator.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/default_comparator.cpython-311.pyc index 6ee389a..d6cd48e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/default_comparator.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/default_comparator.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/dml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/dml.cpython-311.pyc index f6b5fdd..c70ab0c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/dml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/dml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/elements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/elements.cpython-311.pyc index 83971e2..9b47579 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/elements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/elements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/events.cpython-311.pyc index 3121e87..9a95398 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/expression.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/expression.cpython-311.pyc index 8a3224e..bb2f1d9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/expression.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/expression.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/functions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/functions.cpython-311.pyc index 261ce36..9954849 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/functions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/functions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/lambdas.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/lambdas.cpython-311.pyc index 07791ac..d3a3f8d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/lambdas.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/lambdas.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/naming.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/naming.cpython-311.pyc index d2acab0..4905fa6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/naming.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/naming.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/operators.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/operators.cpython-311.pyc index 47f1df6..5b083cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/operators.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/operators.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/roles.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/roles.cpython-311.pyc index 80f8d6e..c7fc8a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/roles.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/roles.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/schema.cpython-311.pyc index ace89e9..36dadf3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/selectable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/selectable.cpython-311.pyc index c47907b..1bcc084 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/selectable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/selectable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/sqltypes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/sqltypes.cpython-311.pyc index 7fb84b0..5ef2198 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/sqltypes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/sqltypes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/traversals.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/traversals.cpython-311.pyc index 7af5186..8a948d8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/traversals.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/traversals.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/type_api.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/type_api.cpython-311.pyc index 65dc69f..22cc77c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/type_api.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/type_api.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/util.cpython-311.pyc index 97b620e..b307cdf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/visitors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/visitors.cpython-311.pyc index 86ae13a..a7270f8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/visitors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/sql/__pycache__/visitors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/__init__.cpython-311.pyc index c4d9db4..9269054 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertions.cpython-311.pyc index ec02cca..b213abf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertsql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertsql.cpython-311.pyc index 9717ec3..a7fca90 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertsql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/assertsql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/asyncio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/asyncio.cpython-311.pyc index feeaf47..e370bed 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/asyncio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/asyncio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/cancellation.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/cancellation.cpython-311.pyc index eea2588..9c0d683 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/cancellation.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/cancellation.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/config.cpython-311.pyc index 7f77785..25d0805 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/engines.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/engines.cpython-311.pyc index 935a2d6..155fc7c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/engines.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/engines.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/entities.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/entities.cpython-311.pyc index 79b7c79..c3324ea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/entities.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/entities.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/exclusions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/exclusions.cpython-311.pyc index 4f3778d..f3dd860 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/exclusions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/exclusions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/pickleable.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/pickleable.cpython-311.pyc index a5a6712..0e239c5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/pickleable.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/pickleable.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiles_file.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiles_file.cpython-311.pyc index 6a3ce1c..705a1bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiles_file.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiles_file.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiling.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiling.cpython-311.pyc index 724bffb..ca3d093 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiling.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/profiling.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/provision.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/provision.cpython-311.pyc index d5bf9c5..5c4c783 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/provision.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/provision.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/requirements.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/requirements.cpython-311.pyc index 944583b..3780714 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/requirements.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/requirements.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/schema.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/schema.cpython-311.pyc index 08c131f..fd3cac5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/schema.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/schema.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/util.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/util.cpython-311.pyc index 7db7b2c..9103830 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/util.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/util.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/warnings.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/warnings.cpython-311.pyc index 19170b3..13be64d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/warnings.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/__pycache__/warnings.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/__init__.cpython-311.pyc index beb1e8a..ea12633 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/base.cpython-311.pyc index 9cf942d..34118fb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/mypy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/mypy.cpython-311.pyc index d2247f2..b4a006f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/mypy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/mypy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/orm.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/orm.cpython-311.pyc index 29f589f..83bf59e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/orm.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/orm.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/sql.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/sql.cpython-311.pyc index 5159f33..9abccfb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/sql.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/fixtures/__pycache__/sql.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/__init__.cpython-311.pyc index 859cd9a..af31513 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/bootstrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/bootstrap.cpython-311.pyc index 024fab2..1a55d0f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/bootstrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/bootstrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/plugin_base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/plugin_base.cpython-311.pyc index 382e028..e5fc777 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/plugin_base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/plugin_base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/pytestplugin.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/pytestplugin.cpython-311.pyc index 44bfec7..4b2773f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/pytestplugin.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/plugin/__pycache__/pytestplugin.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/__init__.cpython-311.pyc index 3921dc7..db12520 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_cte.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_cte.cpython-311.pyc index 81ce02e..68203cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_cte.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_cte.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_ddl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_ddl.cpython-311.pyc index bdc9011..c02fa75 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_ddl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_ddl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_dialect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_dialect.cpython-311.pyc index ab9d2e7..9397ecd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_dialect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_dialect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_insert.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_insert.cpython-311.pyc index 22d2c1c..3b50366 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_insert.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_insert.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_reflection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_reflection.cpython-311.pyc index ecea2e7..03cc2fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_reflection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_reflection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_results.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_results.cpython-311.pyc index 2d6366c..3eaaffc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_results.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_results.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_rowcount.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_rowcount.cpython-311.pyc index 30a2a34..a02efc5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_rowcount.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_rowcount.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_select.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_select.cpython-311.pyc index b5167c0..db6d60c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_select.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_select.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_sequence.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_sequence.cpython-311.pyc index 980a301..9c9992b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_sequence.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_sequence.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_table_via_select.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_table_via_select.cpython-311.pyc index 7f960ca..f0fcf8d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_table_via_select.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_table_via_select.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_types.cpython-311.pyc index 7ea21c4..6759521 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_unicode_ddl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_unicode_ddl.cpython-311.pyc index ac072e2..1d01ab2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_unicode_ddl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_unicode_ddl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_update_delete.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_update_delete.cpython-311.pyc index b912d06..1b9d15b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_update_delete.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/testing/suite/__pycache__/test_update_delete.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/__init__.cpython-311.pyc index 6a4928a..fa2a372 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections.cpython-311.pyc index fde5951..b5ce000 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections_cy.cpython-311.pyc index 51d3d3a..328b8f6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_collections_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_has_cython.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_has_cython.cpython-311.pyc index 47b0f16..4de36d2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_has_cython.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_has_cython.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_immutabledict_cy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_immutabledict_cy.cpython-311.pyc index b4a2172..a3b408f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_immutabledict_cy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/_immutabledict_cy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/compat.cpython-311.pyc index 7837c64..e340a7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/concurrency.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/concurrency.cpython-311.pyc index 312f308..0385ad0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/concurrency.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/concurrency.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/cython.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/cython.cpython-311.pyc index 75c9775..73b51b4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/cython.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/cython.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/deprecations.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/deprecations.cpython-311.pyc index beae66c..b5392fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/deprecations.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/deprecations.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/langhelpers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/langhelpers.cpython-311.pyc index e51065a..099ef90 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/langhelpers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/langhelpers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/preloaded.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/preloaded.cpython-311.pyc index 87e41d7..f48c80d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/preloaded.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/preloaded.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/queue.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/queue.cpython-311.pyc index a6b80d2..70df0ab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/queue.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/queue.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/tool_support.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/tool_support.cpython-311.pyc index fb5a65c..ffcd83a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/tool_support.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/tool_support.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/topological.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/topological.cpython-311.pyc index 43fe75f..4493442 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/topological.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/topological.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/typing.cpython-311.pyc index bb6bff7..ac5c6a9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/sqlalchemy/util/__pycache__/typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/__init__.cpython-311.pyc index 16d17cb..ad11024 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_exception_handler.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_exception_handler.cpython-311.pyc index baf272c..8d0295c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_exception_handler.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_exception_handler.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_utils.cpython-311.pyc index bc1ce84..c3ad489 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/_utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/applications.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/applications.cpython-311.pyc index e13051b..bf3ed46 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/applications.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/applications.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/authentication.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/authentication.cpython-311.pyc index e54ad66..344a0bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/authentication.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/authentication.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/background.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/background.cpython-311.pyc index 3ff3d6c..870ef85 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/background.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/background.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/concurrency.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/concurrency.cpython-311.pyc index 76fd3a2..df51416 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/concurrency.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/concurrency.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/config.cpython-311.pyc index 43d78cf..ea54fe5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/convertors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/convertors.cpython-311.pyc index a4b338c..4d72841 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/convertors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/convertors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/datastructures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/datastructures.cpython-311.pyc index 4e11e60..a1cad18 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/datastructures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/datastructures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/endpoints.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/endpoints.cpython-311.pyc index e080d3b..940bd7d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/endpoints.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/endpoints.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/exceptions.cpython-311.pyc index fe79100..be780a5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/formparsers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/formparsers.cpython-311.pyc index 4d0c20e..f7daa0c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/formparsers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/formparsers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/requests.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/requests.cpython-311.pyc index 010453d..5d54a2c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/requests.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/requests.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/responses.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/responses.cpython-311.pyc index aba0eb5..f97ab07 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/responses.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/responses.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/routing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/routing.cpython-311.pyc index 82d3704..a840647 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/routing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/routing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/schemas.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/schemas.cpython-311.pyc index e412fd9..d7483a6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/schemas.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/schemas.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/staticfiles.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/staticfiles.cpython-311.pyc index 0d50bfe..79f5ff5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/staticfiles.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/staticfiles.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/status.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/status.cpython-311.pyc index be88045..6b53a42 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/status.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/status.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/templating.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/templating.cpython-311.pyc index 42adf62..7992d97 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/templating.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/templating.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/testclient.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/testclient.cpython-311.pyc index 78d3a6a..66f7915 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/testclient.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/testclient.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/types.cpython-311.pyc index e8677f9..c6abdcf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/websockets.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/websockets.cpython-311.pyc index 267e5c4..6d067fd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/websockets.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/__pycache__/websockets.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/__init__.cpython-311.pyc index ce47870..63a1855 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/authentication.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/authentication.cpython-311.pyc index b7804fc..99e7202 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/authentication.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/authentication.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/base.cpython-311.pyc index a1bf89a..11d95f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/body_limit.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/body_limit.cpython-311.pyc index f45dd23..a2bf9f1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/body_limit.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/body_limit.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/cors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/cors.cpython-311.pyc index eb0cd56..f5d272c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/cors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/cors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/errors.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/errors.cpython-311.pyc index 305fbf1..83f50c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/errors.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/errors.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/exceptions.cpython-311.pyc index a4e02c5..005ad09 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/gzip.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/gzip.cpython-311.pyc index 5784997..db37cf3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/gzip.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/gzip.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/httpsredirect.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/httpsredirect.cpython-311.pyc index 691a1be..9aff0bf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/httpsredirect.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/httpsredirect.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/opentelemetry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/opentelemetry.cpython-311.pyc index f7db48c..35bb503 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/opentelemetry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/opentelemetry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/sessions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/sessions.cpython-311.pyc index b7cad6a..0f020f4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/sessions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/sessions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/trustedhost.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/trustedhost.cpython-311.pyc index 9214d3d..e296d67 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/trustedhost.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/trustedhost.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/wsgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/wsgi.cpython-311.pyc index 6c1c783..c961126 100644 Binary files a/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/wsgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/starlette/middleware/__pycache__/wsgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/__init__.cpython-311.pyc index e804efd..a988248 100644 Binary files a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/introspection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/introspection.cpython-311.pyc index a42d125..97a8506 100644 Binary files a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/introspection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/introspection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/typing_objects.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/typing_objects.cpython-311.pyc index c6e3967..01ab0ea 100644 Binary files a/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/typing_objects.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/typing_inspection/__pycache__/typing_objects.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/__pycache__/__init__.cpython-311.pyc index 0422c60..cdf2950 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Africa/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Africa/__pycache__/__init__.cpython-311.pyc index 5789701..76815e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Africa/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Africa/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Argentina/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Argentina/__pycache__/__init__.cpython-311.pyc index 42fd30d..185c6b0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Argentina/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Argentina/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Indiana/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Indiana/__pycache__/__init__.cpython-311.pyc index 6109c6a..70ec252 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Indiana/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Indiana/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Kentucky/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Kentucky/__pycache__/__init__.cpython-311.pyc index c2e61cd..1610216 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Kentucky/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/Kentucky/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/North_Dakota/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/North_Dakota/__pycache__/__init__.cpython-311.pyc index 2d7d5fb..ec06d4b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/North_Dakota/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/North_Dakota/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/__pycache__/__init__.cpython-311.pyc index bbe7df5..4e08d4d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/America/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Antarctica/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Antarctica/__pycache__/__init__.cpython-311.pyc index 626d0d0..f44c612 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Antarctica/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Antarctica/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Arctic/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Arctic/__pycache__/__init__.cpython-311.pyc index 64a03b8..7fb483f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Arctic/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Arctic/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Asia/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Asia/__pycache__/__init__.cpython-311.pyc index eee5ad5..b36545b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Asia/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Asia/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Atlantic/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Atlantic/__pycache__/__init__.cpython-311.pyc index 733b460..e7d783c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Atlantic/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Atlantic/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Australia/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Australia/__pycache__/__init__.cpython-311.pyc index d9fc586..0305b92 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Australia/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Australia/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Brazil/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Brazil/__pycache__/__init__.cpython-311.pyc index f8edbe2..7e6fa78 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Brazil/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Brazil/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Canada/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Canada/__pycache__/__init__.cpython-311.pyc index 65bc9a6..38b0df2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Canada/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Canada/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Chile/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Chile/__pycache__/__init__.cpython-311.pyc index 82d8cfa..3918b9f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Chile/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Chile/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Etc/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Etc/__pycache__/__init__.cpython-311.pyc index f0321fd..80fa894 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Etc/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Etc/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Europe/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Europe/__pycache__/__init__.cpython-311.pyc index 4228ba9..e01f1e4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Europe/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Europe/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Indian/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Indian/__pycache__/__init__.cpython-311.pyc index cd776a7..3ed72cb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Indian/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Indian/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Mexico/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Mexico/__pycache__/__init__.cpython-311.pyc index aa5e9fb..3126900 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Mexico/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Mexico/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Pacific/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Pacific/__pycache__/__init__.cpython-311.pyc index 7f5efeb..07d441b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Pacific/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/Pacific/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/US/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/US/__pycache__/__init__.cpython-311.pyc index 4a6cfbf..52c07df 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/US/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/US/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/__pycache__/__init__.cpython-311.pyc index ee196d7..c3312f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzdata/zoneinfo/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/__init__.cpython-311.pyc index 2f55254..0ccf71c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/unix.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/unix.cpython-311.pyc index 2d9246c..207efc5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/unix.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/unix.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/utils.cpython-311.pyc index abdc567..f44e923 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/win32.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/win32.cpython-311.pyc index c050e51..51ec2fc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/win32.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/win32.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/windows_tz.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/windows_tz.cpython-311.pyc index a3a0570..7bee155 100644 Binary files a/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/windows_tz.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/tzlocal/__pycache__/windows_tz.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn-0.54.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/uvicorn-0.54.0.dist-info/RECORD index 023d5a9..3f62c5f 100644 --- a/server/.venv/lib/python3.11/site-packages/uvicorn-0.54.0.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/uvicorn-0.54.0.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/uvicorn,sha256=Gj7Kp5anehxDl4-AyH0cntLQRU1X0L3kvq6QIcjL7DY,186 +../../../bin/uvicorn,sha256=6IFrdr4nEKkxud8B6t-YVJ-JxL-iPOagA4SmsP_vw9o,190 uvicorn-0.54.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 uvicorn-0.54.0.dist-info/METADATA,sha256=k5nl3do9JuhC1vtUIMOLCFeqxWjVO629wiSzohM576g,6607 uvicorn-0.54.0.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__init__.cpython-311.pyc index 12a706f..72e038f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__main__.cpython-311.pyc index 1c2fa62..1be9b6e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_ansi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_ansi.cpython-311.pyc index cd7ba62..85bd4c3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_ansi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_ansi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_compat.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_compat.cpython-311.pyc index 8dc3d13..d0b5ef0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_compat.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_compat.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_subprocess.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_subprocess.cpython-311.pyc index 191289b..0e41cbf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_subprocess.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_subprocess.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_types.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_types.cpython-311.pyc index 689f7e8..7bed368 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_types.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/_types.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/config.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/config.cpython-311.pyc index 8d9a8d8..37fe0e3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/config.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/config.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/importer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/importer.cpython-311.pyc index 1d952ec..2db7484 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/importer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/importer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/logging.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/logging.cpython-311.pyc index 48567d0..71aaf73 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/logging.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/logging.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/main.cpython-311.pyc index 4894934..6167977 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/server.cpython-311.pyc index ec1e9b9..0c35baa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/workers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/workers.cpython-311.pyc index ee44b90..e53b30f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/workers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/__pycache__/workers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/__init__.cpython-311.pyc index 9ee3e94..0bda3ce 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/off.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/off.cpython-311.pyc index 94380e2..07cdbd1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/off.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/off.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/on.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/on.cpython-311.pyc index c8b90f6..141906f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/on.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/lifespan/__pycache__/on.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/__init__.cpython-311.pyc index 7dbfdb7..4327d39 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/asyncio.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/asyncio.cpython-311.pyc index 99a5614..39e2c3e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/asyncio.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/asyncio.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/auto.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/auto.cpython-311.pyc index d60d547..9cd1ed1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/auto.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/auto.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/uvloop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/uvloop.cpython-311.pyc index df14ba1..e4ee056 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/uvloop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/uvloop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/zuvloop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/zuvloop.cpython-311.pyc index 7f366ca..c0d9dc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/zuvloop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/loops/__pycache__/zuvloop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/__init__.cpython-311.pyc index 4cdc715..0a3a498 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/asgi2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/asgi2.cpython-311.pyc index 28249b4..4cfe4f0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/asgi2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/asgi2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/message_logger.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/message_logger.cpython-311.pyc index 37b09af..7112fbe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/message_logger.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/message_logger.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/proxy_headers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/proxy_headers.cpython-311.pyc index d3dc981..7a307f3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/proxy_headers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/proxy_headers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/wsgi.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/wsgi.cpython-311.pyc index d452852..0e38b26 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/wsgi.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/middleware/__pycache__/wsgi.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/__init__.cpython-311.pyc index bc89605..a4dec2c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/utils.cpython-311.pyc index 3d16499..936c05a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/__init__.cpython-311.pyc index 4b8893b..d2e6842 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto.cpython-311.pyc index c5b44c5..dc036d6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto_zttp_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto_zttp_impl.cpython-311.pyc index e17f585..a7c5ab2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto_zttp_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/auto_zttp_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/flow_control.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/flow_control.cpython-311.pyc index b771889..99232e6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/flow_control.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/flow_control.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/h11_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/h11_impl.cpython-311.pyc index b85a3e7..2064e23 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/h11_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/h11_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/httptools_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/httptools_impl.cpython-311.pyc index 5ff0265..41f479d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/httptools_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/httptools_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_h2_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_h2_impl.cpython-311.pyc index 2911831..270d4b0 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_h2_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_h2_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_impl.cpython-311.pyc index 0c8145c..99da0b5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/http/__pycache__/zttp_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/__init__.cpython-311.pyc index c7c6bc5..10c31e8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/auto.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/auto.cpython-311.pyc index ece9efd..f591148 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/auto.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/auto.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_impl.cpython-311.pyc index 27b8cee..c9a75d7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_sansio_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_sansio_impl.cpython-311.pyc index 850e047..86eafc1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_sansio_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/websockets_sansio_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/wsproto_impl.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/wsproto_impl.cpython-311.pyc index 5d2a427..1a6e2bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/wsproto_impl.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/protocols/websockets/__pycache__/wsproto_impl.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/__init__.cpython-311.pyc index 712864c..cebe2d3 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/basereload.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/basereload.cpython-311.pyc index 57fcef3..7f59abb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/basereload.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/basereload.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/multiprocess.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/multiprocess.cpython-311.pyc index 8f88680..8a6b301 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/multiprocess.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/multiprocess.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/statreload.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/statreload.cpython-311.pyc index b65c2d8..5db09bb 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/statreload.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/statreload.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/watchfilesreload.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/watchfilesreload.cpython-311.pyc index 1c02eef..2867a39 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/watchfilesreload.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvicorn/supervisors/__pycache__/watchfilesreload.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/__init__.cpython-311.pyc index f871d36..93b6302 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_noop.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_noop.cpython-311.pyc index 803f2da..f634dc2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_noop.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_noop.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_testbase.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_testbase.cpython-311.pyc index be6bed0..a90eefe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_testbase.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_testbase.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_version.cpython-311.pyc index 171bc94..49c59e7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvloop/__pycache__/_version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/uvloop/includes/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/uvloop/includes/__pycache__/__init__.cpython-311.pyc index 5dc872c..8c95f4f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/uvloop/includes/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/uvloop/includes/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/RECORD index 86a5e97..2e67bea 100644 --- a/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/RECORD @@ -1,125 +1,10 @@ -app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -app/__pycache__/__init__.cpython-311.pyc,, -app/__pycache__/config.cpython-311.pyc,, -app/__pycache__/database.cpython-311.pyc,, -app/__pycache__/deps.cpython-311.pyc,, -app/__pycache__/main.cpython-311.pyc,, -app/__pycache__/redis_client.cpython-311.pyc,, -app/api/v1/__pycache__/admin.cpython-311.pyc,, -app/api/v1/__pycache__/auth.cpython-311.pyc,, -app/api/v1/__pycache__/common.cpython-311.pyc,, -app/api/v1/__pycache__/incentives.cpython-311.pyc,, -app/api/v1/__pycache__/interactions.cpython-311.pyc,, -app/api/v1/__pycache__/invite.cpython-311.pyc,, -app/api/v1/__pycache__/membership.cpython-311.pyc,, -app/api/v1/__pycache__/payments.cpython-311.pyc,, -app/api/v1/__pycache__/users.cpython-311.pyc,, -app/api/v1/__pycache__/videos.cpython-311.pyc,, -app/api/v1/admin.py,sha256=H8g1TPi5a0Y_UN3vg9sXV4ccgdMBo1Fwj07RrOFYBT0,14046 -app/api/v1/auth.py,sha256=HM_EDLBGjaYf8ctLlqliG27kDOrmZZUtgvr0qkQGfzw,2967 -app/api/v1/common.py,sha256=6WzXV4_xwEJVptIWbs6MFP-nYh8WlDRrw3fjBqQb2QE,2626 -app/api/v1/incentives.py,sha256=Zw6eKex9IO9tdF6y7yS7w-Tb7eqcE5giqOf1AG0zRn4,3026 -app/api/v1/interactions.py,sha256=UBXLYfR3gUgQd7tTUhkwG0GiOqVC-LRJOzf6RiXaVqU,2695 -app/api/v1/invite.py,sha256=q5qnX37CmbMS1ZuNyP4-Q2XiiBsEGDyrDFe5Ct84x1c,2042 -app/api/v1/membership.py,sha256=AJlOExpOQ6wGN0EAG-KViE0XF4qbPL4RbKRLuSnFu_I,998 -app/api/v1/payments.py,sha256=nMQlIO-8VAx0hu3chsQq0woHkkuJfyQkE1t26jrxsVU,2602 -app/api/v1/users.py,sha256=3WYYhbJOChijauMHZiL1Of5O6rGuz-OMj9--bC830fo,4218 -app/api/v1/videos.py,sha256=CJzUe01Yknkke4r7GmXLMRzO1veMW7JoDCYTUSBQ3yY,5924 -app/config.py,sha256=S8DBQflUFeknOd3UTfpEQr4C38r0iKf5EUrYa_YgaEA,2420 -app/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -app/core/__pycache__/__init__.cpython-311.pyc,, -app/core/__pycache__/errors.cpython-311.pyc,, -app/core/__pycache__/ratelimit.cpython-311.pyc,, -app/core/__pycache__/response.cpython-311.pyc,, -app/core/__pycache__/security.cpython-311.pyc,, -app/core/errors.py,sha256=kuZs8wspzcWTBuY5MvROE1ERDc6TtzndlgU_neHOLN8,2859 -app/core/ratelimit.py,sha256=N8eb2185ki-1ec6LqhsFgdL5ofrD6S4VRQ9gViN5wHk,1302 -app/core/response.py,sha256=IrwkgIkxiLSHMXdEjuJf4gkJbJwi0OkyO7gdr48-IiI,2174 -app/core/security.py,sha256=FElzunSDu4C7yJnXptICVMeqn1aQSD64EESEOyr9tSQ,2118 -app/database.py,sha256=neSp1XC1tJYZx6c7aomHyA_cHS9Yl8KHfh_TMR-hNPk,618 -app/deps.py,sha256=WyXToIi5fmv0RrMmU2-HgtFVR0stAV1Hb33jZPYjqWM,3713 -app/main.py,sha256=81zdtserZX6inpivpn-a7wbCaEJyCgf81OpxU5pRnZk,2975 -app/models/__init__.py,sha256=oOSBhc-xjoK3pLEvZTnKLurbA_22uoK8Mepdtf8JLj8,1089 -app/models/__pycache__/__init__.cpython-311.pyc,, -app/models/__pycache__/admin.cpython-311.pyc,, -app/models/__pycache__/base.cpython-311.pyc,, -app/models/__pycache__/billing.cpython-311.pyc,, -app/models/__pycache__/common.cpython-311.pyc,, -app/models/__pycache__/incentive.cpython-311.pyc,, -app/models/__pycache__/interaction.cpython-311.pyc,, -app/models/__pycache__/user.cpython-311.pyc,, -app/models/__pycache__/video.cpython-311.pyc,, -app/models/admin.py,sha256=4uK3OrlH8WxWVCrjrzwH8ijqhpAX2R9kQ2QbijJFPvQ,1580 -app/models/base.py,sha256=JLZuQ-gqMrKA05enzZIFe57UVw4YNJQjJoqwsrhw7oE,116 -app/models/billing.py,sha256=5FBIwmIZEYiFtpNJCmmYyQuIErkwDDgCL4yp8E0El1U,4313 -app/models/common.py,sha256=HcLNqRyC6_2thvB55CA5lerI68QyP7icf2LaWdWB87A,3099 -app/models/incentive.py,sha256=a6PQddaZ74BpBhI3_YdQPfwXX1nK-Q9WRPn9i14g03E,4780 -app/models/interaction.py,sha256=GZwHgQMoA9WjjZFGc_SvZO-hoFt_zcAw3alNqKdrNcM,2312 -app/models/user.py,sha256=oupJhkBldGGGFwAGvQ3CSYYi_bqFRR9MdZwEzU-uJvk,4284 -app/models/video.py,sha256=GtWhC4xm90-t4Kiw1pZKMITDydZR_NokiZBp1XSxN6M,4326 -app/payment/__init__.py,sha256=NAu8R8hVNIfrEFK6bbI0LSnZvwMkBWLnP4_lOqxSh8w,108 -app/payment/__pycache__/__init__.cpython-311.pyc,, -app/payment/__pycache__/alipay.cpython-311.pyc,, -app/payment/__pycache__/base.cpython-311.pyc,, -app/payment/__pycache__/usdt.cpython-311.pyc,, -app/payment/__pycache__/wechat.cpython-311.pyc,, -app/payment/alipay.py,sha256=HVG5dFmu4BfizpXdLZ-Rm3ZVEhxNwoWmrw8hB2bFgu8,2705 -app/payment/base.py,sha256=3qEYxWM-g1yY-8LnU9OctI5ROpG5X0Kx4l5rRNRfZpQ,4403 -app/payment/usdt.py,sha256=-kftgDUj51r6fb-ZsdCBh63PTyMdbpt_IqsyAUDL_0k,862 -app/payment/wechat.py,sha256=NrvxRWBV4uXQx-KZCY_evUdyie3kQH1mkfSkQ8y0GSU,4588 -app/redis_client.py,sha256=EUeC-lISfW7Fw0xBiEeSE1CNnT12cMtkx3u1Xoe_z3E,287 -app/schemas/__pycache__/admin.cpython-311.pyc,, -app/schemas/__pycache__/auth.cpython-311.pyc,, -app/schemas/__pycache__/common.cpython-311.pyc,, -app/schemas/__pycache__/incentive.cpython-311.pyc,, -app/schemas/__pycache__/interaction.cpython-311.pyc,, -app/schemas/__pycache__/invite.cpython-311.pyc,, -app/schemas/__pycache__/payment.cpython-311.pyc,, -app/schemas/__pycache__/user.cpython-311.pyc,, -app/schemas/__pycache__/video.cpython-311.pyc,, -app/schemas/admin.py,sha256=bEHRg3YDuEnT55WmzOf825ioN_1jgH-pCMKeObrGUps,3063 -app/schemas/auth.py,sha256=kSAaOaklUbfVvRsq3pYvq_qAgVhQc5Vh0jKz9ueiP8g,3424 -app/schemas/common.py,sha256=U0jBLhaUPlbeeyT_nKO6KD8irINYVG2yTHZqS-5ISXA,665 -app/schemas/incentive.py,sha256=0C_1UJRqlJ_vj0-ijxKbYEGRKTlTmYlXPnS0d82Ylj0,501 -app/schemas/interaction.py,sha256=005ZU8h1d7_ukNuBv44UuUpdPUHt3jzHL_GMLjbR1lU,287 -app/schemas/invite.py,sha256=H34IkJKZ7Fw5l73yFJ9vzPi_XfB9JLzQphRoR9K-PA0,361 -app/schemas/payment.py,sha256=9cVk9nbtWrWwHi40OVE-adnp7-chkfzv4Zyq3ys66VU,254 -app/schemas/user.py,sha256=vukSFobHZ6zFJK3aetGilOeQckRQc72xuVbrJYBq-B8,423 -app/schemas/video.py,sha256=pnyKZREOl-_qM1oaG8F1usOcI__wBdhVJ7bTeiydygI,1345 -app/services/__pycache__/admin_service.cpython-311.pyc,, -app/services/__pycache__/auth_service.cpython-311.pyc,, -app/services/__pycache__/common_service.cpython-311.pyc,, -app/services/__pycache__/config_service.cpython-311.pyc,, -app/services/__pycache__/incentive_service.cpython-311.pyc,, -app/services/__pycache__/interaction_service.cpython-311.pyc,, -app/services/__pycache__/invite_service.cpython-311.pyc,, -app/services/__pycache__/membership_service.cpython-311.pyc,, -app/services/__pycache__/payment_service.cpython-311.pyc,, -app/services/__pycache__/sensitive_service.cpython-311.pyc,, -app/services/__pycache__/settle_service.cpython-311.pyc,, -app/services/__pycache__/storage_service.cpython-311.pyc,, -app/services/__pycache__/user_service.cpython-311.pyc,, -app/services/__pycache__/video_service.cpython-311.pyc,, -app/services/__pycache__/wallet_service.cpython-311.pyc,, -app/services/admin_service.py,sha256=xKVHiBo3vxlOBV5JtQyCgQP-DJUPW8dXx-WUBA1tGJc,45282 -app/services/auth_service.py,sha256=UJ03hPLcjcVVXdrxxpDkzJZB_Uy8yk4f_aNyoMwYuIM,13441 -app/services/common_service.py,sha256=senUncdnQdHpJ7jG0m71CWI2D0CCB5_Xq7jB5bp1S28,5278 -app/services/config_service.py,sha256=KYyWa5LukzYWj9harGSu07LdjQuT1_ZvDVSOdnv4OZs,1828 -app/services/incentive_service.py,sha256=4-ovmHKy0iUKjHAaSDzA4hbTIxCSLT_sgL26hC6ipKA,12346 -app/services/interaction_service.py,sha256=c7D4cl9nfopH58T1NRLy8-rjDBqwiX7uFFFrCwvgFiA,12896 -app/services/invite_service.py,sha256=AWaThTgYYFocmwFOV47zXlQik-K-slg5yWdV-vj2htU,7189 -app/services/membership_service.py,sha256=9STx1UJCNrmjqmJIH-dXWbAFA5g8afdLdAh8N_dS7co,7847 -app/services/payment_service.py,sha256=Ken7kOFbfLB8KTU4BVQOmKfTeuEYjQK4yh88PbfpTcA,10642 -app/services/sensitive_service.py,sha256=kGdMOmsX6jtvV2mZtwoA_d2qvi6LfI3tGtnItGwxvGA,2520 -app/services/settle_service.py,sha256=vJyrg5MRP10-RJdHTexzyjSuGZ_g253hzIO8vVnT7Uc,6352 -app/services/storage_service.py,sha256=n5H1MNXkmDjTzv0XtA7cV4oTAoIdZLgjB9bkJj1vJ1M,2639 -app/services/user_service.py,sha256=d7M6O9nXRMZijHz1XAS876E7naf5XHHf9HE6vHCx6RU,7443 -app/services/video_service.py,sha256=ThdiS4sOcIH2-Q25n6y3PJC28XKBkVdFiATj54IWJiE,30116 -app/services/wallet_service.py,sha256=YSBB1u3K3rXWQLTurdYPEOE1__TcVrGcsFFLpG7xK54,2624 +__editable__.video_server-0.1.0.pth,sha256=aZ13RVzyKccpVaIeVTIbXigSEgNJmpzuxM_DE6s5yEM,95 +__editable___video_server_0_1_0_finder.py,sha256=gPMU69xiXFF7I6mbBnZ9XIs_dCdXxKv0slEWb0pzAjs,3608 +__pycache__/__editable___video_server_0_1_0_finder.cpython-311.pyc,, video_server-0.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 video_server-0.1.0.dist-info/METADATA,sha256=ZfMa9ovXG5xeYNpvS-swCrntFKaeFWrYkYw30A90gwk,921 video_server-0.1.0.dist-info/RECORD,, video_server-0.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 video_server-0.1.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91 -video_server-0.1.0.dist-info/direct_url.json,sha256=EhjbkulUn5j--nOiuJM_lJED4DxPE2m0nZatOla8qYY,60 +video_server-0.1.0.dist-info/direct_url.json,sha256=NZzgOXsvUD_pVj2ic5q56rYkZTAM707JLaqs6icycYU,76 video_server-0.1.0.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4 diff --git a/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/direct_url.json b/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/direct_url.json index 5c12e9c..c716acf 100644 --- a/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/direct_url.json +++ b/server/.venv/lib/python3.11/site-packages/video_server-0.1.0.dist-info/direct_url.json @@ -1 +1 @@ -{"dir_info": {}, "url": "file:///root/project/video/server"} \ No newline at end of file +{"dir_info": {"editable": true}, "url": "file:///root/project/video/server"} \ No newline at end of file diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/__init__.cpython-311.pyc index 6db3596..06ed5f8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/abstract.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/abstract.cpython-311.pyc index 5b53dc5..c0787ab 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/abstract.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/abstract.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/funtools.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/funtools.cpython-311.pyc index 9cfda85..49519da 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/funtools.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/funtools.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/promises.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/promises.cpython-311.pyc index 5f5a5cc..8f13061 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/promises.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/promises.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/synchronization.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/synchronization.cpython-311.pyc index 52f8be8..127aad1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/synchronization.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/synchronization.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/utils.cpython-311.pyc index 1ed44f7..be23ba4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/vine/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/vine/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles-1.3.0.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/watchfiles-1.3.0.dist-info/RECORD index e1e2e9d..25be966 100644 --- a/server/.venv/lib/python3.11/site-packages/watchfiles-1.3.0.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/watchfiles-1.3.0.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/watchfiles,sha256=jiyWxeJ2mSne37A6XpGx_EuVj_x6udXcOES_N2ZbrVc,186 +../../../bin/watchfiles,sha256=Ua-25Z8ZZc2ir-MVc0o3sHgr-nzgpqjwwDdDYDL-yAc,190 watchfiles-1.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 watchfiles-1.3.0.dist-info/METADATA,sha256=H7qH0I1m8Q91FeSBer1Kx_J6vzMAyzO3rT95dimHpQI,4877 watchfiles-1.3.0.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__init__.cpython-311.pyc index 11ab2c3..40506ca 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__main__.cpython-311.pyc index 53675f0..daef24c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/cli.cpython-311.pyc index 7cbdbfa..e236bfc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/filters.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/filters.cpython-311.pyc index 394a317..51c038c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/filters.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/filters.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/main.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/main.cpython-311.pyc index 609a7f4..c8f008a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/main.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/main.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/run.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/run.cpython-311.pyc index 8a24e85..7867ffa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/run.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/run.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/version.cpython-311.pyc index eb8d247..4109e60 100644 Binary files a/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/watchfiles/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/__init__.cpython-311.pyc index 9b02072..fa86649 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_clip.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_clip.cpython-311.pyc index 8b0b56b..e53c3ef 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_clip.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_clip.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_constants.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_constants.cpython-311.pyc index 5af8402..a374025 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_constants.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_constants.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcswidth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcswidth.cpython-311.pyc index c12b6dc..6ca978f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcswidth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcswidth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcwidth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcwidth.cpython-311.pyc index cd5652b..713a9ad 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcwidth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_wcwidth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_width.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_width.cpython-311.pyc index 979354b..218c934 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_width.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/_width.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/align.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/align.cpython-311.pyc index 7062cef..9f600ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/align.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/align.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/bisearch.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/bisearch.cpython-311.pyc index cb17de9..f6db6cd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/bisearch.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/bisearch.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/control_codes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/control_codes.cpython-311.pyc index 5812b8a..1ef6a60 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/control_codes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/control_codes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/escape_sequences.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/escape_sequences.cpython-311.pyc index 2e7f323..f2b95fa 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/escape_sequences.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/escape_sequences.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/grapheme.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/grapheme.cpython-311.pyc index bb8ee95..7c8b032 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/grapheme.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/grapheme.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/hyperlink.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/hyperlink.cpython-311.pyc index a69d48c..73b217b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/hyperlink.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/hyperlink.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/sgr_state.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/sgr_state.cpython-311.pyc index c90f2b6..8c4727a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/sgr_state.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/sgr_state.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_ambiguous.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_ambiguous.cpython-311.pyc index 78b57db..72e5d7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_ambiguous.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_ambiguous.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_grapheme.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_grapheme.cpython-311.pyc index db4e5fd..6b6dad1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_grapheme.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_grapheme.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_mc.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_mc.cpython-311.pyc index d074827..ee22828 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_mc.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_mc.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_overrides.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_overrides.cpython-311.pyc index dc8240a..8ea6217 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_overrides.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_overrides.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_term_programs.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_term_programs.cpython-311.pyc index 633dc84..7a33406 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_term_programs.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_term_programs.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs15.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs15.cpython-311.pyc index 5256573..29e32c5 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs15.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs15.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs16.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs16.cpython-311.pyc index 612e12e..a267642 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs16.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_vs16.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_wide.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_wide.cpython-311.pyc index 8013874..ab9a197 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_wide.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_wide.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_zero.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_zero.cpython-311.pyc index 133789d..87aefff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_zero.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/table_zero.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/text_sizing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/text_sizing.cpython-311.pyc index 17ee135..e23a63e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/text_sizing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/text_sizing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/textwrap.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/textwrap.cpython-311.pyc index efb9475..ac36912 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/textwrap.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/textwrap.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/unicode_versions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/unicode_versions.cpython-311.pyc index 3d575a0..27aee30 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/unicode_versions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/unicode_versions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/wcwidth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/wcwidth.cpython-311.pyc index 8405589..fb5f504 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/wcwidth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/__pycache__/wcwidth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/__init__.cpython-311.pyc index 0e04600..b0e276f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_058c7585.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_058c7585.cpython-311.pyc index c4671eb..d878b6b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_058c7585.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_058c7585.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_2148ff29.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_2148ff29.cpython-311.pyc index 0d6ab24..30522c8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_2148ff29.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_2148ff29.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_244dc88b.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_244dc88b.cpython-311.pyc index 937b230..1704824 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_244dc88b.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_244dc88b.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_336a71a1.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_336a71a1.cpython-311.pyc index 25f3761..a3a7b33 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_336a71a1.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_336a71a1.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_33ac73f2.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_33ac73f2.cpython-311.pyc index a348174..305d791 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_33ac73f2.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_33ac73f2.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_3a1895d5.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_3a1895d5.cpython-311.pyc index b593b8c..e581e0b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_3a1895d5.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_3a1895d5.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_59180a0d.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_59180a0d.cpython-311.pyc index c19aa01..fd5195c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_59180a0d.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_59180a0d.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_65c6beb5.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_65c6beb5.cpython-311.pyc index ab75249..b29fd8b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_65c6beb5.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_65c6beb5.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_78f828e8.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_78f828e8.cpython-311.pyc index be91993..f0b2d77 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_78f828e8.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_78f828e8.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_8c2ae14d.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_8c2ae14d.cpython-311.pyc index f322d52..98f2caf 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_8c2ae14d.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_8c2ae14d.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_900356bf.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_900356bf.cpython-311.pyc index 14313d4..28d80a7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_900356bf.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_900356bf.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_97904ece.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_97904ece.cpython-311.pyc index 1f8ef84..0fc25a1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_97904ece.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_97904ece.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_a5880eeb.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_a5880eeb.cpython-311.pyc index 5ae60f4..9031e7a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_a5880eeb.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_a5880eeb.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_b6d33cf4.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_b6d33cf4.cpython-311.pyc index 6cb4107..f46a85b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_b6d33cf4.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_b6d33cf4.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_c57c295b.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_c57c295b.cpython-311.pyc index 85e8d9a..afff65f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_c57c295b.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_c57c295b.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_cf02297d.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_cf02297d.cpython-311.pyc index f9bf521..0ac71b6 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_cf02297d.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_cf02297d.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e18ac6a7.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e18ac6a7.cpython-311.pyc index cc745ed..8874068 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e18ac6a7.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e18ac6a7.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e2b75ee3.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e2b75ee3.cpython-311.pyc index 236b5bc..ca520c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e2b75ee3.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_e2b75ee3.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fb5fd79b.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fb5fd79b.cpython-311.pyc index d8a072d..9c98427 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fb5fd79b.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fb5fd79b.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fdc99132.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fdc99132.cpython-311.pyc index ad31fa5..a78762f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fdc99132.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_known_fdc99132.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_registry.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_registry.cpython-311.pyc index bd01cb1..9bcbd35 100644 Binary files a/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_registry.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/wcwidth/table_grapheme_overrides/__pycache__/_registry.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets-17.2.dist-info/RECORD b/server/.venv/lib/python3.11/site-packages/websockets-17.2.dist-info/RECORD index 0da3e27..7a5dab3 100644 --- a/server/.venv/lib/python3.11/site-packages/websockets-17.2.dist-info/RECORD +++ b/server/.venv/lib/python3.11/site-packages/websockets-17.2.dist-info/RECORD @@ -1,4 +1,4 @@ -../../../bin/websockets,sha256=OSYV2j90p1mdMImKUQBWPg8uZ0eA84h2daezjEDNyvI,188 +../../../bin/websockets,sha256=MwkelEKhr3abRDWhTN_GNWKHbh53UDyu0oXnROMyxTc,192 websockets-17.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 websockets-17.2.dist-info/METADATA,sha256=DV8SedCV57qE7yFhSvCCLcUAzLLlG3w6Ge2nFZstreQ,6336 websockets-17.2.dist-info/RECORD,, diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__init__.cpython-311.pyc index 95d704b..3b53e2e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__main__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__main__.cpython-311.pyc index f76a68e..8fa44db 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__main__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/__main__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/auth.cpython-311.pyc index d3f3a6e..95eebdd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/cli.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/cli.cpython-311.pyc index def5bf3..8d52fde 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/cli.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/cli.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/client.cpython-311.pyc index f054f5f..bbf775d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/connection.cpython-311.pyc index 1822624..73aa83e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/datastructures.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/datastructures.cpython-311.pyc index e0741f5..6ec8fe2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/datastructures.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/datastructures.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/exceptions.cpython-311.pyc index ec4f457..bac7d5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/frames.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/frames.cpython-311.pyc index cb74993..d7a935a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/frames.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/frames.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/headers.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/headers.cpython-311.pyc index 6101e16..aa397b2 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/headers.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/headers.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/http11.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/http11.cpython-311.pyc index 82cdf4c..8cdf6e7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/http11.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/http11.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/imports.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/imports.cpython-311.pyc index 0693195..358cc95 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/imports.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/imports.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/protocol.cpython-311.pyc index 55cf009..86696fe 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/proxy.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/proxy.cpython-311.pyc index 07719e7..9663e1a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/proxy.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/proxy.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/server.cpython-311.pyc index 2420096..220b24c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/streams.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/streams.cpython-311.pyc index 0af0066..414a0f4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/streams.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/streams.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/typing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/typing.cpython-311.pyc index 6516b9a..2b7701b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/typing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/typing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/uri.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/uri.cpython-311.pyc index b0cf89e..0f3df0d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/uri.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/uri.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/utils.cpython-311.pyc index 2d1a52e..9991752 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/version.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/version.cpython-311.pyc index 7d4c13c..5b9e9a4 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/version.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/__pycache__/version.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/__init__.cpython-311.pyc index ce4a2f0..0aefea1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/client.cpython-311.pyc index 2bb10e2..d5d16c8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/connection.cpython-311.pyc index 2685f37..54be771 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/messages.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/messages.cpython-311.pyc index 6ae370d..a152d5d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/messages.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/messages.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/router.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/router.cpython-311.pyc index 4ecb9ff..1ac0212 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/router.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/router.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/server.cpython-311.pyc index 90a85c4..236cffc 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/asyncio/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/__init__.cpython-311.pyc index 2d4d52b..73025c7 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/base.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/base.cpython-311.pyc index 34a4ea8..900b4c1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/base.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/base.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/permessage_deflate.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/permessage_deflate.cpython-311.pyc index dc12968..4506b9b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/permessage_deflate.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/extensions/__pycache__/permessage_deflate.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/__init__.cpython-311.pyc index 5069164..344d22a 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/auth.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/auth.cpython-311.pyc index 9696e82..6eccfff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/auth.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/auth.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/client.cpython-311.pyc index 21ff943..8bdbfd9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/exceptions.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/exceptions.cpython-311.pyc index 2b925aa..b426697 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/exceptions.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/exceptions.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/framing.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/framing.cpython-311.pyc index 760348f..fef413d 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/framing.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/framing.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/handshake.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/handshake.cpython-311.pyc index c8f3687..89de321 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/handshake.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/handshake.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/http.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/http.cpython-311.pyc index 393f064..b655929 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/http.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/http.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/protocol.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/protocol.cpython-311.pyc index cca7440..7bf5401 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/protocol.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/protocol.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/server.cpython-311.pyc index cefbeff..6ecf477 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/legacy/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/__init__.cpython-311.pyc index 033dd04..68884f9 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/client.cpython-311.pyc index 31a7da1..1a5d511 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/connection.cpython-311.pyc index 752d34c..b7f5057 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/messages.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/messages.cpython-311.pyc index 36c7d95..e676373 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/messages.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/messages.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/router.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/router.cpython-311.pyc index 5840709..69ebc5b 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/router.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/router.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/server.cpython-311.pyc index 37c6386..1ac3d66 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/utils.cpython-311.pyc index 9bbb1ff..c1677ff 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/sync/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/__init__.cpython-311.pyc index 44e9e38..b766884 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/client.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/client.cpython-311.pyc index cf08f29..eef6b35 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/client.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/client.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/connection.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/connection.cpython-311.pyc index d6cb8e7..184957c 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/connection.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/connection.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/messages.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/messages.cpython-311.pyc index 9660634..719ff30 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/messages.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/messages.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/router.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/router.cpython-311.pyc index 2e6e12c..258a823 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/router.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/router.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/server.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/server.cpython-311.pyc index 88b7412..6cb7444 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/server.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/server.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/utils.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/utils.cpython-311.pyc index b3e2362..fb6b6d8 100644 Binary files a/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/utils.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/websockets/trio/__pycache__/utils.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/__init__.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/__init__.cpython-311.pyc index 40c344a..946f227 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/__init__.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/composer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/composer.cpython-311.pyc index f4efd08..9ff513f 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/composer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/composer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/constructor.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/constructor.cpython-311.pyc index deb19f8..dbbda45 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/constructor.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/constructor.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/cyaml.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/cyaml.cpython-311.pyc index bfffe7a..1d8fa54 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/cyaml.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/cyaml.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/dumper.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/dumper.cpython-311.pyc index 8384451..19d2905 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/dumper.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/dumper.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/emitter.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/emitter.cpython-311.pyc index c1827ee..e997b87 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/emitter.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/emitter.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/error.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/error.cpython-311.pyc index 2096241..eac64bd 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/error.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/error.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/events.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/events.cpython-311.pyc index c6b18e4..0bf2914 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/events.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/events.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/loader.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/loader.cpython-311.pyc index 07aac97..0cef563 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/loader.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/loader.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/nodes.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/nodes.cpython-311.pyc index a072f9f..54e2dc1 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/nodes.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/nodes.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/parser.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/parser.cpython-311.pyc index 6793b5c..eae9525 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/parser.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/parser.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/reader.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/reader.cpython-311.pyc index 23d66af..486a7ac 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/reader.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/reader.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/representer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/representer.cpython-311.pyc index a7e0016..35cb266 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/representer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/representer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/resolver.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/resolver.cpython-311.pyc index b984593..d42cc21 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/resolver.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/resolver.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/scanner.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/scanner.cpython-311.pyc index 21ceb87..005091e 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/scanner.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/scanner.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/serializer.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/serializer.cpython-311.pyc index e439a6f..c5fce07 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/serializer.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/serializer.cpython-311.pyc differ diff --git a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/tokens.cpython-311.pyc b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/tokens.cpython-311.pyc index f3f8a8d..8f8f380 100644 Binary files a/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/tokens.cpython-311.pyc and b/server/.venv/lib/python3.11/site-packages/yaml/__pycache__/tokens.cpython-311.pyc differ diff --git a/server/.venv/pyvenv.cfg b/server/.venv/pyvenv.cfg index 7043554..6e77205 100644 --- a/server/.venv/pyvenv.cfg +++ b/server/.venv/pyvenv.cfg @@ -1,5 +1,5 @@ -home = /root/.pyenv/versions/3.11.14/bin +home = /root/.pyenv/versions/3.11.10/bin include-system-site-packages = false -version = 3.11.14 -executable = /root/.pyenv/versions/3.11.14/bin/python3.11 -command = /root/.pyenv/versions/3.11.14/bin/python -m venv /root/project/video/server/.venv +version = 3.11.10 +executable = /root/.pyenv/versions/3.11.10/bin/python3.11 +command = /root/.pyenv/versions/3.11.10/bin/python3.11 -m venv /root/project/video/server/.venv diff --git a/server/alembic/__pycache__/env.cpython-311.pyc b/server/alembic/__pycache__/env.cpython-311.pyc index 5cf16c1..e0a7eee 100644 Binary files a/server/alembic/__pycache__/env.cpython-311.pyc and b/server/alembic/__pycache__/env.cpython-311.pyc differ diff --git a/server/alembic/versions/__pycache__/d659ecc1b6e7_init_27_tables.cpython-311.pyc b/server/alembic/versions/__pycache__/d659ecc1b6e7_init_27_tables.cpython-311.pyc index 766607a..a9c3bc6 100644 Binary files a/server/alembic/versions/__pycache__/d659ecc1b6e7_init_27_tables.cpython-311.pyc and b/server/alembic/versions/__pycache__/d659ecc1b6e7_init_27_tables.cpython-311.pyc differ diff --git a/server/app/__pycache__/__init__.cpython-311.pyc b/server/app/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 3bfbc62..0000000 Binary files a/server/app/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/server/app/__pycache__/config.cpython-311.pyc b/server/app/__pycache__/config.cpython-311.pyc deleted file mode 100644 index 579e4a4..0000000 Binary files a/server/app/__pycache__/config.cpython-311.pyc and /dev/null differ diff --git a/server/app/__pycache__/database.cpython-311.pyc b/server/app/__pycache__/database.cpython-311.pyc deleted file mode 100644 index 968980a..0000000 Binary files a/server/app/__pycache__/database.cpython-311.pyc and /dev/null differ diff --git a/server/app/__pycache__/deps.cpython-311.pyc b/server/app/__pycache__/deps.cpython-311.pyc deleted file mode 100644 index cb203a8..0000000 Binary files a/server/app/__pycache__/deps.cpython-311.pyc and /dev/null differ diff --git a/server/app/__pycache__/main.cpython-311.pyc b/server/app/__pycache__/main.cpython-311.pyc deleted file mode 100644 index 705bd38..0000000 Binary files a/server/app/__pycache__/main.cpython-311.pyc and /dev/null differ diff --git a/server/app/__pycache__/redis_client.cpython-311.pyc b/server/app/__pycache__/redis_client.cpython-311.pyc deleted file mode 100644 index a69a437..0000000 Binary files a/server/app/__pycache__/redis_client.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/admin.cpython-311.pyc b/server/app/api/v1/__pycache__/admin.cpython-311.pyc deleted file mode 100644 index a9a3195..0000000 Binary files a/server/app/api/v1/__pycache__/admin.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/auth.cpython-311.pyc b/server/app/api/v1/__pycache__/auth.cpython-311.pyc deleted file mode 100644 index 519f742..0000000 Binary files a/server/app/api/v1/__pycache__/auth.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/common.cpython-311.pyc b/server/app/api/v1/__pycache__/common.cpython-311.pyc deleted file mode 100644 index dd9ef58..0000000 Binary files a/server/app/api/v1/__pycache__/common.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/incentives.cpython-311.pyc b/server/app/api/v1/__pycache__/incentives.cpython-311.pyc deleted file mode 100644 index b695825..0000000 Binary files a/server/app/api/v1/__pycache__/incentives.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/interactions.cpython-311.pyc b/server/app/api/v1/__pycache__/interactions.cpython-311.pyc deleted file mode 100644 index 716bb1f..0000000 Binary files a/server/app/api/v1/__pycache__/interactions.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/invite.cpython-311.pyc b/server/app/api/v1/__pycache__/invite.cpython-311.pyc deleted file mode 100644 index b35d773..0000000 Binary files a/server/app/api/v1/__pycache__/invite.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/membership.cpython-311.pyc b/server/app/api/v1/__pycache__/membership.cpython-311.pyc deleted file mode 100644 index 2bac60a..0000000 Binary files a/server/app/api/v1/__pycache__/membership.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/payments.cpython-311.pyc b/server/app/api/v1/__pycache__/payments.cpython-311.pyc deleted file mode 100644 index 107da0b..0000000 Binary files a/server/app/api/v1/__pycache__/payments.cpython-311.pyc and /dev/null differ diff --git a/server/app/api/v1/__pycache__/users.cpython-311.pyc b/server/app/api/v1/__pycache__/users.cpython-311.pyc deleted file mode 100644 index b3c4804..0000000 Binary files a/server/app/api/v1/__pycache__/users.cpython-311.pyc and /dev/null differ diff --git a/server/app/core/__pycache__/__init__.cpython-311.pyc b/server/app/core/__pycache__/__init__.cpython-311.pyc index cd3f20b..37c9f4d 100644 Binary files a/server/app/core/__pycache__/__init__.cpython-311.pyc and b/server/app/core/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/app/core/__pycache__/errors.cpython-311.pyc b/server/app/core/__pycache__/errors.cpython-311.pyc index 4e0c2df..8a88367 100644 Binary files a/server/app/core/__pycache__/errors.cpython-311.pyc and b/server/app/core/__pycache__/errors.cpython-311.pyc differ diff --git a/server/app/core/__pycache__/ratelimit.cpython-311.pyc b/server/app/core/__pycache__/ratelimit.cpython-311.pyc index dcab43a..eff4e99 100644 Binary files a/server/app/core/__pycache__/ratelimit.cpython-311.pyc and b/server/app/core/__pycache__/ratelimit.cpython-311.pyc differ diff --git a/server/app/core/__pycache__/response.cpython-311.pyc b/server/app/core/__pycache__/response.cpython-311.pyc index 1f9c231..64f8d37 100644 Binary files a/server/app/core/__pycache__/response.cpython-311.pyc and b/server/app/core/__pycache__/response.cpython-311.pyc differ diff --git a/server/app/core/__pycache__/security.cpython-311.pyc b/server/app/core/__pycache__/security.cpython-311.pyc index e4559f9..cc14009 100644 Binary files a/server/app/core/__pycache__/security.cpython-311.pyc and b/server/app/core/__pycache__/security.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/__init__.cpython-311.pyc b/server/app/models/__pycache__/__init__.cpython-311.pyc index 235dd3c..08ec1cd 100644 Binary files a/server/app/models/__pycache__/__init__.cpython-311.pyc and b/server/app/models/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/admin.cpython-311.pyc b/server/app/models/__pycache__/admin.cpython-311.pyc index 2df2bcf..76f1930 100644 Binary files a/server/app/models/__pycache__/admin.cpython-311.pyc and b/server/app/models/__pycache__/admin.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/base.cpython-311.pyc b/server/app/models/__pycache__/base.cpython-311.pyc index 0baef04..53cc673 100644 Binary files a/server/app/models/__pycache__/base.cpython-311.pyc and b/server/app/models/__pycache__/base.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/billing.cpython-311.pyc b/server/app/models/__pycache__/billing.cpython-311.pyc index f0f1f2d..0b24d5a 100644 Binary files a/server/app/models/__pycache__/billing.cpython-311.pyc and b/server/app/models/__pycache__/billing.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/common.cpython-311.pyc b/server/app/models/__pycache__/common.cpython-311.pyc index 8402d5d..1eb067a 100644 Binary files a/server/app/models/__pycache__/common.cpython-311.pyc and b/server/app/models/__pycache__/common.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/incentive.cpython-311.pyc b/server/app/models/__pycache__/incentive.cpython-311.pyc index 8b6fe46..962892e 100644 Binary files a/server/app/models/__pycache__/incentive.cpython-311.pyc and b/server/app/models/__pycache__/incentive.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/interaction.cpython-311.pyc b/server/app/models/__pycache__/interaction.cpython-311.pyc index 637a110..4d67741 100644 Binary files a/server/app/models/__pycache__/interaction.cpython-311.pyc and b/server/app/models/__pycache__/interaction.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/user.cpython-311.pyc b/server/app/models/__pycache__/user.cpython-311.pyc index c5f2004..298de0d 100644 Binary files a/server/app/models/__pycache__/user.cpython-311.pyc and b/server/app/models/__pycache__/user.cpython-311.pyc differ diff --git a/server/app/models/__pycache__/video.cpython-311.pyc b/server/app/models/__pycache__/video.cpython-311.pyc index 05cda4f..a21a135 100644 Binary files a/server/app/models/__pycache__/video.cpython-311.pyc and b/server/app/models/__pycache__/video.cpython-311.pyc differ diff --git a/server/app/payment/__pycache__/__init__.cpython-311.pyc b/server/app/payment/__pycache__/__init__.cpython-311.pyc index fc71906..e5eb40d 100644 Binary files a/server/app/payment/__pycache__/__init__.cpython-311.pyc and b/server/app/payment/__pycache__/__init__.cpython-311.pyc differ diff --git a/server/app/payment/__pycache__/alipay.cpython-311.pyc b/server/app/payment/__pycache__/alipay.cpython-311.pyc index a870940..bdc152c 100644 Binary files a/server/app/payment/__pycache__/alipay.cpython-311.pyc and b/server/app/payment/__pycache__/alipay.cpython-311.pyc differ diff --git a/server/app/payment/__pycache__/base.cpython-311.pyc b/server/app/payment/__pycache__/base.cpython-311.pyc index 003e48a..818356d 100644 Binary files a/server/app/payment/__pycache__/base.cpython-311.pyc and b/server/app/payment/__pycache__/base.cpython-311.pyc differ diff --git a/server/app/payment/__pycache__/usdt.cpython-311.pyc b/server/app/payment/__pycache__/usdt.cpython-311.pyc index 7f71701..e55d339 100644 Binary files a/server/app/payment/__pycache__/usdt.cpython-311.pyc and b/server/app/payment/__pycache__/usdt.cpython-311.pyc differ diff --git a/server/app/payment/__pycache__/wechat.cpython-311.pyc b/server/app/payment/__pycache__/wechat.cpython-311.pyc index 7c8d5c6..8a99a79 100644 Binary files a/server/app/payment/__pycache__/wechat.cpython-311.pyc and b/server/app/payment/__pycache__/wechat.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/admin.cpython-311.pyc b/server/app/schemas/__pycache__/admin.cpython-311.pyc index 578bc64..54a3bfc 100644 Binary files a/server/app/schemas/__pycache__/admin.cpython-311.pyc and b/server/app/schemas/__pycache__/admin.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/auth.cpython-311.pyc b/server/app/schemas/__pycache__/auth.cpython-311.pyc index 127145a..382c217 100644 Binary files a/server/app/schemas/__pycache__/auth.cpython-311.pyc and b/server/app/schemas/__pycache__/auth.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/common.cpython-311.pyc b/server/app/schemas/__pycache__/common.cpython-311.pyc index ecb881e..d70dc1c 100644 Binary files a/server/app/schemas/__pycache__/common.cpython-311.pyc and b/server/app/schemas/__pycache__/common.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/incentive.cpython-311.pyc b/server/app/schemas/__pycache__/incentive.cpython-311.pyc index a05232e..fb09084 100644 Binary files a/server/app/schemas/__pycache__/incentive.cpython-311.pyc and b/server/app/schemas/__pycache__/incentive.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/interaction.cpython-311.pyc b/server/app/schemas/__pycache__/interaction.cpython-311.pyc index bf9e02f..2855218 100644 Binary files a/server/app/schemas/__pycache__/interaction.cpython-311.pyc and b/server/app/schemas/__pycache__/interaction.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/invite.cpython-311.pyc b/server/app/schemas/__pycache__/invite.cpython-311.pyc index 012f94a..e8dca28 100644 Binary files a/server/app/schemas/__pycache__/invite.cpython-311.pyc and b/server/app/schemas/__pycache__/invite.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/payment.cpython-311.pyc b/server/app/schemas/__pycache__/payment.cpython-311.pyc index 5d121d6..5600aca 100644 Binary files a/server/app/schemas/__pycache__/payment.cpython-311.pyc and b/server/app/schemas/__pycache__/payment.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/user.cpython-311.pyc b/server/app/schemas/__pycache__/user.cpython-311.pyc index e8eec9f..cd4cb15 100644 Binary files a/server/app/schemas/__pycache__/user.cpython-311.pyc and b/server/app/schemas/__pycache__/user.cpython-311.pyc differ diff --git a/server/app/schemas/__pycache__/video.cpython-311.pyc b/server/app/schemas/__pycache__/video.cpython-311.pyc index 89f6cde..2addadc 100644 Binary files a/server/app/schemas/__pycache__/video.cpython-311.pyc and b/server/app/schemas/__pycache__/video.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/admin_service.cpython-311.pyc b/server/app/services/__pycache__/admin_service.cpython-311.pyc index c60f70f..3aaf44b 100644 Binary files a/server/app/services/__pycache__/admin_service.cpython-311.pyc and b/server/app/services/__pycache__/admin_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/auth_service.cpython-311.pyc b/server/app/services/__pycache__/auth_service.cpython-311.pyc index ded2f8f..45067cf 100644 Binary files a/server/app/services/__pycache__/auth_service.cpython-311.pyc and b/server/app/services/__pycache__/auth_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/common_service.cpython-311.pyc b/server/app/services/__pycache__/common_service.cpython-311.pyc index e611705..68e68a0 100644 Binary files a/server/app/services/__pycache__/common_service.cpython-311.pyc and b/server/app/services/__pycache__/common_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/config_service.cpython-311.pyc b/server/app/services/__pycache__/config_service.cpython-311.pyc index 9dd61d3..12aeaab 100644 Binary files a/server/app/services/__pycache__/config_service.cpython-311.pyc and b/server/app/services/__pycache__/config_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/incentive_service.cpython-311.pyc b/server/app/services/__pycache__/incentive_service.cpython-311.pyc index 02e24f7..0f81b4a 100644 Binary files a/server/app/services/__pycache__/incentive_service.cpython-311.pyc and b/server/app/services/__pycache__/incentive_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/interaction_service.cpython-311.pyc b/server/app/services/__pycache__/interaction_service.cpython-311.pyc index 9aef8cd..ea49c94 100644 Binary files a/server/app/services/__pycache__/interaction_service.cpython-311.pyc and b/server/app/services/__pycache__/interaction_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/invite_service.cpython-311.pyc b/server/app/services/__pycache__/invite_service.cpython-311.pyc index 4a79523..7fb7d5e 100644 Binary files a/server/app/services/__pycache__/invite_service.cpython-311.pyc and b/server/app/services/__pycache__/invite_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/membership_service.cpython-311.pyc b/server/app/services/__pycache__/membership_service.cpython-311.pyc index 38d2e9e..0097dea 100644 Binary files a/server/app/services/__pycache__/membership_service.cpython-311.pyc and b/server/app/services/__pycache__/membership_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/payment_service.cpython-311.pyc b/server/app/services/__pycache__/payment_service.cpython-311.pyc index fc1f230..d1573f3 100644 Binary files a/server/app/services/__pycache__/payment_service.cpython-311.pyc and b/server/app/services/__pycache__/payment_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/sensitive_service.cpython-311.pyc b/server/app/services/__pycache__/sensitive_service.cpython-311.pyc index 216209f..65e475f 100644 Binary files a/server/app/services/__pycache__/sensitive_service.cpython-311.pyc and b/server/app/services/__pycache__/sensitive_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/settle_service.cpython-311.pyc b/server/app/services/__pycache__/settle_service.cpython-311.pyc index d7fa4d9..2ed5cca 100644 Binary files a/server/app/services/__pycache__/settle_service.cpython-311.pyc and b/server/app/services/__pycache__/settle_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/storage_service.cpython-311.pyc b/server/app/services/__pycache__/storage_service.cpython-311.pyc index 132db3e..bd852e7 100644 Binary files a/server/app/services/__pycache__/storage_service.cpython-311.pyc and b/server/app/services/__pycache__/storage_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/user_service.cpython-311.pyc b/server/app/services/__pycache__/user_service.cpython-311.pyc index 18622e4..ecf7831 100644 Binary files a/server/app/services/__pycache__/user_service.cpython-311.pyc and b/server/app/services/__pycache__/user_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/video_service.cpython-311.pyc b/server/app/services/__pycache__/video_service.cpython-311.pyc index a889878..221460b 100644 Binary files a/server/app/services/__pycache__/video_service.cpython-311.pyc and b/server/app/services/__pycache__/video_service.cpython-311.pyc differ diff --git a/server/app/services/__pycache__/wallet_service.cpython-311.pyc b/server/app/services/__pycache__/wallet_service.cpython-311.pyc index 6144762..1a0dbc5 100644 Binary files a/server/app/services/__pycache__/wallet_service.cpython-311.pyc and b/server/app/services/__pycache__/wallet_service.cpython-311.pyc differ diff --git a/server/video_server.egg-info/SOURCES.txt b/server/video_server.egg-info/SOURCES.txt index eeb7ecd..b6af6fd 100644 --- a/server/video_server.egg-info/SOURCES.txt +++ b/server/video_server.egg-info/SOURCES.txt @@ -55,6 +55,7 @@ app/services/payment_service.py app/services/sensitive_service.py app/services/settle_service.py app/services/storage_service.py +app/services/transcode_service.py app/services/user_service.py app/services/video_service.py app/services/wallet_service.py