From f282a70ade798f22ee95ba39dc486ca834791588 Mon Sep 17 00:00:00 2001 From: Jacobe2169 Date: Mon, 29 Jan 2024 13:58:31 +0100 Subject: [PATCH] prerelease commit --- VERSION | 2 +- dependencies/RefGeo | 2 +- dependencies/UsersHub-authentification-module | 2 +- dependencies/Utils-Flask-SQLAlchemy | 2 +- dependencies/Utils-Flask-SQLAlchemy-Geo | 2 +- requirements-dependencies.in | 6 +- requirements-dev.txt | 103 ++++++++---------- requirements.txt | 100 ++++++++--------- 8 files changed, 99 insertions(+), 120 deletions(-) diff --git a/VERSION b/VERSION index b50dd27d..61ce01b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.1 +1.13.2 diff --git a/dependencies/RefGeo b/dependencies/RefGeo index 2272603a..1e7f3266 160000 --- a/dependencies/RefGeo +++ b/dependencies/RefGeo @@ -1 +1 @@ -Subproject commit 2272603a20bd42a226b9eb24af59314d8b88f64d +Subproject commit 1e7f3266c39a4857f62d69193a679e6411bf8aee diff --git a/dependencies/UsersHub-authentification-module b/dependencies/UsersHub-authentification-module index d024adb1..cd7afd0e 160000 --- a/dependencies/UsersHub-authentification-module +++ b/dependencies/UsersHub-authentification-module @@ -1 +1 @@ -Subproject commit d024adb116a6808a54d30b2d633e07940966e461 +Subproject commit cd7afd0e7e8d2995764a9816dc6af3bc258ed50f diff --git a/dependencies/Utils-Flask-SQLAlchemy b/dependencies/Utils-Flask-SQLAlchemy index 1c144eb6..183c3c61 160000 --- a/dependencies/Utils-Flask-SQLAlchemy +++ b/dependencies/Utils-Flask-SQLAlchemy @@ -1 +1 @@ -Subproject commit 1c144eb6b8884c6db746bfb01476ac819c5ecf35 +Subproject commit 183c3c6165af504ca17e6dba1667cb12e1167380 diff --git a/dependencies/Utils-Flask-SQLAlchemy-Geo b/dependencies/Utils-Flask-SQLAlchemy-Geo index 2b5002bf..55a759ea 160000 --- a/dependencies/Utils-Flask-SQLAlchemy-Geo +++ b/dependencies/Utils-Flask-SQLAlchemy-Geo @@ -1 +1 @@ -Subproject commit 2b5002bf13762d1c49b5d18516cd72d82861f12c +Subproject commit 55a759ea766507bd893e7e635d7f8d0aa8e5051c diff --git a/requirements-dependencies.in b/requirements-dependencies.in index 3f67099f..d48ea125 100644 --- a/requirements-dependencies.in +++ b/requirements-dependencies.in @@ -1,3 +1,3 @@ -utils-flask-sqlalchemy>=0.3.0,<1.0 -pypnusershub>=2.0.0,<3 -pypn-ref-geo>=1.2.0,<2.0 +utils-flask-sqlalchemy>=0.4.0,<1.0 +pypnusershub>=2.1.0,<3 +pypn-ref-geo>=1.5.0,<2.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index 40c49797..73ecd735 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # -# 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 @@ -18,30 +18,32 @@ # via # -r requirements-submodules.in # pypn-ref-geo -alembic==1.12.0 +alembic==1.13.1 # via # flask-migrate # pypn-ref-geo # pypnusershub -attrs==23.1.0 +attrs==23.2.0 # via fiona -authlib==1.2.1 +authlib==1.3.0 # via pypnusershub -bcrypt==4.0.1 +bcrypt==4.1.2 # via pypnusershub -boto3==1.28.70 +blinker==1.7.0 + # via flask +boto3==1.34.29 # via -r requirements-common.in -botocore==1.31.70 +botocore==1.34.29 # via # boto3 # s3transfer -certifi==2023.7.22 +certifi==2023.11.17 # via # fiona # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via @@ -56,15 +58,15 @@ cligj==0.7.2 # via fiona contextlib2==21.6.0 # via schema -cryptography==41.0.5 +cryptography==42.0.1 # via authlib -exceptiongroup==1.1.3 +exceptiongroup==1.2.0 # via pytest fiona==1.9.5 # via utils-flask-sqlalchemy-geo -flake8==5.0.4 +flake8==7.0.0 # via -r requirements-dev.in -flask==2.2.5 +flask==3.0.1 # via # -r requirements-common.in # flask-cors @@ -78,9 +80,9 @@ flask==2.2.5 # utils-flask-sqlalchemy flask-cors==4.0.0 # via -r requirements-common.in -flask-login==0.6.2 +flask-login==0.6.3 # via pypnusershub -flask-marshmallow==0.15.0 +flask-marshmallow==1.1.0 # via pypnusershub flask-migrate==4.0.5 # via @@ -93,87 +95,77 @@ flask-sqlalchemy==3.0.5 # pypn-ref-geo # pypnusershub # utils-flask-sqlalchemy -geoalchemy2==0.14.2 +geoalchemy2==0.14.3 # via utils-flask-sqlalchemy-geo -geojson==3.0.1 +geojson==3.1.0 # via utils-flask-sqlalchemy-geo -greenlet==3.0.1 +greenlet==3.0.3 # via sqlalchemy gunicorn==21.2.0 # via -r requirements-common.in -idna==3.4 +idna==3.6 # via requests -importlib-metadata==4.2.0 +importlib-metadata==7.0.1 # via - # alembic - # attrs - # click # fiona - # flake8 # flask - # gunicorn - # mako - # pluggy - # pytest - # sqlalchemy -importlib-resources==5.12.0 - # via alembic iniconfig==2.0.0 # via pytest itsdangerous==2.1.2 # via flask -jinja2==3.1.2 +jinja2==3.1.3 # via flask jmespath==1.0.1 # via # boto3 # botocore -mako==1.2.4 +mako==1.3.0 # via alembic -markupsafe==2.1.3 +markupsafe==2.1.4 # via # jinja2 # mako # werkzeug -marshmallow==3.19.0 +marshmallow==3.20.2 # via # flask-marshmallow # marshmallow-geojson # marshmallow-sqlalchemy # utils-flask-sqlalchemy -marshmallow-geojson==0.4.0 +marshmallow-geojson==0.5.0 # via utils-flask-sqlalchemy-geo -marshmallow-sqlalchemy==0.29.0 +marshmallow-sqlalchemy==0.30.0 # via # -r requirements-common.in # pypnusershub # utils-flask-sqlalchemy-geo mccabe==0.7.0 # via flake8 +numpy==1.26.3 + # via shapely packaging==23.2 # via - # flask-marshmallow # geoalchemy2 # gunicorn # marshmallow # marshmallow-sqlalchemy # pytest -pillow==9.5.0 +pillow==10.2.0 # via -r requirements-common.in -pluggy==1.2.0 +pluggy==1.4.0 # via pytest psycopg2==2.9.9 # via # -r requirements-common.in # pypn-ref-geo # pypnusershub -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.4.3 +pytest==8.0.0 # via # -r requirements-dev.in # pytest-flask @@ -183,23 +175,23 @@ python-dateutil==2.8.2 # via # botocore # utils-flask-sqlalchemy -python-dotenv==0.21.1 +python-dotenv==1.0.1 # via # -r requirements-common.in # pypn-ref-geo requests==2.31.0 # via pypnusershub -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 schema==0.7.5 # via -r requirements-dev.in -shapely==1.8.5.post1 +shapely==2.0.2 # via utils-flask-sqlalchemy-geo six==1.16.0 # via # fiona # python-dateutil -sqlalchemy==1.4.49 +sqlalchemy==1.4.51 # via # -r requirements-common.in # alembic @@ -212,25 +204,20 @@ sqlalchemy==1.4.49 # utils-flask-sqlalchemy-geo tomli==2.0.1 # via pytest -typing-extensions==4.7.1 - # via - # alembic - # importlib-metadata +typing-extensions==4.9.0 + # via alembic urllib3==1.26.18 # via # -r requirements-common.in # botocore # requests -werkzeug==2.2.3 +werkzeug==3.0.1 # via # flask # flask-login - # pypnusershub # pytest-flask -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements.txt b/requirements.txt index 58b2eb13..53ca8f4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,35 @@ # -# 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.in # -alembic==1.12.0 +alembic==1.13.1 # via # flask-migrate # pypn-ref-geo # pypnusershub -attrs==23.1.0 +attrs==23.2.0 # via fiona -authlib==1.2.1 +authlib==1.3.0 # via pypnusershub -bcrypt==4.0.1 +bcrypt==4.1.2 # via pypnusershub -boto3==1.28.70 +blinker==1.7.0 + # via flask +boto3==1.34.29 # via -r requirements-common.in -botocore==1.31.70 +botocore==1.34.29 # via # boto3 # s3transfer -certifi==2023.7.22 +certifi==2023.11.17 # via # fiona # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via @@ -40,11 +42,11 @@ click-plugins==1.1.1 # via fiona cligj==0.7.2 # via fiona -cryptography==41.0.5 +cryptography==42.0.1 # via authlib fiona==1.9.5 # via utils-flask-sqlalchemy-geo -flask==2.2.5 +flask==3.0.1 # via # -r requirements-common.in # flask-cors @@ -57,10 +59,12 @@ flask==2.2.5 # utils-flask-sqlalchemy flask-cors==4.0.0 # via -r requirements-common.in -flask-login==0.6.2 - # via pypnusershub -flask-marshmallow==0.15.0 +flask-login==0.6.3 # via pypnusershub +flask-marshmallow==1.1.0 + # via + # pypn-ref-geo + # pypnusershub flask-migrate==4.0.5 # via # -r requirements-common.in @@ -72,64 +76,57 @@ flask-sqlalchemy==3.0.5 # pypn-ref-geo # pypnusershub # utils-flask-sqlalchemy -geoalchemy2==0.14.2 +geoalchemy2==0.14.3 # via utils-flask-sqlalchemy-geo -geojson==3.0.1 +geojson==3.1.0 # via utils-flask-sqlalchemy-geo -greenlet==3.0.1 +greenlet==3.0.3 # via sqlalchemy gunicorn==21.2.0 # via -r requirements-common.in -idna==3.4 +idna==3.6 # via requests -importlib-metadata==6.7.0 +importlib-metadata==7.0.1 # via - # alembic - # attrs - # click # fiona # flask - # gunicorn - # mako - # sqlalchemy -importlib-resources==5.12.0 - # via alembic itsdangerous==2.1.2 # via flask -jinja2==3.1.2 +jinja2==3.1.3 # via flask jmespath==1.0.1 # via # boto3 # botocore -mako==1.2.4 +mako==1.3.0 # via alembic -markupsafe==2.1.3 +markupsafe==2.1.4 # via # jinja2 # mako # werkzeug -marshmallow==3.19.0 +marshmallow==3.20.2 # via # flask-marshmallow # marshmallow-geojson # marshmallow-sqlalchemy # utils-flask-sqlalchemy -marshmallow-geojson==0.4.0 +marshmallow-geojson==0.5.0 # via utils-flask-sqlalchemy-geo -marshmallow-sqlalchemy==0.29.0 +marshmallow-sqlalchemy==0.30.0 # via # -r requirements-common.in # pypnusershub # utils-flask-sqlalchemy-geo +numpy==1.26.3 + # via shapely packaging==23.2 # via - # flask-marshmallow # geoalchemy2 # gunicorn # marshmallow # marshmallow-sqlalchemy -pillow==9.5.0 +pillow==10.2.0 # via -r requirements-common.in psycopg2==2.9.9 # via @@ -138,29 +135,29 @@ psycopg2==2.9.9 # pypnusershub pycparser==2.21 # via cffi -pypn-ref-geo==1.4.0 +pypn-ref-geo==1.5.0 # via -r requirements-dependencies.in -pypnusershub==2.0.0 +pypnusershub==2.1.0 # via -r requirements-dependencies.in python-dateutil==2.8.2 # via # botocore # utils-flask-sqlalchemy -python-dotenv==0.21.1 +python-dotenv==1.0.1 # via # -r requirements-common.in # pypn-ref-geo requests==2.31.0 # via pypnusershub -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 -shapely==1.8.5.post1 +shapely==2.0.2 # via utils-flask-sqlalchemy-geo six==1.16.0 # via # fiona # python-dateutil -sqlalchemy==1.4.49 +sqlalchemy==1.4.51 # via # -r requirements-common.in # alembic @@ -171,32 +168,27 @@ sqlalchemy==1.4.49 # pypnusershub # utils-flask-sqlalchemy # utils-flask-sqlalchemy-geo -typing-extensions==4.7.1 - # via - # alembic - # importlib-metadata +typing-extensions==4.9.0 + # via alembic urllib3==1.26.18 # via # -r requirements-common.in # botocore # requests -utils-flask-sqlalchemy==0.3.6 +utils-flask-sqlalchemy==0.4.0 # via # -r requirements-dependencies.in # pypn-ref-geo # pypnusershub # utils-flask-sqlalchemy-geo -utils-flask-sqlalchemy-geo==0.2.8 +utils-flask-sqlalchemy-geo==0.3.0 # via pypn-ref-geo -werkzeug==2.2.3 +werkzeug==3.0.1 # via # flask # flask-login - # pypnusershub -zipp==3.15.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools