Skip to content

Commit 3934ca9

Browse files
committed
upgraded to julia v1.4
1 parent 41ddb48 commit 3934ca9

File tree

6 files changed

+24
-41
lines changed

6 files changed

+24
-41
lines changed

.travis.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 0.7
87
- 1.0
98
- 1.1
9+
- 1.2
10+
- 1.3
11+
- 1.4
1012
- nightly
1113
notifications:
1214
email: false
13-
git:
14-
depth: 99999999
1515

1616
## uncomment the following lines to allow failures on nightly julia
1717
## (tests will run but not make your overall status red)
@@ -27,11 +27,5 @@ matrix:
2727
#before_script: # homebrew for mac
2828
# - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
2929

30-
## uncomment the following lines to override the default test script
31-
#script:
32-
# - julia -e 'Pkg.clone(pwd()); Pkg.build("VerTeX"); Pkg.test("VerTeX"; coverage=true)'
3330
after_success:
34-
# push coverage results to Coveralls
35-
- julia -e 'cd(Pkg.dir("VerTeX")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
36-
# push coverage results to Codecov
37-
- julia -e 'cd(Pkg.dir("VerTeX")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
31+
- julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder()); Coveralls.submit(process_folder())'

LICENSE.md

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

Project.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
name = "VerTeX"
22
uuid = "cc48e778-429c-5593-b60f-2bcf41d5649c"
3+
authors = ["Michael Reed"]
4+
version = "0.1.0"
35

46
[deps]
57
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
6-
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
78
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
89
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
910
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
1011
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
1112
TerminalMenus = "dc548174-15c3-5faf-af27-7997cfbde655"
1213
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
1314

15+
[compat]
16+
julia = "1"
17+
Requires = "1"
18+
TerminalMenus = "0"
19+
1420
[extras]
21+
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
22+
GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
23+
Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
1524
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1625

1726
[targets]

appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
environment:
22
matrix:
3-
- julia_version: 0.7
43
- julia_version: 1
54
- julia_version: 1.1
5+
- julia_version: 1.2
6+
- julia_Version: 1.3
7+
- julia_version: 1.4
68
- julia_version: nightly
79

810
platform:

src/VerTeX.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ export dict2toml, tex2dict, tex2toml, dict2tex, toml2tex, toml2dict
88
export zathura, latexmk, pdf, texedit
99

1010
using Pkg, UUIDs, Dates, REPL, Requires
11-
using Pkg.TOML, Pkg.Pkg2, REPL.TerminalMenus
11+
using Pkg.TOML, REPL.TerminalMenus
12+
VERSION < v"1.4" && (using Pkg.Pkg2)
1213

1314
function drawgraph end
1415

@@ -342,7 +343,7 @@ function __init__()
342343
end
343344
end
344345
@require LightGraphs="093fc24a-ae57-5d10-9952-331d41423f4d" begin
345-
using LightGraphs
346+
import LightGraphs
346347
function makegraph(manifest=manifest,dictionary=dictionary,index=collect(keys(dictionary)))
347348
readmanifest()
348349
readdictionary()
@@ -360,11 +361,11 @@ function __init__()
360361
return g
361362
end
362363
end
363-
@require GraphPlot="a2cc645c-3eea-5389-862e-a155d0052231" begin
364-
using LightGraphs, GraphPlot, Compose, Cairo
364+
#@require GraphPlot="a2cc645c-3eea-5389-862e-a155d0052231"
365+
@require Compose="a81c6b42-2e10-5240-aca2-a61377ecd94b" begin
366+
import LightGraphs, Cairo, GraphPlot
365367
function drawgraph(name="/tmp/vtx-data.pdf",manifest=manifest,dictionary=dictionary,index=collect(keys(dictionary)))
366-
p = gplot(makegraph(manifest,dictionary,index),nodelabel=index,layout=circular_layout)
367-
eval(:(draw(PDF($name, $(Expr(:call,:*,32,:cm)), $(Expr(:call,:*,32,:cm))), $p)))
368+
Compose.draw(Compose.PDF(name,32Compose.cm,32Compose.cm),GraphPlot.gplot(makegraph(manifest,dictionary,index),nodelabel=index,layout=GraphPlot.circular_layout))
368369
end
369370
end
370371
end

src/repl.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ using UUIDs, Pkg
99
import REPL
1010
import REPL: LineEdit, REPLCompletions
1111

12-
import Pkg: Types.casesensitive_isdir
1312
using Pkg.Types, Pkg.Display, Pkg.Operations
1413

1514
vtxerror(msg::String...) = throw(PkgError(join(msg)))

0 commit comments

Comments
 (0)