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

Update PsychoPy recipe, and pull in upstream changes. #1

Merged
merged 10,000 commits into from
Jun 25, 2019

Conversation

hoechenberger
Copy link

No description provided.

scopatz and others added 28 commits June 23, 2019 23:27
Appears we are not able to install some dependencies without `openssl`
version `1.1.1a` installed (`1.1.1b` is already included). This tries
forcing `openssl` to version `1.1.1a` to fix the issue.
These don't seem to work as expected either despite getting the
seemingly required version of `openssl` installed. So just go ahead and
drop them.
…sychopy

# Conflicts:
#	.ci_support/build_all.py
#	.ci_support/compute_build_graph.py
#	.circleci/run_docker_build.sh
#	.gitignore
#	.travis.yml
@kastman kastman merged commit 83cc3c3 into kastman:psychopy Jun 25, 2019
@hoechenberger hoechenberger deleted the psychopy branch July 1, 2019 06:56
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.