Skip to content

Commit

Permalink
Merge branch 'main' into typing-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dstansby authored Jun 21, 2024
2 parents b90cbda + 485224f commit 8d4ca41
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 168 deletions.
75 changes: 0 additions & 75 deletions .github/workflows/ci-osx.yaml

This file was deleted.

67 changes: 0 additions & 67 deletions .github/workflows/ci-windows.yaml

This file was deleted.

36 changes: 25 additions & 11 deletions .github/workflows/ci-linux.yaml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linux CI
name: Tests

on: [push, pull_request]

Expand All @@ -8,11 +8,13 @@ concurrency:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{ matrix.platform }}
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12"]
# macos-12 is an intel runner, macos-14 is a arm64 runner
platform: [ubuntu-latest, windows-latest, macos-12, macos-14]

steps:
- name: Checkout source
Expand Down Expand Up @@ -41,6 +43,13 @@ jobs:
c-compiler cxx-compiler
python=${{matrix.python-version}} wheel pip
- name: Install clang
shell: "bash -l {0}"
if: matrix.platform == 'macos-12'
run: |
conda activate env
conda install -y 'clang>=12.0.1,<17'
- name: Show info about `env` environment
shell: "bash -l {0}"
run: |
Expand All @@ -51,7 +60,16 @@ jobs:
run: |
conda activate env
export DISABLE_NUMCODECS_AVX2=""
python -m pip install -v -e .[test,test_extras,msgpack,zfpy,pcodec]
# TODO: put back zfpy import when it supports numpy 2.0
python -m pip install -v -e .[test,test_extras,msgpack,pcodec]
# This is used to test with zfpy, which does not yet support numpy 2.0
- name: Install older numpy and zfpy
if: matrix.python-version == '3.10'
shell: "bash -l {0}"
run: |
conda activate env
python -m pip install "zfpy>=1" "numpy<2"
- name: List installed packages
shell: "bash -l {0}"
Expand All @@ -71,11 +89,7 @@ jobs:
conda activate env
pytest -v
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
#token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
#files: ./coverage1.xml,./coverage2.xml # optional
#flags: unittests # optional
#name: codecov-umbrella # optional
#fail_ci_if_error: true # optional (default = false)
verbose: true # optional (default = false)
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
10 changes: 5 additions & 5 deletions .github/workflows/wheel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-12]
# macos-12 is an intel runner, macos-14 is a arm64 runner
os: [ubuntu-latest, windows-latest, macos-12, macos-14]
env:
CIBW_TEST_COMMAND: python -c "import numcodecs"
CIBW_SKIP: "pp* cp36-* *-musllinux_* *win32 *_i686 *_s390x"
CIBW_ARCHS_MACOS: 'x86_64 arm64'
CIBW_TEST_SKIP: '*-macosx_arm64'
CIBW_BUILD: "cp310-* cp311-* cp312-*"
CIBW_SKIP: "pp* *-musllinux_* *win32 *_i686 *_s390x"
# note: CIBW_ENVIRONMENT is now set in pyproject.toml

steps:
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.9'
python-version: '3.10'

- name: Build sdist
run: pipx run build --sdist
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ submodules:
build:
os: ubuntu-20.04
tools:
python: "3.9"
python: "3.12"

sphinx:
configuration: docs/conf.py
Expand Down
6 changes: 5 additions & 1 deletion docs/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Release notes
Unreleased
----------

Maintenance
~~~~~~~~~~~
* The minimum supported Python version is now Python 3.10.

Enhancements
~~~~~~~~~~~~

Expand All @@ -24,7 +28,7 @@ Fix

* Fix skip of entry points backport tests
By :user:`Elliott Sales de Andrade <QuLogic>`, :issue:`487`.
* Fix Upgrade to Zstd 1.5.5 due to potential corruption.
* Fix Upgrade to Zstd 1.5.5 due to potential corruption.
By :user:`Mark Kittisopikul <mkitti>`, :issue:`429`

Maintenance
Expand Down
7 changes: 1 addition & 6 deletions numcodecs/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
def run_entrypoints():
entries.clear()
eps = entry_points()
if hasattr(eps, 'select'):
# If entry_points() has a select method, use that. Python 3.10+
entries.update({e.name: e for e in eps.select(group="numcodecs.codecs")})
else:
# Otherwise, fallback to using get
entries.update({e.name: e for e in eps.get("numcodecs.codecs", [])})
entries.update({e.name: e for e in eps.select(group="numcodecs.codecs")})


run_entrypoints()
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ A Python package providing buffer compression and transformation codecs \
for use in data storage and communication applications."""
readme = "README.rst"
dependencies = [
"numpy>=1.7,<2",
"numpy>=1.7",
]
requires-python = ">=3.8"
requires-python = ">=3.10"
dynamic = [
"version",
]
Expand Down

0 comments on commit 8d4ca41

Please sign in to comment.