or-tools 0.7.3 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 976e5d3e7d64ac20e1d445baa12720acd4e91469d1fddbaf8c71cf32e1bb7be6
4
- data.tar.gz: 38d1b76452dc3df179cc7536e466846bf6030dfcd1da283393cbfa3c9c68b4b6
3
+ metadata.gz: 0b7f1f552804f88337c4d277ac7062a984c13ea67e43a8cd5567e8c0b8f1b3c6
4
+ data.tar.gz: 5bd93184a59799ef541745a8f4498f4cf25c525c290c3c2c7fbe2d5e5494c942
5
5
  SHA512:
6
- metadata.gz: 2612839346ab70b75cb4f307ae2116816a4638580a1e943e3c09247af4ff0e27177549ae2c170aa1b67d6453922883265c7c7c93d8dfbf573ec1bce650864bc6
7
- data.tar.gz: 256087097f368c7c34d4affc531ef744184c897e99b0727f1c00a620644399de77b9c874e5cfc0f5a519552e965c55647146ad3b29346ebfd4ecc595a8d35068
6
+ metadata.gz: 91077d2961b42021ee98f580d132f99a84128354bd054053de600510c4aba7343e1da9696a5d08a7c214742b92cac45200f85aa136d3e092d77b25ceb4033cdc
7
+ data.tar.gz: 316c4c0423522a2bdb78e006d38c412aa94cbaa14b4a37ebd3c04f340752d5f2adc5a3a9f5cf4adbd6968627a8e0504b58ae77d1d0876eb46cab783843957ead
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## 0.8.0 (2022-08-21)
2
+
3
+ - Updated OR-Tools to 9.4
4
+ - Added binary installation for Mac ARM
5
+ - Restored support for Debian 10
6
+ - Dropped support for Ruby < 2.7
7
+
1
8
  ## 0.7.3 (2022-07-23)
2
9
 
3
10
  - Added more methods to `RoutingModel` and `RoutingDimension`
data/README.md CHANGED
@@ -12,7 +12,7 @@ Add this line to your application’s Gemfile:
12
12
  gem "or-tools"
13
13
  ```
14
14
 
15
- Installation can take a few minutes as OR-Tools downloads and builds. For Mac ARM, also follow [these instructions](#additional-instructions).
15
+ Installation can take a few minutes as OR-Tools downloads and builds.
16
16
 
17
17
  ## Guides
18
18
 
@@ -2263,17 +2263,6 @@ possible_tables.each do |table|
2263
2263
  end
2264
2264
  ```
2265
2265
 
2266
- ## Additional Instructions
2267
-
2268
- ### Mac ARM
2269
-
2270
- ARM binaries are not available for Mac yet, so use Homebrew to install OR-Tools before installing the gem.
2271
-
2272
- ```sh
2273
- brew install or-tools
2274
- bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
2275
- ```
2276
-
2277
2266
  ## History
2278
2267
 
