Skip to content

Commit

Permalink
Merge pull request #41 from JuliaOpt/bl/moiv0.9
Browse files Browse the repository at this point in the history
Update to MOI v0.9
  • Loading branch information
blegat authored Aug 13, 2019
2 parents 6536064 + 4d5c1c1 commit 11dba93
Show file tree
Hide file tree
Showing 16 changed files with 437 additions and 143 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Manifest.toml
*.jl.cov
*.jl.*.cov
*.jl.mem
Expand Down
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ os:
- linux
- osx
julia:
- 0.6
- 0.7
- 1.0
- 1.1

matrix:
allow_failures:
Expand All @@ -21,7 +20,4 @@ addons:
notifications:
email: false
after_success:
# push coverage results to Coveralls
- julia -e 'cd(Pkg.dir("CSDP")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'
# push coverage results to Codecov
- julia -e 'cd(Pkg.dir("CSDP")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
- julia -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'
26 changes: 26 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name = "CSDP"
uuid = "0a46da34-8e4b-519e-b418-48813639ff34"
repo = "https://github.com/JuliaOpt/CSDP.jl.git"
version = "0.5.0"

[deps]
BinDeps = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
SemidefiniteModels = "169818f4-1a3d-53bf-95b3-11177825b1e3"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[compat]
MathOptInterface = "0.9"
MathProgBase = "~0.7.0"
SemidefiniteModels = "~0.1.1"
julia = "1"

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

[targets]
test = ["Test"]
8 changes: 0 additions & 8 deletions REQUIRE

This file was deleted.

3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
environment:
matrix:
- julia_version: 0.6
- julia_version: 0.7
- julia_version: 1
- julia_version: 1.1

platform:
- x86 # 32-bit
Expand Down
6 changes: 3 additions & 3 deletions src/CSDP.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
module CSDP

using Compat
using Compat.LinearAlgebra # For Diagonal
using Compat.SparseArrays # For SparseMatrixCSC
using LinearAlgebra # For Diagonal
using SparseArrays # For SparseMatrixCSC

# Try to load the binary dependency
if isfile(joinpath(dirname(@__FILE__),"..","deps","deps.jl"))
Expand All @@ -14,6 +13,7 @@ end
export Blockmatrix

include("blockmat.h.jl")
include("blockdiag.jl")
include("blockmat.jl")
include("declarations.h.jl")
include("declarations.jl")
Expand Down
Loading

2 comments on commit 11dba93

@blegat
Copy link
Member Author

@blegat blegat commented on 11dba93 Aug 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/2674

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v0.5.0 -m "<description of version>" 11dba9372d4d7141a8d4939238dab00dda96e01e
git push origin v0.5.0

Please sign in to comment.