Skip to content

Commit

Permalink
[build] Add default optional dependency group (#9295)
Browse files Browse the repository at this point in the history
Authored by: bashonly, Grub4K

Co-authored-by: Simon Sawicki <contact@grub4k.xyz>
  • Loading branch information
bashonly and Grub4K committed Mar 4, 2024
1 parent ac340d0 commit cf91400
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -218,7 +218,7 @@ Example usage:
yt-dlp --update-to nightly
# To install nightly with pip:
python -m pip install -U --pre yt-dlp
python -m pip install -U --pre yt-dlp[default]
```

<!-- MANPAGE: BEGIN EXCLUDED SECTION -->
Expand Down
39 changes: 23 additions & 16 deletions devscripts/install_deps.py
Expand Up @@ -19,7 +19,7 @@ def parse_args():
parser.add_argument(
'input', nargs='?', metavar='TOMLFILE', default='pyproject.toml', help='Input file (default: %(default)s)')
parser.add_argument(
'-e', '--exclude', metavar='REQUIREMENT', action='append', help='Exclude a required dependency')
'-e', '--exclude', metavar='DEPENDENCY', action='append', help='Exclude a dependency')
parser.add_argument(
'-i', '--include', metavar='GROUP', action='append', help='Include an optional dependency group')
parser.add_argument(
Expand All @@ -33,21 +33,28 @@ def parse_args():

def main():
args = parse_args()
toml_data = parse_toml(read_file(args.input))
deps = toml_data['project']['dependencies']
targets = deps.copy() if not args.only_optional else []

for exclude in args.exclude or []:
for dep in deps:
simplified_dep = re.match(r'[\w-]+', dep)[0]
if dep in targets and (exclude.lower() == simplified_dep.lower() or exclude == dep):
targets.remove(dep)

optional_deps = toml_data['project']['optional-dependencies']
for include in args.include or []:
group = optional_deps.get(include)
if group:
targets.extend(group)
project_table = parse_toml(read_file(args.input))['project']
optional_groups = project_table['optional-dependencies']
excludes = args.exclude or []

deps = []
if not args.only_optional: # `-o` should exclude 'dependencies' and the 'default' group
deps.extend(project_table['dependencies'])
if 'default' not in excludes: # `--exclude default` should exclude entire 'default' group
deps.extend(optional_groups['default'])

def name(dependency):
return re.match(r'[\w-]+', dependency)[0].lower()

target_map = {name(dep): dep for dep in deps}

for include in filter(None, map(optional_groups.get, args.include or [])):
target_map.update(zip(map(name, include), include))

for exclude in map(name, excludes):
target_map.pop(exclude, None)

targets = list(target_map.values())

if args.print:
for target in targets:
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Expand Up @@ -51,6 +51,7 @@ dependencies = [
]

[project.optional-dependencies]
default = []
secretstorage = [
"cffi",
"secretstorage",
Expand Down

0 comments on commit cf91400

Please sign in to comment.