Skip to content

Commit

Permalink
chore: specify numpy version for pythons < 3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Nov 13, 2024
1 parent 05dcd61 commit af1601a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 129 deletions.
3 changes: 0 additions & 3 deletions .flake8

This file was deleted.

36 changes: 8 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,20 @@ jobs:
os:
- ubuntu-latest
python-version:
- "39"
- "310"
- "311"
- "312"
include:
- os: macos-latest
python-version: "39"
python-version: "310"
- os: macos-latest
python-version: "312"

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4

- uses: cachix/install-nix-action@v30 # v30
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable-small

Expand Down Expand Up @@ -62,26 +61,10 @@ jobs:
os:
- ubuntu-latest
- windows-latest
spec:
- deps:
python-version: "3.9"
numba: "0.53"
llvmlite: "0.36"
- env:
NUMBA_CAPTURED_ERRORS: new_style
deps:
python-version: "3.10"
- env:
NUMBA_CAPTURED_ERRORS: new_style
deps:
python-version: "3.11"
- env:
NUMBA_CAPTURED_ERRORS: new_style
deps:
python-version: "3.12"
defaults:
run:
shell: bash -l {0}
python-version:
- "3.10"
- "3.11"
- "3.12"
steps:
- uses: actions/checkout@v4

Expand All @@ -95,12 +78,9 @@ jobs:
with:
enable-cache: true

- run: uv add "numba==${{ matrix.spec.deps.numba }}" "llvmlite==${{ matrix.spec.deps.llvmlite }}" --python "${{ steps.install_python.outputs.python-version }}"
if: ${{ matrix.spec.deps.numba != null && matrix.spec.deps.llvmlite != null }}

- run: uv run --group tests pytest --numprocesses auto
- run: uv run --group tests pytest -vv
env:
NUMBA_CAPTURED_ERRORS: ${{ matrix.spec.env.NUMBA_CAPTURED_ERRORS }}
NUMBA_CAPTURED_ERRORS: new_style

dry-run-release:
runs-on: ubuntu-latest
Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
inherit (pkgs) lib;
in
rec {
packages.numbsql39 = pkgs.numbsql39;
packages.numbsql310 = pkgs.numbsql310;
packages.numbsql311 = pkgs.numbsql311;
packages.numbsql312 = pkgs.numbsql312;
Expand Down
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ in
value = mkDevEnv final."python${py}";
}
])
[ "39" "310" "311" "312" ]
[ "310" "311" "312" ]
))
2 changes: 1 addition & 1 deletion nix/tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final: prev: {

checkPhase = ''
runHook preCheck
pytest --numprocesses auto
pytest -vv
runHook postCheck
'';

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "numbsql"
version = "7.1.0"
requires-python = ">=3.9"
requires-python = ">=3.10,<4"
description = "JITted SQLite user-defined scalar and aggregate functions"
readme = "README.md"
license = "Apache-2.0"
Expand All @@ -13,7 +13,6 @@ maintainers = [
]
classifiers = [
"Intended Audience :: Developers",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down
99 changes: 6 additions & 93 deletions uv.lock

Large diffs are not rendered by default.

0 comments on commit af1601a

Please sign in to comment.