Skip to content

Commit f473421

Browse files
committed
Merge remote-tracking branch 'upstream/features' into blueyed/pdb-doctest-bdbquit
2 parents 63d5176 + 978c7ae commit f473421

File tree

171 files changed

+4547
-1600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+4547
-1600
lines changed

.coveragerc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,11 @@ source = src/
1616
*/lib/python*/site-packages/
1717
*/pypy*/site-packages/
1818
*\Lib\site-packages\
19+
20+
[report]
21+
skip_covered = True
22+
show_missing = True
23+
exclude_lines =
24+
\#\s*pragma: no cover
25+
^\s*raise NotImplementedError\b
26+
^\s*return NotImplemented\b

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Here is a quick checklist that should be present in PRs.
66
-->
77

88
- [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes.
9-
- [ ] Target the `features` branch for new features and removals/deprecations.
9+
- [ ] Target the `features` branch for new features, improvements, and removals/deprecations.
1010
- [ ] Include documentation when adding new features.
1111
- [ ] Include new tests or update existing tests when applicable.
1212

.pre-commit-config.yaml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
exclude: doc/en/example/py2py3/test_py2.py
22
repos:
3-
- repo: https://github.com/python/black
3+
- repo: https://github.com/psf/black
44
rev: 19.3b0
55
hooks:
66
- id: black
77
args: [--safe, --quiet]
8-
language_version: python3
98
- repo: https://github.com/asottile/blacken-docs
109
rev: v1.0.0
1110
hooks:
1211
- id: blacken-docs
1312
additional_dependencies: [black==19.3b0]
14-
language_version: python3
1513
- repo: https://github.com/pre-commit/pre-commit-hooks
1614
rev: v2.2.3
1715
hooks:
@@ -28,7 +26,7 @@ repos:
2826
hooks:
2927
- id: flake8
3028
language_version: python3
31-
additional_dependencies: [flake8-typing-imports]
29+
additional_dependencies: [flake8-typing-imports==1.3.0]
3230
- repo: https://github.com/asottile/reorder_python_imports
3331
rev: v1.4.0
3432
hooks:
@@ -44,15 +42,10 @@ repos:
4442
hooks:
4543
- id: rst-backticks
4644
- repo: https://github.com/pre-commit/mirrors-mypy
47-
rev: v0.711
45+
rev: v0.720
4846
hooks:
4947
- id: mypy
50-
name: mypy (src)
51-
files: ^src/
52-
args: []
53-
- id: mypy
54-
name: mypy (testing)
55-
files: ^testing/
48+
files: ^(src/|testing/)
5649
args: []
5750
- repo: local
5851
hooks:
@@ -66,7 +59,7 @@ repos:
6659
name: changelog filenames
6760
language: fail
6861
entry: 'changelog files must be named ####.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst'
69-
exclude: changelog/(\d+\.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
62+
exclude: changelog/(\d+\.(feature|improvement|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
7063
files: ^changelog/
7164
- id: py-deprecated
7265
name: py library is deprecated

.travis.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ env:
1313
global:
1414
- PYTEST_ADDOPTS=-vv
1515

16+
# setuptools-scm needs all tags in order to obtain a proper version
17+
git:
18+
depth: false
19+
1620
install:
1721
- python -m pip install --upgrade --pre tox
1822

@@ -31,7 +35,9 @@ jobs:
3135
- test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37
3236

3337
# Full run of latest supported version, without xdist.
34-
- env: TOXENV=py37
38+
# Coverage for:
39+
# - test_sys_breakpoint_interception (via pexpect).
40+
- env: TOXENV=py37-pexpect PYTEST_COVERAGE=1
3541
python: '3.7'
3642

3743
# Coverage tracking is slow with pypy, skip it.
@@ -45,13 +51,11 @@ jobs:
4551
# - pytester's LsofFdLeakChecker
4652
# - TestArgComplete (linux only)
4753
# - numpy
54+
# - old attrs
4855
# Empty PYTEST_ADDOPTS to run this non-verbose.
49-
- env: TOXENV=py37-lsof-numpy-twisted-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
56+
- env: TOXENV=py37-lsof-oldattrs-numpy-twisted-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
5057

5158
# Specialized factors for py37.
52-
# Coverage for:
53-
# - test_sys_breakpoint_interception (via pexpect).
54-
- env: TOXENV=py37-pexpect PYTEST_COVERAGE=1
5559
- env: TOXENV=py37-pluggymaster-xdist
5660
- env: TOXENV=py37-freeze
5761

@@ -68,8 +72,17 @@ jobs:
6872

6973
- stage: deploy
7074
python: '3.6'
71-
install: pip install -U setuptools setuptools_scm
75+
install: pip install -U setuptools setuptools_scm tox
7276
script: skip
77+
# token to upload github release notes: GH_RELEASE_NOTES_TOKEN
78+
env:
79+
- secure: "OjOeL7/0JUDkV00SsTs732e8vQjHynpbG9FKTNtZZJ+1Zn4Cib+hAlwmlBnvVukML0X60YpcfjnC4quDOIGLPsh5zeXnvJmYtAIIUNQXjWz8NhcGYrhyzuP1rqV22U68RTCdmOq3lMYU/W2acwHP7T49PwJtOiUM5kF120UAQ0Zi5EmkqkIvH8oM5mO9Dlver+/U7Htpz9rhKrHBXQNCMZI6yj2aUyukqB2PN2fjAlDbCF//+FmvYw9NjT4GeFOSkTCf4ER9yfqs7yglRfwiLtOCZ2qKQhWZNsSJDB89rxIRXWavJUjJKeY2EW2/NkomYJDpqJLIF4JeFRw/HhA47CYPeo6BJqyyNV+0CovL1frpWfi9UQw2cMbgFUkUIUk3F6DD59PHNIOX2R/HX56dQsw7WKl3QuHlCOkICXYg8F7Ta684IoKjeTX03/6QNOkURfDBwfGszY0FpbxrjCSWKom6RyZdyidnESaxv9RzjcIRZVh1rp8KMrwS1OrwRSdG0zjlsPr49hWMenN/8fKgcHTV4/r1Tj6mip0dorSRCrgUNIeRBKgmui6FS8642ab5JNKOxMteVPVR2sFuhjOQ0Jy+PmvceYY9ZMWc3+/B/KVh0dZ3hwvLGZep/vxDS2PwCA5/xw31714vT5LxidKo8yECjBynMU/wUTTS695D3NY="
80+
addons:
81+
apt:
82+
packages:
83+
# required by publish_gh_release_notes
84+
- pandoc
85+
after_deploy: tox -e publish_gh_release_notes
7386
deploy:
7487
provider: pypi
7588
user: nicoddemus

AUTHORS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Andras Tim
2323
Andrea Cimatoribus
2424
Andreas Zeidler
2525
Andrey Paramonov
26+
Andrzej Klajnert
2627
Andrzej Ostrowski
2728
Andy Freeland
2829
Anthon van der Neut
@@ -55,6 +56,7 @@ Charnjit SiNGH (CCSJ)
5556
Chris Lamb
5657
Christian Boelsen
5758
Christian Fetzer
59+
Christian Neumüller
5860
Christian Theunert
5961
Christian Tismer
6062
Christopher Gilling
@@ -96,6 +98,7 @@ Feng Ma
9698
Florian Bruhin
9799
Floris Bruynooghe
98100
Gabriel Reis
101+
Gene Wood
99102
George Kussumoto
100103
Georgy Dyuldin
101104
Graham Horler
@@ -173,6 +176,7 @@ mbyt
173176
Michael Aquilina
174177
Michael Birtwell
175178
Michael Droettboom
179+
Michael Goerz
176180
Michael Seifert
177181
Michal Wajszczuk
178182
Mihai Capotă
@@ -209,6 +213,7 @@ Raphael Castaneda
209213
Raphael Pierzina
210214
Raquel Alegre
211215
Ravi Chandra
216+
Robert Holt
212217
Roberto Polli
213218
Roland Puntaier
214219
Romain Dorgueil
@@ -239,6 +244,7 @@ Tareq Alayan
239244
Ted Xiao
240245
Thomas Grainger
241246
Thomas Hisch
247+
Tim Hoffmann
242248
Tim Strazny
243249
Tom Dalton
244250
Tom Viner
@@ -258,7 +264,9 @@ Wil Cooley
258264
William Lee
259265
Wim Glenn
260266
Wouter van Ackooy
267+
Xixi Zhao
261268
Xuan Luong
262269
Xuecong Liao
270+
Yoav Caspi
263271
Zac Hatfield-Dodds
264272
Zoltán Máté

0 commit comments

Comments
 (0)