diff --git a/CHANGELOG b/CHANGELOG index 9ff564f85..8fe13a643 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,12 @@ NEXT - fixed issue561: adapt autouse fixture example for python3. +- Fix example in monkeypatch documentation, thanks t-8ch. + +- Do not mark as universal wheel because Python 2.6 is different from + other builds due to the extra argparse dependency. Fixes issue566. + Thanks sontek. + 2.6.1 ----------------------------------- diff --git a/doc/en/monkeypatch.txt b/doc/en/monkeypatch.txt index 4d56e860f..6398bc11e 100644 --- a/doc/en/monkeypatch.txt +++ b/doc/en/monkeypatch.txt @@ -48,7 +48,7 @@ requests in all your tests, you can do:: import pytest @pytest.fixture(autouse=True) def no_requests(monkeypatch): - monkeypatch.delattr("requests.session.Session.request") + monkeypatch.delattr("requests.sessions.Session.request") This autouse fixture will be executed for each test function and it will delete the method ``request.session.Session.request`` diff --git a/setup.cfg b/setup.cfg index 13c7cc0b0..de4074f4f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,6 +5,3 @@ all_files = 1 [upload_sphinx] upload-dir = doc/en/build/html - -[wheel] -universal = 1 \ No newline at end of file