Skip to content

Commit

Permalink
Merge pull request #2596 from PnX-SI/bumpdep
Browse files Browse the repository at this point in the history 
Bumpdep
  • Loading branch information
@TheoLechemia
TheoLechemia committed Jun 14, 2023
2 parents ca818b2 + 37fc66b commit e0eeaf2
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 121 deletions.
2 changes: 1 addition & 1 deletion backend/dependencies/UsersHub-authentification-module
Submodule UsersHub-authentification-module updated 5 files
+1 −1 VERSION
+17 −0 docs/changelog.rst
+1 −0 src/pypnusershub/db/models.py
+1 −1 src/pypnusershub/routes.py
+0 −0 src/pypnusershub/tests/__init__.py
2 changes: 1 addition & 1 deletion backend/dependencies/Utils-Flask-SQLAlchemy
Submodule Utils-Flask-SQLAlchemy updated 5 files
+3 −0 .git-blame-ignore-revs
+1 −1 VERSION
+14 −2 docs/changelog.rst
+33 −19 src/utils_flask_sqla/generic.py
+1 −6 src/utils_flask_sqla/serializers.py
2 changes: 1 addition & 1 deletion backend/dependencies/Utils-Flask-SQLAlchemy-Geo
Submodule Utils-Flask-SQLAlchemy-Geo updated 9 files
+19 −5 .github/workflows/pytest.yml
+1 −1 VERSION
+15 −0 docs/changelog.rst
+1 −0 setup.py
+160 −0 src/utils_flask_sqla_geo/export.py
+62 −2 src/utils_flask_sqla_geo/generic.py
+44 −6 src/utils_flask_sqla_geo/schema.py
+106 −39 src/utils_flask_sqla_geo/tests/test_schema.py
+47 −0 src/utils_flask_sqla_geo/utils.py
5 changes: 3 additions & 2 deletions backend/requirements-common.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ fiona>=1.8.22,<1.9
flask
flask-cors
flask-mail
flask-marshmallow
flask-marshmallow<0.15.0
flask-migrate
flask-sqlalchemy
flask-weasyprint
flask_wtf
geojson
gunicorn>=19.8.0
importlib_metadata;python_version<"3.10"
importlib_metadata==4.13.0;python_version<"3.10"
importlib_metadata;python_version>"3.10"
lxml
marshmallow
marshmallow-sqlalchemy
Expand Down
8 changes: 4 additions & 4 deletions backend/requirements-dependencies.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pypnusershub>=1.6.5,<2
pypnusershub>=1.6.7,<2
pypnnomenclature>=1.5.4,<2
pypn_habref_api>=0.3.2,<1
utils-flask-sqlalchemy-geo>=0.2.7,<1
utils-flask-sqlalchemy>=0.3.3,<1
taxhub>=1.11.1,<2
utils-flask-sqlalchemy-geo>=0.2.8,<1
utils-flask-sqlalchemy>=0.3.4,<1
taxhub>=1.11.2,<2
pypn-ref-geo>=1.3.0,<2
106 changes: 51 additions & 55 deletions backend/requirements-dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile requirements-dev.in
# pip-compile --resolver=backtracking requirements-dev.in
#
-e file:dependencies/Habref-api-module#egg=pypn_habref_api
# via -r requirements-submodules.in
Expand Down Expand Up @@ -37,7 +37,7 @@
# via
# -r requirements-submodules.in
# pypn-ref-geo
alembic==1.8.1
alembic==1.11.1
# via
# flask-migrate
# pypn-ref-geo
Expand All @@ -46,33 +46,33 @@ amqp==5.1.1
# via kombu
async-timeout==4.0.2
# via redis
attrs==22.1.0
attrs==23.1.0
# via fiona
authlib==1.0.1
authlib==1.2.0
# via pypnusershub
bcrypt==4.0.0
bcrypt==4.0.1
# via pypnusershub
billiard==3.6.4.0
# via celery
blinker==1.5
blinker==1.6.2
# via flask-mail
boto3==1.24.64
boto3==1.26.153
# via taxhub
botocore==1.27.64
botocore==1.29.153
# via
# boto3
# s3transfer
cached-property==1.5.2
# via kombu
cairocffi==1.3.0
cairocffi==1.6.0
# via
# cairosvg
# weasyprint
cairosvg==2.5.2
cairosvg==2.7.0
# via weasyprint
celery[redis]==5.2.7
# via -r requirements-common.in
certifi==2022.6.15
certifi==2023.5.7
# via
# fiona
# requests
Expand All @@ -81,7 +81,7 @@ cffi==1.15.1
# cairocffi
# cryptography
# weasyprint
charset-normalizer==2.1.1
charset-normalizer==3.1.0
# via requests
click==8.1.3
# via
Expand All @@ -104,27 +104,25 @@ click-repl==0.2.0
# via celery
cligj==0.7.2
# via fiona
cryptography==37.0.4
cryptography==41.0.1
# via authlib
cssselect2==0.6.0
cssselect2==0.7.0
# via
# cairosvg
# weasyprint
decorator==5.1.1
# via validators
defusedxml==0.7.1
# via cairosvg
deprecated==1.2.13
# via redis
dnspython==2.2.1
dnspython==2.3.0
# via email-validator
email-validator==1.3.0
email-validator==2.0.0.post2
# via wtforms-components
fiona==1.8.22
# via
# -r requirements-common.in
# utils-flask-sqlalchemy-geo
flask==2.2.2
flask==2.2.5
# via
# -r requirements-common.in
# flask-admin
Expand All @@ -142,7 +140,7 @@ flask==2.2.2
# taxhub
# usershub
# utils-flask-sqlalchemy
flask-admin==1.6.0
flask-admin==1.6.1
# via pypnnomenclature
flask-cors==3.0.10
# via
Expand All @@ -156,7 +154,7 @@ flask-marshmallow==0.14.0
# pypn-habref-api
# pypnnomenclature
# pypnusershub
flask-migrate==3.1.0
flask-migrate==4.0.4
# via
# -r requirements-common.in
# pypn-habref-api
Expand All @@ -177,13 +175,13 @@ flask-sqlalchemy==2.5.1
# utils-flask-sqlalchemy
flask-weasyprint==1.0.0
# via -r requirements-common.in
flask-wtf==1.0.1
flask-wtf==1.1.1
# via
# -r requirements-common.in
# usershub
geoalchemy2==0.11.1
# via utils-flask-sqlalchemy-geo
geojson==2.5.0
geojson==3.0.1
# via
# -r requirements-common.in
# utils-flask-sqlalchemy-geo
Expand All @@ -194,21 +192,23 @@ gunicorn==20.1.0
# usershub
html5lib==1.1
# via weasyprint
idna==3.3
idna==3.4
# via
# email-validator
# requests
importlib-metadata==4.12.0 ; python_version < "3.10"
importlib-metadata==4.13.0 ; python_version < "3.10"
# via
# -r requirements-common.in
# alembic
# attrs
# celery
# click
# flask
# kombu
# mako
# munch
# redis
importlib-resources==5.9.0
importlib-resources==5.12.0
# via alembic
infinity==1.5
# via intervals
Expand All @@ -226,28 +226,28 @@ jmespath==1.0.1
# botocore
kombu==5.2.4
# via celery
lxml==4.9.1
lxml==4.9.2
# via -r requirements-common.in
mako==1.2.2
mako==1.2.4
# via alembic
markupsafe==2.1.1
markupsafe==2.1.3
# via
# jinja2
# mako
# werkzeug
# wtforms
# wtforms-components
marshmallow==3.17.1
marshmallow==3.19.0
# via
# -r requirements-common.in
# flask-marshmallow
# marshmallow-geojson
# marshmallow-sqlalchemy
# pypn-habref-api
# utils-flask-sqlalchemy
marshmallow-geojson==0.3.0
marshmallow-geojson==0.4.0
# via utils-flask-sqlalchemy-geo
marshmallow-sqlalchemy==0.28.1
marshmallow-sqlalchemy==0.28.2
# via
# -r requirements-common.in
# pypn-habref-api
Expand All @@ -256,24 +256,23 @@ marshmallow-sqlalchemy==0.28.1
# taxhub
# usershub
# utils-flask-sqlalchemy-geo
munch==2.5.0
munch==3.0.0
# via fiona
packaging==21.3
packaging==23.1
# via
# -r requirements-common.in
# geoalchemy2
# marshmallow
# marshmallow-sqlalchemy
# redis
pillow==9.2.0
pillow==9.5.0
# via
# -r requirements-common.in
# cairosvg
# taxhub
# weasyprint
prompt-toolkit==3.0.31
prompt-toolkit==3.0.38
# via click-repl
psycopg2==2.9.3
psycopg2==2.9.6
# via
# -r requirements-common.in
# pypn-habref-api
Expand All @@ -284,34 +283,32 @@ psycopg2==2.9.3
# usershub
pycparser==2.21
# via cffi
pyparsing==3.0.9
# via packaging
pyphen==0.13.0
pyphen==0.14.0
# via weasyprint
python-dateutil==2.8.2
# via
# -r requirements-common.in
# botocore
# usershub
# utils-flask-sqlalchemy
python-dotenv==0.20.0
python-dotenv==0.21.1
# via
# pypn-habref-api
# pypn-ref-geo
# pypnnomenclature
# taxhub
# usershub
pytz==2022.2.1
pytz==2023.3
# via celery
redis==4.3.4
redis==4.5.5
# via celery
requests==2.28.1
requests==2.31.0
# via
# pypn-habref-api
# pypnusershub
s3transfer==0.6.0
s3transfer==0.6.1
# via boto3
shapely==1.8.4
shapely==1.8.5.post1
# via
# -r requirements-common.in
# pypnnomenclature
Expand Down Expand Up @@ -341,19 +338,20 @@ sqlalchemy==1.3.24
# utils-flask-sqlalchemy
# utils-flask-sqlalchemy-geo
# wtforms-sqlalchemy
tinycss2==1.1.1
tinycss2==1.2.1
# via
# cairosvg
# cssselect2
# weasyprint
toml==0.10.2
# via -r requirements-common.in
typing-extensions==4.3.0
typing-extensions==4.6.3
# via
# alembic
# async-timeout
# importlib-metadata
# redis
urllib3==1.26.12
urllib3==1.26.16
# via
# botocore
# requests
Expand All @@ -365,7 +363,7 @@ vine==5.0.0
# amqp
# celery
# kombu
wcwidth==0.2.5
wcwidth==0.2.6
# via prompt-toolkit
weasyprint==52.5
# via
Expand All @@ -376,10 +374,8 @@ webencodings==0.5.1
# cssselect2
# html5lib
# tinycss2
werkzeug==2.2.2
werkzeug==2.2.3
# via flask
wrapt==1.14.1
# via deprecated
wtforms==3.0.1
# via
# -r requirements-common.in
Expand All @@ -394,7 +390,7 @@ wtforms-sqlalchemy==0.3
# via -r requirements-common.in
xmltodict==0.13.0
# via -r requirements-common.in
zipp==3.8.1
zipp==3.15.0
# via
# importlib-metadata
# importlib-resources
Expand Down
Loading

0 comments on commit e0eeaf2

Please sign in to comment.