or-tools 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976e5d3e7d64ac20e1d445baa12720acd4e91469d1fddbaf8c71cf32e1bb7be6
-  data.tar.gz: 38d1b76452dc3df179cc7536e466846bf6030dfcd1da283393cbfa3c9c68b4b6
+  metadata.gz: 0b7f1f552804f88337c4d277ac7062a984c13ea67e43a8cd5567e8c0b8f1b3c6
+  data.tar.gz: 5bd93184a59799ef541745a8f4498f4cf25c525c290c3c2c7fbe2d5e5494c942
 SHA512:
-  metadata.gz: 2612839346ab70b75cb4f307ae2116816a4638580a1e943e3c09247af4ff0e27177549ae2c170aa1b67d6453922883265c7c7c93d8dfbf573ec1bce650864bc6
-  data.tar.gz: 256087097f368c7c34d4affc531ef744184c897e99b0727f1c00a620644399de77b9c874e5cfc0f5a519552e965c55647146ad3b29346ebfd4ecc595a8d35068
+  metadata.gz: 91077d2961b42021ee98f580d132f99a84128354bd054053de600510c4aba7343e1da9696a5d08a7c214742b92cac45200f85aa136d3e092d77b25ceb4033cdc
+  data.tar.gz: 316c4c0423522a2bdb78e006d38c412aa94cbaa14b4a37ebd3c04f340752d5f2adc5a3a9f5cf4adbd6968627a8e0504b58ae77d1d0876eb46cab783843957ead

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.0 (2022-08-21)
+
+- Updated OR-Tools to 9.4
+- Added binary installation for Mac ARM
+- Restored support for Debian 10
+- Dropped support for Ruby < 2.7
+
 ## 0.7.3 (2022-07-23)
 
 - Added more methods to `RoutingModel` and  `RoutingDimension`

data/README.md

@@ -12,7 +12,7 @@ Add this line to your application’s Gemfile:
 gem "or-tools"
 ```
 
-Installation can take a few minutes as OR-Tools downloads and builds. For Mac ARM, also follow [these instructions](#additional-instructions).
+Installation can take a few minutes as OR-Tools downloads and builds.
 
 ## Guides
 
@@ -2263,17 +2263,6 @@ possible_tables.each do |table|
 end
 ```
 
-## Additional Instructions
-
-### Mac ARM
-
-ARM binaries are not available for Mac yet, so use Homebrew to install OR-Tools before installing the gem.
-
-```sh
-brew install or-tools
-bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
-```
-
 ## History
 
 View the [changelog](https://github.com/ankane/or-tools-ruby/blob/master/CHANGELOG.md)

data/ext/or-tools/ext.cpp

@@ -18,13 +18,7 @@ void Init_ext()
 {
   auto m = Rice::define_module("ORTools");
 
-  // TODO use operations_research::OrToolsVersionString() in 0.8.0
-  m.define_singleton_function(
-    "lib_version",
-    []() {
-      return std::to_string(operations_research::OrToolsMajorVersion()) + "."
-        + std::to_string(operations_research::OrToolsMinorVersion());
-    });
+  m.define_singleton_function("lib_version", &operations_research::OrToolsVersionString);
 
   init_assignment(m);
   init_bin_packing(m);

data/ext/or-tools/routing.cpp

@@ -382,11 +382,7 @@ void init_routing(Rice::Module& m) {
     .define_method("add_variable_target_to_finalizer", &RoutingModel::AddVariableTargetToFinalizer)
     .define_method("add_weighted_variable_target_to_finalizer", &RoutingModel::AddWeightedVariableTargetToFinalizer)
     .define_method("close_model", &RoutingModel::CloseModel)
-    .define_method(
-      "solve",
-      [](RoutingModel& self) {
-        return self.Solve();
-      })
+    // solve defined in Ruby
     .define_method(
       "solve_with_parameters",
       [](RoutingModel& self, const RoutingSearchParameters& search_parameters) {

data/ext/or-tools/vendor.rb

@@ -4,21 +4,15 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "9.3.10497"
+version = "9.4.1874"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
   if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
-    raise <<~MSG
-      Binary installation not available for this platform: Mac ARM
-
-      Run:
-      brew install or-tools
-      bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
-
-    MSG
+    filename = "or-tools_arm64_MacOsX-12.5_cpp_v#{version}.tar.gz"
+    checksum = "ebc185bcb0a056a2704fb1c5175d5c11cc21a7e0634be65139cea55bb6a021ce"
   else
-    filename = "or-tools_MacOsX-12.2.1_v#{version}.tar.gz"
-    checksum = "33941702c59983897935eef06d91aca6c89ed9a8f5f4de3a9dfe489e97d7ca8c"
+    filename = "or-tools_x86_64_MacOsX-12.5_cpp_v#{version}.tar.gz"
+    checksum = "d03c706b51a6ef7aa77886dc3f135baaac52c00803bb548c286fbdeb4a419acd"
   end
 else
   # try /etc/os-release with fallback to /usr/lib/os-release
@@ -32,21 +26,23 @@ else
   os_version = os_info["VERSION_ID"]
 
   if os == "ubuntu" && os_version == "20.04"
-    # TODO remove sub in v9.4
-    filename = "or-tools_amd64_ubuntu-20.04_v#{version.sub(".10497", ".10502")}.tar.gz"
-    checksum = "3d1979967a2c9358b5bc956f2e6b608b00e89e13c71d48d075475ce4138b6d1c"
+    filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
+    checksum = "1b09f0f60b5aab83aeec468842e4a166cd3a4e7910e807f55bc7f96d5dffabdb"
   elsif os == "ubuntu" && os_version == "18.04"
-    filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "6ba5cc153417267e8f8e15f8b6390b17f22de07bacc61f3740a4172ccd56c274"
+    filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
+    checksum = "ef73ebd4ca0f82a1179fdb2aded3c2a85dfe2ab275d91b8a5b147a653ca861ab"
   elsif os == "debian" && os_version == "11"
-    filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
-    checksum = "db0636bab909eabf06a7004f7572dca6fa152f3823c1365b0b7428405bf250e6"
+    filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
+    checksum = "651c62147f231fb90635c522e0a2c799e3de3991c2c75f7c6acb721e7b78946c"
+  elsif os == "debian" && os_version == "10"
+    filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
+    checksum = "36088bc6c6fbb96539245db7cddf498f77ae3e7b7c2cc8f6d7d89d76f90751fb"
   elsif os == "centos" && os_version == "8"
-    filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
-    checksum = "e5649069fd7a3e8228cc18b91e265a90562c5d03a0c962b0346911aada0aedc9"
+    filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
+    checksum = "da2cb303ae332d207592f21bb504e4e2e33dc1b1e8f5747d413c082d9d05504a"
   elsif os == "centos" && os_version == "7"
-    filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
-    checksum = "3bffdec8c09fc1345dcbd6a553437e2894014093fafb53e50adc7d4d776bb08b"
+    filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
+    checksum = "9eaf0178467f4d2fdbe496f62223809aa43e313548cc6cb716e661c00472b4ff"
   else
     platform =
       if Gem.win_platform?

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="