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

Merge repeated requirements #32

Merged
merged 6 commits into from Dec 4, 2018
Merged

Merge repeated requirements #32

merged 6 commits into from Dec 4, 2018

Conversation

@paulbovbel
Copy link
Member

paulbovbel commented Dec 3, 2018

Supercede #27, close #26, #12

See #27 (comment):

dropping the fancy version merging, and going for a 'top-most version declaration wins' approach when combining requirements, and just use the package name as a key. I believe this is basically how pip works anyways, since it doesn't do any real dependency resolution (pypa/pip#988), and it's probably delusional to do a half-baked implementation here. Version merging in catkin_virtualenv has so-far caused nothing but problems (#12, #18)

Uses the upstream API in python-packaging, to make sure we cover all our bases instead of implementing the parsing internally.

Requires ros/rosdistro#19587

@paulbovbel paulbovbel force-pushed the repeated-requirements branch from 0d5821b to 25eb4c3 Dec 3, 2018
@paulbovbel paulbovbel requested review from tappan-at-git and garyservin Dec 3, 2018
@paulbovbel paulbovbel changed the title WIP Merge repeated requirements Merge repeated requirements Dec 3, 2018
@paulbovbel paulbovbel force-pushed the repeated-requirements branch from e4f1c19 to 54dfc69 Dec 3, 2018
@paulbovbel

This comment has been minimized.

Copy link
Member Author

paulbovbel commented Dec 4, 2018

Tests failing upstream pending ros/rosdistro#19587, failing internally because we don't resolve rosdeps for test jobs.

@paulbovbel paulbovbel merged commit 1ab4fb3 into devel Dec 4, 2018
0 of 3 checks passed
0 of 3 checks passed
continuous-integration/jenkins/branch This commit cannot be built
Details
Hpr__catkin_virtualenv__ubuntu_xenial_amd64 Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
@paulbovbel paulbovbel deleted the repeated-requirements branch Mar 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.