summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2019-05-11 17:45:05 -0700
committerGitHub <noreply@github.com>2019-05-11 17:45:05 -0700
commit4def09ae0c596f00b90774986c13e833ccfa86cc (patch)
tree875c680d74ff8cffdc3051f7424957e0b7873909 /numpy/core/numeric.py
parent7efa6192f9393621190e85927a612d11c986718b (diff)
parent96a40bd197fb73a89239b8eea5fee2891a4433a0 (diff)
downloadnumpy-4def09ae0c596f00b90774986c13e833ccfa86cc.tar.gz
Merge pull request #13534 from eric-wieser/pytest-marks
BLD: Make CI pass again with pytest 4.5
Diffstat (limited to 'numpy/core/numeric.py')
0 files changed, 0 insertions, 0 deletions