Merge pull request #41 from AMYPAD/py3.12

AMYPAD · Feb 22, 2024 · 3ff22d6 · 3ff22d6
2 parents b7f57e6 + 71ef18a
commit 3ff22d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.7, 3.11]
+        python: [3.7, 3.12]
     steps:
     - uses: actions/checkout@v4
       with: {fetch-depth: 0}
@@ -41,12 +41,12 @@ jobs:
     runs-on: [self-hosted, cuda, python]
     strategy:
       matrix:
-        python: [3.7, 3.11]
+        python: [3.7, 3.12]
     steps:
     - uses: actions/checkout@v4
       with: {fetch-depth: 0}
     - name: Run setup-python
-      run: setup-python -p${{ matrix.python }} 'cuda-version<12' 'cupy<13'
+      run: setup-python -p${{ matrix.python }} cupy
     - name: pip install -U -e .[dev]
       run: make CXX_FLAGS='' deps-build build-editable deps-run
     - run: make test

diff --git a/pyproject.toml b/pyproject.toml
@@ -47,6 +47,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -88,7 +89,7 @@ known_first_party = ["cuvec", "tests"]
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-timeout = 30
+timeout = 5
 log_level = "INFO"
 python_files = ["tests/test_*.py"]
 testpaths = ["tests"]

diff --git a/tests/test_common.py b/tests/test_common.py
@@ -116,6 +116,7 @@ def test_CuVec_creation(cu, classname, caplog):
 
 
 @mark.parametrize("cu", filter(None, [py, sw]))
+@mark.timeout(20)
 def test_asarray(cu):
     v = cu.asarray(np.random.random(shape))
     w = cu.CuVec(v)
@@ -158,6 +159,7 @@ def test_resize(cu):
     assert v._vec.shape == v.shape
 
 
+@mark.timeout(60)
 @mark.parametrize("cu", filter(None, [cp, py, sw]))
 def test_cuda_array_interface(cu):
     cupy = importorskip("cupy")

diff --git a/tests/test_cpython.py b/tests/test_cpython.py
@@ -28,6 +28,7 @@ def test_CVector_strides():
     assert a.strides == (473344, 1376, 4)
 
 
+@mark.timeout(20)
 def test_asarray():
     v = cu.asarray(np.random.random(shape))
     w = cu.CuVec(v)