or-tools v9.8

.ci_support/linux_64_.yaml

@@ -25,25 +25,27 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230125'
+- '20230802'
 libprotobuf:
-- '3.21'
+- 4.25.1
 numpy:
-- '1.21'
+- '1.22'
 - '1.23'
-- '1.21'
-- '1.21'
+- '1.26'
+- '1.22'
+- '1.22'
 pin_run_as_build:
   python:
     min_pin: x.x
     max_pin: x.x
 python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
+- 3.12.* *_cpython
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.03.02
+- 2023.09.01
 target_platform:
 - linux-64
 zip_keys:

.ci_support/linux_aarch64_.yaml

@@ -29,25 +29,27 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230125'
+- '20230802'
 libprotobuf:
-- '3.21'
+- 4.25.1
 numpy:
-- '1.21'
+- '1.22'
 - '1.23'
-- '1.21'
-- '1.21'
+- '1.26'
+- '1.22'
+- '1.22'
 pin_run_as_build:
   python:
     min_pin: x.x
     max_pin: x.x
 python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
+- 3.12.* *_cpython
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.03.02
+- 2023.09.01
 target_platform:
 - linux-aarch64
 zip_keys:

.ci_support/linux_ppc64le_.yaml

@@ -25,25 +25,27 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libabseil:
-- '20230125'
+- '20230802'
 libprotobuf:
-- '3.21'
+- 4.25.1
 numpy:
-- '1.21'
+- '1.22'
 - '1.23'
-- '1.21'
-- '1.21'
+- '1.26'
+- '1.22'
+- '1.22'
 pin_run_as_build:
   python:
     min_pin: x.x
     max_pin: x.x
 python:
 - 3.10.* *_cpython
 - 3.11.* *_cpython
+- 3.12.* *_cpython
 - 3.8.* *_cpython
 - 3.9.* *_cpython
 re2:
-- 2023.03.02
+- 2023.09.01
 target_platform:
 - linux-ppc64le
 zip_keys:

.ci_support/migrations/python311.yaml → .ci_support/migrations/python312.yaml

@@ -1,4 +1,4 @@
-migrator_ts: 1666686085
+migrator_ts: 1695046563
 __migrator:
     migration_number: 1
     operation: key_add
@@ -10,15 +10,16 @@ __migrator:
             - 3.8.* *_cpython
             - 3.9.* *_cpython
             - 3.10.* *_cpython
-            - 3.11.* *_cpython  # new entry
+            - 3.11.* *_cpython
+            - 3.12.* *_cpython  # new entry
             - 3.6.* *_73_pypy
             - 3.7.* *_73_pypy
             - 3.8.* *_73_pypy
             - 3.9.* *_73_pypy
     paused: false
     longterm: True
-    pr_limit: 60
-    max_solver_attempts: 10  # this will make the bot retry "not solvable" stuff 10 times
+    pr_limit: 30
+    max_solver_attempts: 6  # this will make the bot retry "not solvable" stuff 6 times
     exclude:
       # this shouldn't attempt to modify the python feedstocks
       - python
@@ -29,9 +30,9 @@ __migrator:
     exclude_pinned_pkgs: false
 
 python:
-  - 3.11.* *_cpython
+  - 3.12.* *_cpython
 # additional entries to add for zip_keys
 numpy:
-  - 1.23
+  - 1.26
 python_impl:
   - cpython

recipe/install-cpp.sh

@@ -13,7 +13,7 @@ elif [[ "$PKG_NAME" == "ortools-cpp" ]]; then
     cmake --install ./build-cpp --prefix=./temp_prefix
     # install selected binaries & share
     cp -R ./temp_prefix/share/* $PREFIX/share
-    cp ./temp_prefix/bin/fzn-ortools $PREFIX/bin
+    cp ./temp_prefix/bin/fzn-cp-sat $PREFIX/bin
     cp ./temp_prefix/bin/sat_runner $PREFIX/bin
     cp ./temp_prefix/bin/solve $PREFIX/bin
 else

recipe/meta.yaml

@@ -1,17 +1,17 @@
-{% set version = "9.6" %}
+{% set version = "9.8" %}
 
 {% set libs = ["ortools", "ortools_flatzinc"] %}
 # many, many more headers; this just covers one from main namespace and a nested one
 {% set headers = ["ortools_export.h", "ortools/algorithms/dense_doubly_linked_list.h"] %}
-{% set binaries = ["fzn-ortools", "sat_runner", "solve"] %}
+{% set binaries = ["fzn-cp-sat", "sat_runner", "solve"] %}
 
 package:
   name: or-tools-package
   version: {{ version }}
 
 source:
   url: https://github.com/google/or-tools/archive/v{{ version }}.tar.gz
-  sha256: bc4b07dc9c23f0cca43b1f5c889f08a59c8f2515836b03d4cc7e0f8f2c879234
+  sha256: 85e10e7acf0a9d9a3b891b9b108f76e252849418c6230daea94ac429af8a4ea4
   patches:
     - patches/0001-fail-loudly-in-sample-program-if-scip-not-found.patch
     - patches/0002-depend-on-libortools-for-python-bindings.patch
@@ -20,7 +20,7 @@ source:
 # The meta package
 
 build:
-  number: 3
+  number: 0
   skip: true  # [not linux]
 
 requirements:
@@ -207,7 +207,6 @@ outputs:
         - numpy
         - mypy-protobuf
         - protobuf >=4.21.12
-        - scipy >=1.10
         # match protobuf version from libortools to help solver
         - libprotobuf
         # other C/C++ deps
@@ -269,6 +268,7 @@ outputs:
         - python -c "from ortools.linear_solver import pywraplp; pywraplp.Solver.CreateSolver('SCIP')"  # [not (aarch64 or ppc64le)]
       requires:
         - pip
+        - scipy
       source_files:
         - cmake/samples/python/sample.py
         - ortools/sat/samples/assignment_sat.py

recipe/patches/0001-fail-loudly-in-sample-program-if-scip-not-found.patch

@@ -1,4 +1,4 @@
-From 78c0d19a068fcb7b067ae3274a2724e6c1f8bcea Mon Sep 17 00:00:00 2001
+From 646f887f78fb193720a73d16fdfb02d1fc9db1c4 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Tue, 25 Apr 2023 18:31:29 +1100
 Subject: [PATCH 1/3] fail loudly in sample program if scip not found