Bring back CI and upgrade to Julia 1.6

.github/workflows/TagBot.yml

@@ -13,4 +13,3 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           ssh: ${{ secrets.TAGBOT }}
-

.github/workflows/ci.yml

@@ -0,0 +1,50 @@
+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.0', '1', 'nightly']
+        os: [ubuntu-latest]
+        arch: [x64]
+        include:  # spare windows/macos CI credits
+          - os: windows-latest
+            version: '1'
+            arch: x64
+          - os: macOS-latest
+            version: '1'
+            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
+        env:
+          JULIA_DEBUG: 'Main,UnicodePlots'
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v1
+        with:
+          file: lcov.info

.gitignore

@@ -1,2 +1,5 @@
 *.jl.cov
 *.jl.mem
+/Manifest.toml
+/test/Manifest.toml
+.DS_Store

Project.toml

@@ -18,7 +18,9 @@ julia = "1"
 
 [extras]
 ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
+StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "ReferenceTests"]
+test = ["ReferenceTests", "StableRNGs", "Random", "Test"]

README.md

@@ -1,9 +1,13 @@
 # UnicodePlots
 
 [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE.md)
-[![Build Status](https://travis-ci.org/Evizero/UnicodePlots.jl.svg?branch=master)](https://travis-ci.org/Evizero/UnicodePlots.jl)
 [![Coverage Status](https://coveralls.io/repos/Evizero/UnicodePlots.jl/badge.svg?branch=master&service=github)](https://coveralls.io/github/Evizero/UnicodePlots.jl?branch=master)
 
+| Julia   | CI |
+| ------- | -- |
+| v1      | [![CI](https://github.com/Evizero/UnicodePlots.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/Evizero/UnicodePlots.jl/actions/workflows/ci.yml) |
+| nightly | [![CI (Julia nightly)](https://github.com/Evizero/UnicodePlots.jl/actions/workflows/ci_julia_nightly.yml/badge.svg)](https://github.com/Evizero/UnicodePlots.jl/actions/workflows/ci_julia_nightly.yml) |
+
 Advanced Unicode plotting library designed for use in Julia's REPL.
 
 ## High-level Interface

src/canvas/asciicanvas.jl

@@ -75,23 +75,17 @@ ascii_lookup[0b100_100_100] = '|'
 ascii_lookup[0b001_001_001] = '|'
 ascii_lookup[0b110_011_110] = '}'
 
-# julia #18977
-if !isdefined(Base, :⊻)
-    const ⊻ = $
-end
-
 ascii_decode[0b1] = ' '
 for i in 1:511
     min_dist = typemax(Int)
     min_char = ' '
-    for (k, v) in ascii_lookup
-        cur_dist = count_ones(UInt16(i) ⊻ k)
+    for (k, v) in sort_by_keys(ascii_lookup)
+        cur_dist = count_ones(xor(UInt16(i), k))
         if cur_dist < min_dist
             min_dist = cur_dist
             min_char = v
         end
     end
-    min_char
     ascii_decode[i + 1] = min_char
 end
 

src/common.jl

@@ -71,6 +71,19 @@ function extend_limits(vec, limits)
     (limits == (0.,0.) || limits == [0.,0.]) ? plotting_range_narrow(mi, ma) : (mi, ma)
 end
 
+sort_by_keys(dict::Dict) = sort!(collect(dict), by=x->x[1])
+
+function sorted_keys_values(dict::Dict; k2s=true)
+    if k2s  # check and force key type to be of AbstractString type if necessary
+        kt, vt = eltype(dict).types
+        if !(kt <: AbstractString)
+            dict = Dict(string(k) => v  for (k, v) in pairs(dict))
+        end
+    end
+    keys_vals = sort_by_keys(dict)
+    first.(keys_vals), last.(keys_vals)
+end
+
 const bordermap = Dict{Symbol,Dict{Symbol,String}}()
 const border_solid  = Dict{Symbol,String}()
 const border_corners = Dict{Symbol,String}()

src/interface/barplot.jl

@@ -91,7 +91,7 @@ function barplot(
 end
 
 function barplot(dict::Dict{T,N}; kw...) where {T, N <: Number}
-    barplot(collect(keys(dict)), collect(values(dict)); kw...)
+    barplot(sorted_keys_values(dict)...; kw...)
 end
 
 function barplot(text::AbstractVector, heights::AbstractVector{<:Number}; kw...)
@@ -128,7 +128,7 @@ end
 function barplot!(
         plot::Plot{<:BarplotGraphics},
         dict::Dict{T,N}) where {T, N <: Number}
-    barplot!(plot, collect(keys(dict)), collect(values(dict)))
+    barplot!(plot, sorted_keys_values(dict)...)
 end
 
 function barplot!(

src/interface/boxplot.jl

@@ -162,5 +162,5 @@ function boxplot(text::AbstractString, data::AbstractVector{<:Number}; kw...)
 end
 
 function boxplot(dict::Dict; kw...)
-    boxplot(collect(keys(dict)), collect(values(dict)); kw...)
+    boxplot(sorted_keys_values(dict)...; kw...)
 end

src/interface/histogram.jl

@@ -127,7 +127,7 @@ function histogram(
 end
 
 function histogram(x; bins = nothing, closed = :left, kw...)
-    if bins != nothing
+    if bins !== nothing
         Base.depwarn("The keyword parameter `bins` is deprecated, use `nbins` instead", :histogram)
         hist = fit(Histogram, x; nbins = bins, closed = closed)
     else

test/references/barplot/default_mixed.txt

@@ -1,5 +1,5 @@
        ┌                                        ┐ 
-   bar ┤■■■■■■■■■■■■■■■■■■■■■ 23.0                
    2.1 ┤■■■■■■■■■ 10                              
+   bar ┤■■■■■■■■■■■■■■■■■■■■■ 23.0                
    foo ┤■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ 37.0   
        └                                        ┘ 

test/references/canvas/ascii_print.txt

@@ -1,10 +1,10 @@
-|.  '         *   .  "   .  *      `.v-"
-| \.               .        \   ..-"`   
-|   \.   " | `      v    `  ..-"`   '   
-|   ""\="=""""\---------vvr=________"'  
-|\ "    \{          ..-"`   .   *\  `   
-|   /    /\.   \..-T` \       /   .**   
-|      .    lv-/`   '      \     .     .
-| ` .   ..-"` \.    .        \.         
-|  ...-"`      `\.   *.         .\    " 
-L,-""  .          \..  `*.        . .   
+^.            .        '    `  ,  . ..-"
+| \.          ,.          *    ...-"`   
+|   \(    '.  `.  "   .     ,.-"`  .   .
+|   ""\{T"T"""\---------v_r=________ "` 
+|  .   `\.     .    ..-"`       "   `.  
+|    .    \.    ..-"` *    '     *      
+|           )_-"'                    ,  
+| `     ..-"` \. ,        ,.     . '.  .
+|   .)-"`  *  ` \.  ,  .`         .  '  
+L.-\`         .   \..                 . 

test/references/canvas/ascii_print_nocolor.txt

@@ -1,10 +1,10 @@
-|.  '         *   .  "   .  *      `.v-"
-| \.               .        \   ..-"`   
-|   \.   " | `      v    `  ..-"`   '   
-|   ""\="=""""\---------vvr=________"'  
-|\ "    \{          ..-"`   .   *\  `   
-|   /    /\.   \..-T` \       /   .**   
-|      .    lv-/`   '      \     .     .
-| ` .   ..-"` \.    .        \.         
-|  ...-"`      `\.   *.         .\    " 
-L,-""  .          \..  `*.        . .   
+^.            .        '    `  ,  . ..-"
+| \.          ,.          *    ...-"`   
+|   \(    '.  `.  "   .     ,.-"`  .   .
+|   ""\{T"T"""\---------v_r=________ "` 
+|  .   `\.     .    ..-"`       "   `.  
+|    .    \.    ..-"` *    '     *      
+|           )_-"'                    ,  
+| `     ..-"` \. ,        ,.     . '.  .
+|   .)-"`  *  ` \.  ,  .`         .  '  
+L.-\`         .   \..                 . 

test/references/canvas/ascii_printrow.txt

@@ -1 +1 @@
-|   \.   " | `      v    `  ..-"`   '   
+|   \(    '.  `.  "   .     ,.-"`  .   .