floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,727 Commits 32 Branches 205 Tags
a4425cb4afefbb0d1bbc353dce62dc45f4ba9c5a
Commit Graph

7727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Oliveira
a4425cb4af Merge pull request #3469 from scop/dropthedot 
#dropthedot
 2018-05-15 08:00:28 -03:00
Bruno Oliveira
01d2d81d1f Merge pull request #3468 from scop/spelling 
Spelling and grammar fixes
 2018-05-15 07:59:56 -03:00
Bruno Oliveira
36614b0a3d Fix formatting in CHANGELOG entry 2018-05-14 09:56:36 -03:00
Ville Skyttä
b4370c08b9 #dropthedot 2018-05-13 12:09:47 +02:00
Ville Skyttä
aa51fcb2b6 Spelling and grammar fixes 2018-05-13 12:06:09 +02:00
Ronny Pfannschmidt
84b37e1b57 Merge pull request #3452 from nicoddemus/fix-flaky-xdist-test 
Attempt to fix flaky test on Python 2
 2018-05-05 20:18:06 +02:00
Bruno Oliveira
fa76a5c8fe Attempt to fix flaky test on Python 2 
This test sometimes fails on AppVeyor with:

```
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
.0 = <listiterator object at 0x0549DC50>
    leaked_types = sum(1 for _ in gc.garbage
>                   if 'PseudoFixtureDef' in str(_))
E   UnicodeEncodeError: 'ascii' codec can't encode character u'\u263a' in position 23: ordinal not in range(128)
test_request_garbage.py:19: UnicodeEncodeError
====================== 1 passed, 1 error in 1.39 seconds ======================
```

Use our internal "safe_repr" function to handle Encode errors: who knows
what objects are in garbage after all.
 2018-05-04 17:56:51 -03:00
Ronny Pfannschmidt
27651f4032 Merge pull request #3444 from nicoddemus/escape-whitespace-diffs 
Escape whitespace only strings when diffing them on failed assertions
 2018-05-04 18:14:35 +02:00
Bruno Oliveira
413b1aa4e9 Rename internal function as suggested during review 2018-05-04 11:08:35 -03:00
Bruno Oliveira
dca77b2273 Escape whitespace only strings when diffing them on failed assertions 
Fix #3443
 2018-05-03 20:38:00 -03:00
Ronny Pfannschmidt
08aed1a6bf Merge pull request #3433 from nicoddemus/conda-forge-badge 
Use conda-forge badge instead of anaconda's
 2018-04-27 16:11:58 +02:00
Bruno Oliveira
b49e9191ac Use conda-forge badge instead of anaconda's 
Just noticed that conda-forge has its own badge so let's use that
 2018-04-27 10:23:28 -03:00
Bruno Oliveira
febccae037 Merge pull request #3431 from jdufresne/pypi 
Update all pypi.python.org URLs to pypi.org
 2018-04-26 13:15:46 -03:00
Jon Dufresne
d2bf0bf9bb Update all pypi.python.org URLs to pypi.org 
For details on the new PyPI, see the blog post:

https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
 2018-04-26 06:49:33 -07:00
Bruno Oliveira
0b2b73c36a Remove CHANGELOG entries left by old bug in towncrier 2018-04-24 21:25:13 -03:00
Bruno Oliveira
69b1c2d4f6 Merge pull request #3424 from nicoddemus/release-3.5.1 
Preparing release version 3.5.1
 2018-04-24 19:30:54 -03:00
Bruno Oliveira
4a92011e6e Fix note about importing from collections.abc 3.5.1 2018-04-24 07:06:52 -03:00
Bruno Oliveira
f05230c679 Move #3221 to trivial section in the CHANGELOG 2018-04-23 19:27:07 -03:00
Bruno Oliveira
d61a7670a1 Merge pull request #3422 from rachel1792/master 
updated doc to delete deprecated hook: Issue #3417
 2018-04-23 19:24:52 -03:00
Bruno Oliveira
8d56641590 Preparing release version 3.5.1 2018-04-23 22:24:21 +00:00
Bruno Oliveira
2a480c59ae Merge pull request #3367 from brianmaissy/feature/indicative_error_for_parametrize_with_default_argument 
added indicative error when parametrizing an argument with a default …
 2018-04-23 11:04:36 -03:00
