Skip to content

Commit ca52013

Browse files
authored
Merge pull request #199665 from mfinelli/harlequin-plugins
harlequin: add mysql plugin
2 parents 91940fd + ab38068 commit ca52013

File tree

2 files changed

+32
-12
lines changed

2 files changed

+32
-12
lines changed

Formula/h/harlequin.rb

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ class Harlequin < Formula
99
revision 1
1010

1111
bottle do
12-
sha256 cellar: :any, arm64_sequoia: "a0325720a564ef70170a8678b274989f790c8a9c6f941ce8d0de28ccd2886097"
13-
sha256 cellar: :any, arm64_sonoma: "85bcdff85ce10a5347c4aa11dd122530113712c8822bb71fa6b5bcd2d62ddce4"
14-
sha256 cellar: :any, arm64_ventura: "d53144065dbf6f3795184304a15a683d150f5739c6e65af081b9f89d64d914d0"
15-
sha256 cellar: :any, sonoma: "4cbdc353f11b180b0c3b4f2e30efe8bd9dea204f4419afc83cdfa5d4d30f91b0"
16-
sha256 cellar: :any, ventura: "a35f1ea5b322961525aa3ff9450531e80b97f57b27fbdc99a06ae453b1e4038e"
17-
sha256 cellar: :any_skip_relocation, x86_64_linux: "624d397576b9b0d573162619a8fd98f46f01dc3bd5cba0546efb7d5c439520a1"
12+
rebuild 1
13+
sha256 cellar: :any, arm64_sequoia: "14e426a0f2b72b6ba09716c08135471f973bf9f821b4f6842f305a3fb291c394"
14+
sha256 cellar: :any, arm64_sonoma: "027127834e8bdfe88707d2d389f35d20b733a76c0f25f102bfb75a1b91a76834"
15+
sha256 cellar: :any, arm64_ventura: "43eac7d923cf9d8e9e07f48267902848601f50850530689958580eda6fabe902"
16+
sha256 cellar: :any, sonoma: "bf59dabcc40c4cd6fa31017b5fb8e4c35bb477f6a29fd09e2b8ba308187b67ef"
17+
sha256 cellar: :any, ventura: "1e8395e2404d53835bfc2e77820ab751c0fe9ab0abfb62b0904cd9f66a3fa45b"
18+
sha256 cellar: :any_skip_relocation, x86_64_linux: "7cd455b499a8104ed9539f9562f6b810411937e36fc415f240cc4c6e3d57bc45"
1819
end
1920

2021
depends_on "cmake" => :build
22+
depends_on "mysql" => :build # mysql-connector-python
2123
depends_on "ninja" => :build
2224
depends_on "apache-arrow"
2325
depends_on "[email protected]"
@@ -46,7 +48,12 @@ class Harlequin < Formula
4648
sha256 "68c3a46ab08836fe041d15dcbf838f74a990d551db47cb24ab1c4576fc19351c"
4749
end
4850

49-
resource "Jinja2" do
51+
resource "harlequin-mysql" do
52+
url "https://files.pythonhosted.org/packages/80/fd/410c3a6f6c1d0358359c58a3c36b0ac3519a1da8d0e7f0424f1a00f8bfcc/harlequin_mysql-0.3.0.tar.gz"
53+
sha256 "46ef42c5b658568f5340ee53c241cb1333f3e04914807c1f83741e83517878b3"
54+
end
55+
56+
resource "jinja2" do
5057
url "https://files.pythonhosted.org/packages/ed/55/39036716d19cab0747a5020fc7e907f362fbf48c984b14e62127f7e68e5d/jinja2-3.1.4.tar.gz"
5158
sha256 "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"
5259
end
@@ -61,7 +68,7 @@ class Harlequin < Formula
6168
sha256 "e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"
6269
end
6370

64-
resource "MarkupSafe" do
71+
resource "markupsafe" do
6572
url "https://files.pythonhosted.org/packages/b2/97/5d42485e71dfc078108a86d6de8fa46db44a1a9295e89c5d6d4a06e23a62/markupsafe-3.0.2.tar.gz"
6673
sha256 "ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0"
6774
end
@@ -76,6 +83,11 @@ class Harlequin < Formula
7683
sha256 "bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"
7784
end
7885

86+
resource "mysql-connector-python" do
87+
url "https://github.com/mysql/mysql-connector-python/archive/refs/tags/8.4.0.tar.gz"
88+
sha256 "52944d6fa84c903fd70723a47d2f8c3153c50ae91773f1584a7bd30606c58b35"
89+
end
90+
7991
resource "numpy" do
8092
url "https://files.pythonhosted.org/packages/65/6e/09db70a523a96d25e115e71cc56a6f9031e7b8cd166c1ac8438307c14058/numpy-1.26.4.tar.gz"
8193
sha256 "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"
@@ -96,7 +108,7 @@ class Harlequin < Formula
96108
sha256 "9386d3ca9c145b5539a1cfc75df07757dff870168c959b473a0bccbc3abc8c73"
97109
end
98110

99-
resource "Pygments" do
111+
resource "pygments" do
100112
url "https://files.pythonhosted.org/packages/8e/62/8336eff65bcbc8e4cb5d05b55faf041285951b6e80f33e2bff2024788f31/pygments-2.18.0.tar.gz"
101113
sha256 "786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199"
102114
end
@@ -117,8 +129,8 @@ class Harlequin < Formula
117129
end
118130

119131
resource "rich-click" do
120-
url "https://files.pythonhosted.org/packages/fc/f4/e48dc2850662526a26fb0961aacb0162c6feab934312b109b748ae4efee2/rich_click-1.8.4.tar.gz"
121-
sha256 "0f49471f04439269d0e66a6f43120f52d11d594869a2a0be600cfb12eb0616b9"
132+
url "https://files.pythonhosted.org/packages/9a/31/103501e85e885e3e202c087fa612cfe450693210372766552ce1ab5b57b9/rich_click-1.8.5.tar.gz"
133+
sha256 "a3eebe81da1c9da3c32f3810017c79bd687ff1b3fa35bfc9d8a3338797f1d1a1"
122134
end
123135

124136
resource "shandy-sqlfmt" do
@@ -179,7 +191,12 @@ class Harlequin < Formula
179191
end
180192

181193
def install
182-
virtualenv_install_with_resources
194+
venv = virtualenv_install_with_resources without: "mysql-connector-python"
195+
196+
# PyPI sdist is broken (missing at least setup.py)
197+
resource("mysql-connector-python").stage do
198+
venv.pip_install Pathname.pwd/"mysql-connector-python"
199+
end
183200
end
184201

185202
test do

pypi_formula_mappings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,9 @@
412412
"google-api-python-client", "google-auth", "google-auth-httplib2", "google-auth-oauthlib", "httplib2"
413413
]
414414
},
415+
"harlequin": {
416+
"package_name": "harlequin[mysql]"
417+
},
415418
"hatch": {
416419
"exclude_packages": ["certifi", "cryptography", "uv"]
417420
},

0 commit comments

Comments
 (0)