Skip to content

Conversation

@bertsky
Copy link
Collaborator

@bertsky bertsky commented Mar 23, 2022

No description provided.

@stweil
Copy link
Collaborator

stweil commented Mar 23, 2022

This conflicts with #299.

@bertsky
Copy link
Collaborator Author

bertsky commented Mar 23, 2022

This conflicts with #299.

I don't care TBH – we are still trying to solve the deployment misery (see CI failures for CUDA variant and recent -j switching), which is urgent.

This is necessary to get a true separation of pip calls between (possibly parallel) venvs.

@kba
Copy link
Member

kba commented Mar 23, 2022

This conflicts with #299.

I think it's a counterargument to #299. And it seems to fix the issue at hand (race condition while installing core). Let's merge and hope for the best. If CD still fails, I will push the images manually.

@kba kba merged commit 115bed0 into master Mar 23, 2022
@kba
Copy link
Member

kba commented Mar 23, 2022

This conflicts with #299.

I think it's a counterargument to #299.

Wrong, sry. We still don't need $(PIP) in the ocrd_all Makefile, only in dependent packages.

@stweil stweil deleted the try-to-fix-pip-races branch March 23, 2022 12:19
@stweil
Copy link
Collaborator

stweil commented Mar 23, 2022

I fixed the merge conflict in #299 (now for the second time), so it is ready for merging again.

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.

4 participants