Skip to content

Commit 61e4298

Browse files
authored
Merge branch 'main' into main
2 parents 6f408de + e836f39 commit 61e4298

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+249
-283
lines changed

.github/workflows/ci.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: ["3.10", "3.11", "3.12"]
15+
python-version: ["3.10", "3.11", "3.12", "3.13.0"]
1616
# macos-12 is an intel runner, macos-14 is a arm64 runner
1717
platform: [ubuntu-latest, windows-latest, macos-12, macos-14]
1818

@@ -61,7 +61,15 @@ jobs:
6161
conda activate env
6262
export DISABLE_NUMCODECS_AVX2=""
6363
# TODO: put back zfpy import when it supports numpy 2.0
64-
python -m pip install -v -e .[test,test_extras,msgpack,pcodec]
64+
python -m pip install -v -e .[test,test_extras,msgpack]
65+
66+
- name: Install pcodec
67+
if: matrix.python-version != '3.13.0'
68+
shell: "bash -l {0}"
69+
run: |
70+
conda activate env
71+
python -m pip install -v pcodec
72+
6573
6674
# This is used to test with zfpy, which does not yet support numpy 2.0
6775
- name: Install older numpy and zfpy

.github/workflows/wheel.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
os: [ubuntu-latest, windows-latest, macos-12, macos-14]
1818
env:
1919
CIBW_TEST_COMMAND: python -c "import numcodecs"
20-
CIBW_BUILD: "cp310-* cp311-* cp312-*"
20+
CIBW_BUILD: "cp310-* cp311-* cp312-* cp313-*"
2121
CIBW_SKIP: "pp* *-musllinux_* *win32 *_i686 *_s390x"
2222
# note: CIBW_ENVIRONMENT is now set in pyproject.toml
2323

@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
submodules: true
2828

29-
- uses: pypa/[email protected].0
29+
- uses: pypa/[email protected].2
3030

3131
- uses: actions/upload-artifact@v4
3232
with:
@@ -44,7 +44,7 @@ jobs:
4444
- uses: actions/setup-python@v5
4545
name: Install Python
4646
with:
47-
python-version: '3.10'
47+
python-version: "3.10"
4848

4949
- name: Build sdist
5050
run: pipx run build --sdist

.pre-commit-config.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
exclude: ^fixture/ # files with trailing whitespaces on purpose
12
ci:
23
autoupdate_commit_msg: "chore: update pre-commit hooks"
34
autofix_commit_msg: "style: pre-commit fixes"
@@ -6,9 +7,21 @@ default_stages: [commit, push]
67
default_language_version:
78
python: python3
89
repos:
10+
- repo: https://github.com/pre-commit/pre-commit-hooks
11+
rev: v4.6.0
12+
hooks:
13+
- id: trailing-whitespace
14+
- id: check-yaml
15+
- id: debug-statements
16+
917
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: 'v0.6.5'
18+
rev: v0.6.9
1119
hooks:
1220
- id: ruff
1321
args: ["--fix", "--show-fixes"]
1422
- id: ruff-format
23+
24+
- repo: https://github.com/scientific-python/cookie
25+
rev: 2024.04.23
26+
hooks:
27+
- id: sp-repo-review

.pyup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# autogenerated pyup.io config file
1+
# autogenerated pyup.io config file
22
# see https://pyup.io/docs/configuration/ for all available options
33

44
schedule: every month

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Numcodecs
22
=========
33

4-
Numcodecs is a Python package providing buffer compression and transformation
4+
Numcodecs is a Python package providing buffer compression and transformation
55
codecs for use in data storage and communication applications.
66

77
.. image:: https://readthedocs.org/projects/numcodecs/badge/?version=latest

adhoc/blosc_memleak_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import sys
22

3-
import numcodecs
43
import numpy as np
54
from numpy.testing import assert_array_equal
65

6+
import numcodecs
77

88
codec = numcodecs.Blosc()
99
data = np.arange(int(sys.argv[1]))
10-
for i in range(int(sys.argv[2])):
10+
for _ in range(int(sys.argv[2])):
1111
enc = codec.encode(data)
1212
dec = codec.decode(enc)
1313
arr = np.frombuffer(dec, dtype=data.dtype)

c-blosc

Submodule c-blosc updated 368 files

docs/conf.py

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
# serve to show the default.
1414

1515

16-
import sys
1716
import os
17+
import sys
1818
from unittest.mock import Mock as MagicMock
19+
1920
import numcodecs
2021

2122

docs/release.rst

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,31 @@ Release notes
88
99
.. _unreleased:
1010

11-
Unreleased
12-
----------
11+
0.13.1
12+
------
1313

1414
Breaking changes
1515
~~~~~~~~~~~~~~~~
1616
* `Zstd.default_level`, `Zstd.min_level`, and `Zstd.max_level` are now class methods
1717
instead of properties. This means they must now be called like ``Zstd.default_level()``
1818
instead of ``Zstd.default_level``. This breaking change has been made because Python 3.13
1919
removes support for class properties.
20-
By :user:`David Stansby <dstansby>`
20+
By :user:`David Stansby <dstansby>`, :issue:`576`.
2121

2222
Enhancements
2323
~~~~~~~~~~~~
2424

25-
26-
Fix
27-
~~~
28-
25+
* Update bundled c-blosc to v1.26.1. This updates Zlib to v1.3.1
26+
and Zstd to v1.5.6.
27+
By :user:`David Stansby <dstansby>`, :issue:`560`.
28+
* Added support for Python 3.13 :user:`David Stansby <dstansby>`, :issue:`576`.
29+
* Cleaned up the table of contents in the documentation to list codecs by category
30+
:user:`David Stansby <dstansby>`, :issue:`458`.
2931

3032
Maintenance
3133
~~~~~~~~~~~
3234
* Change format() and old string formatting to f-strings.
3335
By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>`, :issue:`439`.
34-
3536
* Remove pin on Sphinx
3637
By :user:`Elliott Sales de Andrade <QuLogic>`, :issue:`552`.
3738

notebooks/benchmark_vlen.ipynb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
],
2626
"source": [
2727
"import numpy as np\n",
28+
"\n",
2829
"import numcodecs\n",
2930
"\n",
3031
"numcodecs.__version__"

0 commit comments

Comments
 (0)