From 4b8f96328031cd6121bf5cb44e1b58986754adf7 Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 16:27:57 +0200 Subject: [PATCH 1/8] #587 use xfail_strict and adapt affected tests --- tests/test_config.py | 5 ++--- tox.ini | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index 743b08ed9..b5e7f634c 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1108,8 +1108,7 @@ def test_substitution_notfound_issue515(tmpdir, newconfig): ['python', '-c', 'print("Hello, world!")'], ] - @pytest.mark.xfail(raises=AssertionError, reason="issue #301") - def test_substitution_nested_env_defaults_issue301(tmpdir, newconfig, monkeypatch): + def test_substitution_nested_env_defaults(tmpdir, newconfig, monkeypatch): monkeypatch.setenv("IGNORE_STATIC_DEFAULT", "env") monkeypatch.setenv("IGNORE_DYNAMIC_DEFAULT", "env") config = newconfig(""" @@ -1684,7 +1683,7 @@ def test_passing_empty_string(self, tmpdir, newconfig): args = ['--hashseed', ''] self._check_testenv(newconfig, '', args=args) - @pytest.mark.xfail(sys.version_info >= (3, 2), + @pytest.mark.xfail("sys.version_info >= (3, 2) and sys.version < (3, 4)", reason="at least Debian python 3.2/3.3 have a bug: " "http://bugs.python.org/issue11884") def test_passing_no_argument(self, tmpdir, newconfig): diff --git a/tox.ini b/tox.ini index 07c0ffb07..0e84cc93f 100644 --- a/tox.ini +++ b/tox.ini @@ -60,3 +60,4 @@ pep8maxlinelength = 99 # E731 - do not assign a lambda expression, use a def pep8ignore = *.py W503 E402 E731 flakes-ignore = ImportStarUsage +xfail_strict = True From d8587daa41b1f2c4aefcd7bcfe504561fc6709ee Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 16:47:41 +0200 Subject: [PATCH 2/8] #587 fix eval expression --- tests/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_config.py b/tests/test_config.py index b5e7f634c..a86e005f1 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1683,7 +1683,7 @@ def test_passing_empty_string(self, tmpdir, newconfig): args = ['--hashseed', ''] self._check_testenv(newconfig, '', args=args) - @pytest.mark.xfail("sys.version_info >= (3, 2) and sys.version < (3, 4)", + @pytest.mark.xfail("(3, 2) <= sys.version_info < (3, 4)", reason="at least Debian python 3.2/3.3 have a bug: " "http://bugs.python.org/issue11884") def test_passing_no_argument(self, tmpdir, newconfig): From e336fab310b0abf33e1638d1c376b8578f466f2b Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 17:03:57 +0200 Subject: [PATCH 3/8] #587 remove xfail from test_envsitepackagesdir_skip_missing_issue280 ... seems to be fixed --- CHANGELOG | 51 +++++++++++++++++++++++++++++++++-------- tests/test_z_cmdline.py | 1 - 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 610731e9f..62b15c582 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,17 +1,50 @@ -2.8.0rc1 --------- - +2.8rc2 +------ + +- #276: remove easy_install from docs (TL;DR: use pip). + Thanks Martin Andrysík (@sifuraz). +- #301: config: expand nested substitutions + Thanks @vlaci. + Thanks to Eli Collins (@eli-collins) for creating a reproducer. +- #315: add --help and --version to helptox-quickstart + Thanks @vlaci. +- #326: Fix OSError 'Not a directory' when creating env on Jython 2.7.0. + Thanks Nick Douma (@LordGaav). +- #429: Forward MSYSTEM by default on Windows + Thanks Marius Gedminas (@mgedmin) for reporting this. +- #449: add multi platform example to the docs. + Thanks Aleks Bunin (@sashkab) and @rndr. - #474: Start using setuptools_scm for tag based versioning. - #484: Renamed `py.test` to `pytest` throughout the project -- #506: With `-a`: do not show additional environments header if there are none + Thanks Slam (@3lnc). +- #504: With `-a`: do not show additional environments header if there are none + Thanks @rndr. +- #515: Don't require environment variables in test environments where they + are not used. + Thanks André Caron (@AndreLouisCaron). - #517: Forward NUMBER_OF_PROCESSORS by default on Windows to fix `multiprocessor.cpu_count()`. + Thanks André Caron (@AndreLouisCaron). - #518: Forward `USERPROFILE` by default on Windows. -- #515: Don't require environment variables in test environments - where they are not used. -- #326: Fix OSError 'Not a directory' when creating env on Jython 2.7.0. - Thanks Nick Douma (@LordGaav). -- #585: Add documentation for constraints.txt + Thanks André Caron (@AndreLouisCaron). +- #p528: Fix some of the warnings displayed by pytest 3.1.0 + Thanks Bruno Oliveira (@nicoddemus). +- #p547: Add regression test for #137 + Thanks Martin Andrysík (@sifuraz). +- #p553: Add an XFAIL test to reproduce upstream bug #203 + Thanks Bartolomé Sánchez Salado (@bartsanchez). +- #p556: Report more meaningful errors on why virtualenv creation failed + Thanks @vlaci. + Also thanks to Igor Sadchenko (@igor-sadchenko) for pointing out a + problem with that PR before it hit the masses :) +- #575: add announcement doc to end all announcement docs + (using only CHANGELOG and Github issues since 2.5 already) +- #p580: do not ignore Sphinx warnings anymore + Thanks Gábor Bernát (@gaborbernat). +- #585: Expand documentation to explain pass through of flags from deps to pip + (e.g. -rrequirements.txt, -cconstraints.txt) + Thanks Alexander Loechel (@loechel). + 2.7.0 ----- diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py index 93d2e3662..0ec0e3831 100644 --- a/tests/test_z_cmdline.py +++ b/tests/test_z_cmdline.py @@ -797,7 +797,6 @@ def test_envsitepackagesdir(cmd, initproj): """) -@pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl") def test_envsitepackagesdir_skip_missing_issue280(cmd, initproj): initproj("pkg513-0.0.5", filedefs={ 'tox.ini': """ From dacef15334c55a0fa7ec897ecc5356e3e1a26d26 Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 17:12:51 +0200 Subject: [PATCH 4/8] #587 remove xfail from test_envsitepackagesdir ... seems to be fixed --- tests/test_z_cmdline.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py index 0ec0e3831..49e7641f7 100644 --- a/tests/test_z_cmdline.py +++ b/tests/test_z_cmdline.py @@ -782,7 +782,6 @@ def test_installpkg(tmpdir, newconfig): assert sdist_path == p -@pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl") def test_envsitepackagesdir(cmd, initproj): initproj("pkg512-0.0.5", filedefs={ 'tox.ini': """ From 4a4108a88c3a465db92965d772e7a43b1aa46bde Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 19:15:49 +0200 Subject: [PATCH 5/8] #587 fix more xfail * pypy has not problem with #203 * test_passing_no_argument should be o.k. after all ... --- tests/test_config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index a86e005f1..b33f9677e 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1683,9 +1683,6 @@ def test_passing_empty_string(self, tmpdir, newconfig): args = ['--hashseed', ''] self._check_testenv(newconfig, '', args=args) - @pytest.mark.xfail("(3, 2) <= sys.version_info < (3, 4)", - reason="at least Debian python 3.2/3.3 have a bug: " - "http://bugs.python.org/issue11884") def test_passing_no_argument(self, tmpdir, newconfig): """Test that passing no arguments to --hashseed is not allowed.""" args = ['--hashseed'] @@ -2189,7 +2186,9 @@ def test_showconfig_with_force_dep_version(self, cmd, initproj): r'*deps*dep1, dep2==5.0*', ]) - @pytest.mark.xfail(reason='Upstream bug. See #203') + @pytest.mark.xfail( + "pypy not in sys.prefix", + reason='Upstream bug. See #203') def test_colon_symbol_in_directory_name(self, cmd, initproj): initproj('colon:_symbol_in_dir_name', filedefs={ 'tox.ini': ''' From b5ef1c3962f70591bf2a2771f600f28c3bec1cee Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 19:18:40 +0200 Subject: [PATCH 6/8] #587 fix xfail condition --- tests/test_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index b33f9677e..eec68f7f2 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -2187,8 +2187,8 @@ def test_showconfig_with_force_dep_version(self, cmd, initproj): ]) @pytest.mark.xfail( - "pypy not in sys.prefix", - reason='Upstream bug. See #203') + "'pypy' not in sys.prefix", + reason='Upstream bug. See #203') def test_colon_symbol_in_directory_name(self, cmd, initproj): initproj('colon:_symbol_in_dir_name', filedefs={ 'tox.ini': ''' From 52883879ad60e92d309b3c62e9e245667d7cd60d Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 19:32:58 +0200 Subject: [PATCH 7/8] revert accidental commit --- CHANGELOG | 50 ++++++++------------------------------------------ 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 62b15c582..83744edbb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,50 +1,16 @@ -2.8rc2 ------- - -- #276: remove easy_install from docs (TL;DR: use pip). - Thanks Martin Andrysík (@sifuraz). -- #301: config: expand nested substitutions - Thanks @vlaci. - Thanks to Eli Collins (@eli-collins) for creating a reproducer. -- #315: add --help and --version to helptox-quickstart - Thanks @vlaci. -- #326: Fix OSError 'Not a directory' when creating env on Jython 2.7.0. - Thanks Nick Douma (@LordGaav). -- #429: Forward MSYSTEM by default on Windows - Thanks Marius Gedminas (@mgedmin) for reporting this. -- #449: add multi platform example to the docs. - Thanks Aleks Bunin (@sashkab) and @rndr. +2.8.0rc1 +-------- + - #474: Start using setuptools_scm for tag based versioning. - #484: Renamed `py.test` to `pytest` throughout the project - Thanks Slam (@3lnc). -- #504: With `-a`: do not show additional environments header if there are none - Thanks @rndr. -- #515: Don't require environment variables in test environments where they - are not used. - Thanks André Caron (@AndreLouisCaron). +- #506: With `-a`: do not show additional environments header if there are none - #517: Forward NUMBER_OF_PROCESSORS by default on Windows to fix `multiprocessor.cpu_count()`. - Thanks André Caron (@AndreLouisCaron). - #518: Forward `USERPROFILE` by default on Windows. - Thanks André Caron (@AndreLouisCaron). -- #p528: Fix some of the warnings displayed by pytest 3.1.0 - Thanks Bruno Oliveira (@nicoddemus). -- #p547: Add regression test for #137 - Thanks Martin Andrysík (@sifuraz). -- #p553: Add an XFAIL test to reproduce upstream bug #203 - Thanks Bartolomé Sánchez Salado (@bartsanchez). -- #p556: Report more meaningful errors on why virtualenv creation failed - Thanks @vlaci. - Also thanks to Igor Sadchenko (@igor-sadchenko) for pointing out a - problem with that PR before it hit the masses :) -- #575: add announcement doc to end all announcement docs - (using only CHANGELOG and Github issues since 2.5 already) -- #p580: do not ignore Sphinx warnings anymore - Thanks Gábor Bernát (@gaborbernat). -- #585: Expand documentation to explain pass through of flags from deps to pip - (e.g. -rrequirements.txt, -cconstraints.txt) - Thanks Alexander Loechel (@loechel). - +- #515: Don't require environment variables in test environments + where they are not used. +- #326: Fix OSError 'Not a directory' when creating env on Jython 2.7.0. + Thanks Nick Douma (@LordGaav). 2.7.0 ----- From d3cb4ae3a4ed8164d3de348c0d91c06b7a30e1a9 Mon Sep 17 00:00:00 2001 From: Oliver Bestwalter Date: Sat, 26 Aug 2017 20:30:37 +0200 Subject: [PATCH 8/8] #587 fix xfail condition (again) --- tests/test_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_config.py b/tests/test_config.py index eec68f7f2..d6b444269 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -2187,7 +2187,7 @@ def test_showconfig_with_force_dep_version(self, cmd, initproj): ]) @pytest.mark.xfail( - "'pypy' not in sys.prefix", + "'pypy' not in sys.executable", reason='Upstream bug. See #203') def test_colon_symbol_in_directory_name(self, cmd, initproj): initproj('colon:_symbol_in_dir_name', filedefs={