Merge remote-tracking branch 'origin/develop'

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+   install:
+     - requirements: docs/requirements.readthedocs.txt

VERSION

@@ -1 +1 @@
-1.13.3
+1.13.4

apptax/config.py.sample

@@ -13,6 +13,8 @@ TaxHub global settings file
 SQLALCHEMY_DATABASE_URI = "postgresql://monuser:monpassachanger@localhost/taxhubdb"
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 
+# Prefix that indicates where the application can be accessed within the web server's domain name. For example, setting APPLICATION_ROOT to '/taxhub' means that TaxHub is available at https://mondomaine.fr/taxhub.```
+# "/" if the app is at the root of the domain
 APPLICATION_ROOT = '/taxhub'
 # Set this to 'https' if you use encryption
 PREFERRED_URL_SCHEME = 'http'

docs/changelog.md

@@ -1,5 +1,19 @@
+1.13.4 (2024-04-11)
+===================
+
+**🚀 Nouveautés**
+
+* Passage à la version 1.5.2 de RefGeo (#486)
+* Mise à jour de nombreuses dépendances Python (#486)
+
+**🐛 Corrections**
+
+* Correction du problème de déploiement automatique de la documentation sur Read the Docs (#482)
+* Modification du nom de la variable du token d'identification (#481)
+
+
 1.13.3 (2024-02-12)
-==================
+===================
 
 **🐛 Corrections**
 
@@ -36,6 +50,9 @@
 * Ajout de la colonne `group3_inpn` à la vue materialisée `vm_taxref_list_forautocomplete` et d'un filtre `group3_inpn` à la route `allnamebylist` (#432).
 * Passage à Flask-Login pour la gestion de l'authentification via la montée de version du sous-module d'authentification en version 2.0.0
 
+**⚠️ Notes de version**
+
+* Si TaxHub est à la racine de votre serveur web `http://taxhub.mondomain.fr`, le paramètre `APPLICATION_ROOT` doit être égal à `"/"` et non `""`
 
 1.12.1 (2023-09-12)
 ===================

docs/conf.py

@@ -0,0 +1,9 @@
+import sphinx_rtd_theme  # noqa
+
+extensions = [
+    "sphinx_rtd_theme",
+]
+
+project = "TaxHub"
+html_theme = "sphinx_rtd_theme"
+pygments_style = "sphinx"

docs/requirements.readthedocs.txt

@@ -0,0 +1 @@
+sphinx-rtd-theme>=1.0.0

requirements-dependencies.in

@@ -1,3 +1,3 @@
 utils-flask-sqlalchemy>=0.4.1,<1.0
 pypnusershub>=2.1.1,<3
-pypn-ref-geo>=1.5.1,<2.0
+pypn-ref-geo>=1.5.2,<2.0

requirements-dev.txt

@@ -31,13 +31,13 @@ bcrypt==4.1.2
     # via pypnusershub
 blinker==1.7.0
     # via flask
-boto3==1.34.30
+boto3==1.34.81
     # via -r requirements-common.in
-botocore==1.34.30
+botocore==1.34.81
     # via
     #   boto3
     #   s3transfer
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   fiona
     #   requests
@@ -58,15 +58,15 @@ cligj==0.7.2
     # via fiona
 contextlib2==21.6.0
     # via schema
-cryptography==42.0.1
+cryptography==42.0.5
     # via authlib
 exceptiongroup==1.2.0
     # via pytest
-fiona==1.9.5
+fiona==1.9.6
     # via utils-flask-sqlalchemy-geo
 flake8==7.0.0
     # via -r requirements-dev.in
-flask==3.0.1
+flask==3.0.3
     # via
     #   -r requirements-common.in
     #   flask-cors
@@ -82,11 +82,11 @@ flask-cors==4.0.0
     # via -r requirements-common.in
 flask-login==0.6.3
     # via pypnusershub
-flask-marshmallow==1.1.0
+flask-marshmallow==1.2.1
     # via
     #   pypn-ref-geo
     #   pypnusershub
-flask-migrate==4.0.5
+flask-migrate==4.0.7
     # via
     #   -r requirements-common.in
     #   utils-flask-sqlalchemy
@@ -97,7 +97,7 @@ flask-sqlalchemy==3.0.5
     #   pypn-ref-geo
     #   pypnusershub
     #   utils-flask-sqlalchemy
-geoalchemy2==0.14.3
+geoalchemy2==0.14.7
     # via utils-flask-sqlalchemy-geo
 geojson==3.1.0
     # via utils-flask-sqlalchemy-geo
@@ -107,7 +107,7 @@ gunicorn==21.2.0
     # via -r requirements-common.in
 idna==3.6
     # via requests
-importlib-metadata==7.0.1
+importlib-metadata==7.1.0
     # via
     #   fiona
     #   flask
@@ -123,36 +123,35 @@ jmespath==1.0.1
     #   botocore
 mako==1.3.2
     # via alembic
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via
     #   jinja2
     #   mako
     #   werkzeug
-marshmallow==3.20.2
+marshmallow==3.21.1
     # via
     #   flask-marshmallow
     #   marshmallow-geojson
     #   marshmallow-sqlalchemy
     #   utils-flask-sqlalchemy
 marshmallow-geojson==0.5.0
     # via utils-flask-sqlalchemy-geo
-marshmallow-sqlalchemy==0.30.0
+marshmallow-sqlalchemy==1.0.0
     # via
     #   -r requirements-common.in
     #   pypnusershub
     #   utils-flask-sqlalchemy-geo
 mccabe==0.7.0
     # via flake8
-numpy==1.26.3
+numpy==1.26.4
     # via shapely
-packaging==23.2
+packaging==24.0
     # via
     #   geoalchemy2
     #   gunicorn
     #   marshmallow
-    #   marshmallow-sqlalchemy
     #   pytest
-pillow==10.2.0
+pillow==10.3.0
     # via -r requirements-common.in
 pluggy==1.4.0
     # via pytest
@@ -163,17 +162,17 @@ psycopg2==2.9.9
     #   pypnusershub
 pycodestyle==2.11.1
     # via flake8
-pycparser==2.21
+pycparser==2.22
     # via cffi
 pyflakes==3.2.0
     # via flake8
-pytest==8.0.0
+pytest==8.1.1
     # via
     #   -r requirements-dev.in
     #   pytest-flask
 pytest-flask==1.3.0
     # via -r requirements-dev.in
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via
     #   botocore
     #   utils-flask-sqlalchemy
@@ -183,17 +182,17 @@ python-dotenv==1.0.1
     #   pypn-ref-geo
 requests==2.31.0
     # via pypnusershub
-s3transfer==0.10.0
+s3transfer==0.10.1
     # via boto3
 schema==0.7.5
     # via -r requirements-dev.in
-shapely==2.0.2
+shapely==2.0.3
     # via utils-flask-sqlalchemy-geo
 six==1.16.0
     # via
     #   fiona
     #   python-dateutil
-sqlalchemy==1.4.51
+sqlalchemy==1.4.52
     # via
     #   -r requirements-common.in
     #   alembic
@@ -206,20 +205,17 @@ sqlalchemy==1.4.51
     #   utils-flask-sqlalchemy-geo
 tomli==2.0.1
     # via pytest
-typing-extensions==4.9.0
+typing-extensions==4.11.0
     # via alembic
 urllib3==1.26.18
     # via
     #   -r requirements-common.in
     #   botocore
     #   requests
-werkzeug==3.0.1
+werkzeug==3.0.2
     # via
     #   flask
     #   flask-login
     #   pytest-flask
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools