Skip to content
This repository has been archived by the owner on Nov 5, 2019. It is now read-only.

Use pypy-2.6 on Travis #264

Merged

Conversation

dhermes
Copy link
Contributor

@dhermes dhermes commented Aug 13, 2015

This is the latest version and will hopefully be updated in Travis soon (from pypy-2.5).

This PR makes a custom pyenv with pypy-2.6 when running the pypy tox env.

Fixes #261.

@dhermes dhermes force-pushed the pypy-fix-cryptography branch from d910a26 to 5f9dc55 Compare August 13, 2015 21:22
@dhermes dhermes force-pushed the pypy-fix-cryptography branch from 5d8679b to 3a67e93 Compare August 13, 2015 21:55
@dhermes
Copy link
Contributor Author

dhermes commented Aug 13, 2015

@nathanielmanistaatgoogle I finally got the magical incantation right after two dumb mistakes

  1. Using TOXENV (copy-pasta) instead of TOX_ENV
  2. Running the env (tox -e ${TOX_ENV}) before patching the pypy version instead of after

Anyhow we should get this merged ASAP so the build can go green (and other PRs will pass).

@nathanielmanistaatgoogle
Copy link
Contributor

Sorry for the delay in reviewing - was in a meeting.

This smells like a temporary workaround until Travis sorts itself out - is that the case? If so, should there be TODOs in the content of these commits, or issues filed?

@dhermes
Copy link
Contributor Author

dhermes commented Aug 13, 2015

Yes thanks for the reminder. #266 filed.

nathanielmanistaatgoogle added a commit that referenced this pull request Aug 13, 2015
@nathanielmanistaatgoogle nathanielmanistaatgoogle merged commit f322713 into googleapis:master Aug 13, 2015
@dhermes dhermes deleted the pypy-fix-cryptography branch August 13, 2015 23:15
@dhermes dhermes mentioned this pull request Aug 26, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants