Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apache-arrow-glib apache-arrow 16.0.0 #169664

Merged
merged 10 commits into from
Apr 25, 2024
21 changes: 10 additions & 11 deletions Formula/a/apache-arrow-glib.rb
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
class ApacheArrowGlib < Formula
desc "GLib bindings for Apache Arrow"
homepage "https://arrow.apache.org/"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-15.0.2/apache-arrow-15.0.2.tar.gz"
mirror "https://archive.apache.org/dist/arrow/arrow-15.0.2/apache-arrow-15.0.2.tar.gz"
sha256 "abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-16.0.0/apache-arrow-16.0.0.tar.gz"
mirror "https://archive.apache.org/dist/arrow/arrow-16.0.0/apache-arrow-16.0.0.tar.gz"
sha256 "9f4051ae9473c97991d9af801e2f94ae3455067719ca7f90b8137f9e9a700b8d"
license "Apache-2.0"
revision 1
head "https://github.com/apache/arrow.git", branch: "main"

livecheck do
formula "apache-arrow"
end

bottle do
sha256 cellar: :any, arm64_sonoma: "aceea3cb74002930da21bcbf98a152210c72c82b1a1da138b3e2c7e0ce699179"
sha256 cellar: :any, arm64_ventura: "063d17a1f0c2a7be6fac2b3299b8af173d0caaf879f7ed1701f3e9a3b00b3cd4"
sha256 cellar: :any, arm64_monterey: "067b2f4acf575be4f846cb0849f14de5dfb82e31da320e07c11090acb392868b"
sha256 cellar: :any, sonoma: "bc5daf491af0050492960b8da28f7beab7653db05ee9b5d312ebc271d78c1b86"
sha256 cellar: :any, ventura: "036a8dcccba034c88f21a72425c2cf5e01892f73f153b1a980774bd8f98448ae"
sha256 cellar: :any, monterey: "72e40b6ae3d7fc96150a04d51b6df948255b9f682710bd0ca39cbc5052ff9956"
sha256 x86_64_linux: "75ddec98ee485c71033211408a3b18d9a7068e5b0dcba3fa07f38b4472357071"
sha256 cellar: :any, arm64_sonoma: "cace9de8228c855a5e9fe1ef5fe1ae353dc6f791854ae3fdd217aa293ddb6868"
sha256 cellar: :any, arm64_ventura: "cbae74218417e72ecad14832117b6888c4ec54200c71529c74533e678be0a505"
sha256 cellar: :any, arm64_monterey: "3e6351128d81dc839281f985bfdfd147f0a7ce398f1ae289d8dcdf2b139b1a62"
sha256 cellar: :any, sonoma: "c0ebaa906e9ead64d5301ddd726a7e6dedc13e5734214735d29f18bfd11c9642"
sha256 cellar: :any, ventura: "1af78ad7a4a664f2bc1cb0bb2977ead4006cda6c19f8700bedb3391bcbe3c36a"
sha256 cellar: :any, monterey: "75ef106748e468ab3f8b412516eccf4e454cd07ba81cecd3acfee979dd5c79fd"
sha256 x86_64_linux: "bba98396529bd625f737b240a9f63c173b71533cf4b763a7563508b8528828d2"
end

depends_on "gobject-introspection" => :build
Expand Down
27 changes: 14 additions & 13 deletions Formula/a/apache-arrow.rb
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
class ApacheArrow < Formula
desc "Columnar in-memory analytics layer designed to accelerate big data"
homepage "https://arrow.apache.org/"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-15.0.2/apache-arrow-15.0.2.tar.gz"
mirror "https://archive.apache.org/dist/arrow/arrow-15.0.2/apache-arrow-15.0.2.tar.gz"
sha256 "abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6"
url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-16.0.0/apache-arrow-16.0.0.tar.gz"
mirror "https://archive.apache.org/dist/arrow/arrow-16.0.0/apache-arrow-16.0.0.tar.gz"
sha256 "9f4051ae9473c97991d9af801e2f94ae3455067719ca7f90b8137f9e9a700b8d"
license "Apache-2.0"
revision 3
head "https://github.com/apache/arrow.git", branch: "main"

