Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JuliaOpt/NLopt.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
stevengj committed May 13, 2020
2 parents 5e15339 + 7c072d6 commit cc23e91
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 10 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
jobs:
TagBot:
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
19 changes: 11 additions & 8 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
name = "NLopt"
uuid = "76087f3c-5699-56af-9a33-bf431cd00edd"
version = "0.5.1"
version = "0.6"

[deps]
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
CMakeWrapper = "d5fb7624-851a-54ee-a528-d3f3bac0b4a0"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
NLopt_jll = "079eb43e-fd8e-5478-9966-2cf3e3edb778"

[compat]
BinaryProvider = "≥ 0.3.0"
MathProgBase = "~0.5.0, ~0.6, ~0.7"
julia = "≥ 0.7.0"
BinaryProvider = ">= 0.3.0"
MathProgBase = "0.5, 0.6, 0.7, 0.8"
julia = "1.3"

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

[targets]
test = ["Test"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ opt.initial_step = dx
```
Here, `dx` is an array of the (nonzero) initial steps for each
dimension, or a single number if you wish to use the same initial
steps for all dimensions. `get_initial_step(opt::Opt,
steps for all dimensions. `initial_step(opt::Opt,
x::AbstractVector)` returns the initial step that will be used for a
starting guess of `x` in `optimize(opt,x)`.

Expand Down
2 changes: 1 addition & 1 deletion src/NLopt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Base.:(==)(r::Result, s::Symbol) = s == r
const _Opt = Ptr{Cvoid} # nlopt_opt

# pass both f and o to the callback so that we can handle exceptions
struct Callback_Data
mutable struct Callback_Data
f::Function
o::Any # should be Opt, but see Julia issue #269
end
Expand Down

0 comments on commit cc23e91

Please sign in to comment.