Skip to content

Commit

Permalink
add equalize
Browse files Browse the repository at this point in the history
  • Loading branch information
cormullion committed Apr 15, 2024
1 parent 630c3ac commit c76d497
Show file tree
Hide file tree
Showing 22 changed files with 1,408 additions and 2,480 deletions.
21 changes: 21 additions & 0 deletions .JuliaFormatter.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
align_assignment = true
align_conditional = true
#align_matrix = false
align_pair_arrow = true
align_struct_field = true
always_for_in = true
always_use_return = false
annotate_untyped_fields_with_any = false
conditional_to_if = true
format_docstrings = true
#import_to_using = false
join_lines_based_on_source = true
margin=1500
normalize_line_endings = "auto"
#pipe_to_function_call = false
remove_extra_newlines = true
remove_trailing_comma = true
#short_to_long_function_def = false
whitespace_in_kwargs = true
whitespace_ops_in_indices = true
#whitespace_typedefs = false
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 99
labels:
- "dependencies"
- "github-actions"
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: which julia
continue-on-error: true
- name: Install Julia, but only if it is not already available in the PATH
uses: julia-actions/setup-julia@v1
uses: julia-actions/setup-julia@v2
with:
version: '1'
arch: ${{ runner.arch }}
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/JuliaNightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: JuliaNightly
# Nightly Scheduled Julia Nightly Run
on:
schedule:
- cron: '0 2 * * *' # Daily at 2 AM UTC (8 PM CST)
jobs:
test:
name: Julia Nightly - Ubuntu - x64
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: nightly
arch: x64
- uses: actions/cache@v4
env:
cache-name: julia-nightly-cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ env.cache-name }}-
- uses: julia-actions/julia-buildpkg@latest
- run: |
git config --global user.name Tester
git config --global user.email te@st.er
- uses: julia-actions/julia-runtest@latest
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
with:
files: lcov.info
10 changes: 8 additions & 2 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment: # THIS BIT IS NEW
types:
- created
workflow_dispatch:
jobs:
TagBot:
# THIS 'if' LINE IS NEW
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
# NOTHING BELOW HAS CHANGED
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
matrix:
julia-version:
- "1"
- "1.6"
- "1.9"
- "nightly"
os:
Expand All @@ -25,18 +24,17 @@ jobs:
- windows-latest
julia-arch:
- x64
- x86
exclude:
- os: macOS-latest
julia-arch: x86

steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.julia-version }}
arch: ${{ matrix.julia-arch }}
- uses: actions/cache@v1
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
with:
Expand All @@ -49,15 +47,15 @@ jobs:
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
file: lcov.info
docs:
name: Documentation
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: '1'
- run: |
Expand Down
18 changes: 17 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# Changelog

## [v1.5.0] -
## [v1.6.0] - forthcoming

### Added

- `equalize()` and some other functions from PerceptualColorMaps.jl

### Changed

- Interpolations.jl compatibility

- Julia v1.9

### Removed

### Deprecated

## [v1.5.0] - 30 October 2023

### Added

Expand Down
19 changes: 10 additions & 9 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
name = "ColorSchemeTools"
uuid = "d3e213a1-5e82-5c18-bb32-2a58a99f8c46"
authors = ["cormullion <cormullion@mac.com>"]
version = "1.5.0"
version = "1.6.0"

[deps]
Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
QuartzImageIO = "dca85d43-d64c-5e67-8c65-017450d5d020"
Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"

[compat]
Aqua = "0.8"
Clustering = "0.15"
Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
ColorSchemes = "3"
Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
FileIO = "1"
ImageMagick = "1.3"
Images = "0.19, 0.20, 0.21, 0.22, 0.23, 0.24, 0.25, 0.26"
Interpolations = "0.12, 0.13, 0.14"
julia = "1.6"
Images = "0.26"
Interpolations = "0.15"
QuartzImageIO = "0.7"
julia = "1.9"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
test = ["Aqua", "Test"]
Loading

0 comments on commit c76d497

Please sign in to comment.