TST: expand test matrix

.github/workflows/build-test.yaml

@@ -20,12 +20,22 @@ jobs:
  fail-fast: false
  matrix:
  os:
- #- macos-latest
- #- windows-latest
  - ubuntu-latest
  python-version:
  - '3.8'
  - '3.9'
+ - '3.10'
+ - '3.11'
+ # Test all on ubuntu, test ends on macos and windows
+ include:
+ - os: macos-latest
+ python-version: '3.8'
+ - os: windows-latest
+ python-version: '3.8'
+ #- os: macos-latest
+ # python-version: '3.11'
+ - os: windows-latest
+ python-version: '3.11'
 
  runs-on: ${{ matrix.os }}
 
@@ -41,7 +51,7 @@ jobs:
  env:
  dependencies: ${{ matrix.dependencies }}
  run: |
- python -m pip install "."
+ python -m pip install --editable "."
  python -m pip install -r test_requirements.txt
  - name: Run Tests
  env:

.gitignore

@@ -1,6 +1,7 @@
 # Cython generated files
 ewah_bool_utils/ewah_bool_wrap.cpp
 ewah_bool_utils/morton_utils.c
+ewah_bool_utils/_testing.cpp
 temp.linux-x86_64-3.6
 
 # Byte-compiled / optimized / DLL files

tests/test_ewah_bool_utils_cy.pyx → ewah_bool_utils/_testing.pyx

@@ -5,7 +5,7 @@ cimport cython
 cimport numpy as np
 from libcpp.vector cimport vector
 
-from ewah_bool_utils.ewah_bool_array cimport ewah_bool_array
+from .ewah_bool_array cimport ewah_bool_array
 
 import numpy as np
 

setup.py

@@ -31,6 +31,13 @@
  libraries=std_libs,
  include_dirs=[np.get_include()],
  ),
+ Extension(
+ "ewah_bool_utils._testing",
+ ["ewah_bool_utils/_testing.pyx"],
+ include_dirs=["ewah_bool_utils", "ewah_bool_utils/cpp", np.get_include()],
+ extra_compile_args=["-O3", "-march=native"],
+ language="c++",
+ ),
 ]
 
 

test_requirements.txt

@@ -1,2 +1 @@
 pytest>=6.2.4
-Cython>=0.29

tests/test_ewah_bool_utils.py

@@ -1,29 +1,10 @@
-# Concept taken from
-# https://pytestguide.readthedocs.io/en/latest/pytestGuide/#testing-cython-code
-
 """Tests for `ewah_bool_utils` package."""
 
-import os
 import time
-from pathlib import Path
 
 import numpy as np
-import pyximport
-
-ROOT = str(Path(__file__).parents[1].resolve())
-
-pyximport.install(
- pyimport=True,
- setup_args={
- "include_dirs": [
- np.get_include(),
- os.path.join(ROOT, "ewah_bool_utils"),
- os.path.join(ROOT, "ewah_bool_utils", "cpp"),
- ]
- },
-)
 
-from .test_ewah_bool_utils_cy import ( # noqa: E402
+from ewah_bool_utils._testing import (
  ewah_set_and_unset,
  find_ewah_collisions,
  make_and_select_from_ewah_index,