Skip to content
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.

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

Allow PyPy3 support to work with PyPy3 5.5 #66

Merged
merged 2 commits into from
Mar 15, 2017
Merged

Conversation

refi64
Copy link
Contributor

@refi64 refi64 commented Mar 13, 2017

Closes #65.

Copy link
Collaborator

@ryanhiebert ryanhiebert left a comment

Choose a reason for hiding this comment

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

In addition to fixing the match to make the tests pass, also add a test variant for this new version of pypy3.

@@ -46,7 +46,7 @@ def default_toxenv():
# https://github.com/travis-ci/travis-ci/issues/6304
# Force use of the virtualenv `python`.
version = os.environ.get('TRAVIS_PYTHON_VERSION')
if version and default_factors and version.startswith('pypy3.3-5.2-'):
if version and default_factors and re.match(r'pypy-3\.3-5\.\d-', version):
Copy link
Collaborator

Choose a reason for hiding this comment

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

I totally missed it on the first review. Thank goodness for automated testing.

In the translation to using re.match you've added a dash after pypy, which is making it not match the already existing version.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm. I think that just using version.startswith('pypy3.3-') might work. I'm inclined to try that.

@ryanhiebert
Copy link
Collaborator

Thank you for your work on this, @kirbyfan64. I'm doing all this on borrowed computers at the moment, so if you're able to update the pull request that would be very helpful. I think I'll be able to make a release without needing a decent terminal, so I should be good there.

@codecov
Copy link

codecov bot commented Mar 15, 2017

Codecov Report

Merging #66 into master will not change coverage.
The diff coverage is 0%.

@@          Coverage Diff           @@
##           master     #66   +/-   ##
======================================
  Coverage    75.4%   75.4%           
======================================
  Files           4       4           
  Lines         187     187           
  Branches       46      46           
======================================
  Hits          141     141           
  Misses         38      38           
  Partials        8       8
Impacted Files Coverage Δ
src/tox_travis/toxenv.py 90.36% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ccef42...1775611. Read the comment docs.

@ryanhiebert
Copy link
Collaborator

Project coverage is the same, so this already wasn't covered. The build matrix is passing, so technically it is covered in some way, just not a way that's being reported to codecov.

@ryanhiebert ryanhiebert merged commit 8aa244f into tox-dev:master Mar 15, 2017
@ryanhiebert
Copy link
Collaborator

Might be a few days before I release, but thank you very much for your help, @kirbyfan64 !

@ryanhiebert
Copy link
Collaborator

I'm working on cutting a release now. I didn't realize that this hadn't been released yet. I'm sorry, folks.

@ryanhiebert
Copy link
Collaborator

0.9 is out!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants