Skip to content

Commit 9f83be6

Browse files
committed
Merge branch 'release/1.8.1'
2 parents 872ea5e + c36a5ac commit 9f83be6

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

.github/workflows/pypi-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
id-token: write
3030
steps:
3131
- name: Download artifacts
32-
uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
32+
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
3333
with:
3434
path: artifacts/
3535
run_id: ${{ github.event.inputs.run_id || github.event.workflow_run.id }}
@@ -42,13 +42,13 @@ jobs:
4242
mv artifacts/wheels-*/*.whl dist/
4343
4444
- name: Publish to pypi.org
45-
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
45+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
4646
if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi')
4747
with:
4848
packages-dir: dist/
4949

5050
- name: Publish to test.pypi.org
51-
uses: pypa/gh-action-pypi-publish@f7600683efdcb7656dec5b29656edb7bc586e597 # v1.10.3
51+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
5252
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi'
5353
with:
5454
repository-url: https://test.pypi.org/legacy/

.github/workflows/wheel-builder.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: .venv/bin/pip install -U pip build
3737
- name: Make sdist
3838
run: .venv/bin/python -m build --sdist
39-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
39+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4040
with:
4141
name: sdist
4242
path: dist/*.tar.gz
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
os: [ubuntu-20.04, windows-2019, macos-12]
50+
os: [ubuntu-24.04, windows-2022, macos-13]
5151

5252
steps:
5353
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
@@ -57,9 +57,9 @@ jobs:
5757
persist-credentials: false
5858

5959
- name: Build wheels
60-
uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.3
60+
uses: pypa/cibuildwheel@42728e866bbc80d544a70825bd9990b9a26f1a50 # v2.23.1
6161

62-
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
62+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6363
with:
6464
name: wheels-${{ matrix.os }}
6565
path: ./wheelhouse/*.whl

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22

33
build:
4-
os: ubuntu-20.04
4+
os: ubuntu-24.04
55
tools:
66
python: "3.11"
77

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Logbook Changelog
22
=================
33

4+
Version 1.8.1
5+
-------------
6+
7+
- Fixed crash on Python 3.12+ in speedups extension module.
8+
49
Version 1.8.0
510
-------------
611

src/cython/speedups.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ from logbook.concurrency import (
2121
thread_local,
2222
)
2323

24-
from cpython.dict cimport PyDict_Clear, PyDict_SetItem
25-
from cpython.list cimport PyList_Append, PyList_GET_SIZE, PyList_Sort
24+
from cpython.dict cimport PyDict_Clear, PyDict_SetItem, PyDict_Size
25+
from cpython.list cimport PyList_Append, PyList_Sort
2626
from cpython.pythread cimport (
2727
WAIT_LOCK,
2828
PyThread_acquire_lock,
@@ -218,7 +218,7 @@ cdef class ContextStackManager:
218218

219219
objects = self._cache.get(tid)
220220
if objects is None:
221-
if PyList_GET_SIZE(self._cache) > _MAX_CONTEXT_OBJECT_CACHE:
221+
if PyDict_Size(self._cache) > _MAX_CONTEXT_OBJECT_CACHE:
222222
PyDict_Clear(self._cache)
223223
objects = self._global[:]
224224
objects.extend(getattr(self._thread_context, 'stack', ()))

src/logbook/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.8.0"
1+
__version__ = "1.8.1"

0 commit comments

Comments
 (0)