Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies:
- psutil
- prek
- pydocstyle>=5.1.0
- pytest!=4.6.0,!=5.4.0,!=8.1.0,<9.1.0
- pytest!=4.6.0,!=5.4.0,!=8.1.0
- pytest-cov
- pytest-rerunfailures
- pytest-timeout
Expand Down
8 changes: 2 additions & 6 deletions lib/matplotlib/tests/test_mlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ def test_detrend_linear_2d(self):
scope='class')
class TestSpectral:
@pytest.fixture(scope='class', autouse=True)
def stim(self, request, fstims, iscomplex, sides, len_x, NFFT_density,
@classmethod
def stim(cls, request, fstims, iscomplex, sides, len_x, NFFT_density,
nover_density, pad_to_density, pad_to_spectrum):
Fs = 100.

Expand Down Expand Up @@ -323,11 +324,6 @@ def stim(self, request, fstims, iscomplex, sides, len_x, NFFT_density,
if iscomplex:
y = y.astype('complex')

# Interestingly, the instance on which this fixture is called is not
# the same as the one on which a test is run. So we need to modify the
# class itself when using a class-scoped fixture.
cls = request.cls

cls.Fs = Fs
cls.sides = sides
cls.fstims = fstims
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ test = [
"certifi",
"coverage!=6.3",
"psutil; sys_platform != 'cygwin'",
"pytest!=4.6.0,!=5.4.0,!=8.1.0,<9.1.0",
"pytest!=4.6.0,!=5.4.0,!=8.1.0",
"pytest-cov",
"pytest-rerunfailures!=16.0",
"pytest-timeout",
Expand Down
Loading