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 pip-tools #5987

Merged
merged 4 commits into from
Mar 16, 2020
Merged

Update pip-tools #5987

merged 4 commits into from
Mar 16, 2020

Conversation

karlb
Copy link
Contributor

@karlb karlb commented Mar 13, 2020

The diff is so big due to jazzband/pip-tools#1058 and I wanted to avoid having that diff inside another PR. I also explicitly excluded macholib as a ci dependency to avoid differences between MacOS and linux machines.

It's annoying for linux users to manually make sure that it stays included every time they compile the deps. It's only required for MacOS systems and we don't want to have it in the diff every time it is compiled on a different OS.
@auto-assign auto-assign bot requested a review from hackaugusto March 13, 2020 08:27
@@ -4,182 +4,182 @@
#
# './deps compile' (for details see README)
#
alabaster==0.7.12
aniso8601==7.0.0
alabaster==0.7.12 # via -r /home/karl/raiden/requirements/requirements-docs.txt, sphinx
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we somehow avoid having anyone's username in there? Otherwise the diff will be this big for every change from different people.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Uh, that's wrong of course! Why did it put the full path in there? I'll see if I can change that.

Copy link
Contributor Author

@karlb karlb Mar 13, 2020

Choose a reason for hiding this comment

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

Looks like others have the same problem. Why does it work for dependabot, see #5986 and jazzband/pip-tools#1067?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I assume the reason is that our wrapper script (that handles the dependency resolution between the files) passes absolute paths.

I'll see if that is easily fixable.

karlb and others added 2 commits March 13, 2020 15:48
To prevent absolute paths in our pip-compile output we now pass
paths relative to the working directory.
Copy link
Contributor

@palango palango left a comment

Choose a reason for hiding this comment

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

Looks good.

@palango palango merged commit 734f4f6 into raiden-network:develop Mar 16, 2020
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.

3 participants