jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,932 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

7932 Commits

Author SHA1 Message Date
Bruno Oliveira 8e17e32253
Merge pull request #3492 from timhughes/patch-1 
fix typo in docs
 2018-05-20 15:51:03 -03:00
Tim Hughes f0b855369c
fix typo 2018-05-20 19:14:06 +01:00
Ronny Pfannschmidt 4aa7ebaf52
Merge pull request #3490 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-05-19 11:36:11 +02:00
Tyler Goodlet 486b786cb2 Add trivial changelog entry 2018-05-18 12:02:50 -04:00
Bruno Oliveira 674879976f Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-05-18 12:30:08 -03:00
Tyler Goodlet d4065a9166 Detect `pytest_` prefixed hooks 
`pluggy` is deprecating the `implprefix` argument in the next major
release so implement this detection in our derived plugin manager.

Relates to pytest-dev/pluggy#145
 2018-05-17 20:38:54 -04:00
Bruno Oliveira e7f75f69f2
Small grammar fix in CHANGELOG 2018-05-17 21:20:43 -03:00
Bruno Oliveira 5be85a1f55 Merge changelog marks refactoring changelog entries as discussed in review 2018-05-17 21:18:12 -03:00
Bruno Oliveira bb626fe8a7
Fix typo in mark.rst 2018-05-17 16:06:00 -03:00
Ronny Pfannschmidt 45faaeca7a
Merge pull request #3480 from nicoddemus/deprecated-deadlne-hypothesis 
Attempt to fix CI problems related to Hypothesis
 2018-05-17 20:18:27 +02:00
Bruno Oliveira 11fb384efb
Fix link to skipif tutorial in ref docs 2018-05-17 10:15:47 -03:00
Bruno Oliveira 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
Bruno Oliveira f5361a302c Use a more recent hypothesis version on CI 2018-05-16 07:35:02 -03:00
Bruno Oliveira 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
Bruno Oliveira afe4800daf Fix deprecation notice in Node.get_marker 2018-05-15 21:47:40 -03:00
Bruno Oliveira 2cd159e8c5 Add section on how to update marks and add ref to the deprecation notice 2018-05-15 21:35:27 -03:00
Bruno Oliveira 718ba83600
Small adjustment to the CHANGELOG 2018-05-15 21:02:05 -03:00
Bruno Oliveira 1b2f4f4483
Small rewording to the CHANGELOG 2018-05-15 21:01:37 -03:00
Bruno Oliveira f68bab06b4
Reword the changelog 2018-05-15 18:24:14 -03:00
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
aviral1701 f14e097635 added changelog and added my name to the authors 2018-05-15 12:54:48 +05:30
aviral1701 a59f677d93 change doc copyright year to range and auto update year 2018-05-15 12:48:04 +05:30
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 4914135fdf introduce name filtering for marker iteration again 2018-05-11 21:48:15 +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
Bruno Oliveira 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
Ronny Pfannschmidt e6a86e0f4c add tests for #3441 2018-05-03 17:33:59 +02:00
Bruno Oliveira 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
Ronny Pfannschmidt a5cf55dd4a fix test_mark_option_custom - it used the legacy keyword storage for addign markers 2018-05-03 16:33:16 +02:00
Ronny Pfannschmidt 63ef46dd91 fix #3441 - use iter-marks to populate markexpr namespace 2018-05-03 16:28:47 +02:00
Ronny Pfannschmidt 7834b45002
Merge pull request #3437 from nicoddemus/mark-changelog 
Improve changelog note about markers
 2018-05-02 06:45:39 +02:00
Bruno Oliveira 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
Bruno Oliveira 1a880be85b
Remove unused import to fix linting 2018-05-01 19:08:29 -03:00
Brian Maissy c258fe1459 --pdb treats KeyboardInterrupt as exception 2018-05-02 00:58:35 +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
Ronny Pfannschmidt 5ba0663827
Merge pull request #3428 from nicoddemus/merge-master-into-features 
Merge master into features
 2018-04-25 14:04:41 +02:00
Bruno Oliveira 63368e07ea Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-04-24 21:26:45 -03: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 2018-04-24 07:06:52 -03:00