Skip to content

Commit 5718301

Browse files
authored
Merge branch 'master' into fix-vecmat-win-failure
2 parents 80a9352 + 54ee640 commit 5718301

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.github/workflows/openssf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ jobs:
6969

7070
# Upload the results to GitHub's code scanning dashboard.
7171
- name: "Upload to code-scanning"
72-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
72+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
7373
with:
7474
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/PyCQA/bandit
5-
rev: '1.8.3'
5+
rev: '1.8.6'
66
hooks:
77
- id: bandit
88
pass_filenames: false
@@ -77,7 +77,7 @@ repos:
7777
name: isort (pyi)
7878
types: [pyi]
7979
- repo: https://github.com/pycqa/flake8
80-
rev: 7.2.0
80+
rev: 7.3.0
8181
hooks:
8282
- id: flake8
8383
args: ["--config=.flake8"]
@@ -90,7 +90,7 @@ repos:
9090
- id: clang-format
9191
args: ["-i"]
9292
- repo: https://github.com/gitleaks/gitleaks
93-
rev: v8.26.0
93+
rev: v8.28.0
9494
hooks:
9595
- id: gitleaks
9696
- repo: https://github.com/jumanjihouse/pre-commit-hooks
@@ -115,7 +115,7 @@ repos:
115115
]
116116
files: '^dpnp/(dpnp_iface.*|fft|linalg|dpnp_array)'
117117
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
118-
rev: v2.14.0
118+
rev: v2.15.0
119119
hooks:
120120
- id: pretty-format-toml
121121
args: [--autofix]

dpnp/tests/third_party/cupy/core_tests/test_ndarray_adv_indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ class TestArrayAdvancedIndexingSetitemScalarValueIndexError:
751751
def test_adv_setitem(self):
752752
for xp in (numpy, cupy):
753753
a = xp.zeros(self.shape)
754-
with pytest.raises(IndexError):
754+
with pytest.raises((IndexError, ValueError)):
755755
a[self.indexes] = self.value
756756

757757

dpnp/tests/third_party/cupy/testing/_loops.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,7 @@ def test_func(*args, **kw):
408408
if cupy_r.shape == ():
409409
skip = (mask == 0).all()
410410
else:
411-
# mask is numpy.ndarray here which is not supported now
412-
# TODO remove asarray() once dpctl-2053 is addressed
413-
cupy_r = cupy_r[cupy.asarray(mask)].asnumpy()
411+
cupy_r = cupy_r[mask].asnumpy()
414412
numpy_r = numpy_r[mask]
415413

416414
if not skip:

0 commit comments

Comments
 (0)