diff --git a/Dockerfile b/Dockerfile index c3a24986..cc2c0af3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,4 +93,4 @@ ENV TAXHUB_STATIC_FOLDER=/dist/static EXPOSE 5000 -CMD ["gunicorn", "apptax.app:create_app()", "--bind=0.0.0.0:5000", "--access-logfile=-", "--error-logfile=-"] +CMD ["gunicorn", "apptax.app:create_app()", "--bind=0.0.0.0:5000", "--access-logfile=-", "--error-logfile=-", "--reload", "--reload-extra-file=config/config.py"] diff --git a/VERSION b/VERSION index 0eed1a29..f8f4f03b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.0 +1.12.1 diff --git a/apptax/taxonomie/commands/migrate_taxref/commands_v16.py b/apptax/taxonomie/commands/migrate_taxref/commands_v16.py index c64b7524..b11b2e58 100644 --- a/apptax/taxonomie/commands/migrate_taxref/commands_v16.py +++ b/apptax/taxonomie/commands/migrate_taxref/commands_v16.py @@ -159,9 +159,7 @@ def import_data_taxref_v16(): db.session.execute(query) db.session.commit() - with open_remote_file( - base_url, "TAXREF_v16_2022.zip", open_fct=ZipFile, data_dir="tmp" - ) as archive: + with open_remote_file(base_url, "TAXREF_v16_2022.zip", open_fct=ZipFile) as archive: with archive.open("TAXREFv16.txt") as f: logger.info("Insert TAXREFv16 into taxonomie.import_taxref table…") copy_from_csv( diff --git a/docs/changelog.md b/docs/changelog.md index c5379650..b6d46b18 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,17 @@ +1.12.1 (2023-09-12) +=================== + +**🐛 Corrections** + +* [Migration Taxref] Ajout de scripts SQL manquants dans le fichier `setup.py` (#430) +* [Migration Taxref] Ne pas spécifier de répertoire de fichier de données dans la fonction `open_remote_file(...,"TAXREF_v16_2022.zip", ...)`, afin de pouvoir utiliser la variable d'environnement `DATA_PATH` (#430) + + +**💻 Développement** + + * Docker : redémarage de flask suite à modification de config.py + + 1.12.0 (2023-07-11) =================== diff --git a/setup.py b/setup.py index 902eee04..210bbff2 100644 --- a/setup.py +++ b/setup.py @@ -20,9 +20,11 @@ version=version, packages=setuptools.find_packages(where=".", include=["apptax*"]), package_data={ - "apptax": ["templates/*.html"], + "apptax": [ + "templates/*.html", + ], "apptax.migrations": ["alembic.ini", "script.py.mako", "data/*.sql"], - "apptax.taxonomie.commands.migrate_taxref": ["data/*.sql"], + "apptax.taxonomie.commands.migrate_taxref": ["data/*.sql", "data/*/*.sql"], }, install_requires=( list(open("requirements-common.in", "r")) + list(open("requirements-dependencies.in", "r"))