Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

or-tools v9.7 #47

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+232 −124
Open

or-tools v9.7 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
becdf59
updated v9.7
regro-cf-autotick-bot Aug 8, 2023
84f869d
MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and co…
regro-cf-autotick-bot Aug 8, 2023
33f5957
rebase patches
h-vetinari Aug 8, 2023
d513f16
make scipy a test-dependency
h-vetinari Aug 8, 2023
a980ae0
Rebuild for libabseil20230802_libgrpc157_libprotobuf4234
regro-cf-autotick-bot Sep 11, 2023
903390f
MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.2, and co…
h-vetinari Sep 26, 2023
2b23f02
add re2 migration
h-vetinari Oct 13, 2023
0110c00
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
h-vetinari Oct 13, 2023
f955ff3
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
h-vetinari Feb 26, 2024
5231f0e
add stdlib
h-vetinari Oct 9, 2024
9277851
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.41.1, and co…
h-vetinari Oct 9, 2024
f9f462e
add patch for use-before-include in ortools/base/logging.h
h-vetinari Oct 9, 2024
4d48896
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and co…
h-vetinari Oct 20, 2024
1c27954
add abseil/protobuf migration
h-vetinari Oct 20, 2024
03cacde
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.43.0, and co…
h-vetinari Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 17 additions & 11 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -21,35 +25,37 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20240722'
libprotobuf:
- '3.21'
- 5.27.5
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.26'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.12.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.03.02
- 2024.07.02
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
- - python
- numpy
zlib:
- '1.2'
- '1'
26 changes: 16 additions & 10 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -25,35 +29,37 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20240722'
libprotobuf:
- '3.21'
- 5.27.5
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.26'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.12.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.03.02
- 2024.07.02
target_platform:
- linux-aarch64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
- - python
- numpy
zlib:
- '1.2'
- '1'
26 changes: 16 additions & 10 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -21,35 +25,37 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20230125'
- '20240722'
libprotobuf:
- '3.21'
- 5.27.5
numpy:
- '1.21'
- '1.22'
- '1.23'
- '1.21'
- '1.21'
- '1.26'
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.8.* *_cpython
- 3.12.* *_cpython
- 3.9.* *_cpython
re2:
- 2023.03.02
- 2024.07.02
target_platform:
- linux-ppc64le
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
- - python
- numpy
zlib:
- '1.2'
- '1'
18 changes: 18 additions & 0 deletions .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
__migrator:
build_number: 1
commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
- re2
libabseil:
- 20240722
libgrpc:
- "1.65"
libprotobuf:
- 5.27.5
migrator_ts: 1727040240.8650293
37 changes: 0 additions & 37 deletions .ci_support/migrations/python311.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ jobs:
runs-on: ubuntu-latest
name: automerge
steps:
- name: checkout
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@main
Expand Down
25 changes: 23 additions & 2 deletions .gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 18 additions & 8 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading