Skip to content

Commit a2d9e39

Browse files
ccoffrinccoffrin
authored
Drop Julia v0.6/v0.7 (#26)
* drop require for project.toml * drop Julia v0.6/v0.7 from travis * drop compat package * add changelog and prep project for release
1 parent a53a2f1 commit a2d9e39

File tree

9 files changed

+282
-77
lines changed

9 files changed

+282
-77
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,16 @@ os:
33
- linux
44
- osx
55
julia:
6-
- 0.6
7-
- 0.7
86
- 1.0
97
- 1.1
108
matrix:
119
allow_failures:
1210
- julia: nightly
13-
cache:
14-
directories:
15-
- /home/travis/.julia
1611
addons:
1712
apt_packages:
1813
- gfortran
19-
before_install:
20-
- julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.rm("GraphicalModelLearning"); Pkg.rm("GraphicalModelLearning")'
21-
- julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.update()'
2214
after_success:
23-
- julia -e '(VERSION >= v"0.7" && using Pkg); Pkg.add("Coverage"); cd(Pkg.dir("GraphicalModelLearning")); using Coverage; Codecov.submit(process_folder())'
15+
- julia -e 'using Pkg; Pkg.add("Coverage"); cd(Pkg.dir("GraphicalModelLearning")); using Coverage; Codecov.submit(process_folder())'
2416
jobs:
2517
include:
2618
- stage: "Documentation"

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
GraphicalModelLearning.jl Change Log
2+
====================================
3+
4+
### Staged
5+
- nothing
6+
7+
### v0.1.0
8+
- Drop support for Julia v0.6/0.7
9+
10+
### Previous
11+
- See Github releases for details

‎Manifest.toml‎

Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
[[Base64]]
4+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
5+
6+
[[BinDeps]]
7+
deps = ["Compat", "Libdl", "SHA", "URIParser"]
8+
git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9"
9+
uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
10+
version = "0.8.10"
11+
12+
[[BinaryProvider]]
13+
deps = ["Libdl", "SHA"]
14+
git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648"
15+
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
16+
version = "0.5.4"
17+
18+
[[Calculus]]
19+
deps = ["Compat"]
20+
git-tree-sha1 = "f60954495a7afcee4136f78d1d60350abd37a409"
21+
uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
22+
version = "0.4.1"
23+
24+
[[CommonSubexpressions]]
25+
deps = ["Test"]
26+
git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0"
27+
uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
28+
version = "0.2.0"
29+
30+
[[Compat]]
31+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
32+
git-tree-sha1 = "49269e311ffe11ac5b334681d212329002a9832a"
33+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
34+
version = "1.5.1"
35+
36+
[[DataStructures]]
37+
deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
38+
git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038"
39+
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
40+
version = "0.15.0"
41+
42+
[[Dates]]
43+
deps = ["Printf"]
44+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
45+
46+
[[DelimitedFiles]]
47+
deps = ["Mmap"]
48+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
49+
50+
[[DiffResults]]
51+
deps = ["Compat", "StaticArrays"]
52+
git-tree-sha1 = "34a4a1e8be7bc99bc9c611b895b5baf37a80584c"
53+
uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
54+
version = "0.0.4"
55+
56+
[[DiffRules]]
57+
deps = ["Random", "Test"]
58+
git-tree-sha1 = "dc0869fb2f5b23466b32ea799bd82c76480167f7"
59+
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
60+
version = "0.0.10"
61+
62+
[[Distributed]]
63+
deps = ["Random", "Serialization", "Sockets"]
64+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
65+
66+
[[ForwardDiff]]
67+
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "InteractiveUtils", "LinearAlgebra", "NaNMath", "Random", "SparseArrays", "SpecialFunctions", "StaticArrays", "Test"]
68+
git-tree-sha1 = "4c4d727f1b7e0092134fabfab6396b8945c1ea5b"
69+
uuid = "f6369f11-7733-5829-9624-2563aa707210"
70+
version = "0.10.3"
71+
72+
[[InteractiveUtils]]
73+
deps = ["Markdown"]
74+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
75+
76+
[[Ipopt]]
77+
deps = ["BinaryProvider", "Compat", "Libdl", "MathOptInterface", "MathProgBase"]
78+
git-tree-sha1 = "da2baaaf4b7ad386aab321c678028ddcc87ef348"
79+
uuid = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
80+
version = "0.5.4"
81+
82+
[[JuMP]]
83+
deps = ["Calculus", "Compat", "ForwardDiff", "Libdl", "MathProgBase", "Pkg", "ReverseDiffSparse", "Serialization"]
84+
git-tree-sha1 = "3bd8e52f7aeb2736a8e1b0d8ae8d01c2c85fea24"
85+
uuid = "4076af6c-e467-56ae-b986-b466b2749572"
86+
version = "0.18.5"
87+
88+
[[LibGit2]]
89+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
90+
91+
[[Libdl]]
92+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
93+
94+
[[LinearAlgebra]]
95+
deps = ["Libdl"]
96+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
97+
98+
[[Logging]]
99+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
100+
101+
[[Markdown]]
102+
deps = ["Base64"]
103+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
104+
105+
[[MathOptInterface]]
106+
deps = ["Compat", "Unicode"]
107+
git-tree-sha1 = "5d3de69c9220610d0336ab45d3eb8b6ac7a7c807"
108+
uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
109+
version = "0.8.4"
110+
111+
[[MathProgBase]]
112+
deps = ["Compat"]
113+
git-tree-sha1 = "3bf2e534e635df810e5f4b4f1a8b6de9004a0d53"
114+
uuid = "fdba3010-5040-5b88-9595-932c9decdf73"
115+
version = "0.7.7"
116+
117+
[[Missings]]
118+
deps = ["SparseArrays", "Test"]
119+
git-tree-sha1 = "f0719736664b4358aa9ec173077d4285775f8007"
120+
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
121+
version = "0.4.1"
122+
123+
[[Mmap]]
124+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
125+
126+
[[NaNMath]]
127+
deps = ["Compat"]
128+
git-tree-sha1 = "ce3b85e484a5d4c71dd5316215069311135fa9f2"
129+
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
130+
version = "0.3.2"
131+
132+
[[OrderedCollections]]
133+
deps = ["Random", "Serialization", "Test"]
134+
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
135+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
136+
version = "1.1.0"
137+
138+
[[Pkg]]
139+
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
140+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
141+
142+
[[Printf]]
143+
deps = ["Unicode"]
144+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
145+
146+
[[REPL]]
147+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
148+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
149+
150+
[[Random]]
151+
deps = ["Serialization"]
152+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
153+
154+
[[ReverseDiffSparse]]
155+
deps = ["Calculus", "Compat", "DataStructures", "ForwardDiff", "MathProgBase", "NaNMath"]
156+
git-tree-sha1 = "cbbc2c710abea5cfe71459ce4711d80a212aac5a"
157+
uuid = "89212889-6d3f-5f97-b412-7825138f6c9c"
158+
version = "0.8.6"
159+
160+
[[SHA]]
161+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
162+
163+
[[Serialization]]
164+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
165+
166+
[[SharedArrays]]
167+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
168+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
169+
170+
[[Sockets]]
171+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
172+
173+
[[SortingAlgorithms]]
174+
deps = ["DataStructures", "Random", "Test"]
175+
git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd"
176+
uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
177+
version = "0.3.1"
178+
179+
[[SparseArrays]]
180+
deps = ["LinearAlgebra", "Random"]
181+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
182+
183+
[[SpecialFunctions]]
184+
deps = ["BinDeps", "BinaryProvider", "Libdl", "Test"]
185+
git-tree-sha1 = "0b45dc2e45ed77f445617b99ff2adf0f5b0f23ea"
186+
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
187+
version = "0.7.2"
188+
189+
[[StaticArrays]]
190+
deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"]
191+
git-tree-sha1 = "3841b39ed5f047db1162627bf5f80a9cd3e39ae2"
192+
uuid = "90137ffa-7385-5640-81b9-e52037218182"
193+
version = "0.10.3"
194+
195+
[[Statistics]]
196+
deps = ["LinearAlgebra", "SparseArrays"]
197+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
198+
199+
[[StatsBase]]
200+
deps = ["DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
201+
git-tree-sha1 = "8a0f4b09c7426478ab677245ab2b0b68552143c7"
202+
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
203+
version = "0.30.0"
204+
205+
[[Test]]
206+
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
207+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
208+
209+
[[URIParser]]
210+
deps = ["Test", "Unicode"]
211+
git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69"
212+
uuid = "30578b45-9adc-5946-b283-645ec420af67"
213+
version = "0.4.0"
214+
215+
[[UUIDs]]
216+
deps = ["Random", "SHA"]
217+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
218+
219+
[[Unicode]]
220+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

‎Project.toml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name = "GraphicalModelLearning"
2+
uuid = "73787735-dbe8-5e05-9488-dc58b1b075d0"
3+
repo = "https://github.com/lanl-ansi/GraphicalModelLearning.jl.git"
4+
authors = ["Marc Vuffray, Carleton Coffrin"]
5+
version = "0.1.0"
6+
7+
[deps]
8+
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
9+
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
10+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11+
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
12+
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
13+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
14+
15+
[compat]
16+
Ipopt = "~0.4, ~0.5"
17+
JuMP = "~0.17, ~0.18"
18+
MathProgBase = "~0.7"
19+
StatsBase = "~0.25, ~0.26, ~0.27, ~0.28, ~0.29, ~0.30"
20+
julia = "^1"
21+
22+
[extras]
23+
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
24+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
25+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
26+
27+
[targets]
28+
test = ["DelimitedFiles", "Test", "Random"]

‎REQUIRE‎

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

‎src/GraphicalModelLearning.jl‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,9 @@ using JuMP
99
using MathProgBase # for solver type
1010
using Ipopt
1111

12-
import Compat.LinearAlgebra
13-
import Compat.LinearAlgebra: diag
14-
import Compat.Statistics: mean
15-
16-
import Compat.Nothing
17-
import Compat.undef
18-
import Compat.@info
19-
20-
if VERSION < v"0.7.0-"
21-
function Base.digits(value; base=0, pad=0)
22-
if base != 0 && pad != 0
23-
return digits(value, base, pad)
24-
elseif base != 0
25-
return digits(value, base)
26-
else
27-
return digits(value)
28-
end
29-
end
30-
31-
function Base.digits!(array, value; base=0)
32-
if base != 0
33-
digits!(array, value, base)
34-
else
35-
digits!(array, value)
36-
end
37-
end
38-
end
12+
import LinearAlgebra
13+
import LinearAlgebra: diag
14+
import Statistics: mean
3915

4016
include("models.jl")
4117

@@ -93,10 +69,9 @@ NLP() = NLP(IpoptSolver(print_level=0))
9369
learn(samples::Array{T,2}) where T <: Real = learn(samples, RISE(), NLP())
9470
learn(samples::Array{T,2}, formulation::S) where {T <: Real, S <: GMLFormulation} = learn(samples, formulation, NLP())
9571

96-
if VERSION >= v"0.7.0-"
97-
#TODO add better support for Adjoints
98-
learn(samples::LinearAlgebra.Adjoint, args...) = learn(copy(samples), args...)
99-
end
72+
#TODO add better support for Adjoints
73+
learn(samples::LinearAlgebra.Adjoint, args...) = learn(copy(samples), args...)
74+
10075

10176
function data_info(samples::Array{T,2}) where T <: Real
10277
(num_conf, num_row) = size(samples)

‎src/models.jl‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,7 @@ function jsondata(gm::FactorGraph{T}) where T <: Real
7676
end
7777

7878

79-
if VERSION < v"0.7.0-"
80-
Base.start(gm::FactorGraph) = start(gm.terms)
81-
Base.next(gm::FactorGraph, state) = next(gm.terms, state)
82-
Base.done(gm::FactorGraph, state) = done(gm.terms, state)
83-
else
84-
Base.iterate(gm::FactorGraph, kwargs...) = Base.iterate(gm.terms, kwargs...)
85-
end
86-
79+
Base.iterate(gm::FactorGraph, kwargs...) = Base.iterate(gm.terms, kwargs...)
8780

8881
Base.length(gm::FactorGraph) = length(gm.terms)
8982
#Base.size(gm::FactorGraph, a...) = size(gm.terms, a...)

‎test/REQUIRE‎

Whitespace-only changes.

0 commit comments

Comments
 (0)