Skip to content

Automated / semi-automated python3 upgrades #5368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 3, 2019
Merged

Automated / semi-automated python3 upgrades #5368

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9905755
manual changes to .pre-commit-config.yaml
asottile Jun 2, 2019
5034399
pre-commit run fix-encoding-pragma --all-files
asottile Jun 2, 2019
3f1ec52
pre-commit run reorder-python-imports --all-files
asottile Jun 2, 2019
a91fe1f
pre-commit run pyupgrade --all-files
asottile Jun 2, 2019
4df529e
Clean up __future__ and coding: in tests
asottile Jun 2, 2019
c63320c
codecs.open / io.open
asottile Jun 2, 2019
ca1efd5
git rm src/_pytest/_code/_py2traceback.py
asottile Jun 2, 2019
5dcf85c
manual: remove dependence on six
asottile Jun 2, 2019
96fd44e
Update line number for warning
asottile Jun 2, 2019
8292644
Allow multiple positions for the SyntaxError in pypy3.6
asottile Jun 3, 2019
6d393c5
Enable coverage for 'py37' environment
nicoddemus Jun 3, 2019
ce78c9a
Fix linting
nicoddemus Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37

# Full run of latest supported version, without xdist.
- env: TOXENV=py37
- env: TOXENV=py37 PYTEST_COVERAGE=1
Copy link
Contributor

@blueyed blueyed Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not need this, do we?
We have py37-xdist with coverage already (at least).

Copy link
Member

@nicoddemus nicoddemus Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure, this fixed the coverage on the PR.

Copy link
Contributor

@blueyed blueyed Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd guess it was the rebase that fixed it.

We can revert this and this - after things stabilized a bit.. :)

python: '3.7'

# Coverage tracking is slow with pypy, skip it.
Expand Down