Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.13
3.15
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/clean-prep/libs-methods/dask-pipeline.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions docs/clean-prep/libs-methods/voluptuous.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
" )"
]
},
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading