Skip to content

Commit 69a1238

Browse files
committed
Update README to use scipopt conda channel
1 parent 21408a7 commit 69a1238

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

README.rst

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,8 @@ CMake is made available in the ``ecole`` environment created earlier.
6666

6767
SCIP runtime dependency
6868
^^^^^^^^^^^^^^^^^^^^^^^
69-
Head to the `download page <https://scip.zib.de/index.php#download>`_, select version
70-
7.0.0 and download the ``scipoptsuite-7.0.0.tgz`` file.
71-
Extract it using
72-
73-
.. code-block:: bash
74-
75-
tar -xz -f scipoptsuite-7.0.0.tgz
76-
77-
Create a local conda package for SCIP using the recipe provided in this repository.
78-
79-
*Note: "/path/to/scipoptsuite-7.0.0" has to be an absolute path here.*
80-
81-
.. code-block:: bash
82-
83-
export CONDA_BLD_PATH="${CONDA_PREFIX}/conda-bld"
84-
SCIP_DIR="/path/to/scipoptsuite-7.0.0" conda build -c conda-forge .circleci/recipe/scipoptsuite-7.0.0
85-
86-
Install the SCIP package in the ``ecole`` environment
87-
88-
.. code-block:: bash
89-
90-
conda install -c "file://${CONDA_BLD_PATH}" -c conda-forge scipoptsuite
91-
69+
Scip dependency is resolved from `conda` inside `conda-dev.yaml`.
70+
No other action are necessary :)
9271

9372
Building
9473
^^^^^^^^

conda-dev.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
channels:
2-
- defaults
2+
- scipopt
33
- conda-forge
4+
- defaults
45

56
dependencies:
67
# General convenience
@@ -17,11 +18,15 @@ dependencies:
1718
- clang-tools>=10
1819
- conan
1920
- ccache
21+
# C++ runtime dependency
22+
- scip
2023
# Build time Python dependencies
2124
- python>=3.6
2225
- pybind11
2326
- numpy>=1.4
2427
- xtensor-python
28+
# Python runtime dependency
29+
- pyscipopt >= 3.0.1 # optional
2530
# Python dev tools
2631
- ipython
2732
- pytest

0 commit comments

Comments
 (0)