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

Ensure that, if we're developing inside a venv, the venv python is used #1056

Merged
merged 3 commits into from Jun 11, 2020

Conversation

tjguk
Copy link
Collaborator

@tjguk tjguk commented Jun 11, 2020

This is hopefully a non-controversial PR to ensure that the Windows make.py uses Python from the running virtualenv, otherwise it won't pick up the installed packages

@tjguk
Copy link
Collaborator Author

tjguk commented Jun 11, 2020

Appveyor is happy but Travis is failing with an obscure core dump somewhere in py.test
Since I don't believe it'll have been caused by this change (unless as a result of the changes of version in PyQt etc.) I'm going to go ahead and merge this in, hoping that we'll be able to roll forward if anything does need fixing

@tjguk tjguk merged commit 7564b56 into mu-editor:master Jun 11, 2020
@tjguk tjguk deleted the make_use_venv branch June 11, 2020 09:24
@dybber
Copy link
Collaborator

dybber commented Jun 11, 2020

Perhaps the pytest issue is the one described here: pytest-dev/pytest#6492 - maybe we should try, as suggested, to pin the version to latest one without that issue pytest==5.3.2

@tjguk
Copy link
Collaborator Author

tjguk commented Jun 11, 2020

Thanks, @dybber. I've merged and closed this PR for now (as I'm working on the Windows stuff). But I'll open a separate one with only that pytest change we'll see what happens.

@tjguk
Copy link
Collaborator Author

tjguk commented Jun 11, 2020

Generated #1057

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