Skip to content

Commit 8bd4421

Browse files
committed
Merge branch 'main' into dsl-constructors
# Conflicts: # CMakeLists.txt # tests/ndarray/test_dsl_kernels.py
2 parents d9bfa71 + 0ef157b commit 8bd4421

7 files changed

Lines changed: 889 additions & 10 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Build (Windows)
7272
if: runner.os == 'Windows'
7373
id: build_windows
74-
run: pip install -e .[test]
74+
run: pip install -e . --group test
7575
env:
7676
CMAKE_C_COMPILER_LAUNCHER: sccache
7777
CMAKE_CXX_COMPILER_LAUNCHER: sccache
@@ -84,7 +84,7 @@ jobs:
8484
- name: Build (non-Windows)
8585
if: runner.os != 'Windows'
8686
id: build_non_windows
87-
run: pip install -e .[test]
87+
run: pip install -e . --group test
8888

8989
- name: Test (Windows)
9090
if: runner.os == 'Windows'

.github/workflows/cibuildwheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
python -m venv sdist_test_env
110110
source sdist_test_env/bin/activate
111111
pip install pip --upgrade
112-
pip install --break-system-packages -e .[test]
112+
pip install --break-system-packages -e . --group test
113113
114114
- name: Test sdist package with pytest
115115
if: ${{ matrix.os == 'ubuntu-latest' }}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ endif()
6363

6464
FetchContent_Declare(miniexpr
6565
GIT_REPOSITORY https://github.com/Blosc/miniexpr.git
66-
GIT_TAG af37741a3344604e21d5572e9b216117d0db8768
66+
GIT_TAG 06ee29cdc9c5cfbf22f9a6fedcdaf46af1fec373
6767
# SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../miniexpr
6868
)
6969
FetchContent_MakeAvailable(miniexpr)

0 commit comments

Comments
 (0)