From f60c06bc1717a7330e39c5e704ed439eeb8dbaea Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 30 Oct 2020 22:19:16 +0100 Subject: [PATCH] Some Cleanup of setup.py and documentation in auth --- flaschengeist/plugins/auth/__init__.py | 2 +- setup.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/flaschengeist/plugins/auth/__init__.py b/flaschengeist/plugins/auth/__init__.py index 593a160..b65dc87 100644 --- a/flaschengeist/plugins/auth/__init__.py +++ b/flaschengeist/plugins/auth/__init__.py @@ -25,7 +25,7 @@ def login(): Route: ``/auth`` | Method: ``POST`` - POST-data: {'userid': string, 'password': string} + POST-data: ``{userid: string, password: string}`` Returns: A JSON object with `flaschengeist.models.user.User` and created diff --git a/setup.py b/setup.py index 3111e62..c6c3874 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,7 @@ setup( packages=find_packages(), package_data={"": ["*.toml"]}, scripts=["run_flaschengeist"], + python_requires=">=3.6", install_requires=[ "Flask >= 1.1", "toml", @@ -18,17 +19,22 @@ setup( "flask_cors", "werkzeug", "python-dateutil", + # Needed for python < 3.7 + "backports-datetime-fromisoformat", ], extras_require={"ldap": ["flask_ldapconn", "ldap3"], "bjoern": ["bjoern"]}, entry_points={ "flaschengeist.plugin": [ + # Authentication providers + "auth_plain = flaschengeist.plugins.auth_plain:AuthPlain", + "auth_ldap = flaschengeist.plugins.auth_ldap:AuthLDAP [ldap]", + # Route providers (and misc) "auth = flaschengeist.plugins.auth:AuthRoutePlugin", "users = flaschengeist.plugins.users:UsersPlugin", "roles = flaschengeist.plugins.roles:RolesPlugin", + "balance = flaschengeist.plugins.balance:BalancePlugin", "schedule = flaschengeist.plugins.schedule:SchedulePlugin", "mail = flaschengeist.plugins.message_mail:MailMessagePlugin", - "auth_plain = flaschengeist.plugins.auth_plain:AuthPlain", - "auth_ldap = flaschengeist.plugins.auth_ldap:AuthLDAP [ldap]", ], }, )