full support of pep517

Since llast upgrade build is broken. Lets fully migrate to
pyproject.toml. Note for maintaners: because data_files option is
deprectated (see https://github.com/pypa/setuptools/discussions/2648)
you will have to install files manually inside your packaging process
This commit is contained in:
2023-08-11 03:01:18 +03:00
parent 3a88d00db0
commit 1baf04998d
34 changed files with 147 additions and 266 deletions

View File

@ -22,7 +22,7 @@ import aiohttp_apispec # type: ignore[import]
from aiohttp.web import Application
from typing import Any
from ahriman import version
from ahriman import __version__
from ahriman.core.configuration import Configuration
@ -59,7 +59,7 @@ def _info() -> dict[str, Any]:
"name": "GPL3",
"url": "https://raw.githubusercontent.com/arcan1s/ahriman/master/COPYING",
},
"version": version.__version__,
"version": __version__,
}

View File

@ -19,7 +19,7 @@
#
from marshmallow import Schema, fields
from ahriman import version
from ahriman import __version__
from ahriman.web.schemas.counters_schema import CountersSchema
from ahriman.web.schemas.status_schema import StatusSchema
@ -45,5 +45,5 @@ class InternalStatusSchema(Schema):
})
version = fields.String(required=True, metadata={
"description": "Repository version",
"example": version.__version__,
"example": __version__,
})

View File

@ -19,7 +19,7 @@
#
from marshmallow import Schema, fields
from ahriman import version
from ahriman import __version__
from ahriman.web.schemas.package_properties_schema import PackagePropertiesSchema
from ahriman.web.schemas.remote_schema import RemoteSchema
@ -35,7 +35,7 @@ class PackageSchema(Schema):
})
version = fields.String(required=True, metadata={
"description": "Package version",
"example": version.__version__,
"example": __version__,
})
remote = fields.Nested(RemoteSchema(), required=True, metadata={
"description": "Package remote properties",

View File

@ -21,7 +21,7 @@ import aiohttp_apispec # type: ignore[import]
from aiohttp.web import HTTPBadRequest, HTTPNoContent, Response, json_response
from ahriman import version
from ahriman import __version__
from ahriman.models.build_status import BuildStatusEnum
from ahriman.models.counters import Counters
from ahriman.models.internal_status import InternalStatus
@ -68,7 +68,8 @@ class StatusView(BaseView):
architecture=self.service.architecture,
packages=counters,
repository=self.service.repository.name,
version=version.__version__)
version=__version__,
)
return json_response(status.view())