daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-11-09 19:13:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

refactor: update pep722 reference implementation

Browse source
This commit is contained in:
Daylin Morgan 2023-08-08 16:28:48 -05:00
parent 7a0f3d6ad6
commit 63fe7c07ea
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
2 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/pep722.py
View file

@ -1,9 +1,13 @@
#!/usr/bin/env -S viv run -s #!/usr/bin/env -S viv run -s
# In order to run, this script needs the following 3rd party libraries # In order to run, this script needs the following 3rd party libraries
# #
## Script Dependencies: # Script Dependencies:
## requests # requests
## rich # rich # Needed for the output
#
# # Not needed - just to show that fragments in URLs do not
# # get treated as comments
# pip @ https://github.com/pypa/pip/archive/1.3.1.zip#sha1=2e15a2d4e7e9f394a9c7a6c905c6a239402a6442
import requests import requests
from rich.pretty import pprint from rich.pretty import pprint

34
src/viv/viv.py
View file

@ -55,7 +55,7 @@ from typing import (
from urllib.error import HTTPError from urllib.error import HTTPError
from urllib.request import urlopen from urllib.request import urlopen
__version__ = "23.8a2-8-g95531c3-dev" __version__ = "23.8a2-9-g7a0f3d6-dev"
class Spinner: class Spinner:
@ -1138,15 +1138,27 @@ def _read_metadata_block(txt: str) -> Generator[Tuple[str, str, List[str]], None
yield block_type, extra, block_data yield block_type, extra, block_data
def deps_block(txt: str) -> List[str]: DEPENDENCY_BLOCK_MARKER = r"(?i)^#\s+script\s+dependencies:\s*$"
return list(
(
req def read_dependency_block(txt: str) -> List[str]:
for block_type, extra, block_data in _read_metadata_block(txt) lines = iter(txt.splitlines())
for req in block_data for line in lines:
if block_type == "Script Dependencies" if re.match(DEPENDENCY_BLOCK_MARKER, line):
) for line in lines:
) if not line.startswith("#"):
break
# Remove comments. An inline comment is introduced by
# a hash, which must be preceded and followed by a
# space. The initial hash will be skipped as it has
# no space before it.
line = line.split(" # ", maxsplit=1)[0]
line = line[1:].strip()
if not line:
continue
# let pip handle the requirement errors
yield line
break
def _parse_date(txt: str) -> datetime: def _parse_date(txt: str) -> datetime:
@ -1641,7 +1653,7 @@ class Viv:
script_text = fetch_script(script) script_text = fetch_script(script)
viv_used = uses_viv(script_text) viv_used = uses_viv(script_text)
deps = deps_block(script_text) deps = list(read_dependency_block(script_text))
if viv_used and deps: if viv_used and deps:
error( error(