From b5d929d12b6013233b66005350d7c7e0758c9528 Mon Sep 17 00:00:00 2001 From: David Cooper Date: Mon, 16 Sep 2024 13:12:51 -0400 Subject: [PATCH] Bump deps, clean up pyproject --- client/package-lock.json | 26 +++++++++++++------------- client/package.json | 2 +- docs/poetry.lock | 9 +++++---- docs/pyproject.toml | 2 +- server/poetry.lock | 18 +++++++++--------- server/pyproject.toml | 4 +++- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c2b14fdd..5f7dc981 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -29,7 +29,7 @@ "esbuild": "^0.23.1", "esbuild-style-plugin": "^1.6.3", "esbuild-svelte": "^0.8.2", - "eslint": "^8.57.0", + "eslint": "^8.57.1", "eslint-plugin-svelte": "^2.44.0", "eventemitter3": "^5.0.1", "fs-extra": "^11.2.0", @@ -1514,9 +1514,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "license": "MIT", "engines": { @@ -1548,14 +1548,14 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -5299,17 +5299,17 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", diff --git a/client/package.json b/client/package.json index 50ada9b7..0a9f02c9 100644 --- a/client/package.json +++ b/client/package.json @@ -57,7 +57,7 @@ "esbuild": "^0.23.1", "esbuild-style-plugin": "^1.6.3", "esbuild-svelte": "^0.8.2", - "eslint": "^8.57.0", + "eslint": "^8.57.1", "eslint-plugin-svelte": "^2.44.0", "eventemitter3": "^5.0.1", "fs-extra": "^11.2.0", diff --git a/docs/poetry.lock b/docs/poetry.lock index a7d61f11..1bf7e8a8 100644 --- a/docs/poetry.lock +++ b/docs/poetry.lock @@ -368,18 +368,19 @@ pyyaml = ">=5.1" [[package]] name = "mkdocs-macros-plugin" -version = "1.0.5" +version = "1.2.0" description = "Unleash the power of MkDocs with macros and variables" optional = false python-versions = ">=3.8" files = [ - {file = "mkdocs-macros-plugin-1.0.5.tar.gz", hash = "sha256:fe348d75f01c911f362b6d998c57b3d85b505876dde69db924f2c512c395c328"}, - {file = "mkdocs_macros_plugin-1.0.5-py3-none-any.whl", hash = "sha256:f60e26f711f5a830ddf1e7980865bf5c0f1180db56109803cdd280073c1a050a"}, + {file = "mkdocs-macros-plugin-1.2.0.tar.gz", hash = "sha256:7603b85cb336d669e29a8a9cc3af8b90767ffdf6021b3e023d5ec2e0a1f927a7"}, + {file = "mkdocs_macros_plugin-1.2.0-py3-none-any.whl", hash = "sha256:3e442f8f37aa69710a69b5389e6b6cd0f54f4fcaee354aa57a61735ba8f97d27"}, ] [package.dependencies] jinja2 = "*" mkdocs = ">=0.17" +packaging = "*" python-dateutil = "*" pyyaml = "*" termcolor = "*" @@ -846,4 +847,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "29ee7efa2cb56ed1f8eeb4654e13dab7940b5d9dfb0df6b18c6d423406883547" +content-hash = "418a6eb06776b1a9ab8e2d9f315cc1aa1649e8d5c94923e5b221df137482ff5c" diff --git a/docs/pyproject.toml b/docs/pyproject.toml index 05731160..b08494ae 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -10,7 +10,7 @@ package-mode = false [tool.poetry.dependencies] python = "^3.9" mkdocs = "^1.6.1" -mkdocs-macros-plugin = "^1.0.5" +mkdocs-macros-plugin = "^1.2.0" mkdocs-material = "^9.5.34" mkdocs-same-dir = "^0.1.3" diff --git a/server/poetry.lock b/server/poetry.lock index cf0007ef..d07099af 100644 --- a/server/poetry.lock +++ b/server/poetry.lock @@ -637,26 +637,26 @@ wcwidth = "*" [[package]] name = "psycopg" -version = "3.2.1" +version = "3.2.2" description = "PostgreSQL database adapter for Python" optional = false python-versions = ">=3.8" files = [ - {file = "psycopg-3.2.1-py3-none-any.whl", hash = "sha256:ece385fb413a37db332f97c49208b36cf030ff02b199d7635ed2fbd378724175"}, - {file = "psycopg-3.2.1.tar.gz", hash = "sha256:dc8da6dc8729dacacda3cc2f17d2c9397a70a66cf0d2b69c91065d60d5f00cb7"}, + {file = "psycopg-3.2.2-py3-none-any.whl", hash = "sha256:babf565d459d8f72fb65da5e211dd0b58a52c51e4e1fa9cadecff42d6b7619b2"}, + {file = "psycopg-3.2.2.tar.gz", hash = "sha256:8bad2e497ce22d556dac1464738cb948f8d6bab450d965cf1d8a8effd52412e0"}, ] [package.dependencies] -typing-extensions = ">=4.4" +typing-extensions = {version = ">=4.6", markers = "python_version < \"3.13\""} tzdata = {version = "*", markers = "sys_platform == \"win32\""} [package.extras] -binary = ["psycopg-binary (==3.2.1)"] -c = ["psycopg-c (==3.2.1)"] -dev = ["ast-comments (>=1.1.2)", "black (>=24.1.0)", "codespell (>=2.2)", "dnspython (>=2.1)", "flake8 (>=4.0)", "mypy (>=1.6)", "types-setuptools (>=57.4)", "wheel (>=0.37)"] +binary = ["psycopg-binary (==3.2.2)"] +c = ["psycopg-c (==3.2.2)"] +dev = ["ast-comments (>=1.1.2)", "black (>=24.1.0)", "codespell (>=2.2)", "dnspython (>=2.1)", "flake8 (>=4.0)", "mypy (>=1.11)", "types-setuptools (>=57.4)", "wheel (>=0.37)"] docs = ["Sphinx (>=5.0)", "furo (==2022.6.21)", "sphinx-autobuild (>=2021.3.14)", "sphinx-autodoc-typehints (>=1.12)"] pool = ["psycopg-pool"] -test = ["anyio (>=4.0)", "mypy (>=1.6)", "pproxy (>=2.7)", "pytest (>=6.2.5)", "pytest-cov (>=3.0)", "pytest-randomly (>=3.5)"] +test = ["anyio (>=4.0)", "mypy (>=1.11)", "pproxy (>=2.7)", "pytest (>=6.2.5)", "pytest-cov (>=3.0)", "pytest-randomly (>=3.5)"] [[package]] name = "ptyprocess" @@ -1266,4 +1266,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "4355ac428bdfd37aeaf3e517d53e8bcf07e140d364abda7548b58740c668af1d" +content-hash = "c24ff1b8eb5e2dbf4dbbb833f63509ff58d3632b4f97fe71f19e71add013dfc2" diff --git a/server/pyproject.toml b/server/pyproject.toml index a04a08fe..b71ff073 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -4,6 +4,8 @@ version = "0.0.1-dev0" description = "Tomato Radio Automation Server" authors = ["David Cooper "] license = "MIT" +readme = "../README.md" +package-mode = false [tool.poetry.dependencies] python = "^3.11" @@ -18,7 +20,7 @@ django-pgtrigger = "^4.12.2" django-user-messages = "^1.1.0" gunicorn = "^23.0.0" huey = "^2.5.1" -psycopg = "^3.2.1" +psycopg = "^3.2.2" python-dotenv = "^1.0.1" schema = "^0.7.7" starlette = "^0.38.5"