BCRARL · BCRARL · May 25, 2020 · Jul 3, 2020 · Jul 15, 2020 · Sep 10, 2020
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
@@ -0,0 +1,16 @@
+name: CompatHelper
+on:
+  schedule:
+    - cron: '00 00 * * *'
+  workflow_dispatch:
+jobs:
+  CompatHelper:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Pkg.add("CompatHelper")
+        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
+      - name: CompatHelper.main()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}  # optional
+        run: julia -e 'using CompatHelper; CompatHelper.main()'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,47 @@
+name: CI
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+    tags: '*'
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
+          - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
+          - 'nightly'
+        os:
+          - ubuntu-latest
+          - macos-latest
+        arch:
+          - x64
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v1
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v1
+        with:
+          file: lcov.info
diff --git a/.github/workflows/tagbot.yml b/.github/workflows/tagbot.yml
@@ -0,0 +1,20 @@
+name: TagBot
+on:
+  issue_comment:
+    types:
+      - created
+  workflow_dispatch:
+    inputs:
+      lookback:
+        default: 3
+permissions:
+  contents: write
+jobs:
+  TagBot:
+    if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JuliaRegistries/TagBot@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ssh: ${{ secrets.DOCUMENTER_KEY }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/Project.toml b/Project.toml
@@ -1,33 +1,21 @@
 name = "GraphPlot"
 uuid = "a2cc645c-3eea-5389-862e-a155d0052231"
 authors = ["JuliaGraphs"]
-version = "0.4.2"
+version = "0.6.0"
 
 [deps]
 ArnoldiMethod = "ec485272-7323-5ecc-a04f-4719b315124d"
-ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
-LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
+Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-ArnoldiMethod = "0.0.4"
-ColorTypes = "0.9, 0.10"
-Colors = "0.11, 0.12"
-Compose = "0.7, 0.8"
-LightGraphs = "1.1"
-VisualRegressionTests = "0.2, 0.3"
-julia = "1"
-
-[extras]
-Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
-ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
-
-[targets]
-test = ["Test", "Cairo", "ImageMagick", "VisualRegressionTests"]
+ArnoldiMethod = "0.2"
+Colors = "0.12"
+Compose = "0.9"
+Graphs = "1.4"
+julia = "1.6"
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # GraphPlot
 
-[![Build Status](https://travis-ci.org/JuliaGraphs/GraphPlot.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphs/GraphPlot.jl)
-[![Julia Build](http://pkg.julialang.org/badges/GraphPlot_0.6.svg)](http://pkg.julialang.org/?pkg=GraphPlot)
+![CI](https://github.com/JuliaGraphs/GraphPlot.jl/workflows/CI/badge.svg?branch=master)
+[![version](https://juliahub.com/docs/GraphPlot/version.svg)](https://juliahub.com/ui/Packages/GraphPlot/bUwXr)
 
 Graph layout and visualization algorithms based on [Compose.jl](https://github.com/dcjones/Compose.jl) and inspired by [GraphLayout.jl](https://github.com/IainNZ/GraphLayout.jl).
 
@@ -14,7 +14,7 @@ Other layout algorithms are wrapped from [NetworkX](https://github.com/networkx/
 # Getting Started
 
 From the Julia REPL the latest version can be installed with
-```{execute="false"}
+```julia
 Pkg.add("GraphPlot")
 ```
 GraphPlot is then loaded with
@@ -25,16 +25,16 @@ using GraphPlot
 # Usage
 ## karate network
 ```julia
-using LightGraphs: smallgraph
+using Graphs: smallgraph
 g = smallgraph(:karate)
 gplot(g)
 
 ```
 
 ## Add node label
 ```julia
-using LightGraphs
-nodelabel = [1:nv(g)]
+using Graphs
+nodelabel = 1:nv(g)
 gplot(g, nodelabel=nodelabel)
 
 ```
@@ -47,7 +47,7 @@ gplot(g, nodelabel=nodelabel, nodelabeldist=1.5, nodelabelangleoffset=π/4)
 ## Control the node size
 ```julia
 # nodes size proportional to their degree
-nodesize = [LightGraphs.out_degree(g, v) for v in LightGraphs.vertices(g)]
+nodesize = [Graphs.outdegree(g, v) for v in Graphs.vertices(g)]
 gplot(g, nodesize=nodesize)
 ```
 
@@ -76,13 +76,13 @@ gplot(g, nodelabelsize=nodelabelsize, nodesize=nodesize, nodelabel=nodelabel)
 
 ## Draw edge labels
 ```julia
-edgelabel = [1:LightGraphs.ne(g)]
+edgelabel = 1:Graphs.ne(g)
 gplot(g, edgelabel=edgelabel, nodelabel=nodelabel)
 ```
 
 ## Adjust edge labels
 ```julia
-edgelabel = [1:LightGraphs.ne(g)]
+edgelabel = 1:Graphs.ne(g)
 gplot(g, edgelabel=edgelabel, nodelabel=nodelabel, edgelabeldistx=0.5, edgelabeldisty=0.5)
 ```
 
@@ -99,7 +99,7 @@ gplot(g, nodefillc=nodefillc)
 ## Different layout
 
 ### spring layout (default)
-This is the defaut layout and will be chosen if no layout is specified. The [default parameters to the spring layout algorithm](https://github.com/JuliaGraphs/GraphPlot.jl/blob/master/src/layout.jl#L78) can be changed by supplying an anonymous function, e.g., if nodes appear clustered too tightly together, try 
+This is the defaut layout and will be chosen if no layout is specified. The [default parameters to the spring layout algorithm](https://github.com/JuliaGraphs/GraphPlot.jl/blob/master/src/layout.jl#L78) can be changed by supplying an anonymous function, e.g., if nodes appear clustered too tightly together, try
 ```julia
 layout=(args...)->spring_layout(args...; C=20)
 gplot(g, layout=layout, nodelabel=nodelabel)
@@ -121,8 +121,8 @@ gplot(g, layout=spectral_layout)
 ### shell layout
 ```julia
 nlist = Vector{Vector{Int}}(undef, 2) # two shells
-nlist[1] = [1:5] # first shell
-nlist[2] = [6:nv(g)] # second shell
+nlist[1] = 1:5 # first shell
+nlist[2] = 6:nv(g) # second shell
 locs_x, locs_y = shell_layout(g, nlist)
 gplot(g, locs_x, locs_y, nodelabel=nodelabel)
 ```
@@ -132,38 +132,67 @@ gplot(g, locs_x, locs_y, nodelabel=nodelabel)
 gplot(g, linetype="curve")
 ```
 
+## Show plot
+
+When using an IDE such as VSCode, `Cairo.jl` is required to visualize the plot inside the IDE.
+When using the REPL, `gplothtml` will allow displaying the plot on a browser.
+
 ## Save to figure
-```{execute="false"}
-using Cairo, Compose
+```julia
+using Compose
 # save to pdf
 draw(PDF("karate.pdf", 16cm, 16cm), gplot(g))
 # save to png
 draw(PNG("karate.png", 16cm, 16cm), gplot(g))
 # save to svg
 draw(SVG("karate.svg", 16cm, 16cm), gplot(g))
+# alternate way of saving to svg without loading Compose
+saveplot(gplot(g, plot_size = (16cm, 16cm)), "karate.svg")
 ```
-# LightGraphs integration
+# Graphs.jl integration
 ```julia
-using LightGraphs
+using Graphs
 h = watts_strogatz(50, 6, 0.3)
 gplot(h)
 ```
 
 # Arguments
-+ `G` graph to plot
-+ `layout` Optional. layout algorithm. Currently can choose from
-[random_layout, circular_layout, spring_layout, stressmajorize_layout, 
-shell_layout, spectral_layout].
-Default: `spring_layout`
-+ `nodelabel` Optional. Labels for the vertices. Default: `nothing`
-+ `nodefillc` Optional. Color to fill the nodes with.
-Default: `colorant"turquoise"`
-+ `nodestrokec` Color for the node stroke.
-Default: `nothing`
-+ `arrowlengthfrac` Fraction of line length to use for arrows.
-Set to 0 for no arrows. Default: 0 for undirected graph and 0.1 for directed graph
-+ `arrowangleoffset` angular width in radians for the arrows. Default: `π/9` (20 degrees)
-
++ `G` Graph to draw
++ `locs_x, locs_y` Locations of the nodes (will be normalized and centered). If not specified, will be obtained from `layout` kwarg.
+
+# Keyword Arguments
++ `layout` Layout algorithm: `random_layout`, `circular_layout`, `spring_layout`, `shell_layout`, `stressmajorize_layout`, `spectral_layout`. Default: `spring_layout`
++ `title` Plot title. Default: `""`
++ `title_color` Plot title color. Default: `colorant"black"`
++ `title_size` Plot title size. Default: `4.0`
++ `font_family` Font family for all text. Default: `"Helvetica"`
++ `NODESIZE` Max size for the nodes. Default: `3.0/sqrt(N)`
++ `nodesize` Relative size for the nodes, can be a Vector. Default: `1.0`
++ `nodelabel` Labels for the vertices, a Vector or nothing. Default: `nothing`
++ `nodelabelc` Color for the node labels, can be a Vector. Default: `colorant"black"`
++ `nodelabeldist` Distances for the node labels from center of nodes. Default: `0.0`
++ `nodelabelangleoffset` Angle offset for the node labels. Default: `π/4.0`
++ `NODELABELSIZE` Largest fontsize for the vertice labels. Default: `4.0`
++ `nodelabelsize` Relative fontsize for the vertice labels, can be a Vector. Default: `1.0`
++ `nodefillc` Color to fill the nodes with, can be a Vector. Default: `colorant"turquoise"`
++ `nodestrokec` Color for the nodes stroke, can be a Vector. Default: `nothing`
++ `nodestrokelw` Line width for the nodes stroke, can be a Vector. Default: `0.0`
++ `edgelabel` Labels for the edges, a Vector or nothing. Default: `[]`
++ `edgelabelc` Color for the edge labels, can be a Vector. Default: `colorant"black"`
++ `edgelabeldistx, edgelabeldisty` Distance for the edge label from center of edge. Default: `0.0`
++ `EDGELABELSIZE` Largest fontsize for the edge labels. Default: `4.0`
++ `edgelabelsize` Relative fontsize for the edge labels, can be a Vector. Default: `1.0`
++ `EDGELINEWIDTH` Max line width for the edges. Default: `0.25/sqrt(N)`
++ `edgelinewidth` Relative line width for the edges, can be a Vector. Default: `1.0`
++ `edgestrokec` Color for the edge strokes, can be a Vector. Default: `colorant"lightgray"`
++ `arrowlengthfrac` Fraction of line length to use for arrows. Equal to 0 for undirected graphs. Default: `0.1` for the directed graphs
++ `arrowangleoffset` Angular width in radians for the arrows. Default: `π/9 (20 degrees)`
++ `linetype` Type of line used for edges ("straight", "curve"). Default: "straight"
++ `outangle` Angular width in radians for the edges (only used if `linetype = "curve`). Default: `π/5 (36 degrees)`
++ `background_color` Color for the plot background. Default: `nothing`
++ `plot_size` Tuple of measures for width x height of plot area. Default: `(10cm, 10cm)`
++ `leftpad, rightpad, toppad, bottompad` Padding for the plot margins. Default: `0mm`
++ `pad` Padding for plot margins (overrides individual padding if given). Default: `nothing`
 # Reporting Bugs
 
 Filing an issue to report a bug, counterintuitive behavior, or even to request a feature is extremely valuable in helping me prioritize what to work on, so don't hestitate.
diff --git a/REQUIRE b/REQUIRE
diff --git a/examples/graphplot.ipynb b/examples/graphplot.ipynb
@@ -49,7 +49,7 @@
    "outputs": [],
    "source": [
     "# load needed package firstly\n",
-    "using LightGraphs\n",
+    "using Graphs\n",
     "using GraphPlot"
    ]
   },
@@ -12127,7 +12127,7 @@
     }
    },
    "source": [
-    "# Native LightGraphs integration"
+    "# Native Graphs.jl integration"
    ]
   },
   {

diff --git a/src/GraphPlot.jl b/src/GraphPlot.jl
@@ -1,7 +1,7 @@
 module GraphPlot
 
 using Compose  # for plotting features
-using LightGraphs
+using Graphs
 
 const gadflyjs = joinpath(dirname(Base.source_path()), "gadfly.js")
 
@@ -15,7 +15,9 @@ export
     spring_layout,
     spectral_layout,
     shell_layout,
-    stressmajorize_layout
+    stressmajorize_layout,
+    saveplot,
+    mm, cm, inch
 
 include("deprecations.jl")
 

diff --git a/src/collapse_plot.jl b/src/collapse_plot.jl
@@ -64,11 +64,11 @@ function community_layout(g::AbstractGraph, membership::Vector{Int})
 end
 
 function collapse_layout(g::AbstractGraph, membership::Vector{Int})
-    lightg = LightGraphs.SimpleGraph(nv(g))
+    sg = Graphs.SimpleGraph(nv(g))
     for e in edges(g)
         u = src(e)
         v = dst(e)
-        LightGraphs.add_edge!(lightg, u, v)
+        Graphs.add_edge!(sg, u, v)
     end
     N = length(membership)
     lx = zeros(N)
@@ -84,7 +84,7 @@ function collapse_layout(g::AbstractGraph, membership::Vector{Int})
     h, w = collapse_graph(g, membership)
     clx, cly = spring_layout(h)
     for (lbl, nodes) in comms
-        subg = lightg[nodes]
+        subg = sg[nodes]
         sublx, subly = spring_layout(subg)
         θ = range(0, stop=2pi, length=(length(nodes) + 1))[1:end-1]
         for (idx, node) in enumerate(nodes)