updating for v4.1

CARTAvis · Jan 21, 2024 · c40f438 · c40f438
1 parent fce2bdd
commit c40f438
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/Formula/carta-casacore.rb b/Formula/carta-casacore.rb
@@ -1,7 +1,7 @@
-class CartaCasacore < Formula
+nginx -tclass CartaCasacore < Formula
   desc "This is carta-casacore used by CARTA"
   homepage "https://github.com/CARTAvis/carta-casacore"
-  url "https://github.com/CARTAvis/carta-casacore.git", tag: "3.4.0+6.5.0+2022.5.11"
+  url "https://github.com/CARTAvis/carta-casacore.git", tag: "3.5.0+6.6.0+2024.1.18"
   license "GPL-2.0-only"
 
   depends_on "cmake" => :build
@@ -15,16 +15,12 @@ class CartaCasacore < Formula
   depends_on "wcslib"
 
   resource "casadata" do
-    url "https://alma.asiaa.sinica.edu.tw/_downloads/measures_data.tar.gz"
-    sha256 "8e9c0cba5beacaa36e752231318304791c3ff45d01159a4e3512285538bdcce8"
+    url "https://carta.asiaa.sinica.edu.tw/_downloads/measures_data_21_1_2024.tgz"
+    sha256 "2e7977836b735f5201915311c5c384272270ecbc4d86604f79f73a8e15cdc220"
   end
 
   def install
 
-    if MacOS.version == 14
-      odie ("Homebrew CARTA currently does not support macOS Sonoma. Please use the macOS Electron version of CARTA which is compatible with Sonoma.")
-    end
-
     resource("casadata").stage do
       mkdir_p "#{share}/casacore/data"
       cp_r "ephemerides", "#{share}/casacore/data"

diff --git a/Formula/carta.rb b/Formula/carta.rb
@@ -1,7 +1,7 @@
 class Carta < Formula
   desc "Backend and frontend components of CARTA"
   homepage "https://cartavis.github.io/"
-  url "https://github.com/CARTAvis/carta-backend.git", tag: "v4.0.0"
+  url "https://github.com/CARTAvis/carta-backend.git", tag: "v4.1.0"
   license "GPL-3.0-only"
 
   depends_on "cmake" => :build
@@ -20,20 +20,16 @@ class Carta < Formula
   conflicts_with "carta-beta", because: "they both share the same executable name; 'carta'"
 
   resource "frontend" do
-    url "https://registry.npmjs.org/carta-frontend/-/carta-frontend-4.0.0.tgz"
-    sha256 "9dcf21bdc030d7779e9e8c7db7a4b8e8222336466368d559055b5187f1190183"
+    url "https://registry.npmjs.org/carta-frontend/-/carta-frontend-4.1.0.tgz"
+    sha256 "6bf5588b8014445167148f9da05b2b284e56ffef37d521a22f2397a6042a242d"
   end
 
   def install
 
-    if MacOS.version == 14
-      odie ("Homebrew CARTA currently does not support macOS Sonoma. Please use the macOS Electron version of CARTA which is compatible with Sonoma.")
-    end
-
     # Building the carta-backend
     system "git", "submodule", "update", "--recursive", "--init"
     ENV["OPENSSL_ROOT_DIR"] = "$(brew --prefix openssl)"
-    path = HOMEBREW_PREFIX/"Cellar/carta-casacore/2022.5.11/include"
+    path = HOMEBREW_PREFIX/"Cellar/carta-casacore/2024.1.18/include"
     args = [
       "-DCMAKE_PREFIX_PATH=#{lib}",
       "-DCMAKE_INCLUDE_PATH=#{include}",
@@ -67,6 +63,6 @@ def caveats
   end
 
   test do
-    assert_match "4.0.0", shell_output("#{bin}/carta_backend --version")
+    assert_match "4.1.0", shell_output("#{bin}/carta_backend --version")
   end
 end