From 69eb8ce3e157034ca10a14377ca567a178715dad Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Sat, 17 Sep 2022 15:37:45 +0200 Subject: [PATCH] fdroidserver: depend on pyyaml and yamllint Closes #110977. Signed-off-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/fdroidserver.rb | 22 +++++++--------------- pypi_formula_mappings.json | 2 +- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Formula/fdroidserver.rb b/Formula/fdroidserver.rb index 89fcf478e2a..71e1788292a 100644 --- a/Formula/fdroidserver.rb +++ b/Formula/fdroidserver.rb @@ -22,8 +22,10 @@ class Fdroidserver < Formula depends_on "openssl@1.1" depends_on "pillow" depends_on "python@3.10" + depends_on "pyyaml" depends_on "s3cmd" depends_on "six" + depends_on "yamllint" uses_from_macos "libffi", since: :catalina uses_from_macos "libxml2" @@ -196,11 +198,6 @@ class Fdroidserver < Formula sha256 "8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0" end - resource "pathspec" do - url "https://files.pythonhosted.org/packages/24/9f/a9ae1e6efa11992dba2c4727d94602bd2f6ee5f0dedc29ee2d5d572c20f7/pathspec-0.10.1.tar.gz" - sha256 "7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d" - end - resource "pexpect" do url "https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10/pexpect-4.8.0.tar.gz" sha256 "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c" @@ -271,11 +268,6 @@ class Fdroidserver < Formula sha256 "a8fe93ccf2ff37ecc95ec2f49ea74a91a6ce73a4db4a16a98dd26d397cfd09e5" end - resource "PyYAML" do - url "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz" - sha256 "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2" - end - resource "qrcode" do url "https://files.pythonhosted.org/packages/94/9f/31f33cdf3cf8f98e64c42582fb82f39ca718264df61957f28b0bbb09b134/qrcode-7.3.1.tar.gz" sha256 "375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578" @@ -326,11 +318,6 @@ class Fdroidserver < Formula sha256 "e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4" end - resource "yamllint" do - url "https://files.pythonhosted.org/packages/54/21/4bcf449477392d5896128ee1e21dfb7ab640a77e338a2e34748cf38fed0a/yamllint-1.27.1.tar.gz" - sha256 "e688324b58560ab68a1a3cff2c0a474e3fed371dfe8da5d1b9817b7df55039ce" - end - def install venv = virtualenv_create(libexec, "python3.10") @@ -355,6 +342,11 @@ class Fdroidserver < Formula venv.pip_install_and_link buildpath bash_completion.install "completion/bash-completion" => "fdroid" doc.install "examples" + + # we depend on yamllint, but that's a separate formula, so install a `.pth` file to link them + site_packages = Language::Python.site_packages("python3.10") + yamllint = Formula["yamllint"].opt_libexec + (libexec/site_packages/"homebrew-yamllint.pth").write yamllint/site_packages end def caveats diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index c4c3f42216c..7d54742b94a 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -170,7 +170,7 @@ "exclude_packages": ["six"] }, "fdroidserver": { - "exclude_packages": ["numpy", "pillow", "six"], + "exclude_packages": ["numpy", "pillow", "six", "PyYAML", "yamllint", "pathspec"], "extra_packages": ["wheel"] }, "flintrock": {