Skip to content

Commit b2cd21f

Browse files
authored
Prep for v1.0 (#188)
1 parent 5ee3d45 commit b2cd21f

16 files changed

+50
-781
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
version: ['1.0', '1'] # Test against LTS and current minor release
14+
version: ['1.6', '1'] # Test against LTS and current minor release
1515
os: [ubuntu-latest, macOS-latest, windows-latest]
1616
arch: [x64]
1717
include:
1818
# Also test against 32-bit Linux on LTS.
19-
- version: '1.0'
19+
- version: '1.6'
2020
os: ubuntu-latest
2121
arch: x86
2222
steps:

Project.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
name = "Cbc"
22
uuid = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
33
repo = "https://github.com/jump-dev/Cbc.jl.git"
4-
version = "0.9.2"
4+
version = "1.0.0"
55

66
[deps]
7-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
8-
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
97
Cbc_jll = "38041ee0-ae04-5750-a4d2-bb4d0d83d27d"
10-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
118
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
129
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1310

1411
[compat]
15-
BinaryProvider = "0.5.9"
16-
CEnum = "0.3, 0.4"
1712
Cbc_jll = "=2.10.5, ~200.1000.500"
18-
MathOptInterface = "0.10.6"
19-
julia = "1"
13+
MathOptInterface = "1"
14+
julia = "1.6"
2015

2116
[extras]
2217
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[![Build Status](https://github.com/jump-dev/Cbc.jl/workflows/CI/badge.svg?branch=master)](https://github.com/jump-dev/Cbc.jl/actions?query=workflow%3ACI)
66
[![codecov](https://codecov.io/gh/jump-dev/Cbc.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/jump-dev/Cbc.jl)
77

8-
`Cbc.jl` is a Julia wrapper for the [COIN-OR Branch and Cut (Cbc)](https://projects.coin-or.org/Cbc)
9-
solver.
8+
`Cbc.jl` is a wrapper for the [COIN-OR Branch and Cut (Cbc)](https://projects.coin-or.org/Cbc)
9+
solver.
1010

1111
The wrapper has two components:
1212
* a thin wrapper around the complete C API
@@ -23,9 +23,7 @@ import Pkg; Pkg.add("Cbc")
2323
```
2424

2525
In addition to installing the Cbc.jl package, this will also download and
26-
install the Cbc binaries. (You do not need to install Cbc separately.) If you
27-
require a custom build of Cbc, see the **Custom Installation** instructions
28-
below.
26+
install the Cbc binaries. (You do not need to install Cbc separately.)
2927

3028
## Use with JuMP
3129

@@ -73,36 +71,10 @@ The following options are likely to be the most useful:
7371
The complete list of parameters can be found by running the `cbc` executable and
7472
typing `?` at the prompt.
7573

76-
On Julia 1.3 and above, you can start the `cbc` executable from Julia as follows:
74+
You can start the `cbc` executable from Julia as follows:
7775
```julia
7876
using Cbc_jll
7977
Cbc_jll.cbc() do exe
8078
run(`$(exe)`)
8179
end
8280
```
83-
84-
## Custom Installation
85-
86-
To install custom built Cbc binaries, use the environmental variable
87-
`JULIA_CBC_LIBRARY_PATH` to point to the path at which you installed Cbc (the
88-
folder containing `libCbcSolver`).
89-
90-
For example, on Mac, after installing Cbc with `brew install cbc`, use:
91-
```julia
92-
ENV["JULIA_CBC_LIBRARY_PATH"] = "/usr/local/Cellar/cbc/2.10.5/lib"
93-
import Pkg
94-
Pkg.add("Cbc")
95-
Pkg.build("Cbc")
96-
```
97-
Replace `"/usr/local/Cellar/cbc/2.10.5/lib"` with a different path as
98-
appropriate.
99-
100-
**You must have `JULIA_CBC_LIBRARY_PATH` set _every_ time you run `using Cbc`,
101-
not just when you install it.**
102-
103-
Switch back to the default binaries as follows:
104-
```julia
105-
delete!(ENV, "JULIA_CBC_LIBRARY_PATH")
106-
import Pkg
107-
Pkg.build("Cbc")
108-
```

deps/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

deps/build.jl

Lines changed: 0 additions & 66 deletions
This file was deleted.

deps/build_Cgl.v0.60.2.jl

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)