Refactor CLI to lean more heavily on click's built in functionality #2814
Conversation
- Allow parsing of multiple packages, editable and non-editable, interspersed - Handle `--index` and `--extra-index-url` with click's native parsing - Split commonly used options out into separate groups
- Handle packages and editable packages separately - Allow `pip_install` to take `Requirement` objects as arguments rather than re-parsing - Remove bad parsing logic
- Handle editable installs more effectively - Actually store the distribution after we create it - Actually get the dependencies from it
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
- Fixes #2748 Signed-off-by: Dan Ryan <dan@danryan.co>
- Fixes #2173 Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co> Update requirementslib Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co> Don't re-clone repos now that this works Signed-off-by: Dan Ryan <dan@danryan.co> Prune peeps directory from manifest Signed-off-by: Dan Ryan <dan@danryan.co> Fix nonetype uris Signed-off-by: Dan Ryan <dan@danryan.co> Manually lock requirements? Signed-off-by: Dan Ryan <dan@danryan.co> Update requirementslib - leave context before updating sha Signed-off-by: Dan Ryan <dan@danryan.co> Fix requirementslib vcs checkouts Signed-off-by: Dan Ryan <dan@danryan.co> fix tmpdir implementation Signed-off-by: Dan Ryan <dan@danryan.co> final fix for vcs uris Signed-off-by: Dan Ryan <dan@danryan.co> Allow for adding requirements objects directly to pipfile Signed-off-by: Dan Ryan <dan@danryan.co> Update piptools patch Signed-off-by: Dan Ryan <dan@danryan.co>
Signed-off-by: Dan Ryan <dan@danryan.co>
techalchemy
changed the title
techalchemy
added
Type: Enhancement 💡
pipenv/cli/options.py
Outdated
| def callback(ctx, param, value): | ||
| state = ctx.ensure_object(State) | ||
| if isinstance(value, (tuple, list)): | ||
| state.extra_index_urls.extend(list(value)) |
There was a problem hiding this comment.
No need to convert this one extra time, extend() works for any iterables. But is this check (to distinguish input type from strings) needed at all? Doesn’t the multiple=True flag guarantee this always gets a list?
There was a problem hiding this comment.
Hmmm I think so, will fix
| return value | ||
| return option("--python", default=False, nargs=1, callback=callback, | ||
| help="Specify which version of Python virtualenv should use.", | ||
| expose_value=False)(f) |
There was a problem hiding this comment.
I hope we can merge two, three and python soon, but it probably needs to be done after this is merged.
There was a problem hiding this comment.
I did consider that, but actually they are grouped together in common_options and don't appear anywhere else anyway. I tried my best to keep this organized and grouped based on how we are using these things currently. The real concern here (and the thing to watch out for in this review) is that the state passing approach I think will pass the cli options and args as well... so we just need to be sure this doesn't accidentally add new CLI options to the API
|
@uranusjr i personally don't think combining two/three and python are a good idea, but as two is slowly dying away, it may be a good idea. In either case, it will require a PEEP. |
|
@kennethreitz I don’t mean combining them in the CLI, but that |
|
ah, gotcha! |
Signed-off-by: Dan Ryan <dan@danryan.co>
We currently handle a lot of parsing in custom functions that are quite broadly speaking broken at a lot of edge cases. This refactor (which I put off a lot because I didn't really understand how to do this with click's tooling, but now I do) restructures a lot of the cruft we've merged in over the last year or so and builds it back into click's parser.
Additionally this will centralize various options to avoid having them repeated throughout the CLI declarations. This also pulls in updates to
requirementslibwith some bugfixes and enhancements around VCS checkout handling, plus a minor tweak to our patched version ofpip-toolswhich fixes a bug in some overlookedsetup.pyrunners where we forgot to actually assign the resulting distribution to a variable (which has caused a number of issues).Caught a few other very minor issues in the refactor during syntax cleanups.
-e directorymultiple times attempts to install-eas a package #2279