From 20a25b23e0c57846367f146d630cd9dc671a2c15 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Tue, 25 Nov 2025 00:12:47 +0100 Subject: [PATCH 1/7] build: python 3.14 --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 0a716c7..24f4f9b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -83,7 +83,7 @@ fi # FIXME: do not hardcode this # FIXME: move to layer root extra_env ? -echo "export PYTHON3_SHORT_VERSION := 3.13" >>adm/root.mk +echo "export PYTHON3_SHORT_VERSION := 3.14" >>adm/root.mk echo "BOOTSTRAP DONE !" echo "MFEXT_HOME=${MFEXT_HOME}" From 9ad98c9d877a3e7d9b21ab1ca00405b7a22231d7 Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Tue, 2 Dec 2025 12:58:13 +0000 Subject: [PATCH 2/7] feat: update watchfiles and remove Aspose.Slides for Python 3.14 compatibility --- .metwork-framework/components.md | 5 ++--- .../import_python3_extratools.py | 2 +- .../0500_extra_packages/Makefile.mk | 8 ++++---- .../0500_extra_packages/requirements-to-freeze.txt | 2 +- .../0500_extra_packages/requirements3.txt | 3 +-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index 2cc3447..8e0c20a 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -4,7 +4,6 @@ | [argon2-cffi-bindings](https://github.com/hynek/argon2-cffi-bindings) | 21.2.0 | python3_extratools | | [argon2-cffi](https://pypi.org/project/argon2-cffi) | 23.1.0 | python3_extratools | | [asgiref](https://github.com/django/asgiref/) | 3.8.1 | python3_extratools | -| [aspose-slides](https://products.aspose.com/slides/python-net/) | 25.5.0 | python3_extratools | | [async-lru](https://github.com/aio-libs/async-lru) | 2.0.5 | python3_extratools | | [bleach](https://github.com/mozilla/bleach) | 6.2.0 | python3_extratools | | [comm](https://github.com/ipython/comm) | 0.2.2 | python3_extratools | @@ -81,7 +80,7 @@ | [ujson](https://github.com/ultrajson/ultrajson) | 5.10.0 | python3_extratools | | [uri-template](https://gitlab.linss.com/open-source/python/uri-template) | 1.3.0 | python3_extratools | | [uvicorn](https://www.uvicorn.org/) | 0.34.2 | python3_extratools | -| [watchfiles](https://github.com/samuelcolvin/watchfiles) | 1.0.5 | python3_extratools | +| [watchfiles](https://github.com/samuelcolvin/watchfiles) | 1.1.1 | python3_extratools | | [webcolors](https://pypi.org/project/webcolors) | 24.11.1 | python3_extratools | | [webencodings](https://github.com/SimonSapin/python-webencodings) | 0.5.1 | python3_extratools | | [websocket-client](https://github.com/websocket-client/websocket-client.git) | 1.8.0 | python3_extratools | @@ -89,4 +88,4 @@ | [widgetsnbextension](http://jupyter.org) | 4.0.14 | python3_extratools | | [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) | 3.2.5 | python3_extratools | -*(88 components)* +*(87 components)* diff --git a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py index ca650e9..56821dd 100644 --- a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py +++ b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py @@ -81,4 +81,4 @@ import websockets import widgetsnbextension import xlsxwriter -import aspose.slides +#import aspose.slides not Python3.14 compliant for the time being diff --git a/layers/layer5_python3_extratools/0500_extra_packages/Makefile.mk b/layers/layer5_python3_extratools/0500_extra_packages/Makefile.mk index 66fc191..090217b 100644 --- a/layers/layer5_python3_extratools/0500_extra_packages/Makefile.mk +++ b/layers/layer5_python3_extratools/0500_extra_packages/Makefile.mk @@ -3,8 +3,8 @@ include $(MFEXT_HOME)/share/python3_layer.mk export PY_NUM=$(shell echo $(PYTHON_SHORT_VERSION) | sed -e 's/\.//') -all:: $(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose +#all:: $(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose -$(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose: - cd $(PYTHON3_SITE_PACKAGES)/aspose && ls -1 *.cpython-*.so | grep -v $(PY_NUM) | xargs rm -f - touch $(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose +#$(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose: +# cd $(PYTHON3_SITE_PACKAGES)/aspose && ls -1 *.cpython-*.so | grep -v $(PY_NUM) | xargs rm -f +# touch $(PYTHON3_SITE_PACKAGES)/aspose/.clean_aspose diff --git a/layers/layer5_python3_extratools/0500_extra_packages/requirements-to-freeze.txt b/layers/layer5_python3_extratools/0500_extra_packages/requirements-to-freeze.txt index a9dbe0a..8862131 100644 --- a/layers/layer5_python3_extratools/0500_extra_packages/requirements-to-freeze.txt +++ b/layers/layer5_python3_extratools/0500_extra_packages/requirements-to-freeze.txt @@ -7,7 +7,7 @@ jupyter notebook>=7 jupyter-console python-pptx -Aspose.Slides +#Aspose.Slides 25.11.0 is not Python 3.14 compliant pyxml2pdf reportlab #requirements required in other layers diff --git a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt index 0db23a1..68d036a 100644 --- a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt +++ b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt @@ -2,7 +2,6 @@ anyio==4.9.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 asgiref==3.8.1 -Aspose.Slides==25.5.0 async-lru==2.0.5 bleach==6.2.0 comm==0.2.2 @@ -73,7 +72,7 @@ uc-micro-py==1.0.3 ujson==5.10.0 uri-template==1.3.0 uvicorn==0.34.2 -watchfiles==1.0.5 +watchfiles==1.1.1 webcolors==24.11.1 webencodings==0.5.1 websockets==15.0.1 From c4e7a665c9ab41e348e8344e8fa97a2ad56f73d4 Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Tue, 28 Apr 2026 10:27:31 +0000 Subject: [PATCH 3/7] build: dategouv_client is not yet Python 3.14 compliant --- .../import_python3_extratools.py | 1 - .../0500_extra_packages/requirements3.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py index c93d15a..e41fc7c 100644 --- a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py +++ b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py @@ -5,7 +5,6 @@ import cairosvg import comm import cssselect2 -import datagouv import debugpy import docstring_to_markdown import download diff --git a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt index 5d6f36d..8fb491a 100644 --- a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt +++ b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt @@ -7,7 +7,6 @@ cairocffi==1.7.1 cairosvg==2.9.0 comm==0.2.2 cssselect2==0.9.0 -datagouv_client==0.2.3 debugpy==1.8.14 docstring-to-markdown==0.17 download==0.3.5 From cd68aac30d8ec0125c560c10219b7316c1038824 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Thu, 30 Apr 2026 09:01:44 +0200 Subject: [PATCH 4/7] build: Update components.md --- .metwork-framework/components.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index 7ec34b9..2756471 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -9,7 +9,6 @@ | [CairoSVG](https://courtbouillon.org/cairosvg) | 2.9.0 | python3_extratools | | [comm](https://github.com/ipython/comm) | 0.2.2 | python3_extratools | | [cssselect2](https://doc.courtbouillon.org/cssselect2/) | 0.9.0 | python3_extratools | -| [datagouv_client](https://pypi.org/project/datagouv_client) | 0.2.3 | python3_extratools | | [debugpy](https://aka.ms/debugpy) | 1.8.14 | python3_extratools | | [docstring-to-markdown](https://pypi.org/project/docstring-to-markdown) | 0.17 | python3_extratools | | [download](https://github.com/choldgraf/download) | 0.3.5 | python3_extratools | @@ -89,4 +88,4 @@ | [widgetsnbextension](http://jupyter.org) | 4.0.14 | python3_extratools | | [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) | 3.2.5 | python3_extratools | -*(88 components)* +*(87 components)* From f5e0660a000e74cd9ef805c5821a91613fae74c5 Mon Sep 17 00:00:00 2001 From: thebaptiste Date: Mon, 1 Jun 2026 10:03:54 +0000 Subject: [PATCH 5/7] feat: add datagouv_client 0.3.2 (now Python 3.14 compliant) --- .metwork-framework/components.md | 3 ++- .../0500_extra_packages/requirements3.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index 2756471..84b7a72 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -9,6 +9,7 @@ | [CairoSVG](https://courtbouillon.org/cairosvg) | 2.9.0 | python3_extratools | | [comm](https://github.com/ipython/comm) | 0.2.2 | python3_extratools | | [cssselect2](https://doc.courtbouillon.org/cssselect2/) | 0.9.0 | python3_extratools | +| [datagouv_client](https://pypi.org/project/datagouv_client) | 0.3.2 | python3_extratools | | [debugpy](https://aka.ms/debugpy) | 1.8.14 | python3_extratools | | [docstring-to-markdown](https://pypi.org/project/docstring-to-markdown) | 0.17 | python3_extratools | | [download](https://github.com/choldgraf/download) | 0.3.5 | python3_extratools | @@ -88,4 +89,4 @@ | [widgetsnbextension](http://jupyter.org) | 4.0.14 | python3_extratools | | [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) | 3.2.5 | python3_extratools | -*(87 components)* +*(88 components)* diff --git a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt index 8fb491a..967283f 100644 --- a/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt +++ b/layers/layer5_python3_extratools/0500_extra_packages/requirements3.txt @@ -7,6 +7,7 @@ cairocffi==1.7.1 cairosvg==2.9.0 comm==0.2.2 cssselect2==0.9.0 +datagouv_client==0.3.2 debugpy==1.8.14 docstring-to-markdown==0.17 download==0.3.5 From 9e8a8e5a024bad9091c3b4214a68bec9fa24dffd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Wed, 12 Aug 2026 09:58:43 +0200 Subject: [PATCH 6/7] Update import_python3_extratools.py --- .../import_python3_extratools.py | 1 + 1 file changed, 1 insertion(+) diff --git a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py index fc4cda0..227790b 100644 --- a/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py +++ b/integration_tests/0012_test_import_python3_extratools/import_python3_extratools.py @@ -5,6 +5,7 @@ import cairosvg import comm import cssselect2 +import datagouv import debugpy import docstring_to_markdown import download From 4e166d06e3317e2855d0c658521dd3f85ebf1588 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste VESLIN <19856429+thebaptiste@users.noreply.github.com> Date: Wed, 12 Aug 2026 14:58:22 +0200 Subject: [PATCH 7/7] fix components.md --- .metwork-framework/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.metwork-framework/components.md b/.metwork-framework/components.md index face1fe..fcaff5d 100644 --- a/.metwork-framework/components.md +++ b/.metwork-framework/components.md @@ -94,4 +94,4 @@ | [widgetsnbextension](http://jupyter.org) | 4.0.14 | python3_extratools | | [xlsxwriter](https://github.com/jmcnamara/XlsxWriter) | 3.2.5 | python3_extratools | -*(93 components)* \ No newline at end of file +*(93 components)*