Skip to content

Commit 62cbeb8

Browse files
committed
change scip requirement
1 parent c22bf50 commit 62cbeb8

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## Unreleased
9+
10+
### Added
11+
12+
### Changed
13+
14+
* Changed `scip` version to `9.1` for linux and osx.
15+
16+
### Removed
17+
18+
819
## [0.7.2] 2024-10-29
920

1021
### Added

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pip install -e .'[dev]'
3838
**Mac**:
3939

4040
```bash
41-
conda create -n cgal-dev python=3.10 gmp mpfr boost-cpp eigen=3.3 cgal-cpp pybind11 scip'>=9.0' --yes
41+
conda create -n cgal-dev python=3.10 gmp mpfr boost-cpp eigen=3.3 cgal-cpp pybind11 scip=9.1 --yes
4242
conda activate cgal-dev
4343
git clone https://github.com/compas-dev/compas_cgal
4444
cd compas_cgal

env_linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- pip >=19.0
77
- gmp
88
- mpfr
9-
- scip >=9
9+
- scip =9.1
1010
- boost-cpp
1111
- eigen =3.3
1212
- cgal-cpp

env_osx.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ dependencies:
66
- pip >=19.0
77
- gmp
88
- mpfr
9-
- scip >=9
9+
- scip =9.1
1010
- boost-cpp
11-
- eigen =3.3
12-
- cgal-cpp
11+
- eigen
12+
- cgal-cpp >=6.0
1313
- pybind11
1414
- compas >=2.4
1515
- pip:

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ def cpp_flag(compiler):
100100
101101
The newer version is prefered over c++11 (when it is available).
102102
"""
103-
flags = ["-std=c++20", "-std=c++17", "-std=c++14", "-std=c++11"]
103+
# flags = ["-std=c++20", "-std=c++17", "-std=c++14", "-std=c++11"]
104+
flags = ["-std=c++20"]
104105

105106
for flag in flags:
106107
if has_flag(compiler, flag):

tasks.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import print_function
2-
31
import os
42

53
from compas_invocations2 import build

0 commit comments

Comments
 (0)