diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 11:54:14 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 11:54:14 -0400 |
| commit | b7c83dad9e11fbbc2a69fcc5fc26d4c7d1f5551f (patch) | |
| tree | 6e44ffdf5ee615d3a845106e3a51c172b2dedce0 /conftest.py | |
| parent | b66e45a90e82c9170cc48f21e4dac9d206193953 (diff) | |
| parent | 61e61296d9537c3e82516611ec283e42b1ed0466 (diff) | |
| download | python-setuptools-git-b7c83dad9e11fbbc2a69fcc5fc26d4c7d1f5551f.tar.gz | |
Merge branch 'master' into patch-1
Diffstat (limited to 'conftest.py')
| -rw-r--r-- | conftest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conftest.py b/conftest.py index f896561e..d5e851fe 100644 --- a/conftest.py +++ b/conftest.py @@ -25,4 +25,5 @@ collect_ignore = [ if sys.version_info < (3, 6): + collect_ignore.append('docs/conf.py') # uses f-strings collect_ignore.append('pavement.py') |