bottle do
sha256 cellar: :any, arm64_sonoma: "744efe8f7602b219e974ec89f028b2d96522915ba30c859572aacaef9f1a72d0"
sha256 cellar: :any, arm64_ventura: "e0f9cd1a7fe97e0972188c3ea967b65bba4545220d5cdf08cc52edd2e610eed0"
sha256 cellar: :any, arm64_monterey: "d93573b391d94d6287bc6cda94f641ebed61e1e13431c0703a6f44f5a8e3b17f"
sha256 cellar: :any, sonoma: "fbad317cc877b7f3572a563d0591c395230d739c4239e51fc29e173ffba376db"
sha256 cellar: :any, ventura: "effe7f0860daabf8bc4e3d557415732865fde2d341ffe85fea64531e22c33ca2"
sha256 cellar: :any, monterey: "68e33a1da68ad277855ccb530e3cec0e0b1e90e9b4bf93c9da207d0c9bce048c"
sha256 x86_64_linux: "1e474abf4a4d4cea7c9f8a6f599e836c3c0f7d9bafa86f8b9e2e28aeac91b91b"
sha256 cellar: :any, arm64_sonoma: "d1b43f3931efacc42904e4123ce07fcdf0987c13a6f6c5a8c7b53b4102c36671"
sha256 cellar: :any, arm64_ventura: "96ac8542a1719313cc5e9eecec9919bb4ee4bfc60e5d80adaf4850ffa1257324"
sha256 cellar: :any, arm64_monterey: "208f278c5170145b67f892e3b4afd0cf4f6dfb70b5a20a7f6855ee2e8dbdf73d"
sha256 cellar: :any, sonoma: "41b1d49cfd9ceb9e926c13148603595b5a8a0a83190faa1be2f165d5b849e355"
sha256 cellar: :any, ventura: "02c96eee2e13d84a3b44d36290fb3ad3d5b53e1dfac103c6365a3eb4201a8f46"
sha256 cellar: :any, monterey: "6dae0d977f5fbf6b1a1307d54d71106a2c997e8e2c86c88e51bd4bd16380304d"
sha256 cellar: :any_skip_relocation, x86_64_linux: "7c76fbcb37ded8a2982ded4bb0dfcc41e8e72a21471dcbd40937556c0c6e6ad1"
end

depends_on "boost" => :build
Expand All @@ -26,7 +25,7 @@ class ApacheArrow < Formula
depends_on "bzip2"
depends_on "glog"
depends_on "grpc"
depends_on "llvm@17"
depends_on "llvm"
depends_on "lz4"
depends_on "openssl@3"
depends_on "protobuf"
Expand All @@ -43,10 +42,12 @@ class ApacheArrow < Formula
def install
# Work around an Xcode 15 linker issue which causes linkage against LLVM's
# libunwind due to it being present in a library search path.
ENV.remove "HOMEBREW_LIBRARY_PATHS", Formula["llvm@17"].opt_lib if DevelopmentTools.clang_build_version >= 1500
llvm = Formula["llvm"]
ENV.remove "HOMEBREW_LIBRARY_PATHS", llvm.opt_lib if DevelopmentTools.clang_build_version >= 1500

