From 3263c46165159f5e4116d8b0517abdf46acd5601 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Wed, 1 Mar 2023 05:32:36 -0500
Subject: [PATCH] python yaml tweaks

---
 projects/pipenv.pypa.io/package.yml     |  2 +-
 projects/pre-commit.com/package.yml     |  4 +---
 projects/virtualenv.pypa.io/package.yml |  5 +----
 projects/youtube-dl.org/package.yml     |  5 +----
 projects/youtube-dl.org/shim.bash       | 11 -----------
 projects/yt-dlp.org/package.yml         |  8 +++++---
 6 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100755 projects/youtube-dl.org/shim.bash

diff --git a/projects/pipenv.pypa.io/package.yml b/projects/pipenv.pypa.io/package.yml
index e1490889..ee6a12af 100644
--- a/projects/pipenv.pypa.io/package.yml
+++ b/projects/pipenv.pypa.io/package.yml
@@ -32,4 +32,4 @@ test:
     pipenv run pycowsay "Hello World"
 
 provides:
-  - bin/pipenv
\ No newline at end of file
+  - bin/pipenv
diff --git a/projects/pre-commit.com/package.yml b/projects/pre-commit.com/package.yml
index 42e69b26..e0ece602 100644
--- a/projects/pre-commit.com/package.yml
+++ b/projects/pre-commit.com/package.yml
@@ -10,8 +10,7 @@ dependencies:
   python.org: '>=3.8'
 
 build:
-  script:
-    python-venv.sh {{prefix}}/bin/pre-commit
+  python-venv.sh {{prefix}}/bin/pre-commit
 
 provides:
   - bin/pre-commit
@@ -39,4 +38,3 @@ test:
         rev: v0.9.1
         hooks:
         -   id: trailing-whitespace
-
diff --git a/projects/virtualenv.pypa.io/package.yml b/projects/virtualenv.pypa.io/package.yml
index e1481598..d5448ece 100644
--- a/projects/virtualenv.pypa.io/package.yml
+++ b/projects/virtualenv.pypa.io/package.yml
@@ -9,10 +9,8 @@ versions:
 dependencies:
   python.org: '>=3.7'
 
-
 build:
-  script:
-    python-venv.sh {{prefix}}/bin/virtualenv
+  python-venv.sh {{prefix}}/bin/virtualenv
 
 test:
   script: |
@@ -30,6 +28,5 @@ test:
     deactivate # exit venv
     venv_dir/bin/pycowsay "All tests pass!" # verify that pycowsay was installed inside the venv
 
-
 provides:
   - bin/virtualenv
diff --git a/projects/youtube-dl.org/package.yml b/projects/youtube-dl.org/package.yml
index d937bce3..98b4ef83 100644
--- a/projects/youtube-dl.org/package.yml
+++ b/projects/youtube-dl.org/package.yml
@@ -2,9 +2,6 @@ distributable:
   url: https://github.com/ytdl-org/youtube-dl/releases/download/{{version}}/youtube-dl-{{version}}.tar.gz
   strip-components: 1
 
-#NOTE copy-pasta from mesonbuild.com
-#TODO make a brewkit/ script to do this automatically
-
 versions:
   github: ytdl-org/youtube-dl
   strip: /^youtube-dl /
@@ -15,7 +12,7 @@ dependencies:
 build:
   python-venv.sh {{prefix}}/bin/youtube-dl
 
-test: |
+test:
   youtube-dl --simulate https://youtu.be/pOtd1cbOP7k
 
 provides:
diff --git a/projects/youtube-dl.org/shim.bash b/projects/youtube-dl.org/shim.bash
deleted file mode 100755
index 8a711907..00000000
--- a/projects/youtube-dl.org/shim.bash
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-self="${BASH_SOURCE[0]}"
-if test -L "$self"; then
-  prefix="$(dirname "$self")"
-  suffix="$(dirname $(readlink $self))"
-  LIBEXEC="$(cd $prefix/$suffix && pwd)"
-else
-  LIBEXEC="$(cd "$(dirname "$self")" && pwd)"
-fi
-source "$LIBEXEC/activate"
-exec "$LIBEXEC"/youtube-dl.py "$@"
diff --git a/projects/yt-dlp.org/package.yml b/projects/yt-dlp.org/package.yml
index ec3841ea..3da23ef2 100644
--- a/projects/yt-dlp.org/package.yml
+++ b/projects/yt-dlp.org/package.yml
@@ -7,13 +7,15 @@ versions:
   strip: /^yt-dlp /
 
 dependencies:
-  tea.xyz/gx/cc: c99 # to build brotli pymod
   python.org: 3
 
 build:
-  python-venv.sh {{prefix}}/bin/yt-dlp
+  dependencies:
+    tea.xyz/gx/cc: c99 # to build brotli pymod
+  script:
+    python-venv.sh {{prefix}}/bin/yt-dlp
 
-test: |
+test:
   yt-dlp --simulate https://youtu.be/pOtd1cbOP7k
 
 provides: