10000 Merge pull request #141925 from chenrui333/python-markdown-update-build · ArduinoBot/homebrew-core@87b45ed · GitHub
[go: up one dir, main page]
Skip to content

Commit 87b45ed

Browse files
BrewTestBotBrewTestBot
authored
Merge pull request Homebrew#141925 from chenrui333/python-markdown-update-build
python-markdown: build with std_pip_args
2 parents 6c976da + f626cc9 commit 87b45ed

File tree

6 files changed

+58
-84
lines changed

6 files changed

+58
-84
lines changed

‎Formula/f/ford.rb

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@ class Ford < Formula
99
head "https://github.com/Fortran-FOSS-Programmers/ford.git", branch: "master"
1010

1111
bottle do
12-
sha256 cellar: :any_skip_relocation, arm64_ventura: "8948ca52f3af0b56e558b409e482b4677a586d7c9bd52951b5cc517ce94d578b"
13-
sha256 cellar: :any_skip_relocation, arm64_monterey: "5b728acd2e5faff1e19e8a3ed27a93a5c8d74cb9f50499e432d2b2448a8b941a"
14-
sha256 cellar: :any_skip_relocation, arm64_big_sur: "9a04cc0ba94e82dc320f8f2aaab1f90ee09984ec7cb1b7513267387990484daa"
15-
sha256 cellar: :any_skip_relocation, ventura: "c069a3f2ba3f9f00e1d562ec2b9dc3c363fad14badc0fbfe129c3875ce602334"
16-
sha256 cellar: :any_skip_relocation, monterey: "52d1f4ef76fca496c73599dade40d4fd97d2f0f223320fe511bccd2ccb439c23"
17-
sha256 cellar: :any_skip_relocation, big_sur: "f94d3c0f8b7f6626a2e232617ba906748d7ca1fea1245bcb803f1bfd4afc2bc1"
18-
sha256 cellar: :any_skip_relocation, x86_64_linux: "893e1dc1a61555955610fba040b79d4ddc5b851fd9622663dc38173e02dfe2e8"
12+
rebuild 1
13+
sha256 cellar: :any_skip_relocation, arm64_ventura: "8ebf168d485bded0c51fa40ee69ee91b155d7a7e34f323d7585972d4053eb732"
14+
sha256 cellar: :any_skip_relocation, arm64_monterey: "a4fbf95afb8a084c738f1d450ace10bedb5dd06dfbfde43654add76c0c12644d"
15+
sha256 cellar: :any_skip_relocation, arm64_big_sur: "e836d281dc9c6d54fcb310318196394446b3e05916dbdaac2d6da45b2635e077"
16+
sha256 cellar: :any_skip_relocation, ventura: "ef26796d030e5dc19738a5e2fe831f085321bf37eaa4b21321d27dd9049e0d0c"
17+
sha256 cellar: :any_skip_relocation, monterey: "7222ee74f230d94ed43f853ce6ce68f5539251c1ff7b5dbe1c0ceae0d2d04d0c"
18+
sha256 cellar: :any_skip_relocation, big_sur: "be9ebc5b389125cf1fa6fba5d24df190827dd75656b3d374ced1ec57bbd826d1"
19+
sha256 cellar: :any_skip_relocation, x86_64_linux: "fe447cdac85d7355d04d8e808f39123a924c27eb509dc7b1d779fb3f32c28130"
1920
end
2021

2122
depends_on "graphviz"
2223
depends_on "pygments"
24+
depends_on "python-markdown"
25+
depends_on "python-markupsafe"
2326
depends_on "python@3.11"
2427

2528
uses_from_macos "libxml2"
@@ -40,21 +43,11 @@ class Ford < Formula
4043
sha256 "31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"
4144
end
4245

43-
resource "markdown" do
44-
url "https://files.pythonhosted.org/packages/9d/80/cc67bfb7deb973d5ae662ee6454d2dafaa8f7c106feafd0d1572666ebde5/Markdown-3.4.3.tar.gz"
45-
sha256 "8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520"
46-
end
47-
4846
resource "markdown-include" do
4947
url "https://files.pythonhosted.org/packages/5d/9c/7f53ad33ec7b7243910f8a5c3335c895fb070dc21b2e38b5a38d6a966c0c/markdown-include-0.7.2.tar.gz"
5048
sha256 "84070d0244367f99bdf9bbdd49ff7b9f51517bbee7582ad7aa8ff363e30d8157"
5149
end
5250

53-
resource "markupsafe" do
54-
url "https://files.pythonhosted.org/packages/95/7e/68018b70268fb4a2a605e2be44ab7b4dd7ce7808adae6c5ef32e34f4b55a/MarkupSafe-2.1.2.tar.gz"
55-
sha256 "abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"
56-
end
57-
5851
resource "python-markdown-math" do
5952
url "https://files.pythonhosted.org/packages/ec/17/e7e3f3fce951b8adec10987834f4b2fa721ebd9bd6651ce2a4f39c4c544d/python-markdown-math-0.8.tar.gz"
6053
sha256 "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635"

‎Formula/g/grip.rb

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@ class Grip < Formula
99
revision 2
1010

1111
bottle do
12-
rebuild 1
13-
sha256 cellar: :any_skip_relocation, arm64_ventura: "d21cc3005461af05fb3066de25d04621de02c0df9dde5e065e584facc243ab36"
14-
sha256 cellar: :any_skip_relocation, arm64_monterey: "6e9e444cacc4e1b7a2d97367e9fb227b499f89831a780c84ad5a27a23a0f7a28"
15-
sha256 cellar: :any_skip_relocation, arm64_big_sur: "f034a537001bdf1b4ecce9f9bd5e8545f29a28649c0e4744774f062732757c9c"
16-
sha256 cellar: :any_skip_relocation, ventura: "d65953b1d02446617ffaf65217ace2a1d18d2839ff675e128696a2eacf9dd299"
17-
sha256 cellar: :any_skip_relocation, monterey: "bc5e3ebc10c36c3aebdd486447293b64869f6e19637ebd9227570ca9ada9d68f"
18-
sha256 cellar: :any_skip_relocation, big_sur: "e2263523ec145ebcacefb1463c509f31ea642e7ef997ad003ba5b7b9abeccbef"
19-
sha256 cellar: :any_skip_relocation, x86_64_linux: "c6e238c050103ba090ac1e09ef867c2e2e11ab3a9189b9a26e5adcaf9e6d5669"
12+
rebuild 2
13+
sha256 cellar: :any_skip_relocation, arm64_ventura: "c799923362a18c5cc9835251d14ade71c69ad898333c891b2b252f040605311c"
14+
sha256 cellar: :any_skip_relocation, arm64_monterey: "f21e46c38501eb76b7c4d04a540f6f699c02332eafc62f310c54e11bbc414fd0"
15+
sha256 cellar: :any_skip_relocation, arm64_big_sur: "b2f0698cedd93da90d745538e17b86444e9e72adb1b25a1d1379bdbf27421eb4"
16+
sha256 cellar: :any_skip_relocation, ventura: "f8c869eae9a51fb2f4d994d22ca686f8984eba5cb421203af652a0efeaf6f5dd"
17+
sha256 cellar: :any_skip_relocation, monterey: "834235cdc36f10575528c8c3d108b6b3e2304cd38df89221d390b2727e6e6eba"
18+
sha256 cellar: :any_skip_relocation, big_sur: "a6525546b3457842019ea88fc23d6a561b0240b0f8b1aeec88d464ac922b54b7"
19+
sha256 cellar: :any_skip_relocation, x86_64_linux: "900f1e266b1bd0748e891c4b4e7fdabcec5138a6b898b99a410cd1507602b45b"
2020
end
2121

2222
depends_on "pygments"
2323
depends_on "python-certifi"
24+
depends_on "python-markdown"
25+
depends_on "python-markupsafe"
2426
depends_on "python@3.11"
2527

2628
resource "blinker" do
@@ -63,16 +65,6 @@ class Grip < Formula
6365
sha256 "31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"
6466
end
6567

66-
resource "markdown" do
67-
url "https://files.pythonhosted.org/packages/87/2a/62841f4fb1fef5fa015ded48d02401cd95643ca03b6760b29437b62a04a4/Markdown-3.4.4.tar.gz"
68-
sha256 "225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6"
69-
end
70-
71-
resource "markupsafe" do
72-
url "https://files.pythonhosted.org/packages/6d/7c/59a3248f411813f8ccba92a55feaac4bf360d29e2ff05ee7d8e1ef2d7dbf/MarkupSafe-2.1.3.tar.gz"
73-
sha256 "af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"
74-
end
75-
7668
resource "path-and-address" do
7769
url "https://files.pythonhosted.org/packages/2b/b5/749fab14d9e84257f3b0583eedb54e013422b6c240491a4ae48d9ea5e44f/path-and-address-2.0.1.zip"
7870
sha256 "e96363d982b3a2de8531f4cd5f086b51d0248b58527227d43cf5014d045371b7"

‎Formula/m/mkdocs.rb

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@ class Mkdocs < Formula
88
license "BSD-2-Clause"
99

1010
bottle do
11-
sha256 cellar: :any_skip_relocation, arm64_ventura: "babf3653895e0d2ac60b5c3e4dd22f79ff08efee07cd4ebf3f983a87dd85124a"
12-
sha256 cellar: :any_skip_relocation, arm64_monterey: "22636c0da833f5e869ce99247c6176d8c8c101431ecb0c9f967407027bd6ddd3"
13-
sha256 cellar: :any_skip_relocation, arm64_big_sur: "9747e30efdd47a8aaaa46d7adf050cdbb97192510200a754fcaf0667e779a4b5"
14-
sha256 cellar: :any_skip_relocation, ventura: "463a687cd9dc8c767b69a11aab8174d4d7738cc60fec9dd4d0205ad8c47020b0"
15-
sha256 cellar: :any_skip_relocation, monterey: "5e33a552aa9d9cd1852a4c9031bd6cbaeaa05f895f2e5a81c678ee94a0178a89"
16-
sha256 cellar: :any_skip_relocation, big_sur: "820b90d542d7705e4bc9c0459d2f3adf4d515c9e6ac13eb6f0fdfeacca8221e6"
17-
sha256 cellar: :any_skip_relocation, x86_64_linux: "58ae1a780d19c44629d29b44af2d2ef154a52a7cd7c6b81729a1f1373165f2e5"
11+
rebuild 1
12+
sha256 cellar: :any_skip_relocation, arm64_ventura: "249b5998c5d738de86911b237847392eed7595a0af74257bf5c0ce335a2f579f"
13+
sha256 cellar: :any_skip_relocation, arm64_monterey: "98ff8fec37e7ea3e796ca2b899ef7367e49c53ecef4016c0b8d614d9e43a41d8"
14+
sha256 cellar: :any_skip_relocation, arm64_big_sur: "3c541029e15c00fa6f47fb9f57290253586a1ac1d6c4efea65d79be8b145f4ef"
15+
sha256 cellar: :any_skip_relocation, ventura: "d28d7e5dcfd94cd83d304c53fb7b3b2b9ebb222cd5267aefebb20160bb9f5ca0"
16+
sha256 cellar: :any_skip_relocation, monterey: "21ebf8073ce196f7954d92899e69dffe68fa57733bd2a1478694f82c1ede929b"
17+
sha256 cellar: :any_skip_relocation, big_sur: "8c6b374343347d3efd7ff9297575ed740557ca0e017668428c8f6d64fc91cfa9"
18+
sha256 cellar: :any_skip_relocation, x86_64_linux: "f4b6fb23dee11ef2a58981ae3634769850427bb6f218eb6c7872d1bdefad1746"
1819
end
1920

21+
depends_on "python-markdown"
22+
depends_on "python-markupsafe"
23+
depends_on "python-packaging"
2024
depends_on "python@3.11"
2125
depends_on "pyyaml"
2226
depends_on "six"
@@ -36,26 +40,11 @@ class Mkdocs < Formula
3640
sha256 "31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"
3741
end
3842

39-
resource "markdown" do
40-
url "https://files.pythonhosted.org/packages/87/2a/62841f4fb1fef5fa015ded48d02401cd95643ca03b6760b29437b62a04a4/Markdown-3.4.4.tar.gz"
41-
sha256 "225c6123522495d4119a90b3a3ba31a1e87a70369e03f14799ea9c0d7183a3d6"
42-
end
43-
44-
resource "markupsafe" do
45-
url "https://files.pythonhosted.org/packages/6d/7c/59a3248f411813f8ccba92a55feaac4bf360d29e2ff05ee7d8e1ef2d7dbf/MarkupSafe-2.1.3.tar.gz"
46-
sha256 "af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"
47-
end
48-
4943
resource "mergedeep" do
5044
url "https://files.pythonhosted.org/packages/3a/41/580bb4006e3ed0361b8151a01d324fb03f420815446c7def45d02f74c270/mergedeep-1.3.4.tar.gz"
5145
sha256 "0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8"
5246
end
5347

54-
resource "packaging" do
55-
url "https://files.pythonhosted.org/packages/b9/6c/7c6658d258d7971c5eb0d9b69fa9265879ec9a9158031206d47800ae2213/packaging-23.1.tar.gz"
56-
sha256 "a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"
57-
end
58-
5948
resource "pathspec" do
6049
url "https://files.pythonhosted.org/packages/a0/2a/bd167cdf116d4f3539caaa4c332752aac0b3a0cc0174cdb302ee68933e81/pathspec-0.11.2.tar.gz"
6150
sha256 "e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"

‎Formula/p/python-markdown.rb

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
class PythonMarkdown < Formula
2-
include Language::Python::Virtualenv
3-
42
desc "Python implementation of Markdown"
53
homepage "https://python-markdown.github.io"
64
url "https://files.pythonhosted.org/packages/87/2a/62841f4fb1fef5fa015ded48d02401cd95643ca03b6760b29437b62a04a4/Markdown-3.4.4.tar.gz"
@@ -9,23 +7,30 @@ class PythonMarkdown < Formula
97
head "https://github.com/Python-Markdown/markdown.git", branch: "master"
108

119
bottle do
12-
sha256 cellar: :any_skip_relocation, arm64_ventura: "e47ce3cd5f32d01e63145054e502a7231901b74fd3163f97050192d70427457e"
13-
sha256 cellar: :any_skip_relocation, arm64_monterey: "d2e789fd1839fc8747f4bfd3f09d82fb322b38de1818890767198f57977dc9aa"
14-
sha256 cellar: :any_skip_relocation, arm64_big_sur: "c06919942f75f4a11144be345117bd9a8232769728425ecc4acec53e182e3c93"
15-
sha256 cellar: :any_skip_relocation, ventura: "09a71189f52aed377371795afc3f45071451a96a8553a66291e62b4097c7834e"
16-
sha256 cellar: :any_skip_relocation, monterey: "786b7b5b79deca23a668f5746f4c2aeb2ef04fb5944465f1149a10783cc7b6c7"
17-
sha256 cellar: :any_skip_relocation, big_sur: "35a65f9f3da4fdcc06ddf07b0cbc0ecf9b6e84e3077f63e52844f94a781fc67d"
18-
sha256 cellar: :any_skip_relocation, x86_64_linux: "59f716c12dd644e01512e9815ccd100070e28e4c8ccee5db92a6d309675e174c"
10+
rebuild 1
11+
sha256 cellar: :any_skip_relocation, arm64_ventura: "2118a98603123ff5f283a713c17e3a4588cf577690e6cfbd18cf0f9a86e06f02"
12+
sha256 cellar: :any_skip_relocation, arm64_monterey: "f6052ea49275af4e1cb22a8defda61803f9dec4157aeb3e118d6c08c6fade88e"
13+
sha256 cellar: :any_skip_relocation, arm64_big_sur: "4b7e1e77dbe6563b35f53dfa1f8140f80d75baf1cb8b807878081a2bf4087a00"
14+
sha256 cellar: :any_skip_relocation, ventura: "cf1970201addc305f51dd6880da17c12aacd754e1540f2c320dd77d6fc024a03"
15+
sha256 cellar: :any_skip_relocation, monterey: "89b7af86db5003d8e9e3ba570476d29d286cdd943fa03911f0a62cc695e939ad"
16+
sha256 cellar: :any_skip_relocation, big_sur: "80d58b809875ebe463956a4a5a2eedda9a105e005644d998dd8efc69ff428fd1"
17+
sha256 cellar: :any_skip_relocation, x86_64_linux: "2019874cc73e7e15fa563fc15c0bc187fc91a751e03db65827abbc3db349b1ab"
1918
end
2019

2120
depends_on "python@3.11"
2221

