Merge pull request #88 from PnX-SI/develop

2.1.1
PnX-SI · Jan 30, 2024 · 5e85d6c · 5e85d6c
2 parents cd7afd0 + 40ec9e0
commit 5e85d6c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 59 deletions.
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-2.1.0
+2.1.1
 
diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,17 @@
 CHANGELOG
 *********
 
+2.1.1 (2024-01-30)
+-----------------
+
+**🚀 Nouveautés**
+
+- Mise à jour de Utils-Flask-SQLAlchemy en version 0.4.1
+
+**🐛 Corrections**
+
+- Modification de l'instanciation du UserSchema dans la route `/auth/login` pour retourner `max_level_profil`
+
 2.1.0 (2024-01-29)
 ------------------
 

diff --git a/requirements-dependencies.in b/requirements-dependencies.in
@@ -1 +1 @@
-utils-flask-sqlalchemy>=0.4.0,<1.0
+utils-flask-sqlalchemy>=0.4.1,<1.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,137 +1,131 @@
 #
-# This file is autogenerated by pip-compile with Python 3.7
+# This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
 #    pip-compile requirements-dev.in
 #
 -e file:dependencies/Utils-Flask-SQLAlchemy#egg=utils-flask-sqlalchemy
     # via -r requirements-submodules.in
-alembic==1.9.4
+alembic==1.13.1
     # via
     #   -r requirements-common.in
     #   flask-migrate
-attrs==22.2.0
-    # via pytest
-authlib==1.2.0
+authlib==1.3.0
     # via -r requirements-common.in
-bcrypt==4.0.1
+bcrypt==4.1.2
     # via -r requirements-common.in
-certifi==2022.12.7
+blinker==1.7.0
+    # via flask
+certifi==2023.11.17
     # via requests
-cffi==1.15.1
+cffi==1.16.0
     # via cryptography
-charset-normalizer==3.0.1
+charset-normalizer==3.3.2
     # via requests
-click==8.1.3
+click==8.1.7
     # via flask
 contextlib2==21.6.0
     # via schema
-cryptography==39.0.1
+cryptography==42.0.1
     # via authlib
-exceptiongroup==1.1.0
+exceptiongroup==1.2.0
     # via pytest
-flake8==5.0.4
+flake8==7.0.0
     # via -r requirements-dev.in
-flask==2.2.3
+flask==3.0.1
     # via
     #   -r requirements-common.in
+    #   flask-login
     #   flask-marshmallow
     #   flask-migrate
     #   flask-sqlalchemy
     #   pytest-flask
     #   utils-flask-sqlalchemy
-flask-marshmallow==0.14.0
+flask-login==0.6.3
+    # via -r requirements-common.in
+flask-marshmallow==1.1.0
     # via -r requirements-common.in
-flask-migrate==4.0.4
+flask-migrate==4.0.5
     # via utils-flask-sqlalchemy
-flask-sqlalchemy==2.5.1
+flask-sqlalchemy==3.0.5
     # via
     #   -r requirements-common.in
     #   flask-migrate
     #   utils-flask-sqlalchemy
-idna==3.4
+greenlet==3.0.3
+    # via sqlalchemy
+idna==3.6
     # via requests
-importlib-metadata==4.2.0
-    # via
-    #   alembic
-    #   click
-    #   flake8
-    #   flask
-    #   mako
-    #   pluggy
-    #   pytest
-importlib-resources==5.12.0
-    # via alembic
+importlib-metadata==7.0.1
+    # via flask
 iniconfig==2.0.0
     # via pytest
 itsdangerous==2.1.2
     # via flask
-jinja2==3.1.2
+jinja2==3.1.3
     # via flask
-mako==1.2.4
+mako==1.3.2
     # via alembic
-markupsafe==2.1.2
+markupsafe==2.1.4
     # via
     #   jinja2
     #   mako
     #   werkzeug
-marshmallow==3.19.0
+marshmallow==3.20.2
     # via
     #   flask-marshmallow
     #   marshmallow-sqlalchemy
     #   utils-flask-sqlalchemy
-marshmallow-sqlalchemy==0.28.1
+marshmallow-sqlalchemy==0.30.0
     # via -r requirements-common.in
 mccabe==0.7.0
     # via flake8
-packaging==23.0
+packaging==23.2
     # via
     #   marshmallow
     #   marshmallow-sqlalchemy
     #   pytest
-pluggy==1.0.0
+pluggy==1.4.0
     # via pytest
-psycopg2==2.9.5
+psycopg2==2.9.9
     # via -r requirements-common.in
-pycodestyle==2.9.1
+pycodestyle==2.11.1
     # via flake8
 pycparser==2.21
     # via cffi
-pyflakes==2.5.0
+pyflakes==3.2.0
     # via flake8
-pytest==7.2.1
+pytest==8.0.0
     # via
     #   -r requirements-dev.in
     #   pytest-flask
-pytest-flask==1.2.0
+pytest-flask==1.3.0
     # via -r requirements-dev.in
 python-dateutil==2.8.2
     # via utils-flask-sqlalchemy
-requests==2.28.2
+requests==2.31.0
     # via -r requirements-common.in
 schema==0.7.5
     # via -r requirements-dev.in
 six==1.16.0
-    # via
-    #   flask-marshmallow
-    #   python-dateutil
-sqlalchemy==1.3.24
+    # via python-dateutil
+sqlalchemy==1.4.51
     # via
     #   -r requirements-common.in
     #   alembic
     #   flask-sqlalchemy
     #   marshmallow-sqlalchemy
+    #   utils-flask-sqlalchemy
 tomli==2.0.1
     # via pytest
-typing-extensions==4.5.0
-    # via importlib-metadata
-urllib3==1.26.14
+typing-extensions==4.9.0
+    # via alembic
+urllib3==2.1.0
     # via requests
-werkzeug==2.2.3
+werkzeug==3.0.1
     # via
     #   flask
+    #   flask-login
     #   pytest-flask
-zipp==3.14.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+zipp==3.17.0
+    # via importlib-metadata
diff --git a/requirements.txt b/requirements.txt
@@ -92,7 +92,7 @@ typing-extensions==4.9.0
     # via alembic
 urllib3==2.1.0
     # via requests
-utils-flask-sqlalchemy==0.4.0
+utils-flask-sqlalchemy==0.4.1
     # via -r requirements-dependencies.in
 werkzeug==3.0.1
     # via

diff --git a/src/pypnusershub/routes.py b/src/pypnusershub/routes.py
@@ -106,7 +106,9 @@ def login():
             .where(models.User.identifiant == login)
             .where(models.User.filter_by_app())
         ).scalar_one()
-        user_dict = UserSchema(exclude=["remarques"]).dump(user)
+        user_dict = UserSchema(exclude=["remarques"], only=["+max_level_profil"]).dump(
+            user
+        )
     except exc.NoResultFound as e:
         msg = json.dumps(
             {
+1 −1		VERSION
+1 −1		docs/changelog.rst
+1 −0		src/utils_flask_sqla/schema.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		utils-flask-sqlalchemy>=0.4.0,<1.0
		utils-flask-sqlalchemy>=0.4.1,<1.0