Skip to content
Merged
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: 2 additions & 0 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ Deprecations
method to be used, this is done automatically in run()

Testsuite
* Raised minimum pytest version to 3.3.0, warns now uses the `match`
argument instead of `match_expr` (Issue #2329)
* Add tests for the new water bridge analysis (PR #2087)

11/06/18 richardjgowers
Expand Down
3 changes: 2 additions & 1 deletion testsuite/MDAnalysisTests/lib/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,8 @@ def AlternateUniverse(anything):
new_name=new_name,
release=release, remove=remove,
message=message)
with pytest.warns(DeprecationWarning, match_expr="`.+` is deprecated"):
# match_expr changed to match (Issue 2329)
with pytest.warns(DeprecationWarning, match="`.+` is deprecated"):
oldfunc(42)

doc = oldfunc.__doc__
Expand Down
2 changes: 1 addition & 1 deletion testsuite/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def run(self):
},
install_requires=[
'MDAnalysis=={0!s}'.format(RELEASE), # same as this release!
'pytest>=3.1.2',
'pytest>=3.3.0', # Raised to 3.3.0 due to Issue 2329
'hypothesis',
'psutil>=4.0.2',
'mock>=2.0.0', # replace with unittest.mock in python 3 only version
Expand Down