diff --git a/bin/freenit.sh b/bin/freenit.sh index 793fc73..d51286e 100755 --- a/bin/freenit.sh +++ b/bin/freenit.sh @@ -8,19 +8,15 @@ if [ -z "${NAME}" ]; then fi -MODULES="schemas" PROJECT_ROOT=`python${PY_VERSION} -c 'import os; import freenit; print(os.path.dirname(os.path.abspath(freenit.__file__)))'` mkdir ${NAME} -for module in ${MODULES}; do - mkdir -p ${NAME}/${module} - touch ${NAME}/${module}/__init__.py -done touch ${NAME}/__init__.py echo 'freenit' >requirements.txt cp -r ${PROJECT_ROOT}/project/* . mv api ${NAME} mv models ${NAME} +mv schemas ${NAME} echo "app_name=\"${NAME}\" # noqa: E225" >name.py echo "ipdb" >requirements_dev.txt diff --git a/freenit/project/schemas/__init__.py b/freenit/project/schemas/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/freenit/project/schemas/role.py b/freenit/project/schemas/role.py new file mode 100644 index 0000000..10fb014 --- /dev/null +++ b/freenit/project/schemas/role.py @@ -0,0 +1,5 @@ +from freenit.schemas.role import RoleSchema as BaseRoleSchema + + +class RoleSchema(BaseRoleSchema): + pass diff --git a/freenit/project/schemas/user.py b/freenit/project/schemas/user.py new file mode 100644 index 0000000..1f714a4 --- /dev/null +++ b/freenit/project/schemas/user.py @@ -0,0 +1,5 @@ +from freenit.schemas.user import BaseUserSchema + + +class UserSchema(BaseUserSchema): + pass diff --git a/freenit/project/wsgi.py b/freenit/project/wsgi.py index 56b3455..f691034 100644 --- a/freenit/project/wsgi.py +++ b/freenit/project/wsgi.py @@ -10,10 +10,7 @@ api = import_module(f'{app_name}.api') config_name = os.getenv('FLASK_ENV') or 'default' config = configs[config_name] -schemas = { - 'user': f'{app_name}.schemas.user', -} -app = create_app(config, schemas=schemas) +app = create_app(config) api.create_api(app) hostname = socket.gethostname() port = os.environ.get('FLASK_PORT', 5000) diff --git a/setup.py b/setup.py index 7ca9000..0df51a9 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='freenit', - version='0.0.25', + version='0.0.26', description='REST API framework based on Flask-Smorest', long_description=README, long_description_content_type='text/markdown', @@ -58,6 +58,7 @@ 'project/bin/*', 'project/api/*', 'project/models/*', + 'project/schemas/*', ] }, scripts=['bin/freenit.sh'],