From 7cf859085ebfe8187a3215b4223a01f1e73fd109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Mon, 18 Aug 2014 19:44:34 +0000 Subject: [PATCH 1/4] [doc] fix requests monkeypatch example --- doc/en/monkeypatch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`` From b0ac3581dd452508c39602ff9a00b829ec28606c Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 19 Aug 2014 21:00:46 +0200 Subject: [PATCH 2/4] Mention doc fix in changelog --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9ff564f85..2cd155260 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ NEXT - fixed issue561: adapt autouse fixture example for python3. +- Fix example in monkeypatch documentation, thanks t-8ch. + 2.6.1 ----------------------------------- From 0ea46e6aef1c927f98398e32db375a1bf668456f Mon Sep 17 00:00:00 2001 From: "sontek@gmail.com" Date: Thu, 21 Aug 2014 12:47:53 -0700 Subject: [PATCH 3/4] Removed marking pytest as universal, py26 and py27 are not compatible. --HG-- branch : fix_universal --- setup.cfg | 3 --- 1 file changed, 3 deletions(-) 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 From 9289d77a8070439f88072024a4014ba549385f99 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Fri, 22 Aug 2014 20:22:51 +0200 Subject: [PATCH 4/4] Mention why no universal wheel in changelog Fixes issue566. --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2cd155260..8fe13a643 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,10 @@ NEXT - 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 -----------------------------------