From ca83b19ee3de305feb95f0b732966d1be780a335 Mon Sep 17 00:00:00 2001 From: veit Date: Thu, 8 Oct 2026 13:27:00 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=93=9D=20Add=20git=20mergetool?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.rst | 3 ++- docs/productive/git/branch.rst | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 34e7801a..88831df5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -23,7 +23,8 @@ emergencies when we need to start branches for older versions. Added ~~~~~ -📝 Adopt Git 2.56 features +* 📝 Add git mergetool +* 📝 Adopt Git 2.56 features * Add git add --resolved * Add git merge-base diff --git a/docs/productive/git/branch.rst b/docs/productive/git/branch.rst index 1bf86a04..eb3c2752 100644 --- a/docs/productive/git/branch.rst +++ b/docs/productive/git/branch.rst @@ -306,10 +306,11 @@ And to edit the non-merged files, you can create a `Git command alias Now you can edit all unmerged files with ``git edit-unmerged`` and then add all files to the staging area with ``git add -u``. -.. seealso:: - I took the editor variable from the `gitalias - `_ project. And maybe you’ll - find more ideas for your alias there. +Alternatively, you can also use ``git mergetool``. + + .. seealso:: + * `gitalias `_ + * `git-mergetool `_ Delete branches --------------- From ecd14db130826627b2fc5f33cbc1c35c5da7e818 Mon Sep 17 00:00:00 2001 From: veit Date: Mon, 12 Oct 2026 14:28:08 +0200 Subject: [PATCH 2/5] :memo: Switch to httpx2 --- .../{install-example.ipynb => example.ipynb} | 172 +++++++++++------- docs/data-processing/httpx/index.rst | 22 ++- docs/data-processing/httpx/module.ipynb | 49 +++-- docs/data-processing/httpx/nominatim.py | 2 +- 4 files changed, 162 insertions(+), 83 deletions(-) rename docs/data-processing/httpx/{install-example.ipynb => example.ipynb} (69%) diff --git a/docs/data-processing/httpx/install-example.ipynb b/docs/data-processing/httpx/example.ipynb similarity index 69% rename from docs/data-processing/httpx/install-example.ipynb rename to docs/data-processing/httpx/example.ipynb index 5cbc805e..e08fd148 100644 --- a/docs/data-processing/httpx/install-example.ipynb +++ b/docs/data-processing/httpx/example.ipynb @@ -4,34 +4,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# httpx installation and sample application" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Installation\n", - "\n", - "The httpx library is useful for communicating with REST APIs. With [Spack](../../productive/envs/spack/index.rst) you can provide httpx in your kernel:\n", - "\n", - "``` bash\n", - "$ spack env activate python-311\n", - "$ spack install py-httpx\n", - "```\n", - "\n", - "Alternatively, you can install httpx with other package managers, for example\n", - "\n", - "``` bash\n", - "$ uv add httpx\n", - "```" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Example OSM Nominatim API\n", + "# Example OSM Nominatim API\n", "\n", "In this example we get our data from the [OpenStreetMap Nominatim API](https://nominatim.org/release-docs/develop/api/Overview/). This can be reached via the URL `https://nominatim.openstreetmap.org/search?`. To e.g. receive information about the Berlin Congress Center in Berlin in JSON format, the URL `https://nominatim.openstreetmap.org/search.php?q=Alexanderplatz+Berlin&format=json` should be given, and if you want to display the corresponding map section you just have to leave out `&format=json`.\n", "\n", @@ -48,10 +21,18 @@ { "cell_type": "code", "execution_count": 1, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:40.705561Z", + "iopub.status.busy": "2026-10-12T12:10:40.705433Z", + "iopub.status.idle": "2026-10-12T12:10:41.679500Z", + "shell.execute_reply": "2026-10-12T12:10:41.677314Z", + "shell.execute_reply.started": "2026-10-12T12:10:40.705547Z" + } + }, "outputs": [], "source": [ - "import httpx\n", + "import httpx2 as httpx\n", "\n", "\n", "search_url = \"https://nominatim.openstreetmap.org/search?\"\n", @@ -65,7 +46,15 @@ { "cell_type": "code", "execution_count": 2, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:41.681558Z", + "iopub.status.busy": "2026-10-12T12:10:41.681150Z", + "iopub.status.idle": "2026-10-12T12:10:41.698010Z", + "shell.execute_reply": "2026-10-12T12:10:41.696344Z", + "shell.execute_reply.started": "2026-10-12T12:10:41.681513Z" + } + }, "outputs": [ { "data": { @@ -86,27 +75,34 @@ "cell_type": "code", "execution_count": 3, "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:41.698791Z", + "iopub.status.busy": "2026-10-12T12:10:41.698612Z", + "iopub.status.idle": "2026-10-12T12:10:41.708412Z", + "shell.execute_reply": "2026-10-12T12:10:41.706917Z", + "shell.execute_reply.started": "2026-10-12T12:10:41.698774Z" + }, "scrolled": true }, "outputs": [ { "data": { "text/plain": [ - "[{'place_id': 128497332,\n", + "[{'place_id': 145504962,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 783052052,\n", " 'lat': '52.5219814',\n", - " 'lon': '13.413635717448294',\n", + " 'lon': '13.4136358',\n", " 'class': 'place',\n", " 'type': 'square',\n", " 'place_rank': 25,\n", - " 'importance': 0.5136915868107359,\n", + " 'importance': 0.5119277148736227,\n", " 'addresstype': 'square',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Spandauer Vorstadt, Mitte, Berlin, Deutschland',\n", " 'boundingbox': ['52.5201457', '52.5238113', '13.4103097', '13.4160801']},\n", - " {'place_id': 128243381,\n", + " {'place_id': 145397195,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'node',\n", " 'osm_id': 3908141014,\n", @@ -115,24 +111,24 @@ " 'class': 'railway',\n", " 'type': 'station',\n", " 'place_rank': 30,\n", - " 'importance': 0.43609907778808027,\n", + " 'importance': 0.4682518726909874,\n", " 'addresstype': 'railway',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Dircksenstraße, Mitte, Berlin, 10179, Deutschland',\n", + " 'display_name': 'Alexanderplatz, 2, Dircksenstraße, Klosterviertel, Spandauer Vorstadt, Mitte, Berlin, 10179, Deutschland',\n", " 'boundingbox': ['52.5165661', '52.5265661', '13.4062804', '13.4162804']},\n", - " {'place_id': 128416772,\n", + " {'place_id': 143700934,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 346206374,\n", - " 'lat': '52.5216214',\n", - " 'lon': '13.4131913',\n", + " 'lat': '52.5216438',\n", + " 'lon': '13.4131914',\n", " 'class': 'highway',\n", " 'type': 'pedestrian',\n", " 'place_rank': 26,\n", - " 'importance': 0.10000999999999993,\n", + " 'importance': 0.05342208819714653,\n", " 'addresstype': 'road',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Klosterviertel, Spandauer Vorstadt, Mitte, Berlin, 10178, Deutschland',\n", " 'boundingbox': ['52.5216214', '52.5216661', '13.4131913', '13.4131914']}]" ] }, @@ -155,24 +151,32 @@ { "cell_type": "code", "execution_count": 4, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:41.708870Z", + "iopub.status.busy": "2026-10-12T12:10:41.708759Z", + "iopub.status.idle": "2026-10-12T12:10:41.910735Z", + "shell.execute_reply": "2026-10-12T12:10:41.910073Z", + "shell.execute_reply.started": "2026-10-12T12:10:41.708860Z" + } + }, "outputs": [ { "data": { "text/plain": [ - "[{'place_id': 128497332,\n", + "[{'place_id': 144589064,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 783052052,\n", " 'lat': '52.5219814',\n", - " 'lon': '13.413635717448294',\n", + " 'lon': '13.4136358',\n", " 'class': 'place',\n", " 'type': 'square',\n", " 'place_rank': 25,\n", - " 'importance': 0.5136915868107359,\n", + " 'importance': 0.5119277148736227,\n", " 'addresstype': 'square',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Spandauer Vorstadt, Mitte, Berlin, Deutschland',\n", " 'boundingbox': ['52.5201457', '52.5238113', '13.4103097', '13.4160801']}]" ] }, @@ -211,7 +215,15 @@ { "cell_type": "code", "execution_count": 5, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:41.911595Z", + "iopub.status.busy": "2026-10-12T12:10:41.911370Z", + "iopub.status.idle": "2026-10-12T12:10:41.916296Z", + "shell.execute_reply": "2026-10-12T12:10:41.914791Z", + "shell.execute_reply.started": "2026-10-12T12:10:41.911576Z" + } + }, "outputs": [ { "data": { @@ -238,24 +250,32 @@ { "cell_type": "code", "execution_count": 6, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:41.917136Z", + "iopub.status.busy": "2026-10-12T12:10:41.916983Z", + "iopub.status.idle": "2026-10-12T12:10:42.922727Z", + "shell.execute_reply": "2026-10-12T12:10:42.921914Z", + "shell.execute_reply.started": "2026-10-12T12:10:41.917119Z" + } + }, "outputs": [ { "data": { "text/plain": [ - "[{'place_id': 128497332,\n", + "[{'place_id': 144589064,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 783052052,\n", " 'lat': '52.5219814',\n", - " 'lon': '13.413635717448294',\n", + " 'lon': '13.4136358',\n", " 'class': 'place',\n", " 'type': 'square',\n", " 'place_rank': 25,\n", - " 'importance': 0.5136915868107359,\n", + " 'importance': 0.5119277148736227,\n", " 'addresstype': 'square',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Spandauer Vorstadt, Mitte, Berlin, Deutschland',\n", " 'boundingbox': ['52.5201457', '52.5238113', '13.4103097', '13.4160801']}]" ] }, @@ -282,7 +302,15 @@ { "cell_type": "code", "execution_count": 7, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:42.924490Z", + "iopub.status.busy": "2026-10-12T12:10:42.924042Z", + "iopub.status.idle": "2026-10-12T12:10:42.935439Z", + "shell.execute_reply": "2026-10-12T12:10:42.934277Z", + "shell.execute_reply.started": "2026-10-12T12:10:42.924446Z" + } + }, "outputs": [], "source": [ "def nominatim_search(address, fmt=\"json\", limit=1, **kwargs):\n", @@ -310,24 +338,32 @@ { "cell_type": "code", "execution_count": 8, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:42.936257Z", + "iopub.status.busy": "2026-10-12T12:10:42.936100Z", + "iopub.status.idle": "2026-10-12T12:10:44.020311Z", + "shell.execute_reply": "2026-10-12T12:10:44.018303Z", + "shell.execute_reply.started": "2026-10-12T12:10:42.936240Z" + } + }, "outputs": [ { "data": { "text/plain": [ - "[{'place_id': 128497332,\n", + "[{'place_id': 144589064,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 783052052,\n", " 'lat': '52.5219814',\n", - " 'lon': '13.413635717448294',\n", + " 'lon': '13.4136358',\n", " 'class': 'place',\n", " 'type': 'square',\n", " 'place_rank': 25,\n", - " 'importance': 0.5136915868107359,\n", + " 'importance': 0.5119277148736227,\n", " 'addresstype': 'square',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Spandauer Vorstadt, Mitte, Berlin, Deutschland',\n", " 'boundingbox': ['52.5201457', '52.5238113', '13.4103097', '13.4160801']}]" ] }, @@ -352,7 +388,15 @@ { "cell_type": "code", "execution_count": 9, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:10:44.021826Z", + "iopub.status.busy": "2026-10-12T12:10:44.021496Z", + "iopub.status.idle": "2026-10-12T12:10:44.031518Z", + "shell.execute_reply": "2026-10-12T12:10:44.029915Z", + "shell.execute_reply.started": "2026-10-12T12:10:44.021794Z" + } + }, "outputs": [], "source": [ "from functools import lru_cache\n", @@ -373,9 +417,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.13 Kernel", + "display_name": "Python 3.14 Kernel", "language": "python", - "name": "python313" + "name": "python314" }, "language_info": { "codemirror_mode": { @@ -387,7 +431,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.13.0" + "version": "3.14.0" }, "latex_envs": { "LaTeX_envs_menu_present": true, diff --git a/docs/data-processing/httpx/index.rst b/docs/data-processing/httpx/index.rst index 466ce962..08fec107 100644 --- a/docs/data-processing/httpx/index.rst +++ b/docs/data-processing/httpx/index.rst @@ -2,16 +2,28 @@ .. .. SPDX-License-Identifier: BSD-3-Clause -httpx -===== +HTTPX2 +====== -`httpx `_ is an http client with which requests -can be sent easily. +`HTTPX2 `_ is an HTTP client that +can be used seamlessly as a replacement for `HTTPX +`_ and simplifies HTML requests +compared to the Python standard library’s :doc:`urllib.request +`. + +Installation +------------ + +You can easily install HTTPX2 using :ref:`uv`: + +.. code-block:: console + + $ uv add httpx2 .. toctree:: :hidden: :titlesonly: :maxdepth: 0 - install-example.ipynb + example.ipynb module.ipynb diff --git a/docs/data-processing/httpx/module.ipynb b/docs/data-processing/httpx/module.ipynb index 2b30c2c5..ccd66681 100644 --- a/docs/data-processing/httpx/module.ipynb +++ b/docs/data-processing/httpx/module.ipynb @@ -6,43 +6,66 @@ "source": [ "# Create module\n", "\n", - "It is not very practical to start Jupyter every time and go through all the cells of the [httpx notebook](install-example.ipynb) just to be able to use the functions. Instead, we should store our functions in a separate module, like in [nominatim.py](nominatim.py):\n", + "It is not very practical to start Jupyter every time and go through all the cells of the [example.ipynb](example.ipynb) just to be able to use the functions. Instead, we should store our functions in a separate module, like in [nominatim.py](nominatim.py):\n", "\n", - "1. For this I have created a new text file in Jupyter in the same place as these notebooks, and named it `nominatim.py`.\n", - "2. Then I copied the imports, the method `nominatim_search` and its decorator `lru_cache` and saved the file.\n", - "3. Now we can go back to our notebook and import the code from this file and do our searches:" + "1. To do this, create a new text file in Jupyter in the same location as this notebook, named `nominatim.py`.\n", + "2. Next, copy the imports, the `nominatim_search` method and its `lru_cache` decorator into the file, and save it.\n", + "3. We can now return to our [example.ipynb](example.ipynb) and replace the copied code with the following import:" ] }, { "cell_type": "code", "execution_count": 1, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:01:16.353251Z", + "iopub.status.busy": "2026-10-12T12:01:16.353165Z", + "iopub.status.idle": "2026-10-12T12:01:16.377597Z", + "shell.execute_reply": "2026-10-12T12:01:16.376812Z", + "shell.execute_reply.started": "2026-10-12T12:01:16.353234Z" + } + }, "outputs": [], "source": [ "from nominatim import nominatim_search" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We can then open our search again:" + ] + }, { "cell_type": "code", "execution_count": 2, - "metadata": {}, + "metadata": { + "execution": { + "iopub.execute_input": "2026-10-12T12:01:16.377864Z", + "iopub.status.busy": "2026-10-12T12:01:16.377772Z", + "iopub.status.idle": "2026-10-12T12:01:17.636688Z", + "shell.execute_reply": "2026-10-12T12:01:17.634495Z", + "shell.execute_reply.started": "2026-10-12T12:01:16.377856Z" + } + }, "outputs": [ { "data": { "text/plain": [ - "[{'place_id': 159000335,\n", + "[{'place_id': 144771482,\n", " 'licence': 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright',\n", " 'osm_type': 'way',\n", " 'osm_id': 783052052,\n", " 'lat': '52.5219814',\n", - " 'lon': '13.413635717448294',\n", + " 'lon': '13.4136358',\n", " 'class': 'place',\n", " 'type': 'square',\n", " 'place_rank': 25,\n", - " 'importance': 0.5136915868107359,\n", + " 'importance': 0.5119277148736227,\n", " 'addresstype': 'square',\n", " 'name': 'Alexanderplatz',\n", - " 'display_name': 'Alexanderplatz, Mitte, Berlin, 10178, Deutschland',\n", + " 'display_name': 'Alexanderplatz, Spandauer Vorstadt, Mitte, Berlin, Deutschland',\n", " 'boundingbox': ['52.5201457', '52.5238113', '13.4103097', '13.4160801']}]" ] }, @@ -67,9 +90,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.13 Kernel", + "display_name": "Python 3.14 Kernel", "language": "python", - "name": "python313" + "name": "python314" }, "language_info": { "codemirror_mode": { @@ -81,7 +104,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.13.0" + "version": "3.14.0" }, "latex_envs": { "LaTeX_envs_menu_present": true, diff --git a/docs/data-processing/httpx/nominatim.py b/docs/data-processing/httpx/nominatim.py index e86f0a24..3aa90030 100644 --- a/docs/data-processing/httpx/nominatim.py +++ b/docs/data-processing/httpx/nominatim.py @@ -5,7 +5,7 @@ from functools import lru_cache from time import sleep -import httpx +import httpx2 as httpx @lru_cache(maxsize=1000) From bf67cf7d4b82c4525d602deea4824ccae867a1f7 Mon Sep 17 00:00:00 2001 From: veit Date: Mon, 12 Oct 2026 15:49:48 +0200 Subject: [PATCH 3/5] :arrow_up: Switch to Python 3.15, remove 3.10 * Use latest in rtd config * Use base_python_file --- .python-version | 2 +- .readthedocs.yaml | 2 +- docs/productive/envs/uv/index.rst | 2 +- docs/productive/git/advanced/gitlab/ci-cd/github-migration.rst | 2 +- pyproject.toml | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.python-version b/.python-version index 24ee5b1b..93a848f9 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.13 +3.15 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 4c2cf083..576dcd67 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -16,7 +16,7 @@ build: # graphviz is required for sphinx.ext.graphviz - graphviz tools: - python: "3.14" + python: latest python: # See https://docs.readthedocs.com/platform/stable/build-customization.html#install-dependencies-with-uv diff --git a/docs/productive/envs/uv/index.rst b/docs/productive/envs/uv/index.rst index 51ea6e92..80ccb77e 100644 --- a/docs/productive/envs/uv/index.rst +++ b/docs/productive/envs/uv/index.rst @@ -68,7 +68,7 @@ Testing in different Python environments ---------------------------------------- uv simplifies the :ref:`parallel installation of different Python versions, -including PyPy and free-threaded Python 3.13 `. With +including PyPy and free-threaded Python `. With :ref:`tox_uv` you can then test your project automatically in the different Python environments. diff --git a/docs/productive/git/advanced/gitlab/ci-cd/github-migration.rst b/docs/productive/git/advanced/gitlab/ci-cd/github-migration.rst index eec37a1e..f2239c2c 100644 --- a/docs/productive/git/advanced/gitlab/ci-cd/github-migration.rst +++ b/docs/productive/git/advanced/gitlab/ci-cd/github-migration.rst @@ -311,7 +311,7 @@ GitHub Actions syntax for databases and service containers uses: actions/checkout@v4 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version-file: '.python-version' - name: Test with pytest run: python -m pytest diff --git a/pyproject.toml b/pyproject.toml index e9987074..c620e3b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,11 +13,10 @@ license-files = [ "LICENSE" ] authors = [ { name = "Veit Schiele", email = "veit@cusy.io" }, ] -requires-python = ">=3.10" +requires-python = ">=3.11" classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", From e9680d1fd888821031c3875a1aeb97f75ea6da50 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 22:04:48 +0000 Subject: [PATCH 4/5] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/tox-dev/pyproject-fmt: 59e7b26529dc6f15c43063064b8b06ded60d0910 → 50e0f3aee9dc5747a5f173f79a7417403c18dda6](https://github.com/tox-dev/pyproject-fmt/compare/59e7b26529dc6f15c43063064b8b06ded60d0910...50e0f3aee9dc5747a5f173f79a7417403c18dda6) - [github.com/abravalheri/validate-pyproject: 17e12779811926f000bdfa1795f9e3735dd71ac3 → 82d21874c3242e4dc27bb47641c996902ef64eef](https://github.com/abravalheri/validate-pyproject/compare/17e12779811926f000bdfa1795f9e3735dd71ac3...82d21874c3242e4dc27bb47641c996902ef64eef) - [github.com/astral-sh/ruff-pre-commit: a56c0b927e6465d37cae3e97d35d4d18ab2b96cd → 25bcf95026b96e2dd3c0aec3090c3d6ef6ca2e6c](https://github.com/astral-sh/ruff-pre-commit/compare/a56c0b927e6465d37cae3e97d35d4d18ab2b96cd...25bcf95026b96e2dd3c0aec3090c3d6ef6ca2e6c) - [github.com/adamchainz/blacken-docs: fda77690955e9b63c6687d8806bafd56a526e45f → dda8db18cfc68df532abf33b185ecd12d5b7b326](https://github.com/adamchainz/blacken-docs/compare/fda77690955e9b63c6687d8806bafd56a526e45f...dda8db18cfc68df532abf33b185ecd12d5b7b326) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fa441c10..563f7db6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,15 +24,15 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/tox-dev/pyproject-fmt - rev: 59e7b26529dc6f15c43063064b8b06ded60d0910 # frozen: v2.29.4 + rev: 50e0f3aee9dc5747a5f173f79a7417403c18dda6 # frozen: v2.30.3 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: 17e12779811926f000bdfa1795f9e3735dd71ac3 # frozen: 0.26 + rev: 82d21874c3242e4dc27bb47641c996902ef64eef # frozen: v0.27 hooks: - id: validate-pyproject - repo: https://github.com/astral-sh/ruff-pre-commit - rev: a56c0b927e6465d37cae3e97d35d4d18ab2b96cd # frozen: v0.16.9 + rev: 25bcf95026b96e2dd3c0aec3090c3d6ef6ca2e6c # frozen: v0.17.3 hooks: - id: ruff-check args: [--fix, --exit-non-zero-on-fix] @@ -43,7 +43,7 @@ repos: - id: sphinx-lint types: [rst] - repo: https://github.com/adamchainz/blacken-docs - rev: fda77690955e9b63c6687d8806bafd56a526e45f # frozen: 1.20.0 + rev: dda8db18cfc68df532abf33b185ecd12d5b7b326 # frozen: 1.20.0 hooks: - id: blacken-docs args: [--line-length=79] From addcbd43919e8405c834d7815432a93d507afa14 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 22:05:53 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/clean-prep/libs-methods/dask-pipeline.ipynb | 4 ++-- docs/clean-prep/libs-methods/voluptuous.ipynb | 6 +++--- .../serialisation-formats/toml/example.ipynb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/clean-prep/libs-methods/dask-pipeline.ipynb b/docs/clean-prep/libs-methods/dask-pipeline.ipynb index 7a3621d3..08c07358 100644 --- a/docs/clean-prep/libs-methods/dask-pipeline.ipynb +++ b/docs/clean-prep/libs-methods/dask-pipeline.ipynb @@ -243,8 +243,8 @@ " data = resp.json().get(\"response\")[0]\n", " td = datetime.datetime.fromtimestamp(\n", " data.get(\"risetime\"),\n", - " tz=datetime.timezone.utc,\n", - " ) - datetime.datetime.now(tz=datetime.timezone.utc)\n", + " tz=datetime.UTC,\n", + " ) - datetime.datetime.now(tz=datetime.UTC)\n", " m, s = divmod(int(td.total_seconds()), 60)\n", " h, m = divmod(m, 60)\n", " logger.info(\n", diff --git a/docs/clean-prep/libs-methods/voluptuous.ipynb b/docs/clean-prep/libs-methods/voluptuous.ipynb index d7cdc293..e1f6dadb 100644 --- a/docs/clean-prep/libs-methods/voluptuous.ipynb +++ b/docs/clean-prep/libs-methods/voluptuous.ipynb @@ -503,7 +503,7 @@ "source": [ "def valid_date(fmt=\"%Y-%m-%d %H:%M:%S\"):\n", " return lambda v: datetime.datetime.strptime(v, fmt).replace(\n", - " tzinfo=datetime.timezone.utc\n", + " tzinfo=datetime.UTC\n", " )" ] }, @@ -607,8 +607,8 @@ " def validation_func(v):\n", " try:\n", " assert datetime.datetime.strptime(v, fmt).replace(\n", - " tzinfo=datetime.timezone.utc\n", - " ) <= datetime.datetime.now(tz=datetime.timezone.utc)\n", + " tzinfo=datetime.UTC\n", + " ) <= datetime.datetime.now(tz=datetime.UTC)\n", " except AssertionError:\n", " msg = f\"The date is in the future! {v}\"\n", " raise Invalid(msg) from AssertionError\n", diff --git a/docs/data-processing/serialisation-formats/toml/example.ipynb b/docs/data-processing/serialisation-formats/toml/example.ipynb index db7db3db..1b507541 100644 --- a/docs/data-processing/serialisation-formats/toml/example.ipynb +++ b/docs/data-processing/serialisation-formats/toml/example.ipynb @@ -80,10 +80,10 @@ } ], "source": [ - "from pathlib import Path\n", - "\n", "import tomllib\n", "\n", + "from pathlib import Path\n", + "\n", "\n", "with Path.open(\"pyproject.toml\", \"rb\") as f:\n", " data = tomllib.load(f)\n",