From 7bc19c0de3cdc07ed62e27da259aceca524a0c76 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Sat, 2 Aug 2025 16:14:08 +0200 Subject: move from [tool.poetry] to [project] Poetry supports this now, and it is the standard between the Python package managers. The only thing we need to keep for now are the dependency groups, but that's fine. --- poetry.lock | 4 +-- pyproject.toml | 83 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 45 insertions(+), 42 deletions(-) diff --git a/poetry.lock b/poetry.lock index 19c12d6..1efcb87 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2510,5 +2510,5 @@ test = ["zope.testing"] [metadata] lock-version = "2.1" -python-versions = "^3.11" -content-hash = "2a783d3d70463e01e91f4c20034c392e5a95a08e74632e41ede93d650f3c86e7" +python-versions = ">=3.11" +content-hash = "25d574fa9b0e6d5b287d26edaec91cccaea35dad8249c193ffe1881151be88e0" diff --git a/pyproject.toml b/pyproject.toml index 26d89bb..e6541d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,15 +2,54 @@ requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" -[tool.poetry] +[project] name = "fietsboek" description = "GPX file sharing website" version = "0.11.0" license = "AGPL-3.0-or-later" readme = "README.md" authors = [ - "Daniel Schadt ", + { name = "Daniel Schadt", email = "fietsboek@kingdread.de>" }, +] +keywords = ["web", "gpx"] +requires-python = ">=3.11" +dependencies = [ + "pyramid (>=2, <3)", + "pyramid_jinja2 (>=2.10, <3.0)", + "pyramid_debugtoolbar (>=4.9, <5.0)", + "pyramid_retry (>=2.1, <3.0)", + "pyramid_tm (>=2.5, <3.0)", + "waitress (>=3, <4)", + + "SQLAlchemy[mypy] (>=2.0.15, <3.0.0)", + "alembic (>=1.8, <2.0)", + "transaction (>=5, <6)", + "zope.sqlalchemy (>=3.0, <4.0)", + "redis (>=6, <7)", + + "Babel (>=2.11, <3.0)", + "cryptography (>=45, <46)", + "gpxpy (>=1.5, <2.0)", + "markdown (>=3.4, <4.0)", + "nh3 (>=0.2.9, <0.3.0)", + "Click (>=8.1, <9.0)", + "requests (>=2.28.1, <3.0.0)", + + "pydantic (>=2, <3)", + "termcolor (>=3.1.0, <4.0.0)", + "filelock (>=3.8.2, <4.0.0)", + "brotli (>=1.0.9, <2.0.0)", + "click-option-group (>=0.5.5, <0.6.0)", + "fitparse (>=1.2.0, <2.0.0)", + "pillow (>=11.2.1, <12.0.0)", ] + +[project.urls] +documentation = "https://docs.fietsboek.org/" +homepage = "https://fietsboek.org/" +repository = "https://gitlab.com/dunj3/fietsboek" + +[tool.poetry] classifiers = [ 'Development Status :: 3 - Alpha', 'Framework :: Pyramid', @@ -19,42 +58,6 @@ classifiers = [ 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', ] -documentation = "https://docs.fietsboek.org/" -homepage = "https://fietsboek.org/" -repository = "https://gitlab.com/dunj3/fietsboek" -keywords = ["web", "gpx"] - -[tool.poetry.dependencies] -python = "^3.11" - -pyramid = "^2" -pyramid_jinja2 = "^2.10" -pyramid_debugtoolbar = "^4.9" -pyramid_retry = "^2.1" -pyramid_tm = "^2.5" -waitress = "^3" - -SQLAlchemy = { version = "^2.0.15", extras = ["mypy"] } -alembic = "^1.8" -transaction = "^5" -"zope.sqlalchemy" = "^3.0" -redis = "^6" - -Babel = "^2.11" -cryptography = "^45" -gpxpy = "^1.5" -markdown = "^3.4" -nh3 = "^0.2.9" -Click = "^8.1" -requests = "^2.28.1" - -pydantic = "^2" -termcolor = "^3.1.0" -filelock = "^3.8.2" -brotli = "^1.0.9" -click-option-group = "^0.5.5" -fitparse = "^1.2.0" -pillow = "^11.2.1" [tool.poetry.group.docs] optional = true @@ -89,12 +92,12 @@ types-requests = "^2.28.11.5" types-babel = "^2.11.0.7" types-redis = "^4.3.21.6" -[tool.poetry.scripts] +[project.scripts] fietsctl = "fietsboek.scripts.fietsctl:cli" fietscron = "fietsboek.scripts.fietscron:cli" fietsupdate = "fietsboek.updater.cli:cli" -[tool.poetry.plugins."paste.app_factory"] +[project.entry-points."paste.app_factory"] main = "fietsboek:main" [tool.black] -- cgit v1.2.3