Rachel Kogan
6ea4c12da7 updated doc to delete deprecated hook 2018-04-22 21:56:18 -04:00
Bruno Oliveira
f0084608cc Merge pull request #3407 from rachel1792/master 
Fix typo in caplog fixture documentation: Issue #3406
 2018-04-20 17:41:04 -03:00
Bruno Oliveira
cefeba33ef Update changelog formatting 2018-04-20 17:40:19 -03:00
Ronny Pfannschmidt
1cc79ffc10 Merge pull request #3408 from MarSoft/patch-2 
Fix typo in the comment
 2018-04-19 09:21:11 +02:00
Семён Марьясин
d8015764e6 Fix typo in the comment 2018-04-18 12:47:52 +03:00
Rachel Kogan
48c99f62e3 add changelog 2018-04-17 16:24:32 -04:00
Rachel Kogan
8ff8a82c51 Merge branch 'master' of github.com:pytest-dev/pytest 2018-04-17 16:21:04 -04:00
Rachel Kogan
bb8984f5ed fix error in caplog docs. 2018-04-17 16:17:29 -04:00
Bruno Oliveira
159cd39777 Merge pull request #3401 from kohr-h/underscore_fixtures 
Mention omission of fixtures with leading '_', closes #3398
 2018-04-16 13:25:10 -03:00
Brian Maissy
857098fe0f added indicative error when parametrizing an argument with a default value 2018-04-15 20:52:57 +03:00
Holger Kohr
6626d2aef9 Mention omission of fixtures with leading '_', closes #3398 2018-04-14 11:04:00 +02:00
Ronny Pfannschmidt
36f6687b70 Merge pull request #3397 from darrenburns/patch-2 
Fix some mistakes in contributing.rst
 2018-04-13 13:20:31 +02:00
Darren Burns
86def48b25 Fix some mistakes in contributing.rst 2018-04-13 11:33:58 +01:00
Bruno Oliveira
0024b71f1c Merge pull request #3395 from darrenburns/patch-1 
Update CONTRIBUTING.rst
 2018-04-12 18:42:33 -03:00
Ronny Pfannschmidt
17a43dc4a5 firther enhance the links in contributing.rst 2018-04-12 22:06:06 +02:00
Darren Burns
958f146125 Update CONTRIBUTING.rst 
Fixes a broken link in CONTRIBUTING.rst
 2018-04-12 20:54:32 +01:00
Bruno Oliveira
015626ce69 Merge pull request #3384 from nicoddemus/leak-frame 
Reset reference to failed test frame before each test executes
 2018-04-12 07:53:34 -03:00
Ronny Pfannschmidt
f9a908abb8 Merge pull request #3388 from nicoddemus/simplify-tox 
Simplify tox to avoid repetition
 2018-04-12 11:32:48 +02:00
Ronny Pfannschmidt
160c309371 Merge pull request #3391 from nicoddemus/project-urls 
Add additional project urls to setup.py
 2018-04-12 08:54:12 +02:00
Bruno Oliveira
37ee4fbc48 Add additional project urls to setup.py 
According to:

https://packaging.python.org/tutorials/distributing-packages/#project-urls

Those URLs are displayed in the project page in Warehouse (new PyPI).
 2018-04-11 23:46:17 -03:00
Bruno Oliveira
888fcbc4b4 Simplify tox to avoid repetition 
Also took the opportunity to:

* Use more cores for py*-xdist environments
* Update freeze test to use py36
 2018-04-11 18:30:15 -03:00
Bruno Oliveira
6e8e3c967a Add changelog entry for #2798 2018-04-10 21:09:57 -03:00
Bruno Oliveira
78c900448e Add acceptance test for #2798 2018-04-10 21:04:30 -03:00
Bruno Oliveira
e012dbe346 Merge pull request #3373 from backbord/master 
Fix issue #3372
 2018-04-06 22:10:57 -03:00
Tim Strazny
5bd8561016 linting: unfortunate dedent be gone. 2018-04-06 17:36:35 +02:00
Tim Strazny
846d91fb95 Follow Ronny's advice and use `type in base_type`. 2018-04-06 16:23:04 +02:00
Tim Strazny
0cd74dc324 Ensure object is class before calling issubclass. 2018-04-06 14:40:30 +02:00
Tim Strazny
ec2d8223cf Fix issue #3372 2018-04-06 14:16:12 +02:00
Ronny Pfannschmidt
5d4fe87b72 Merge pull request #3371 from nicoddemus/remove-labels-descriptions 
Remove label descriptions from development guide
 2018-04-06 07:39:15 +02:00