Merge from master to features #1705

RonnyPfannschmidt · 2016-07-06T09:54:31Z

new pr

…funcargvalue issue1625, rename getfuncargvalue to getfixturevalue

…lapse_false Fixes pytest-dev#1503 no longer collapse false explanations

I have came across this when noticing that universal-ctags fails to parse this correctly (universal-ctags/ctags#997).

This was added in b2d66b9 but is a bad idea. When a plugin can't be imported, commandline options (optionally set in pytest.ini) could be undefined, which means pytest bails out much earlier before showing the warning, which is hard to debug. Fixes pytest-dev#1479, also see pytest-dev#1307 and pytest-dev#1497

Combining multiple imports the "import pdb" imports the pytest module as opposed to the python debugger.

Don't ignore ImportError when importing setuptools plugins

Update website wrt indiegogo campaign

…epr__ Simplify Argument.__repr__

Add changelog entry for pytest-dev#1564

Rename the default plugin "pdb" into "debugging"

Fixes pytest-dev#925

Even though catch is a Python keyword, 'catched' just looks terrible in text. If the text was supposed to reference the keyword, then 'catched' should be changed to "'catch'ed".

catched -> caught

I wouldn't have even attempted what I did to cause pytest-dev#1688 if this had been there.

Document the interaction of autouse scopes

Closes pytest-dev#1691

Add changelog to requirements for pytest-dev plugins

Fix pytest-dev#1696

Some of our builds have been timing out (over 1 hour), on AppVeyor

Split AppVeyor test runs in multiple jobs to avoid timeout issues

…-docs Fix links and removed 404 links from talks.rst

coveralls · 2016-07-06T10:00:38Z

Coverage increased (+0.05%) to 92.143% when pulling b9a91dc on RonnyPfannschmidt:merge-master into f31c31a on pytest-dev:features.

The-Compiler · 2016-07-06T10:29:13Z

CHANGELOG.rst

@@ -187,6 +210,9 @@
 .. _@Vogtinator: https://github.com/Vogtinator
 .. _@blueyed: https://github.com/blueyed
 .. _@fengxx: https://github.com/fengxx
+.. _@bagerard: https://github.com/bagerard
+.. _@davehunt: https://github.com/davehunt


INFO CHANGELOG.rst:242 Duplicate explicit target name: "@davehunt".

(he's already on line 216/242)

coveralls · 2016-07-06T11:56:20Z

Coverage increased (+0.05%) to 92.143% when pulling dad6aa8 on RonnyPfannschmidt:merge-master into f31c31a on pytest-dev:features.

nicoddemus · 2016-07-06T15:36:01Z

Hmm it failed on Windows:

_________________ ERROR collecting testing/python/metafunc.py _________________
_pytest\python.py:374: in fget
    return self._obj
   AttributeError: 'Module' object has no attribute '_obj'
During handling of the above exception, another exception occurred:
...
.tox\py35-xdist\lib\site-packages\hypothesis\internal\charmap.py:77: in categories
    cm = charmap()
.tox\py35-xdist\lib\site-packages\hypothesis\internal\charmap.py:63: in charmap
    os.rename(tmpfile, f)
FileExistsError: [WinError 183] Cannot create a file when that file already exists: 'C:\\projects\\pytest\\.hypothesis\\tmp\\tmp9lzkh68w' -> 'C:\\projects\\pytest\\.hypothesis\\unicodedata\\8.0.0\\charmap.pickle.gz'
_________________ ERROR collecting testing/python/metafunc.py _________________

The first error ('Module' object has no attribute '_obj') might be related to this comment, although I find the error about hypothisis suspicious, specially because it happend on an xdist environment...

RonnyPfannschmidt · 2016-07-07T06:52:10Z

at second glance it seems like a hypothesis bug @DRMacIver might know more

flub · 2016-07-07T07:24:07Z

So can we merge this anyway? But every single PR will show this issue? How wise is it to make all PRs dependent on an external project?

The-Compiler · 2016-07-07T07:27:10Z

To be honest I'd rather wait a day or two to see what @DRMacIver has to say about it - and if it really turns out to be a hypothesis issue and we don't find a quick fix, just blacklist the hypothesis tests for now, merge this, and then investigate afterwards.

How wise is it to make all PRs dependent on an external project?

Do you mean in general, or if we'd merge this?

nicoddemus · 2016-07-07T11:58:29Z

To be honest I'd rather wait a day or two to see what @DRMacIver has to say about it - and if it really turns out to be a hypothesis issue and we don't find a quick fix, just blacklist the hypothesis tests for now, merge this, and then investigate afterwards.

This merge is long overdue now, so I would rather do it now rather than wait a few more days. I propose we report the issue to hypothesis repository and xfail the test which depends on Hypothesis, but only when running on xdist:

xdist = request.config.pluginmanager.getplugin('xdist')
if xdist:
    pytest.xfail(reason='bad interaction with xdist, waiting on HypothesisWorks/hypothesis-python/#X ')

How wise is it to make all PRs dependent on an external project?

All PRs already depend on a bunch of external projects: nose, mock or even colorama, just to name a few. Hypothesis is no different IMO. Bugs in external projects are part of life. 😁

flub · 2016-07-08T09:16:11Z

@nicoddemus It is a collection error though, maybe we should be adding .hypothesis to norecursedirs in tox.ini? It's more a stab in the dark then really understanding the issue tough.

Sure about the external dep, it's unavoidable I guess. It's just a bit annoying that this seemingly unrelated thing is holding up what should be a routine merge.

The-Compiler · 2016-07-08T09:53:22Z

It is a collection error though, maybe we should be adding .hypothesis to norecursedirs in tox.ini? It's more a stab in the dark then really understanding the issue tough.

It happens at collection time because the @hypothesis.given decorator (which is in the stacktrace) gets run then.

The-Compiler · 2016-07-08T09:56:29Z

Oh! According to HypothesisWorks/hypothesis#344 a fix is out in Hypothesis 3.4.1 (this is why I suggested waiting, @DRMacIver is incredibly quick with fixing bugs 😆).

Since we don't seem to pin test dependency versions, rerunning the build now.

nicoddemus · 2016-07-08T10:59:13Z

@DRMacIver is incredibly quick with fixing bugs

Oh I didn't know that, otherwise I might have suggested the same! 😁

Thanks @DRMacIver!

nicoddemus · 2016-07-08T10:59:55Z

I'm hitting that "Merge" button the second I see that AppVeyor build green! 😆

nicoddemus · 2016-07-08T11:16:18Z

Thanks everyone! 👍

DRMacIver · 2016-07-08T11:27:39Z

It happens at collection time because the @hypothesis.given decorator (which is in the stacktrace) gets run then.

Hmm. It's interesting that it errors there though. It's supposed to defer as much as possible to test execution time to speed up file loading and localize errors better.

The-Compiler and others added 30 commits June 22, 2016 20:18

Trivial spelling fix in runtest_setup.py

6359e75

issue1625, name getfuncargvalue to getfixturevalue

df9918e

Merge pull request pytest-dev#1626 from tomviner/issue1625/rename-get…

3d263c6

…funcargvalue issue1625, rename getfuncargvalue to getfixturevalue

Fixes pytest-dev#1503 no longer collapse false explanations

77689eb

remove links to funding campaign

ea5bda0

rm global header

62255d8

update sprint page to be past tense

7612b65

Merge pull request pytest-dev#1654 from tomviner/issue1503/remove_col…

0c63762

…lapse_false Fixes pytest-dev#1503 no longer collapse false explanations

Simplify Argument.__repr__

939407e

I have came across this when noticing that universal-ctags fails to parse this correctly (universal-ctags/ctags#997).

Renamed pytest pdb to debugging which conflicts with python pdb.

05b5554

Combining multiple imports the "import pdb" imports the pytest module as opposed to the python debugger.

Renamed the pdb module and changed unit tests accordingly

9a5224e

Merge pull request pytest-dev#1564 from The-Compiler/issue1479

70ea3ce

Don't ignore ImportError when importing setuptools plugins

Add changelog entry for pytest-dev#1564

ce603dc

Merge pull request pytest-dev#1656 from pytest-dev/rm-indiegogo-links

7eb1318

Update website wrt indiegogo campaign

Merge pull request pytest-dev#1648 from blueyed/simplify-Argument-__r…

df17f86

…epr__ Simplify Argument.__repr__

Merge pull request pytest-dev#1666 from pytest-dev/1564-changelog

e024214

Add changelog entry for pytest-dev#1564

Merge pull request pytest-dev#1663 from aostr/master

c519b95

Rename the default plugin "pdb" into "debugging"

Improve of the test output for logical expression with brackets.

e2f5501

Fixes pytest-dev#925

Fix bad merge in CHANGELOG

22c2d87

Remove commented out code

58e5581

Merge branch 'logic_brackets'

7e78965

catched -> caught

21d2778

Even though catch is a Python keyword, 'catched' just looks terrible in text. If the text was supposed to reference the keyword, then 'catched' should be changed to "'catch'ed".

Merge pull request pytest-dev#1679 from eli-b/patch-1

1e60294

catched -> caught

Document the interaction of autouse scopes

771c453

I wouldn't have even attempted what I did to cause pytest-dev#1688 if this had been there.

Merge pull request pytest-dev#1689 from quodlibetor/autouse-docs

75ecd94

Document the interaction of autouse scopes

Add changelog to requirements for pytest-dev plugins

e3c43a1

Closes pytest-dev#1691

Merge pull request pytest-dev#1692 from pytest-dev/changelog

f74dd85

Add changelog to requirements for pytest-dev plugins

Fix links and removed 404 links from talks.rst

8d39ce1

Fix pytest-dev#1696

Split AppVeyor test runs in multiple jobs to avoid timeout issues

10c5e6f

Some of our builds have been timing out (over 1 hour), on AppVeyor

The-Compiler and others added 3 commits July 5, 2016 06:43

Merge pull request pytest-dev#1700 from nicoddemus/split-appveyor

067e044

Split AppVeyor test runs in multiple jobs to avoid timeout issues

Merge pull request pytest-dev#1699 from nicoddemus/404-links-on-talks…

cc0920c

…-docs Fix links and removed 404 links from talks.rst

merge from master to features

b9a91dc

RonnyPfannschmidt mentioned this pull request Jul 6, 2016

Feature master merge #1674

Closed

The-Compiler reviewed Jul 6, 2016
View reviewed changes

fix duplicate target in changelog

dad6aa8

RonnyPfannschmidt mentioned this pull request Jul 7, 2016

usage in combination with xdist fails on windows due to posix style atomic file rewrite HypothesisWorks/hypothesis#344

Closed

nicoddemus merged commit 293351c into pytest-dev:features Jul 8, 2016

RonnyPfannschmidt deleted the merge-master branch August 21, 2016 18:07

Uh oh!

Merge from master to features #1705

Merge from master to features #1705

Uh oh!

Conversation

RonnyPfannschmidt commented Jul 6, 2016

Uh oh!

coveralls commented Jul 6, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

The-Compiler Jul 6, 2016

Choose a reason for hiding this comment

Uh oh!

coveralls commented Jul 6, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nicoddemus commented Jul 6, 2016

Uh oh!

RonnyPfannschmidt commented Jul 7, 2016

Uh oh!

flub commented Jul 7, 2016

Uh oh!

The-Compiler commented Jul 7, 2016

Uh oh!

nicoddemus commented Jul 7, 2016

Uh oh!

flub commented Jul 8, 2016

Uh oh!

The-Compiler commented Jul 8, 2016

Uh oh!

The-Compiler commented Jul 8, 2016

Uh oh!

nicoddemus commented Jul 8, 2016

Uh oh!

nicoddemus commented Jul 8, 2016

Uh oh!

nicoddemus commented Jul 8, 2016

Uh oh!

DRMacIver commented Jul 8, 2016

Uh oh!

Uh oh!

coveralls commented Jul 6, 2016 •

edited

Loading

coveralls commented Jul 6, 2016 •

edited

Loading