2279
2268
  View the [changelog](https://github.com/ankane/or-tools-ruby/blob/master/CHANGELOG.md)
data/ext/or-tools/ext.cpp CHANGED
@@ -18,13 +18,7 @@ void Init_ext()
18
18
  {
19
19
  auto m = Rice::define_module("ORTools");
20
20
 
21
- // TODO use operations_research::OrToolsVersionString() in 0.8.0
22
- m.define_singleton_function(
23
- "lib_version",
24
- []() {
25
- return std::to_string(operations_research::OrToolsMajorVersion()) + "."
26
- + std::to_string(operations_research::OrToolsMinorVersion());
27
- });
21
+ m.define_singleton_function("lib_version", &operations_research::OrToolsVersionString);
28
22
 
29
23
  init_assignment(m);
30
24
  init_bin_packing(m);
@@ -382,11 +382,7 @@ void init_routing(Rice::Module& m) {
382
382
  .define_method("add_variable_target_to_finalizer", &RoutingModel::AddVariableTargetToFinalizer)
383
383
  .define_method("add_weighted_variable_target_to_finalizer", &RoutingModel::AddWeightedVariableTargetToFinalizer)
384
384
  .define_method("close_model", &RoutingModel::CloseModel)
385
- .define_method(
386
- "solve",
387
- [](RoutingModel& self) {
388
- return self.Solve();
389
- })
385
+ // solve defined in Ruby
390
386
  .define_method(
391
387
  "solve_with_parameters",
392
388
  [](RoutingModel& self, const RoutingSearchParameters& search_parameters) {
@@ -4,21 +4,15 @@ require "fileutils"
4
4
  require "net/http"
5
5
  require "tmpdir"
6
6
 
7
- version = "9.3.10497"
7
+ version = "9.4.1874"
8
8
 
9
9
  if RbConfig::CONFIG["host_os"] =~ /darwin/i
10
10
  if RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i
11
- raise <<~MSG
12
- Binary installation not available for this platform: Mac ARM
13
-
14
- Run:
15
- brew install or-tools
16
- bundle config build.or-tools --with-or-tools-dir=/opt/homebrew
17
-
18
- MSG
11
+ filename = "or-tools_arm64_MacOsX-12.5_cpp_v#{version}.tar.gz"
12
+ checksum = "ebc185bcb0a056a2704fb1c5175d5c11cc21a7e0634be65139cea55bb6a021ce"
19
13
  else
20
- filename = "or-tools_MacOsX-12.2.1_v#{version}.tar.gz"
21
- checksum = "33941702c59983897935eef06d91aca6c89ed9a8f5f4de3a9dfe489e97d7ca8c"
14
+ filename = "or-tools_x86_64_MacOsX-12.5_cpp_v#{version}.tar.gz"
15
+ checksum = "d03c706b51a6ef7aa77886dc3f135baaac52c00803bb548c286fbdeb4a419acd"
22
16
  end
23
17
  else
24
18
  # try /etc/os-release with fallback to /usr/lib/os-release
@@ -32,21 +26,23 @@ else
32
26
  os_version = os_info["VERSION_ID"]
33
27
 
34
28
  if os == "ubuntu" && os_version == "20.04"
35
- # TODO remove sub in v9.4
36
- filename = "or-tools_amd64_ubuntu-20.04_v#{version.sub(".10497", ".10502")}.tar.gz"
37
- checksum = "3d1979967a2c9358b5bc956f2e6b608b00e89e13c71d48d075475ce4138b6d1c"
29
+ filename = "or-tools_amd64_ubuntu-20.04_cpp_v#{version}.tar.gz"
30
+ checksum = "1b09f0f60b5aab83aeec468842e4a166cd3a4e7910e807f55bc7f96d5dffabdb"
38
31
  elsif os == "ubuntu" && os_version == "18.04"
39
- filename = "or-tools_amd64_ubuntu-18.04_v#{version}.tar.gz"
40
- checksum = "6ba5cc153417267e8f8e15f8b6390b17f22de07bacc61f3740a4172ccd56c274"
32
+ filename = "or-tools_amd64_ubuntu-18.04_cpp_v#{version}.tar.gz"
33
+ checksum = "ef73ebd4ca0f82a1179fdb2aded3c2a85dfe2ab275d91b8a5b147a653ca861ab"
41
34
  elsif os == "debian" && os_version == "11"
42
- filename = "or-tools_amd64_debian-11_v#{version}.tar.gz"
43
- checksum = "db0636bab909eabf06a7004f7572dca6fa152f3823c1365b0b7428405bf250e6"
35
+ filename = "or-tools_amd64_debian-11_cpp_v#{version}.tar.gz"
36
+ checksum = "651c62147f231fb90635c522e0a2c799e3de3991c2c75f7c6acb721e7b78946c"
37
+ elsif os == "debian" && os_version == "10"
38
+ filename = "or-tools_amd64_debian-10_cpp_v#{version}.tar.gz"
39
+ checksum = "36088bc6c6fbb96539245db7cddf498f77ae3e7b7c2cc8f6d7d89d76f90751fb"
44
40
  elsif os == "centos" && os_version == "8"
45
- filename = "or-tools_amd64_centos-8_v#{version}.tar.gz"
46
- checksum = "e5649069fd7a3e8228cc18b91e265a90562c5d03a0c962b0346911aada0aedc9"
41
+ filename = "or-tools_amd64_centos-8_cpp_v#{version}.tar.gz"
42
+ checksum = "da2cb303ae332d207592f21bb504e4e2e33dc1b1e8f5747d413c082d9d05504a"
47
43
  elsif os == "centos" && os_version == "7"
48
- filename = "or-tools_amd64_centos-7_v#{version}.tar.gz"
49
- checksum = "3bffdec8c09fc1345dcbd6a553437e2894014093fafb53e50adc7d4d776bb08b"
44
+ filename = "or-tools_amd64_centos-7_cpp_v#{version}.tar.gz"
45
+ checksum = "9eaf0178467f4d2fdbe496f62223809aa43e313548cc6cb716e661c00472b4ff"
50
46
  else
51
47
  platform =
52
48
  if Gem.win_platform?
@@ -1,3 +1,3 @@
1
1
  module ORTools
2
- VERSION = "0.7.3"
2
+ VERSION = "0.8.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: or-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.3
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Kane
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-07-23 00:00:00.000000000 Z
11
+ date: 2022-08-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rice
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - ">="
87
87
  - !ruby/object:Gem::Version
88
- version: '2.6'
88
+ version: '2.7'
89
89
  required_rubygems_version: !ruby/object:Gem::Requirement
90
90
  requirements:
91
91
  - - ">="