Skip to content

Commit 3ff22d6

Browse files
committed
Merge pull request #41 from AMYPAD/py3.12
2 parents b7f57e6 + 71ef18a commit 3ff22d6

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
python: [3.7, 3.11]
23+
python: [3.7, 3.12]
2424
steps:
2525
- uses: actions/checkout@v4
2626
with: {fetch-depth: 0}
@@ -41,12 +41,12 @@ jobs:
4141
runs-on: [self-hosted, cuda, python]
4242
strategy:
4343
matrix:
44-
python: [3.7, 3.11]
44+
python: [3.7, 3.12]
4545
steps:
4646
- uses: actions/checkout@v4
4747
with: {fetch-depth: 0}
4848
- name: Run setup-python
49-
run: setup-python -p${{ matrix.python }} 'cuda-version<12' 'cupy<13'
49+
run: setup-python -p${{ matrix.python }} cupy
5050
- name: pip install -U -e .[dev]
5151
run: make CXX_FLAGS='' deps-build build-editable deps-run
5252
- run: make test

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ classifiers = [
4747
"Programming Language :: Python :: 3.9",
4848
"Programming Language :: Python :: 3.10",
4949
"Programming Language :: Python :: 3.11",
50+
"Programming Language :: Python :: 3.12",
5051
"Programming Language :: Python :: 3 :: Only",
5152
"Topic :: Software Development :: Libraries",
5253
"Topic :: Software Development :: Libraries :: Python Modules",
@@ -88,7 +89,7 @@ known_first_party = ["cuvec", "tests"]
8889

8990
[tool.pytest.ini_options]
9091
minversion = "6.0"
91-
timeout = 30
92+
timeout = 5
9293
log_level = "INFO"
9394
python_files = ["tests/test_*.py"]
9495
testpaths = ["tests"]

tests/test_common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ def test_CuVec_creation(cu, classname, caplog):
116116

117117

118118
@mark.parametrize("cu", filter(None, [py, sw]))
119+
@mark.timeout(20)
119120
def test_asarray(cu):
120121
v = cu.asarray(np.random.random(shape))
121122
w = cu.CuVec(v)
@@ -158,6 +159,7 @@ def test_resize(cu):
158159
assert v._vec.shape == v.shape
159160

160161

162+
@mark.timeout(60)
161163
@mark.parametrize("cu", filter(None, [cp, py, sw]))
162164
def test_cuda_array_interface(cu):
163165
cupy = importorskip("cupy")

tests/test_cpython.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def test_CVector_strides():
2828
assert a.strides == (473344, 1376, 4)
2929

3030

31+
@mark.timeout(20)
3132
def test_asarray():
3233
v = cu.asarray(np.random.random(shape))
3334
w = cu.CuVec(v)

0 commit comments

Comments
 (0)