22
33As of the upstream:
44
5- https://github.com/pyodide/micropip/blob/v0.2 .0/micropip/_micropip .py#L468
5+ https://github.com/pyodide/micropip/blob/0.10 .0/micropip/package_manager .py#L43-L55
66
77.. code:
88
99 async def install(
1010 self,
11- requirements: str | list[str], # -r and [packages ]
11+ requirements: str | list[str], # -r and [PACKAGES ]
1212 keep_going: bool = False, # --verbose
1313 deps: bool = True, # --no-deps
1414 credentials: str | None = None, # no CLI alias
1515 pre: bool = False, # --pre
1616 index_urls: list[str] | str | None = None, # no CLI alias
1717 *,
18- verbose: bool | int | None = None,
19- ):
20- ```
18+ constraints: list[str] | None = None, # --constraints
19+ reinstall: bool = False, # no CLI alias
20+ verbose: bool | int | None = None, # --verbose
21+ ) -> None:
2122
2223As this is _not_ really a CLI, it doesn't bother with accurate return codes, and
2324failures should not block execution.
2425"""
2526
27+ from __future__ import annotations
28+
2629import re
2730import sys
28- import typing
31+ from typing import Any , TYPE_CHECKING
2932from argparse import ArgumentParser
3033from pathlib import Path
3134
32- REQ_FILE_PREFIX = r"^(-r|--requirements)\s*=?\s*(.*)\s*"
35+ if TYPE_CHECKING :
36+ from collections .abc import AsyncIterator
37+
38+ REQ_FILE_SPEC = r"^(?P<flag>-r|--requirements)\s*=?\s*(?P<path_ref>.+)$"
3339
3440__all__ = ["get_transformed_code" ]
3541
3642
37- def warn (msg ):
43+ def warn (msg : str ) -> None :
44+ """Print a warning to stderr."""
3845 print (msg , file = sys .stderr , flush = True )
3946
4047
@@ -44,7 +51,7 @@ def _get_parser() -> ArgumentParser:
4451 "piplite" ,
4552 exit_on_error = False ,
4653 allow_abbrev = False ,
47- description = "a pip-like wrapper for `piplite` and `micropip`" ,
54+ description = "a `` pip`` -like wrapper for `` piplite`` and `` micropip` `" ,
4855 )
4956 parser .add_argument (
5057 "--verbose" ,
@@ -64,7 +71,19 @@ def _get_parser() -> ArgumentParser:
6471 "--requirements" ,
6572 "-r" ,
6673 nargs = "*" ,
67- help = "paths to requirements files" ,
74+ help = (
75+ "path to a requirements file; each line should be a PEP 508 spec"
76+ " or -r to a relative path"
77+ ),
78+ )
79+ parser .add_argument (
80+ "--constraints" ,
81+ "-c" ,
82+ nargs = "*" ,
83+ help = (
84+ "path to a constraints file; each line should be a PEP 508 spec"
85+ " or -r to a relative path"
86+ ),
6887 )
6988 parser .add_argument (
7089 "--no-deps" ,
@@ -76,6 +95,11 @@ def _get_parser() -> ArgumentParser:
7695 action = "store_true" ,
7796 help = "whether pre-release packages should be considered" ,
7897 )
98+ parser .add_argument (
99+ "--force-reinstall" ,
100+ action = "store_true" ,
101+ help = "reinstall all packages even if they are already installed" ,
102+ )
79103 parser .add_argument (
80104 "packages" ,
81105 nargs = "*" ,
@@ -87,21 +111,25 @@ def _get_parser() -> ArgumentParser:
87111 return parser
88112
89113
90- async def get_transformed_code (argv : list [str ]) -> typing . Optional [ str ] :
114+ async def get_transformed_code (argv : list [str ]) -> str | None :
91115 """Return a string of code for use in in-kernel execution."""
92116 action , kwargs = await get_action_kwargs (argv )
117+ code_str : str = "\n "
93118
94119 if action == "help" :
95120 pass
121+
96122 if action == "install" :
97123 if kwargs ["requirements" ]:
98- return f"""await __import__("piplite").install(**{ kwargs } \n """
124+ code_str = f"""await __import__("piplite").install(**{ kwargs } \n """
99125 else :
100126 warn ("piplite needs at least one package to install" )
101127
128+ return code_str
102129
103- async def get_action_kwargs (argv : list [str ]) -> tuple [typing .Optional [str ], dict ]:
104- """Get the arguments to `piplite` subcommands from CLI-like tokens."""
130+
131+ async def get_action_kwargs (argv : list [str ]) -> tuple [str | None , dict [str , Any ]]:
132+ """Get the arguments to ``piplite`` subcommands from CLI-like tokens."""
105133
106134 parser = _get_parser ()
107135
@@ -126,51 +154,54 @@ async def get_action_kwargs(argv: list[str]) -> tuple[typing.Optional[str], dict
126154 if args .verbose :
127155 kwargs ["keep_going" ] = True
128156
157+ if args .reinstall :
158+ kwargs ["reinstall" ] = True
159+
129160 for req_file in args .requirements or []:
130- kwargs ["requirements" ] += await _packages_from_requirements_file (
131- Path (req_file )
132- )
161+ async for spec in _specs_from_requirements_file (Path (req_file )):
162+ kwargs ["requirements" ] += [spec ]
133163
134- return action , kwargs
164+ for const_file in args .constraints or []:
165+ async for spec in _specs_from_requirements_file (Path (const_file )):
166+ kwargs ["constraints" ] += [spec ]
135167
168+ return action , kwargs
136169
137- async def _packages_from_requirements_file (req_path : Path ) -> list [str ]:
138- """Extract (potentially nested) package requirements from a requirements file."""
139- if not req_path .exists ():
140- warn (f"piplite could not find requirements file { req_path } )
141- return []
142170
143- requirements = []
171+ async def _specs_from_requirements_file (spec_path : Path ) -> AsyncIterator [str ]:
172+ """Extract package specs from a ``requirements.txt``-style file."""
173+ if not spec_path .exists ():
174+ warn (f"piplite could not find requirements file { spec_path } )
175+ return
144176
145- for line_no , line in enumerate (req_path .read_text (encoding = "utf" ).splitlines ()):
146- requirements += await _packages_from_requirements_line (
147- req_path , line_no + 1 , line
148- )
177+ for line_no , line in enumerate (spec_path .read_text (encoding = "utf" ).splitlines ()):
178+ async for spec in _specs_from_requirements_line (spec_path , line_no + 1 , line ):
179+ yield spec
149180
150- return requirements
151181
182+ async def _specs_from_requirements_line (
183+ spec_path : Path , line_no : int , line : str
184+ ) -> AsyncIterator [str ]:
185+ """Get package specs from a line of a ``requirements.txt``-style file.
152186
153- async def _packages_from_requirements_line (
154- req_path : Path , line_no : int , line : str
155- ) -> list [str ]:
156- """Extract (potentially nested) package requirements from line of a
157- requirements file.
187+ ``micropip`` has a sufficient pep508 implementation to handle most cases.
158188
159- `micropip` has a sufficient pep508 implementation to handle most cases
189+ References to other, local files with ``-r`` are supported.
160190 """
161- req = line .strip ().split ("#" )[0 ].strip ()
162- # is it another requirement file?
163- req_file_match = re .match (REQ_FILE_PREFIX , req )
164- if req_file_match :
165- if req_file_match [2 ].startswith ("/" ):
166- sub_req = Path (req )
167- else :
168- sub_req = req_path .parent / req_file_match [2 ]
169- return await _packages_from_requirements_file (sub_req )
170-
171- if req .startswith ("-" ):
172- warn (f"{ req_path } { line_no } { req } )
173- req = None
174- if not req :
175- return []
176- return [req ]
191+ raw = line .strip ().split ("#" )[0 ].strip ()
192+ # is it another spec file?
193+ file_match = re .match (REQ_FILE_SPEC , raw )
194+
195+ if file_match :
196+ ref = file_match .groupdict ()["path_ref" ]
197+ ref_path = Path (ref if ref .startswith ("/" ) else spec_path .parent / ref )
198+ async for sub_spec in _specs_from_requirements_file (ref_path ):
199+ yield sub_spec
200+ elif raw .startswith ("-" ):
201+ warn (f"{ spec_path } { line_no } { raw } )
202+ return
203+ else :
204+ spec = raw
205+
206+ if spec :
207+ yield spec
0 commit comments