args = %W[
-DCMAKE_INSTALL_RPATH=#{rpath}
-DLLVM_ROOT=#{llvm.opt_prefix}
-DARROW_ACERO=ON
-DARROW_COMPUTE=ON
-DARROW_CSV=ON
Expand Down
46 changes: 23 additions & 23 deletions Formula/d/dvc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ class Dvc < Formula
url "https://files.pythonhosted.org/packages/89/cc/427135561f60135df896521c58aa1bd6848d5405a0c07c1689a21af57f7a/dvc-3.50.0.tar.gz"
sha256 "59106be452a74843e3618a92f80d9593f8e2b73892591f5ccafa6c6ac82cad1c"
license "Apache-2.0"
revision 1

bottle do
sha256 cellar: :any, arm64_sonoma: "309d54dd38fdd40ef85dd7299b15c39d4a5ee1802ccff2cb752a06aedda9cbb5"
sha256 cellar: :any, arm64_ventura: "90ad231b1dfd1be8f421a5120a853ee73fdfe7462c7f1de584b905e66b1dacd1"
sha256 cellar: :any, arm64_monterey: "361b2c90f195cd1b74d6c2c3515d4758dc6941401cebd27933fccc2ab7511e27"
sha256 cellar: :any, sonoma: "5f97147bb4a99d21c590574bbe70a642bc81989248748c1aad0b6b7420e3de89"
sha256 cellar: :any, ventura: "51d6bd34265a4817d5ed92610a10900705b3e1841425491cb6cbf5995e500042"
sha256 cellar: :any, monterey: "d965bf5d26b25dbb5f6e40a99192c4b99fc0f602aeaf7faa380a3816350296c9"
sha256 cellar: :any_skip_relocation, x86_64_linux: "56183a7f74b32ecb92b57b283b74826fb8ce955ee6fe85f38ec2926d1c10955f"
sha256 cellar: :any, arm64_sonoma: "a2030dba0cf1093bbbeb816f94c9724bdf1b280cf1bbd576ca2be1edcee2f139"
sha256 cellar: :any, arm64_ventura: "9e6aff24676990c852901ceb7207451b49bc5d229e3fa84ab43593842b9630e1"
sha256 cellar: :any, arm64_monterey: "6bbb1b0975dc9fde0cdbb65abf65846226e3768b7f3502dacb0447e52326ed17"
sha256 cellar: :any, sonoma: "6bddaf8ade58c583e6e238d6c949d400c0b3097e20304c5db3a7ea60eaee8579"
sha256 cellar: :any, ventura: "a6720c16b7749c6f229b88c4c3165e424589e5b6a2aedc7e85be29c098c7c945"
sha256 cellar: :any, monterey: "4caf1efc24ffea5acfbf2b09891ea9859a778acf92e3f2483e67d1026a40f446"
end

depends_on "cmake" => :build # for pyarrow
Expand Down Expand Up @@ -169,8 +169,8 @@ class Dvc < Formula
end

resource "celery" do
url "https://files.pythonhosted.org/packages/99/72/45a2d2f9b45ccc6e80e2168ce169d17bf06a98711c192d7b53d5a8accf77/celery-5.3.6.tar.gz"
sha256 "870cc71d737c0200c397290d730344cc991d13a057534353d124c9380267aab9"
url "https://files.pythonhosted.org/packages/8a/9c/cf0bce2cc1c8971bf56629d8f180e4ca35612c7e79e6e432e785261a8be4/celery-5.4.0.tar.gz"
sha256 "504a19140e8d3029d5acad88330c541d4c3f64c789d85f94756762d8bca7e706"
end

resource "charset-normalizer" do
Expand Down Expand Up @@ -239,8 +239,8 @@ class Dvc < Formula
end

resource "dulwich" do
url "https://files.pythonhosted.org/packages/2b/e2/788910715b4910d08725d480278f625e315c3c011eb74b093213363042e0/dulwich-0.21.7.tar.gz"
sha256 "a9e9c66833cea580c3ac12927e4b9711985d76afca98da971405d414de60e968"
url "https://files.pythonhosted.org/packages/cf/ac/cf6420b90832c4ffbc88b92962dd0167c58632c2b8d508d5baf4ecb0c61d/dulwich-0.22.1.tar.gz"
sha256 "e36d85967cfbf25da1c7bc3d6921adc5baa976969d926aaf1582bd5fd7e94758"
end

resource "dvc-azure" do
Expand Down Expand Up @@ -374,8 +374,8 @@ class Dvc < Formula
end

resource "google-api-python-client" do
url "https://files.pythonhosted.org/packages/f5/89/cd79e7ad831c351f8085e07bf3196d1c36bcd2200ead46e68b244a3b0e68/google-api-python-client-2.126.0.tar.gz"
sha256 "97c0410630e2bebd194d99e91bd620dab5bc6b6ec0bf033f9a9109b700b83acb"
url "https://files.pythonhosted.org/packages/cb/0f/6f0a8070802d6ee9a1393a4653202786c5ea9b10aa098a4c40c04be7c668/google-api-python-client-2.127.0.tar.gz"
sha256 "bbb51b0fbccdf40e536c26341e372d7800f09afebb53103bbcc94e08f14b523b"
end

resource "google-auth" do
Expand Down Expand Up @@ -584,8 +584,8 @@ class Dvc < Formula
end

resource "pyarrow" do
url "https://files.pythonhosted.org/packages/35/a1/b7c9bacfd17a9d1d8d025db2fc39112e0b1a629ea401880e4e97632dbc4c/pyarrow-15.0.2.tar.gz"
sha256 "9c9bc803cb3b7bfacc1e96ffbfd923601065d9d3f911179d81e72d99fd74a3d9"
url "https://files.pythonhosted.org/packages/b8/c3/61781b3a0d754807f5662fc0cb459f2bb5e76db1b18a1cfbb3efd770fdcc/pyarrow-16.0.0.tar.gz"
sha256 "59bb1f1edbbf4114c72415f039f1359f1a57d166a331c3229788ccbfbb31689a"
end

resource "pyasn1" do
Expand All @@ -604,13 +604,13 @@ class Dvc < Formula
end

resource "pydantic" do
url "https://files.pythonhosted.org/packages/cd/fc/70fe71ff78f680d584eba9c55a30092f6ef0b9cf0c75a74bd35a24151a83/pydantic-2.7.0.tar.gz"
sha256 "b5ecdd42262ca2462e2624793551e80911a1e989f462910bb81aef974b4bb383"
url "https://files.pythonhosted.org/packages/1f/74/0d009e056c2bd309cdc053b932d819fcb5ad3301fc3e690c097e1de3e714/pydantic-2.7.1.tar.gz"
sha256 "e9dbb5eada8abe4d9ae5f46b9939aead650cd2b68f249bb3a8139dbe125803cc"
end

resource "pydantic-core" do
url "https://files.pythonhosted.org/packages/3d/28/d693aab237fca82da327990a88a983b2b84b890032076ee4a87e18038dbb/pydantic_core-2.18.1.tar.gz"
sha256 "de9d3e8717560eb05e28739d1b35e4eac2e458553a52a301e51352a7ffc86a35"
url "https://files.pythonhosted.org/packages/e9/23/a609c50e53959eb96393e42ae4891901f699aaad682998371348650a6651/pydantic_core-2.18.2.tar.gz"
sha256 "2e29d20810dfc3043ee13ac7d9e25105799817683348823f305ab3f349b9386e"
end

resource "pydot" do
Expand Down Expand Up @@ -704,8 +704,8 @@ class Dvc < Formula
end

resource "scmrepo" do
url "https://files.pythonhosted.org/packages/a6/0d/a4afa91fb5421cdc8daf2dce18849b4129046fc71d40a4df51bcb6fa3f0f/scmrepo-3.3.1.tar.gz"
sha256 "e347bf57f799887e3b788b90bfa275e901aafa7c5afbbb2eaaa1419bdfc5d63a"
url "https://files.pythonhosted.org/packages/ca/ef/3eca3d34aad6369059cb1745f1783e06b6dece2a7584ef45c54f59b55477/scmrepo-3.3.2.tar.gz"
sha256 "a817334bf005275e7f0f98d768ce21bb5cbfc05676a0d6081372eb927e7c737b"
end

resource "semver" do
Expand Down Expand Up @@ -754,8 +754,8 @@ class Dvc < Formula
end

resource "sshfs" do
url "https://files.pythonhosted.org/packages/90/b9/2c6a1238d70ba1bc6487b92ec5f3eba9a905ff34da31dab15e419d57e32c/sshfs-2023.10.0.tar.gz"
sha256 "8f63f83dd05511552f3ac9590212888dff70dfd43645615b5c030190d2fe3a2b"
url "https://files.pythonhosted.org/packages/83/f2/4b53287303e92ef280c99fec4a88b4f3fcb5cf14e4b234d74f439382f959/sshfs-2024.4.1.tar.gz"
sha256 "8c5da6ccf050d1f14a20c32d390f4bf1dfdc7a178d67a317dc3dbeb9b5e2f200"
end

resource "tabulate" do
Expand Down
16 changes: 8 additions & 8 deletions Formula/g/gdal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ class Gdal < Formula
url "https://github.com/OSGeo/gdal/releases/download/v3.8.5/gdal-3.8.5.tar.gz"
sha256 "0c865c7931c7e9bb4832f50fb53aec8676cbbaccd6e55945011b737fb89a49c2"
license "MIT"
revision 1
revision 2

livecheck do
url "https://download.osgeo.org/gdal/CURRENT/"
regex(/href=.*?gdal[._-]v?(\d+(?:\.\d+)+)\.t/i)
end

bottle do
sha256 arm64_sonoma: "580b3a43c1f7ad99636d71752010837f18ee01d682f7ced35baf3a54dd4981dc"
sha256 arm64_ventura: "7e45b47166f47b0f73988b827add67287d8be7a36427ea72752807cd1c63dfa6"
sha256 arm64_monterey: "0b8529ad9a4e4518600c22db5ddf2bd44836f897eb7bb1928b4516a13b56106c"
sha256 sonoma: "66bed34ff624697893cf8f529f08ea1576ab33454f2cac505559931fef42fc78"
sha256 ventura: "cbdf3729393db59d73909be21eb236eeb82bd7cca0d13bcbe7951f670533b6a6"
sha256 monterey: "d05b9e31b0f6c031b7ace80a761aa67011aaa43a7fc0281e30cb5a07707ebf25"
sha256 x86_64_linux: "ae386034848df266cdedc17f7760e0226be95cb165bd02b65e15296a1ca206e4"
sha256 arm64_sonoma: "85584b8aef5067c1ee2201e3f07e104799c024a8e0641050a3c64d8c12fd0405"
sha256 arm64_ventura: "a758bd4a1d38a10d09a9d856bce2dd675e2985654d6a56660a21d6563d5226dd"
sha256 arm64_monterey: "b9798e3107ec437d2bc31ed8007fb00f9cd7b6a3c0eea37ec96e4ff6b6377d74"
sha256 sonoma: "5180ef68191134b281e36a95e2b8a3e5fdea38475ff64d260788fa238612f124"
sha256 ventura: "ed90857cf92bd6d8ae4690cb29223f6b532074330de79eb50601dd0d2d742686"
sha256 monterey: "aa64506ece001f2197189edd96ec3067d0db3dd370a74b1237331e2b26d418b4"
sha256 x86_64_linux: "c147afa9936e0727c9e816d50777f359eec26ea78ed4f46647965dafeb0b443f"
end

head do
Expand Down
30 changes: 21 additions & 9 deletions Formula/v/vineyard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ class Vineyard < Formula
url "https://github.com/v6d-io/v6d/releases/download/v0.22.1/v6d-0.22.1.tar.gz"
sha256 "16aea4dc63830925c2d8cd89dc36580ff80dd7610793d56ae5d0d09972cf2fcc"
license "Apache-2.0"
revision 1

bottle do
sha256 arm64_sonoma: "735777e66863fde84e3d493d7d514eb81207aff7414bb338ecb95a7bc330381f"
sha256 arm64_ventura: "112ca291c6de7c2a92b3f41fd431930d2d0a4b5b569644aa418c8124f59831ed"
sha256 arm64_monterey: "3d4001555091698f10d57f2d100df41d0449a7f803fe48fe5ef132ff46a67e39"
sha256 sonoma: "720983a2beeea2aaf584c0be1685845b5573d7795a331e13c1291689a92241df"
sha256 ventura: "b6fb3149867768f4f61aba0cb2b566d70f117ea49a56a990b300187dbe6ff904"
sha256 monterey: "2e6999a381668f1ffab2b35704482195daa9181e4444e5d67403832a8e7244df"
sha256 cellar: :any_skip_relocation, x86_64_linux: "fef2b7a9c5e634c269a735e60a2ca7f224d1c81bbbdbe9954ebbde872ddb65f2"
sha256 arm64_sonoma: "6f92524f4f5d2e5b71a68a54314e20b0f23caac1ab578a73d5ee2cd5fe942030"
sha256 arm64_ventura: "1b1789c73b0e745d13a2d57a5620a348b622f4d8967f73b1dd2846c7d58d0bd1"
sha256 arm64_monterey: "30a0aabb3277ea75a836db664cb7929fe2a24807f239ac0632434cbf10274cec"
sha256 sonoma: "94154dde18c24c431103d4db402bb260c99f15e79bb6c56fa0d6c0ee4f0ee435"
sha256 ventura: "f0dd8408d2fdd0b693ee4baeb0f28562275891f61a48ad615929305846e82de2"
sha256 monterey: "a597e092c45f61dfc0ad60971dcfe80223e7b4ce7913cd45608b31d66888bd10"
sha256 cellar: :any_skip_relocation, x86_64_linux: "4e218fd701201885a89ee5da2d7ce4d7b08b06f8b93f6fc81399269b3a4e42bd"
end

depends_on "cmake" => [:build, :test]
depends_on "llvm" => [:build, :test]
depends_on "python-setuptools" => :build
depends_on "[email protected]" => :build
depends_on "apache-arrow"
depends_on "boost"
Expand All @@ -37,19 +37,31 @@ class Vineyard < Formula

fails_with gcc: "5"

resource "setuptools" do
url "https://files.pythonhosted.org/packages/d6/4f/b10f707e14ef7de524fe1f8988a294fb262a29c9b5b12275c7e188864aed/setuptools-69.5.1.tar.gz"
sha256 "6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987"
end

def install
python = "python3.12"
venv = virtualenv_create(libexec, python)
venv.pip_install resources
# LLVM is keg-only.
ENV.prepend_path "PYTHONPATH", Formula["llvm"].opt_prefix/Language::Python.site_packages(python)

# Work around an Xcode 15 linker issue which causes linkage against LLVM's
# libunwind due to it being present in a library search path.
ENV.remove "HOMEBREW_LIBRARY_PATHS", Formula["llvm"].opt_lib

# Work around API changes in `apache-arrow` 16+.
# Issue ref: https://github.com/v6d-io/v6d/issues/1881
arrow_uri_files = %w[modules/io/io/local_io_adaptor.cc modules/io/io/io_factory.cc]
inreplace arrow_uri_files, "arrow::internal::Uri", "arrow::util::Uri"
Comment on lines +56 to +59
Copy link
Member

@cho-m cho-m Apr 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a follow up PR, I will switch to upstream commit v6d-io/v6d@e8b8c82 (which was done after I reported issue v6d-io/v6d#1881 so not available at time of original run). The changes are the same, i.e. replacing all arrow::internal::Uri* usage with arrow::util::Uri*.


system "cmake", "-S", ".", "-B", "build",
"-DCMAKE_CXX_STANDARD=17",
"-DCMAKE_CXX_STANDARD_REQUIRED=TRUE",
"-DPYTHON_EXECUTABLE=#{which(python)}",
"-DPYTHON_EXECUTABLE=#{venv.root}/bin/python",
"-DUSE_EXTERNAL_ETCD_LIBS=ON",
"-DUSE_EXTERNAL_REDIS_LIBS=ON",
"-DUSE_EXTERNAL_HIREDIS_LIBS=ON",
Expand Down