From 03901e1d123ac679fa11142d2ace8df72fc9f76b Mon Sep 17 00:00:00 2001 From: Firq Date: Thu, 21 Dec 2023 17:11:47 +0100 Subject: [PATCH] updated package to conform to pylint --- backend/.gitignore | 3 ++- .../__init__.py | 0 .../__main__.py | 4 ++-- backend/{fgo-request-manager => fgo_request_manager}/app.py | 0 .../config/__init__.py | 0 .../config/settings.py | 2 +- .../database/__init__.py | 0 .../database/database.py | 0 .../database/storage/.gitignore | 0 backend/fgo_request_manager/models/__init__.py | 0 .../models/interface.py | 0 .../models/requestentry.py | 0 .../models/requests.py | 0 .../routes/__init__.py | 0 .../routes/health.py | 6 +++--- .../routes/openapi.py | 0 .../routes/requests/__init__.py | 0 .../routes/requests/base.py | 0 .../routes/requests/create.py | 0 .../routes/requests/interact.py | 0 .../routes/version.py | 0 backend/pyproject.toml | 4 ++-- 22 files changed, 10 insertions(+), 9 deletions(-) rename backend/{fgo-request-manager => fgo_request_manager}/__init__.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/__main__.py (91%) rename backend/{fgo-request-manager => fgo_request_manager}/app.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/config/__init__.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/config/settings.py (97%) rename backend/{fgo-request-manager => fgo_request_manager}/database/__init__.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/database/database.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/database/storage/.gitignore (100%) create mode 100644 backend/fgo_request_manager/models/__init__.py rename backend/{fgo-request-manager => fgo_request_manager}/models/interface.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/models/requestentry.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/models/requests.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/__init__.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/health.py (71%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/openapi.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/requests/__init__.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/requests/base.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/requests/create.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/requests/interact.py (100%) rename backend/{fgo-request-manager => fgo_request_manager}/routes/version.py (100%) diff --git a/backend/.gitignore b/backend/.gitignore index 69b7c60..a55cc81 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -1,3 +1,4 @@ .venv/ __pycache__/ -*.egg-info \ No newline at end of file +*.egg-info +dist/ \ No newline at end of file diff --git a/backend/fgo-request-manager/__init__.py b/backend/fgo_request_manager/__init__.py similarity index 100% rename from backend/fgo-request-manager/__init__.py rename to backend/fgo_request_manager/__init__.py diff --git a/backend/fgo-request-manager/__main__.py b/backend/fgo_request_manager/__main__.py similarity index 91% rename from backend/fgo-request-manager/__main__.py rename to backend/fgo_request_manager/__main__.py index 96b1d65..d24fe78 100644 --- a/backend/fgo-request-manager/__main__.py +++ b/backend/fgo_request_manager/__main__.py @@ -7,8 +7,8 @@ from .routes import routes from .routes.requests import routes_requests from .config import ServerSettings -instance = Application.get_instance() -app, api = instance.app, instance.api +APP = Application.get_instance() +app, api = APP.app, APP.api api.register_blueprint(routes) api.register_blueprint(routes_requests) diff --git a/backend/fgo-request-manager/app.py b/backend/fgo_request_manager/app.py similarity index 100% rename from backend/fgo-request-manager/app.py rename to backend/fgo_request_manager/app.py diff --git a/backend/fgo-request-manager/config/__init__.py b/backend/fgo_request_manager/config/__init__.py similarity index 100% rename from backend/fgo-request-manager/config/__init__.py rename to backend/fgo_request_manager/config/__init__.py diff --git a/backend/fgo-request-manager/config/settings.py b/backend/fgo_request_manager/config/settings.py similarity index 97% rename from backend/fgo-request-manager/config/settings.py rename to backend/fgo_request_manager/config/settings.py index 5611458..216dea0 100644 --- a/backend/fgo-request-manager/config/settings.py +++ b/backend/fgo_request_manager/config/settings.py @@ -10,7 +10,7 @@ class DatabaseSettings: class APISettings: API_TITLE = "Support Organizer" - API_VERSION = "0.1.0-a" + API_VERSION = "0.1.0-a1" OPENAPI_VERSION = "3.1.0" # openapi.json settings diff --git a/backend/fgo-request-manager/database/__init__.py b/backend/fgo_request_manager/database/__init__.py similarity index 100% rename from backend/fgo-request-manager/database/__init__.py rename to backend/fgo_request_manager/database/__init__.py diff --git a/backend/fgo-request-manager/database/database.py b/backend/fgo_request_manager/database/database.py similarity index 100% rename from backend/fgo-request-manager/database/database.py rename to backend/fgo_request_manager/database/database.py diff --git a/backend/fgo-request-manager/database/storage/.gitignore b/backend/fgo_request_manager/database/storage/.gitignore similarity index 100% rename from backend/fgo-request-manager/database/storage/.gitignore rename to backend/fgo_request_manager/database/storage/.gitignore diff --git a/backend/fgo_request_manager/models/__init__.py b/backend/fgo_request_manager/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/fgo-request-manager/models/interface.py b/backend/fgo_request_manager/models/interface.py similarity index 100% rename from backend/fgo-request-manager/models/interface.py rename to backend/fgo_request_manager/models/interface.py diff --git a/backend/fgo-request-manager/models/requestentry.py b/backend/fgo_request_manager/models/requestentry.py similarity index 100% rename from backend/fgo-request-manager/models/requestentry.py rename to backend/fgo_request_manager/models/requestentry.py diff --git a/backend/fgo-request-manager/models/requests.py b/backend/fgo_request_manager/models/requests.py similarity index 100% rename from backend/fgo-request-manager/models/requests.py rename to backend/fgo_request_manager/models/requests.py diff --git a/backend/fgo-request-manager/routes/__init__.py b/backend/fgo_request_manager/routes/__init__.py similarity index 100% rename from backend/fgo-request-manager/routes/__init__.py rename to backend/fgo_request_manager/routes/__init__.py diff --git a/backend/fgo-request-manager/routes/health.py b/backend/fgo_request_manager/routes/health.py similarity index 71% rename from backend/fgo-request-manager/routes/health.py rename to backend/fgo_request_manager/routes/health.py index d25042c..92eaf44 100644 --- a/backend/fgo-request-manager/routes/health.py +++ b/backend/fgo_request_manager/routes/health.py @@ -5,7 +5,7 @@ from ..app import Application from ..models.interface import HealthGet, HealthStatus from . import routes as blp -instance = Application.get_instance() +APP = Application.get_instance() @blp.route("/health") class ApiVersion(MethodView): @@ -13,8 +13,8 @@ class ApiVersion(MethodView): @blp.response(200, HealthGet, description="Successful operation") def get(self): response = { - "alive_since": datetime.strftime(instance.alive_since, "%d.%m.%Y %H:%M:%S"), - "alive_for": str(datetime.now() - instance.alive_since), + "alive_since": datetime.strftime(APP.alive_since, "%d.%m.%Y %H:%M:%S"), + "alive_for": str(datetime.now() - APP.alive_since), "status": HealthStatus.OK } return response diff --git a/backend/fgo-request-manager/routes/openapi.py b/backend/fgo_request_manager/routes/openapi.py similarity index 100% rename from backend/fgo-request-manager/routes/openapi.py rename to backend/fgo_request_manager/routes/openapi.py diff --git a/backend/fgo-request-manager/routes/requests/__init__.py b/backend/fgo_request_manager/routes/requests/__init__.py similarity index 100% rename from backend/fgo-request-manager/routes/requests/__init__.py rename to backend/fgo_request_manager/routes/requests/__init__.py diff --git a/backend/fgo-request-manager/routes/requests/base.py b/backend/fgo_request_manager/routes/requests/base.py similarity index 100% rename from backend/fgo-request-manager/routes/requests/base.py rename to backend/fgo_request_manager/routes/requests/base.py diff --git a/backend/fgo-request-manager/routes/requests/create.py b/backend/fgo_request_manager/routes/requests/create.py similarity index 100% rename from backend/fgo-request-manager/routes/requests/create.py rename to backend/fgo_request_manager/routes/requests/create.py diff --git a/backend/fgo-request-manager/routes/requests/interact.py b/backend/fgo_request_manager/routes/requests/interact.py similarity index 100% rename from backend/fgo-request-manager/routes/requests/interact.py rename to backend/fgo_request_manager/routes/requests/interact.py diff --git a/backend/fgo-request-manager/routes/version.py b/backend/fgo_request_manager/routes/version.py similarity index 100% rename from backend/fgo-request-manager/routes/version.py rename to backend/fgo_request_manager/routes/version.py diff --git a/backend/pyproject.toml b/backend/pyproject.toml index b0840ce..50cd408 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools >= 61.0"] build-backend = "setuptools.build_meta" [project] -name = "fgo-request-manager" +name = "fgo_request_manager" version = "0.1.0a1" dependencies = [ "flask~=2.3.3", @@ -27,4 +27,4 @@ classifiers = [ [tool.setuptools.packages.find] where = ["."] -include = ["fgo-request-manager*"] +include = ["fgo_request_manager*"]