From f1adfe2f5d24d722fa2316d6f8b3682aed390298 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Sat, 15 Oct 2022 13:58:46 +0200 Subject: [PATCH] fdroidserver: depend on fonttools, ipython, pygments Closes #113198. Signed-off-by: Rui Chen Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/fdroidserver.rb | 125 +++---------------------------------- pypi_formula_mappings.json | 8 ++- 2 files changed, 14 insertions(+), 119 deletions(-) diff --git a/Formula/fdroidserver.rb b/Formula/fdroidserver.rb index daf539a5677..22f756ec3cc 100644 --- a/Formula/fdroidserver.rb +++ b/Formula/fdroidserver.rb @@ -19,9 +19,12 @@ class Fdroidserver < Formula depends_on "pkg-config" => :build depends_on "rust" => :build + depends_on "fonttools" + depends_on "ipython" depends_on "numpy" depends_on "openssl@1.1" depends_on "pillow" + depends_on "pygments" depends_on "python@3.10" depends_on "pyyaml" depends_on "s3cmd" @@ -32,13 +35,6 @@ class Fdroidserver < Formula uses_from_macos "libxml2" uses_from_macos "libxslt" - resource "appnope" do - on_macos do - url "https://files.pythonhosted.org/packages/6a/cd/355842c0db33192ac0fc822e2dcae835669ef317fe56c795fb55fcddb26f/appnope-0.1.3.tar.gz" - sha256 "02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24" - end - end - resource "androguard" do url "https://files.pythonhosted.org/packages/83/78/0f44e8f0fd10493b3118d79d60599c93e5a2cd378d83054014600a620cba/androguard-3.3.5.tar.gz" sha256 "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2" @@ -59,11 +55,6 @@ class Fdroidserver < Formula sha256 "13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c" end - resource "asttokens" do - url "https://files.pythonhosted.org/packages/4d/c8/987ee029c83ad1cddb03bb004e9c7a8de1be4cdbda21122a0b9f639fcc31/asttokens-2.0.8.tar.gz" - sha256 "c61e16246ecfb2cde2958406b4c8ebc043c9e6d73aaa83c941673b35e5d3a76b" - end - resource "backcall" do url "https://files.pythonhosted.org/packages/a2/40/764a663805d84deee23043e1426a9175567db89c8b3287b5c2ad9f71aa93/backcall-0.2.0.tar.gz" sha256 "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e" @@ -114,26 +105,11 @@ class Fdroidserver < Formula sha256 "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f" end - resource "decorator" do - url "https://files.pythonhosted.org/packages/66/0c/8d907af351aa16b42caae42f9d6aa37b900c67308052d10fdce809f8d952/decorator-5.1.1.tar.gz" - sha256 "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330" - end - resource "defusedxml" do url "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz" sha256 "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69" end - resource "executing" do - url "https://files.pythonhosted.org/packages/7e/f7/148b1a293f8187b0ea5327be6ec595731bf2b0dde8d6dae9c907a1ecd704/executing-1.0.0.tar.gz" - sha256 "98daefa9d1916a4f0d944880d5aeaf079e05585689bebd9ff9b32e31dd5e1017" - end - - resource "fonttools" do - url "https://files.pythonhosted.org/packages/9a/fe/0c77652d275fa4dfb887b72c7c149aba71153b618c73d62ada1527d2f0ef/fonttools-4.37.1.zip" - sha256 "4606e1a88ee1f6699d182fea9511bd9a8a915d913eab4584e5226da1180fcce7" - end - resource "gitdb" do url "https://files.pythonhosted.org/packages/fc/44/64e02ef96f20b347385f0e9c03098659cb5a1285d36c3d17c56e534d80cf/gitdb-4.0.9.tar.gz" sha256 "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa" @@ -149,16 +125,6 @@ class Fdroidserver < Formula sha256 "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" end - resource "ipython" do - url "https://files.pythonhosted.org/packages/25/a5/dda90aa8cb931458a357ae65ff4341d7694464f322b095a438489440dc7c/ipython-8.5.0.tar.gz" - sha256 "097bdf5cd87576fd066179c9f7f208004f7a6864ee1b20f37d346c0bcb099f84" - end - - resource "jedi" do - url "https://files.pythonhosted.org/packages/c2/25/273288df952e07e3190446efbbb30b0e4871a0d63b4246475f3019d4f55e/jedi-0.18.1.tar.gz" - sha256 "74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab" - end - resource "kiwisolver" do url "https://files.pythonhosted.org/packages/5f/5c/272a7dd49a1914f35cd8d6d9f386defa8b047f6fbd06badd6b77b3ba24e7/kiwisolver-1.4.4.tar.gz" sha256 "d41997519fcba4a1e46eb4a2fe31bc12f0ff957b2b81bac28db24744f333e955" @@ -174,56 +140,16 @@ class Fdroidserver < Formula sha256 "339cac48b80ddbc8bfd05daae0a3a73414651a8596904c2a881cfd1edb65f26c" end - resource "matplotlib-inline" do - url "https://files.pythonhosted.org/packages/d9/50/3af8c0362f26108e54d58c7f38784a3bdae6b9a450bab48ee8482d737f44/matplotlib-inline-0.1.6.tar.gz" - sha256 "f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304" - end - resource "networkx" do url "https://files.pythonhosted.org/packages/d9/c6/ad9dc9195c0e5d8879d2a28667aa45e087631576b40f9c954a086693a36d/networkx-2.8.6.tar.gz" sha256 "bd2b7730300860cbd2dafe8e5af89ff5c9a65c3975b352799d87a6238b4301a6" end - resource "packaging" do - url "https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c/packaging-21.3.tar.gz" - sha256 "dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb" - end - resource "paramiko" do url "https://files.pythonhosted.org/packages/1d/08/3b8d8f1b4ec212c17429c2f3ff55b7f2237a1ad0c954972e39c8f0ac394c/paramiko-2.11.0.tar.gz" sha256 "003e6bee7c034c21fbb051bf83dc0a9ee4106204dd3c53054c71452cc4ec3938" end - resource "parso" do - url "https://files.pythonhosted.org/packages/a2/0e/41f0cca4b85a6ea74d66d2226a7cda8e41206a624f5b330b958ef48e2e52/parso-0.8.3.tar.gz" - sha256 "8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0" - end - - resource "pexpect" do - url "https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10/pexpect-4.8.0.tar.gz" - sha256 "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c" - end - - resource "pickleshare" do - url "https://files.pythonhosted.org/packages/d8/b6/df3c1c9b616e9c0edbc4fbab6ddd09df9535849c64ba51fcb6531c32d4d8/pickleshare-0.7.5.tar.gz" - sha256 "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca" - end - - resource "prompt-toolkit" do - url "https://files.pythonhosted.org/packages/80/76/c94cf323ca362dd7baca8d8ddf3b5fe1576848bc0156522ad581c04f8446/prompt_toolkit-3.0.31.tar.gz" - sha256 "9ada952c9d1787f52ff6d5f3484d0b4df8952787c087edf6a1f7c2cb1ea88148" - end - - resource "ptyprocess" do - url "https://files.pythonhosted.org/packages/20/e5/16ff212c1e452235a90aeb09066144d0c5a6a8c0834397e03f5224495c4e/ptyprocess-0.7.0.tar.gz" - sha256 "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220" - end - - resource "pure-eval" do - url "https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd/pure_eval-0.2.2.tar.gz" - sha256 "2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3" - end - resource "pyasn1" do url "https://files.pythonhosted.org/packages/a4/db/fffec68299e6d7bad3d504147f9094830b704527a7fc098b721d38cc7fa7/pyasn1-0.4.8.tar.gz" sha256 "aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba" @@ -244,26 +170,11 @@ class Fdroidserver < Formula sha256 "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d" end - resource "Pygments" do - url "https://files.pythonhosted.org/packages/e0/ef/5905cd3642f2337d44143529c941cc3a02e5af16f0f65f81cbef7af452bb/Pygments-2.13.0.tar.gz" - sha256 "56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1" - end - resource "PyNaCl" do url "https://files.pythonhosted.org/packages/a7/22/27582568be639dfe22ddb3902225f91f2f17ceff88ce80e4db396c8986da/PyNaCl-1.5.0.tar.gz" sha256 "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" end - resource "pyparsing" do - url "https://files.pythonhosted.org/packages/71/22/207523d16464c40a0310d2d4d8926daffa00ac1f5b1576170a32db749636/pyparsing-3.0.9.tar.gz" - sha256 "2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb" - end - - resource "python-dateutil" do - url "https://files.pythonhosted.org/packages/4c/c4/13b4776ea2d76c115c1d1b84579f3764ee6d57204f6be27119f13a61d0a9/python-dateutil-2.8.2.tar.gz" - sha256 "0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86" - end - resource "python-vagrant" do url "https://files.pythonhosted.org/packages/2b/3f/2e42a44c9705d72d9925fe8daf00f31bcf82e8b84ec5a752a8a1357c3ef8/python-vagrant-1.0.0.tar.gz" sha256 "a8fe93ccf2ff37ecc95ec2f49ea74a91a6ce73a4db4a16a98dd26d397cfd09e5" @@ -294,26 +205,11 @@ class Fdroidserver < Formula sha256 "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936" end - resource "stack-data" do - url "https://files.pythonhosted.org/packages/d6/3a/6baf4a5e7b48f00bc636bc878c6d93afd032dfeafc10b4a0a5a27232efb3/stack_data-0.5.0.tar.gz" - sha256 "715c8855fbf5c43587b141e46cc9d9339cc0d1f8d6e0f98ed0d01c6cb974e29f" - end - - resource "traitlets" do - url "https://files.pythonhosted.org/packages/b2/ed/3c842dbe5a8f0f1ebf3f5b74fc1a46601ed2dfe0a2d256c8488d387b14dd/traitlets-5.3.0.tar.gz" - sha256 "0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2" - end - resource "urllib3" do url "https://files.pythonhosted.org/packages/b2/56/d87d6d3c4121c0bcec116919350ca05dc3afd2eeb7dc88d07e8083f8ea94/urllib3-1.26.12.tar.gz" sha256 "3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e" end - resource "wcwidth" do - url "https://files.pythonhosted.org/packages/89/38/459b727c381504f361832b9e5ace19966de1a235d73cdbdea91c771a1155/wcwidth-0.2.5.tar.gz" - sha256 "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83" - end - resource "wheel" do url "https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a540964b73589256cb10cc10057c87ac78fc2/wheel-0.37.1.tar.gz" sha256 "e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4" @@ -322,14 +218,6 @@ class Fdroidserver < Formula def install venv = virtualenv_create(libexec, "python3.10") - resource("ptyprocess").stage do - # Without removing this file, `pip` will ignore the `setup.py` file and - # attempt to download the [`flit`](https://github.com/takluyver/flit) - # build system. - rm_f "pyproject.toml" - venv.pip_install Pathname.pwd - end - venv.pip_install resource("lxml") venv.pip_install resource("cffi") # or bcrypt fails to build venv.pip_install resource("wheel") # or kiwisolver fails to build @@ -344,10 +232,11 @@ class Fdroidserver < Formula 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 + %w[fonttools ipython pygments yamllint].each do |package_name| + package = Formula[package_name].opt_libexec + (libexec/site_packages/"homebrew-#{package_name}.pth").write package/site_packages + end end def caveats diff --git a/pypi_formula_mappings.json b/pypi_formula_mappings.json index a81ba5314a1..20a207fc951 100644 --- a/pypi_formula_mappings.json +++ b/pypi_formula_mappings.json @@ -189,7 +189,13 @@ "exclude_packages": ["six"] }, "fdroidserver": { - "exclude_packages": ["numpy", "pillow", "six", "PyYAML", "yamllint", "pathspec"], + "exclude_packages": [ + "numpy", "pillow", "six", "PyYAML", "yamllint", "pathspec", "fonttools", "Brotli", "Pygments", + "ipython", "appnope", "asttokens", "backcall", "debugpy", "decorator", "entrypoints", + "executing", "ipykernel", "jedi", "matplotlib-inline", "nest-asyncio", "packaging", + "parso", "pexpect", "pickleshare", "prompt-toolkit", "psutil", "ptyprocess", "pure-eval", + "pyparsing", "python-dateutil", "pyzmq", "stack-data", "tornado", "traitlets", "wcwidth" + ], "extra_packages": ["wheel"] }, "flintrock": {