From 946eb35b5d3cab861e50f6298fe31b6a847ca84d Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 18 Dec 2020 12:46:50 -0500 Subject: [PATCH 1/4] networkit 8.0 --- Formula/networkit.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Formula/networkit.rb b/Formula/networkit.rb index 52dc2d05235f0..418ed8db029ff 100644 --- a/Formula/networkit.rb +++ b/Formula/networkit.rb @@ -4,10 +4,9 @@ class Networkit < Formula desc "Performance toolkit for large-scale network analysis" homepage "https://networkit.github.io" url "https://github.com/networkit/networkit.git", - tag: "7.1", - revision: "4c6dcc4367b51005a34221242048609c357ffbd6" + tag: "8.0", + revision: "bdbb926e7d3102c32a3fc54d4cfa769bfac822f4" license "MIT" - revision 1 bottle do sha256 "23f70cc4fa3dc267391415b12f871ef39e27cca750e2e3a638b9075075ef4314" => :arm64_big_sur From 4947f29df4b2465740ec24e81be81777e933dd61 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 19 Dec 2020 01:10:11 -0500 Subject: [PATCH 2/4] libnetworkit 8.0 Signed-off-by: Rui Chen --- Formula/libnetworkit.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/libnetworkit.rb b/Formula/libnetworkit.rb index c0bbefc78711e..f3d0d05b0050c 100644 --- a/Formula/libnetworkit.rb +++ b/Formula/libnetworkit.rb @@ -1,8 +1,8 @@ class Libnetworkit < Formula desc "NetworKit is an OS-toolkit for large-scale network analysis" homepage "https://networkit.github.io" - url "https://github.com/networkit/networkit/archive/7.1.tar.gz" - sha256 "60026c3be581ae9d5c919c861605082fcb9c8205758b3ddfcde2408153ae166e" + url "https://github.com/networkit/networkit/archive/8.0.tar.gz" + sha256 "cdf9571043edbe76c447622ed33efe9cba2880f887ca231d98f6d3c22027e20e" license "MIT" bottle do From c3a990dc0f5573400d357e8afab0e4edc04d37a8 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 27 Dec 2020 12:35:46 -0500 Subject: [PATCH 3/4] networkit: switch to tarball --- Formula/networkit.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Formula/networkit.rb b/Formula/networkit.rb index 418ed8db029ff..a780357577944 100644 --- a/Formula/networkit.rb +++ b/Formula/networkit.rb @@ -3,9 +3,8 @@ class Networkit < Formula desc "Performance toolkit for large-scale network analysis" homepage "https://networkit.github.io" - url "https://github.com/networkit/networkit.git", - tag: "8.0", - revision: "bdbb926e7d3102c32a3fc54d4cfa769bfac822f4" + url "https://github.com/networkit/networkit/archive/8.0.tar.gz" + sha256 "cdf9571043edbe76c447622ed33efe9cba2880f887ca231d98f6d3c22027e20e" license "MIT" bottle do @@ -17,12 +16,18 @@ class Networkit < Formula depends_on "cmake" => :build depends_on "cython" => :build + depends_on "tlx" => :build + depends_on "libnetworkit" depends_on "numpy" depends_on "python@3.9" depends_on "scipy" def install + # fix tlx path reference + inreplace "setup.py", "\"-DCMAKE_BUILD_TYPE=Release\"", + "\"-DCMAKE_BUILD_TYPE=Release\", \"-DNETWORKIT_EXT_TLX=#{Formula["tlx"].opt_prefix}\"" + xy = Language::Python.major_minor_version Formula["python@3.9"].opt_bin/"python3" rpath_addons = Formula["libnetworkit"].opt_lib @@ -30,7 +35,7 @@ def install ENV.append_path "PYTHONPATH", Formula["cython"].opt_libexec/"lib/python#{xy}/site-packages" system Formula["python@3.9"].opt_bin/"python3", "setup.py", "build_ext", "--networkit-external-core", - "--rpath=@loader_path;#{rpath_addons}" + "--rpath=@loader_path;#{rpath_addons}" system Formula["python@3.9"].opt_bin/"python3", "setup.py", "install", "--single-version-externally-managed", "--record=installed.txt", From 7c1e8e7761cb0d1413e479ebdee5a41221dc3f4a Mon Sep 17 00:00:00 2001 From: Seeker Date: Tue, 26 Jan 2021 09:15:24 -0800 Subject: [PATCH 4/4] networkit: add patch --- Formula/networkit.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Formula/networkit.rb b/Formula/networkit.rb index a780357577944..9f769911c3231 100644 --- a/Formula/networkit.rb +++ b/Formula/networkit.rb @@ -23,11 +23,14 @@ class Networkit < Formula depends_on "python@3.9" depends_on "scipy" - def install - # fix tlx path reference - inreplace "setup.py", "\"-DCMAKE_BUILD_TYPE=Release\"", - "\"-DCMAKE_BUILD_TYPE=Release\", \"-DNETWORKIT_EXT_TLX=#{Formula["tlx"].opt_prefix}\"" + # setup.py: add --external-tlx option + # https://github.com/networkit/networkit/pull/666 + patch do + url "https://github.com/networkit/networkit/commit/dbe93306402e6ffee78bf45df5efc9cf2ac991a7.patch?full_index=1" + sha256 "7b50df48972f5490ede25e101d04e7ec4b1c4f8ededfdaee94c17fedf917d572" + end + def install xy = Language::Python.major_minor_version Formula["python@3.9"].opt_bin/"python3" rpath_addons = Formula["libnetworkit"].opt_lib @@ -35,6 +38,7 @@ def install ENV.append_path "PYTHONPATH", Formula["cython"].opt_libexec/"lib/python#{xy}/site-packages" system Formula["python@3.9"].opt_bin/"python3", "setup.py", "build_ext", "--networkit-external-core", + "--external-tlx=#{Formula["tlx"].opt_prefix}", "--rpath=@loader_path;#{rpath_addons}" system Formula["python@3.9"].opt_bin/"python3", "setup.py", "install", "--single-version-externally-managed",