22+
def python3
23+
which("python3.11")
24+
end
25+
2326
def install
24-
virtualenv_install_with_resources
27+
system python3, "-m", "pip", "install", *std_pip_args, "."
2528
end
2629

2730
test do
2831
(testpath/"test.md").write("# Hello World!")
2932
assert_equal "<h1>Hello World!</h1>", shell_output(bin/"markdown_py test.md").strip
33+
34+
system python3, "-c", "import markdown;"
3035
end
3136
end

‎Formula/r/redo.rb

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,24 @@ class Redo < Formula
99
revision 2
1010

1111
bottle do
12-
rebuild 1
13-
sha256 cellar: :any_skip_relocation, arm64_ventura: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
14-
sha256 cellar: :any_skip_relocation, arm64_monterey: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
15-
sha256 cellar: :any_skip_relocation, arm64_big_sur: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
16-
sha256 cellar: :any_skip_relocation, ventura: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
17-
sha256 cellar: :any_skip_relocation, monterey: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
18-
sha256 cellar: :any_skip_relocation, big_sur: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
19-
sha256 cellar: :any_skip_relocation, catalina: "1232319e15044a5dbd0e2b0f2608a4bbbad086f07beb2abc33fb7492c4f66204"
20-
sha256 cellar: :any_skip_relocation, x86_64_linux: "3ff5f989f702472df0da1a1a6fa57b1648226cbc302f434f3f89678f39375764"
12+
rebuild 2
13+
sha256 cellar: :any_skip_relocation, arm64_ventura: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
14+
sha256 cellar: :any_skip_relocation, arm64_monterey: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
15+
sha256 cellar: :any_skip_relocation, arm64_big_sur: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
16+
sha256 cellar: :any_skip_relocation, ventura: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
17+
sha256 cellar: :any_skip_relocation, monterey: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
18+
sha256 cellar: :any_skip_relocation, big_sur: "f7e392b19dabdac8d71937132f56dc068b462b36cb90c1bc345f8f3362935bd8"
19+
sha256 cellar: :any_skip_relocation, x86_64_linux: "8311708347ac6e5dd70472cbae269bb3a647e49068ff2cc4d6c87571523364ce"
2120
end
2221

22+
depends_on "python-markdown"
2323
depends_on "python@3.11"
2424

2525
resource "beautifulsoup4" do
2626
url "https://files.pythonhosted.org/packages/e8/b0/cd2b968000577ec5ce6c741a54d846dfa402372369b8b6861720aa9ecea7/beautifulsoup4-4.11.1.tar.gz"
2727
sha256 "ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"
2828
end
2929

30-
resource "Markdown" do
31-
url "https://files.pythonhosted.org/packages/d6/58/79df20de6e67a83f0d0bbfe6c19bb82adf68cdf362885257eb01099f930a/Markdown-3.3.7.tar.gz"
32-
sha256 "cbb516f16218e643d8e0a95b309f77eb118cb138d39a4f27851e6a63581db874"
33-
end
34-
3530
resource "soupsieve" do
3631
url "https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38/soupsieve-2.3.2.post1.tar.gz"
3732
sha256 "fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"

‎pypi_formula_mappings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
"extra_packages": ["Brotli"]
345345
},
346346
"ford": {
347-
"exclude_packages": ["pygments"]
347+
"exclude_packages": ["markdown", "markupsafe", "pygments"]
348348
},
349349
"fred": {
350350
"exclude_packages": ["certifi"]
@@ -391,7 +391,7 @@
391391
"exclude_packages": ["certifi"]
392392
},
393393
"grip": {
394-
"exclude_packages": ["certifi", "Pygments"]
394+
"exclude_packages": ["certifi", "markdown", "markupsafe", "Pygments"]
395395
},
396396
"grokmirror": {
397397
"exclude_packages": ["certifi"]
@@ -541,7 +541,7 @@
541541
"exclude_packages": ["certifi", "cffi", "cryptography", "protobuf", "pycparser"]
542542
},
543543
"mkdocs": {
544-
"exclude_packages": ["six", "PyYAML"]
544+
"exclude_packages": ["markdown", "markupsafe", "six", "packaging", "PyYAML"]
545545
},
546546
"molecule": {
547547
"extra_packages": ["docker-py", "molecule-vagrant", "python-vagrant"],

0 commit comments

Comments
 (0)
0