Feature/better resolver #2267
Feature/better resolver #2267
Conversation
techalchemy
force-pushed
the
feature/better-resolver
branch
from
f3a3c56
to
3df97c3
Compare
Signed-off-by: Dan Ryan <dan@danryan.co>
- Fixes #2088, #2234, #1901 - Fully leverage piptools' compile functionality by using constraints in the same `RequirementSet` during resolution - Use `PIP_PYTHON_PATH` for compatibility check to filter out `requires_python` markers - Fix vcs resolution - Update JSON API endpoints - Enhance resolution for editable dependencies - Minor fix for adding packages to pipfiles Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
techalchemy
force-pushed
the
feature/better-resolver
branch
from
3df97c3
to
f532b2e
Compare
| except TypeError: | ||
| ireq.version = dist.version | ||
| ireq.project_name = dist.project_name | ||
| ireq.req = dist.as_requirement() |
There was a problem hiding this comment.
I don’t quite understand why these are needed :|
There was a problem hiding this comment.
You just have to believe me that they are, based on errors I encountered
There was a problem hiding this comment.
Sometimes the InstallRequirement doesn't properly get these values set on it during the resolution process because of ephemeral wheel building moving on too quickly or something along those lines, it's quite hard to pin down exactly where in the stack it is going wrong which is why I added an additional safeguard to try and get the actual name of the package in question and resolve the actual requirement and version -- these elements are critical for downstream resolution if we want to provide real conflict resolution
This shouldn't affect any functionalities, only clean up some generator usages to reduce repeated looping through requirements.
pipenv/utils.py
Outdated
| if ' -i ' in dep: | ||
| dep, url = dep.split(' -i ') | ||
| req = Requirement.from_line(dep) | ||
| constraints.append(req.as_line()) |
There was a problem hiding this comment.
What does this from_line → to_line combination do? Can’t dep be added directly into constraints?
There was a problem hiding this comment.
The short answer is no, the long answer is 'a lot of things happen here'. The line we pass in could be anything, but the intermediary step ensures that, for example, if it is a local path, we tell pip to name it properly, or if it is a wheel, we do the same. This step also ensures that we format the line in the proper filesystem-appropriate format, we supply the formatted markers correctly, it essentially offers us an extra layer of sanity checking and validation. At some point we can stop passing 'deps' around at all and just pass requirement objects, I just haven't done the code cleanup for that.
Signed-off-by: Dan Ryan <dan@danryan.co>
… feature/better-resolver
| release_requires = self.session.get(release_url) | ||
| for requires in release_requires.json().get('info', {}).get('requires_dist', {}): | ||
| i = InstallRequirement.from_line(requires) | ||
| if self.DEFAULT_INDEX_URL not in self.finder.index_urls: |
There was a problem hiding this comment.
Thank you so much for cleaning this garbage up, seriously this was so horrible to look at
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
- The specifierset will fail otherwise - We don't want to include only things that have this -- we want to _exclude_ things that do not match it Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
- fix for windows vcs urls Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
- convert to string properly
Signed-off-by: Dan Ryan <dan@danryan.co>
uranusjr
force-pushed
the
feature/better-resolver
branch
from
f1a0d65
to
a5e69e4
Compare
Signed-off-by: Dan Ryan <dan@danryan.co>
Patch piptools to use current environment python
in the same
RequirementSetduring resolutionPIP_PYTHON_PATHfor compatibility check to filter outrequires_pythonmarkers