File tree 3 files changed +9
-8
lines changed
3 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -295,8 +295,8 @@ jobs:
295
295
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
296
296
SET PACKAGE_VERSION=%%F
297
297
)
298
- SET "TEST_DEPENDENCIES=pytest pytest-cov "
299
- conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
298
+ SET "TEST_DEPENDENCIES=pytest scipy "
299
+ conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
300
300
301
301
- name : Report content of test environment
302
302
shell : cmd /C CALL {0}
Original file line number Diff line number Diff line change @@ -295,15 +295,16 @@ jobs:
295
295
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
296
296
SET PACKAGE_VERSION=%%F
297
297
)
298
- SET "TEST_DEPENDENCIES=pytest pytest-cov "
299
- conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} scipy -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
298
+ SET "TEST_DEPENDENCIES=pytest scipy "
299
+ conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
300
300
301
301
- name : Report content of test environment
302
302
shell : cmd /C CALL {0}
303
303
run : |
304
304
echo "Value of CONDA environment variable was: " %CONDA%
305
305
echo "Value of CONDA_PREFIX environment variable was: " %CONDA_PREFIX%
306
306
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
307
+
307
308
- name : Run tests
308
309
shell : cmd /C CALL {0}
309
310
run : >-
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ def _tls_dfti_cache_capsule():
89
89
cdef extern from " Python.h" :
90
90
ctypedef int size_t
91
91
92
- long PyInt_AsLong (object ob)
92
+ long PyLong_AsLong (object ob)
93
93
int PyObject_HasAttrString(object , char * )
94
94
95
95
@@ -262,7 +262,7 @@ cdef cnp.ndarray _process_arguments(
262
262
xnd[0 ] = cnp.PyArray_NDIM(x_arr) # tensor-rank of the array
263
263
264
264
err = 0
265
- axis_[0 ] = PyInt_AsLong (axis)
265
+ axis_[0 ] = PyLong_AsLong (axis)
266
266
if (axis_[0 ] == - 1 and PyErr_Occurred()):
267
267
PyErr_Clear()
268
268
err = 1
@@ -278,7 +278,7 @@ cdef cnp.ndarray _process_arguments(
278
278
n_[0 ] = x_arr.shape[axis_[0 ]]
279
279
else :
280
280
try :
281
- n_[0 ] = PyInt_AsLong (n)
281
+ n_[0 ] = PyLong_AsLong (n)
282
282
except :
283
283
err = 1
284
284
@@ -334,7 +334,7 @@ cdef int _is_integral(object num):
334
334
if num is None :
335
335
return 0
336
336
try :
337
- n = PyInt_AsLong (num)
337
+ n = PyLong_AsLong (num)
338
338
_integral = 1 if n > 0 else 0
339
339
except :
340
340
_integral = 0
You can’t perform that action at this time.
0 commit comments