5edad01d4e
Merge pull request #3476 from avirlrma/master
...
change doc copyright year to range and auto update year
2018-05-16 17:53:23 -03:00
f5361a302c
Use a more recent hypothesis version on CI
2018-05-16 07:35:02 -03:00
94e62dfc50
Increase hypothesis deadline
...
The value is pretty close to the new default that will come out in
future hypothesis versions, which is generating a deprecation error
on CI.
Using a loose deadline because CI boxes are not reliable in how much
CPU power they have available
2018-05-16 07:34:53 -03:00
afe4800daf
Fix deprecation notice in Node.get_marker
2018-05-15 21:47:40 -03:00
2cd159e8c5
Add section on how to update marks and add ref to the deprecation notice
2018-05-15 21:35:27 -03:00
718ba83600
Small adjustment to the CHANGELOG
2018-05-15 21:02:05 -03:00
1b2f4f4483
Small rewording to the CHANGELOG
2018-05-15 21:01:37 -03:00
f68bab06b4
Reword the changelog
2018-05-15 18:24:14 -03:00
a4425cb4af
Merge pull request #3469 from scop/dropthedot
...
#dropthedot
2018-05-15 08:00:28 -03:00
01d2d81d1f
Merge pull request #3468 from scop/spelling
...
Spelling and grammar fixes
2018-05-15 07:59:56 -03:00
f14e097635
added changelog and added my name to the authors
2018-05-15 12:54:48 +05:30
a59f677d93
change doc copyright year to range and auto update year
2018-05-15 12:48:04 +05:30
36614b0a3d
Fix formatting in CHANGELOG entry
2018-05-14 09:56:36 -03:00
b4370c08b9
#dropthedot
2018-05-13 12:09:47 +02:00
aa51fcb2b6
Spelling and grammar fixes
2018-05-13 12:06:09 +02:00
4914135fdf
introduce name filtering for marker iteration again
2018-05-11 21:48:15 +02:00
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
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
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
413b1aa4e9
Rename internal function as suggested during review
2018-05-04 11:08:35 -03:00
dca77b2273
Escape whitespace only strings when diffing them on failed assertions
...
Fix #3443
2018-05-03 20:38:00 -03:00
35f53a7353
Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorage
...
Fix #3441 let mark expressions be populated from the modern marker storage
2018-05-03 19:27:07 -03:00
e6a86e0f4c
add tests for #3441
2018-05-03 17:33:59 +02:00
b03b387861
Merge pull request #3436 from brianmaissy/feature/enter_pdb_on_keyboard_interrupt
...
--pdb treats KeyboardInterrupt as exception
2018-05-03 12:20:43 -03:00
a5cf55dd4a
fix test_mark_option_custom - it used the legacy keyword storage for addign markers
2018-05-03 16:33:16 +02:00
63ef46dd91
fix #3441 - use iter-marks to populate markexpr namespace
2018-05-03 16:28:47 +02:00
7834b45002
Merge pull request #3437 from nicoddemus/mark-changelog
...
Improve changelog note about markers
2018-05-02 06:45:39 +02:00
ccaa979f27
Improve changelog note about markers
...
Also changed the title in the docs because the previous title had
the same level as the title, making it appear in a separate entry
in `contents.rst`
2018-05-01 19:27:53 -03:00
1a880be85b
Remove unused import to fix linting
2018-05-01 19:08:29 -03:00
c258fe1459
--pdb treats KeyboardInterrupt as exception
2018-05-02 00:58:35 +03:00
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
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
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
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
5ba0663827
Merge pull request #3428 from nicoddemus/merge-master-into-features
...
Merge master into features
2018-04-25 14:04:41 +02:00
63368e07ea
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-24 21:26:45 -03:00
0b2b73c36a
Remove CHANGELOG entries left by old bug in towncrier
2018-04-24 21:25:13 -03:00
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
4a92011e6e
Fix note about importing from collections.abc
2018-04-24 07:06:52 -03:00
6e62fc98ff
Merge pull request #2849 from ApaDoctor/disable-repeated-fixture
...
provide error fixture applied to the same func
2018-04-24 06:36:54 +02:00
132fb61eba
Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture
2018-04-23 22:24:53 -03:00
03850cf962
Add test for applying fixture twice
...
Fix #2334
2018-04-23 22:17:46 -03:00
f05230c679
Move #3221 to trivial section in the CHANGELOG
2018-04-23 19:27:07 -03:00
d61a7670a1
Merge pull request #3422 from rachel1792/master
...
updated doc to delete deprecated hook: Issue #3417
2018-04-23 19:24:52 -03:00
8d56641590
Preparing release version 3.5.1
2018-04-23 22:24:21 +00:00
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
6ea4c12da7
updated doc to delete deprecated hook
2018-04-22 21:56:18 -04:00
f0084608cc
Merge pull request #3407 from rachel1792/master
...
Fix typo in caplog fixture documentation: Issue #3406
2018-04-20 17:41:04 -03:00
cefeba33ef
Update changelog formatting
2018-04-20 17:40:19 -03:00
3318e53d01
Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch
...
#3290 improve monkeypatch
2018-04-19 17:05:52 -03:00
Bruno Oliveira
aviral1701
Ville Skyttä
Ronny Pfannschmidt
Brian Maissy
Jon Dufresne
Rachel Kogan