Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cormullion committed Jan 2, 2020
2 parents e8dc970 + 0890b41 commit 318515c
Showing 54 changed files with 1,739 additions and 20,124 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: CompatHelper

on:
schedule:
- cron: '00 * * * *'
issues:
types: [opened, reopened]

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
julia-version: [1.2.0]
julia-arch: [x86]
os: [ubuntu-latest]
steps:
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.julia-version }}
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@ os:
- osx
- linux
julia:
- 0.7
- 1.0
- 1.2
- nightly
notifications:
email: false
85 changes: 0 additions & 85 deletions Manifest.toml

This file was deleted.

11 changes: 8 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Colors"
uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
version = "0.9.6"
version = "0.11.1"

[deps]
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -9,9 +9,14 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
ColorTypes = "0.9"
FixedPointNumbers = "0.6, 0.7"
Reexport = "0.2"
julia = "1"

[extras]
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test", "JLD2"]
test = ["Test"]
30 changes: 6 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,22 @@
# Colors

| **Documentation** | [**Package Evaluator**][pkgeval-link] | **Build Status** | **Code Coverage** |
|:---------------------------------------:|:-------------------------------------:|:-----------------------------------------:|:-------------------------------:|
| [![][docs-stable-img]][docs-stable-url] | [![][pkg-0.4-img]][pkg-0.4-url] | [![Build Status][travis-img]][travis-url] | [![][codecov-img]][codecov-url] |
| [![][docs-latest-img]][docs-latest-url] | [![][pkg-0.5-img]][pkg-0.5-url] | [![Build Status][appvey-img]][appvey-url] | |
| | [![][pkg-0.6-img]][pkg-0.6-url] | | |
| | [![][pkg-0.7-img]][pkg-0.7-url] | | |
| **Documentation** | **Build Status** | **Code Coverage** |
|:---------------------------------------:|:-----------------------------------------:|:-------------------------------:|
| [![][docs-stable-img]][docs-stable-url] | [![Build Status][travis-img]][travis-url] | [![][codecov-img]][codecov-url] |
| [![][docs-latest-img]][docs-latest-url] | [![Build Status][appvey-img]][appvey-url] | |
| | | |
| | | |

This library provides a wide array of functions for dealing with color. This
includes conversion between colorspaces, measuring distance between colors,
simulating color blindness, parsing colors, and generating color scales for graphics.





[docs-latest-img]: https://img.shields.io/badge/docs-latest-blue.svg
[docs-latest-url]: http://juliagraphics.github.io/Colors.jl/latest/

[docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
[docs-stable-url]: http://juliagraphics.github.io/Colors.jl/stable/

[pkgeval-link]: http://pkg.julialang.org/?pkg=Colors

[pkg-0.4-img]: http://pkg.julialang.org/badges/Colors_0.4.svg
[pkg-0.4-url]: http://pkg.julialang.org/detail/Colors.html

[pkg-0.5-img]: http://pkg.julialang.org/badges/Colors_0.5.svg
[pkg-0.5-url]: http://pkg.julialang.org/detail/Colors.html

[pkg-0.6-img]: http://pkg.julialang.org/badges/Colors_0.6.svg
[pkg-0.6-url]: http://pkg.julialang.org/detail/Colors.html

[pkg-0.7-img]: http://pkg.julialang.org/badges/Colors_0.7.svg
[pkg-0.7-url]: http://pkg.julialang.org/?pkg=Colors&ver=0.7

[travis-img]: https://travis-ci.org/JuliaGraphics/Colors.jl.svg?branch=master
[travis-url]: https://travis-ci.org/JuliaGraphics/Colors.jl

2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
environment:
matrix:
- julia_version: 0.7
- julia_version: 1.0
- julia_version: 1.2
- julia_version: latest

platform:
2 changes: 2 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[deps]
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
31 changes: 31 additions & 0 deletions docs/colormaps.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This file is the successor to "images/GenerateImages.jl" (v0.5.1).
module Colormaps

using Colors

struct ColormapSVG <: Main.SVG
buf::IOBuffer
end

function ColormapSVG(cm::AbstractVector{T}, w="96mm", h="4mm") where T<:Color
io = IOBuffer()
n = length(cm)
write(io,
"""
<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
width="$w" height="$h"
viewBox="0 0 $n 1" preserveAspectRatio="none"
shape-rendering="crispEdges" stroke="none">
""")
for i in 1:n
c = hex(cm[i])
write(io,
"""
<rect width="$(n+1-i)" height="1" x="$(i-1)" y="0" fill="#$c" />
""")
end
write(io, "</svg>")
ColormapSVG(io)
end

end
16 changes: 13 additions & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
using Documenter, Colors

abstract type SVG end
function Base.show(io::IO, mime::MIME"image/svg+xml", svg::SVG)
write(io, take!(svg.buf))
flush(io)
end

include("colormaps.jl")
include("namedcolorcharts.jl")


makedocs(
clean = false,
modules = [Colors],
format = Documenter.HTML(
prettyurls = get(ENV, "CI", nothing) == "true",
assets = ["assets/favicon.ico"]),
format = Documenter.HTML(prettyurls = get(ENV, "CI", nothing) == "true",
assets = ["assets/resize_svg.js", "assets/favicon.ico"]),
sitename = "Colors",
pages = Any[
"Introduction" => "index.md",
Loading

0 comments on commit 318515c

Please sign in to comment.