diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml index 3dfba52..f40ca27 100644 --- a/.github/workflows/CompatHelper.yml +++ b/.github/workflows/CompatHelper.yml @@ -37,7 +37,7 @@ jobs: - name: "Run CompatHelper" run: | import CompatHelper - CompatHelper.main() + CompatHelper.main(subdirs=["ColorSchemes"]) shell: julia --color=yes {0} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/Invalidations.yml b/.github/workflows/Invalidations.yml index 4d0004e..d8a2261 100644 --- a/.github/workflows/Invalidations.yml +++ b/.github/workflows/Invalidations.yml @@ -19,16 +19,24 @@ jobs: - uses: julia-actions/setup-julia@v1 with: version: '1' - - uses: actions/checkout@v3 - - uses: julia-actions/julia-buildpkg@v1 + - uses: actions/checkout@v6 + - uses: julia-actions/julia-buildpkg@latest + with: + project: ColorSchemes - uses: julia-actions/julia-invalidations@v1 + with: + project: ColorSchemes id: invs_pr - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 with: ref: ${{ github.event.repository.default_branch }} - - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-buildpkg@latest + with: + project: ColorSchemes - uses: julia-actions/julia-invalidations@v1 + with: + project: ColorSchemes id: invs_default - name: Report invalidation counts diff --git a/.github/workflows/TagBot.yml b/.github/workflows/TagBot.yml index 4bad0ec..cb5e784 100644 --- a/.github/workflows/TagBot.yml +++ b/.github/workflows/TagBot.yml @@ -27,6 +27,7 @@ jobs: steps: - uses: JuliaRegistries/TagBot@v1 with: + subdir: ColorSchemes token: ${{ secrets.GITHUB_TOKEN }} # Edit the following line to reflect the actual name of the GitHub Secret containing your private key ssh: ${{ secrets.DOCUMENTER_KEY }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9dc151b..f9f1d47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,43 +1,47 @@ name: CI + on: pull_request: - branches: - - master + branches: [master] push: - branches: - - master + branches: [master] tags: '*' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: test: - name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.julia-arch }} + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - julia-version: - - "1.6" - - "1" - os: - - ubuntu-latest - - windows-latest - julia-arch: - - x64 - exclude: - - os: macOS-latest - julia-arch: aarch64 - julia-version: '1' + version: + - '1.6' # lowest declared LTS in Project.toml + - 'lts' # latest LTS + - '1' + os: [ubuntu-latest, windows-latest, macos-latest] + arch: [x64] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: - version: ${{ matrix.julia-version }} - arch: ${{ matrix.julia-arch }} + version: ${{ matrix.version }} + arch: ${{ matrix.arch }} - uses: julia-actions/cache@v2 - - uses: julia-actions/julia-buildpkg@v1 - - uses: julia-actions/julia-runtest@v1 - - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v4 + - uses: julia-actions/julia-buildpkg@latest + with: + project: ColorSchemes + - uses: julia-actions/julia-runtest@latest + with: + project: ColorSchemes + - uses: julia-actions/julia-processcoverage@latest + with: + directories: ColorSchemes/src + - uses: codecov/codecov-action@v5 with: file: lcov.info token: ${{ secrets.CODECOV_TOKEN }} @@ -46,20 +50,16 @@ jobs: name: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v2 + - uses: actions/checkout@v6 + - uses: julia-actions/setup-julia@latest with: version: '1' + - run: julia --project=docs -e 'using Pkg; Pkg.instantiate()' - run: | julia --project=docs -e ' - using Pkg - Pkg.develop(PackageSpec(path=pwd())) - Pkg.instantiate()' - - run: | - julia --project=docs -e ' - using Documenter: doctest - using ColorSchemes - doctest(ColorSchemes)' # change ColorSchemes to the name of your package + import Documenter, ColorSchemes + Documenter.doctest(joinpath(@__DIR__, "docs", "src"), [ColorSchemes]) + ' - run: julia --project=docs docs/make.jl env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 82f2fbd..a9eed62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.cov .vscode/* + docs/build/* -Manifest.toml -src/build_* +**/Manifest.toml + +**/src/build_* diff --git a/ColorSchemes/LICENSE.md b/ColorSchemes/LICENSE.md new file mode 120000 index 0000000..7eabdb1 --- /dev/null +++ b/ColorSchemes/LICENSE.md @@ -0,0 +1 @@ +../LICENSE.md \ No newline at end of file diff --git a/Project.toml b/ColorSchemes/Project.toml similarity index 98% rename from Project.toml rename to ColorSchemes/Project.toml index 5a552f0..7fb8957 100644 --- a/Project.toml +++ b/ColorSchemes/Project.toml @@ -17,7 +17,7 @@ ColorVectorSpace = "0.10, 0.11" Colors = "0.12, 0.13, 0.13.1" FixedPointNumbers = "0.8, 0.8.5" PrecompileTools = "1" -julia = "1" +julia = "1.6" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/ColorSchemes/README.md b/ColorSchemes/README.md new file mode 120000 index 0000000..32d46ee --- /dev/null +++ b/ColorSchemes/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/data/allcolorschemes.jl b/ColorSchemes/data/allcolorschemes.jl similarity index 100% rename from data/allcolorschemes.jl rename to ColorSchemes/data/allcolorschemes.jl diff --git a/data/catppuccin_scheme.jl b/ColorSchemes/data/catppuccin_scheme.jl similarity index 100% rename from data/catppuccin_scheme.jl rename to ColorSchemes/data/catppuccin_scheme.jl diff --git a/data/catppuccinlicense.txt b/ColorSchemes/data/catppuccinlicense.txt similarity index 100% rename from data/catppuccinlicense.txt rename to ColorSchemes/data/catppuccinlicense.txt diff --git a/data/cmasher.jl b/ColorSchemes/data/cmasher.jl similarity index 100% rename from data/cmasher.jl rename to ColorSchemes/data/cmasher.jl diff --git a/data/cmasherlicense.txt b/ColorSchemes/data/cmasherlicense.txt similarity index 100% rename from data/cmasherlicense.txt rename to ColorSchemes/data/cmasherlicense.txt diff --git a/data/cmocean.jl b/ColorSchemes/data/cmocean.jl similarity index 100% rename from data/cmocean.jl rename to ColorSchemes/data/cmocean.jl diff --git a/data/cmoceanlicense.txt b/ColorSchemes/data/cmoceanlicense.txt similarity index 100% rename from data/cmoceanlicense.txt rename to ColorSchemes/data/cmoceanlicense.txt diff --git a/data/cmyt.jl b/ColorSchemes/data/cmyt.jl similarity index 100% rename from data/cmyt.jl rename to ColorSchemes/data/cmyt.jl diff --git a/data/cmytlicense.txt b/ColorSchemes/data/cmytlicense.txt similarity index 100% rename from data/cmytlicense.txt rename to ColorSchemes/data/cmytlicense.txt diff --git a/data/colorbrewerlicense.txt b/ColorSchemes/data/colorbrewerlicense.txt similarity index 100% rename from data/colorbrewerlicense.txt rename to ColorSchemes/data/colorbrewerlicense.txt diff --git a/data/colorbrewerschemes.jl b/ColorSchemes/data/colorbrewerschemes.jl similarity index 100% rename from data/colorbrewerschemes.jl rename to ColorSchemes/data/colorbrewerschemes.jl diff --git a/data/colorcetdata.jl b/ColorSchemes/data/colorcetdata.jl similarity index 100% rename from data/colorcetdata.jl rename to ColorSchemes/data/colorcetdata.jl diff --git a/data/cvd.jl b/ColorSchemes/data/cvd.jl similarity index 100% rename from data/cvd.jl rename to ColorSchemes/data/cvd.jl diff --git a/data/fastie.jl b/ColorSchemes/data/fastie.jl similarity index 100% rename from data/fastie.jl rename to ColorSchemes/data/fastie.jl diff --git a/data/feathers.jl b/ColorSchemes/data/feathers.jl similarity index 100% rename from data/feathers.jl rename to ColorSchemes/data/feathers.jl diff --git a/data/featherslicense.txt b/ColorSchemes/data/featherslicense.txt similarity index 100% rename from data/featherslicense.txt rename to ColorSchemes/data/featherslicense.txt diff --git a/data/flags.jl b/ColorSchemes/data/flags.jl similarity index 100% rename from data/flags.jl rename to ColorSchemes/data/flags.jl diff --git a/data/ghibli.jl b/ColorSchemes/data/ghibli.jl similarity index 100% rename from data/ghibli.jl rename to ColorSchemes/data/ghibli.jl diff --git a/data/gnu.jl b/ColorSchemes/data/gnu.jl similarity index 100% rename from data/gnu.jl rename to ColorSchemes/data/gnu.jl diff --git a/data/jcolors.jl b/ColorSchemes/data/jcolors.jl similarity index 100% rename from data/jcolors.jl rename to ColorSchemes/data/jcolors.jl diff --git a/data/kindlmann.jl b/ColorSchemes/data/kindlmann.jl similarity index 100% rename from data/kindlmann.jl rename to ColorSchemes/data/kindlmann.jl diff --git a/data/matplotlib.jl b/ColorSchemes/data/matplotlib.jl similarity index 100% rename from data/matplotlib.jl rename to ColorSchemes/data/matplotlib.jl diff --git a/data/matplotliblicense.txt b/ColorSchemes/data/matplotliblicense.txt similarity index 100% rename from data/matplotliblicense.txt rename to ColorSchemes/data/matplotliblicense.txt diff --git a/data/metbrewer.jl b/ColorSchemes/data/metbrewer.jl similarity index 100% rename from data/metbrewer.jl rename to ColorSchemes/data/metbrewer.jl diff --git a/data/metbrewlicense.txt b/ColorSchemes/data/metbrewlicense.txt similarity index 100% rename from data/metbrewlicense.txt rename to ColorSchemes/data/metbrewlicense.txt diff --git a/data/nord.jl b/ColorSchemes/data/nord.jl similarity index 100% rename from data/nord.jl rename to ColorSchemes/data/nord.jl diff --git a/data/pnw.jl b/ColorSchemes/data/pnw.jl similarity index 100% rename from data/pnw.jl rename to ColorSchemes/data/pnw.jl diff --git a/data/progress.jl b/ColorSchemes/data/progress.jl similarity index 100% rename from data/progress.jl rename to ColorSchemes/data/progress.jl diff --git a/data/sampledcolorschemes.jl b/ColorSchemes/data/sampledcolorschemes.jl similarity index 100% rename from data/sampledcolorschemes.jl rename to ColorSchemes/data/sampledcolorschemes.jl diff --git a/data/sanzo.jl b/ColorSchemes/data/sanzo.jl similarity index 100% rename from data/sanzo.jl rename to ColorSchemes/data/sanzo.jl diff --git a/data/scicolor.jl b/ColorSchemes/data/scicolor.jl similarity index 100% rename from data/scicolor.jl rename to ColorSchemes/data/scicolor.jl diff --git a/data/scientificcolormaps.txt b/ColorSchemes/data/scientificcolormaps.txt similarity index 100% rename from data/scientificcolormaps.txt rename to ColorSchemes/data/scientificcolormaps.txt diff --git a/data/seaborn.jl b/ColorSchemes/data/seaborn.jl similarity index 100% rename from data/seaborn.jl rename to ColorSchemes/data/seaborn.jl diff --git a/data/seabornlicense.txt b/ColorSchemes/data/seabornlicense.txt similarity index 100% rename from data/seabornlicense.txt rename to ColorSchemes/data/seabornlicense.txt diff --git a/data/tableau.jl b/ColorSchemes/data/tableau.jl similarity index 100% rename from data/tableau.jl rename to ColorSchemes/data/tableau.jl diff --git a/data/websafe.jl b/ColorSchemes/data/websafe.jl similarity index 100% rename from data/websafe.jl rename to ColorSchemes/data/websafe.jl diff --git a/data/wesanderson.jl b/ColorSchemes/data/wesanderson.jl similarity index 100% rename from data/wesanderson.jl rename to ColorSchemes/data/wesanderson.jl diff --git a/src/ColorSchemes.jl b/ColorSchemes/src/ColorSchemes.jl similarity index 100% rename from src/ColorSchemes.jl rename to ColorSchemes/src/ColorSchemes.jl diff --git a/src/precompile.jl b/ColorSchemes/src/precompile.jl similarity index 100% rename from src/precompile.jl rename to ColorSchemes/src/precompile.jl diff --git a/test/runtests.jl b/ColorSchemes/test/runtests.jl similarity index 100% rename from test/runtests.jl rename to ColorSchemes/test/runtests.jl diff --git a/docs/Project.toml b/docs/Project.toml index 633c99e..067b76f 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -1,7 +1,14 @@ [deps] +ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4" ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" Luxor = "ae8d54c2-7ccd-5906-9d76-62fc9837b5bc" + +[compat] +Documenter = "1" + +[sources] +ColorSchemes = {path = "../ColorSchemes"} diff --git a/docs/make.jl b/docs/make.jl index 0a6edba..b5296eb 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -5,6 +5,7 @@ makedocs( sitename = "ColorSchemes", warnonly = true, format = Documenter.HTML( + inventory_version = pkgversion(ColorSchemes), size_threshold = nothing, prettyurls = get(ENV, "CI", nothing) == "true", assets = ["assets/colorschemes-docs.css"]),