Skip to content

Commit

Permalink
Merge branch 'main' into interpolations
Browse files Browse the repository at this point in the history
  • Loading branch information
asinghvi17 authored Jun 24, 2024
2 parents 1f8767b + d2d9f3e commit d4b47d6
Show file tree
Hide file tree
Showing 111 changed files with 8,165 additions and 3,379 deletions.
59 changes: 38 additions & 21 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,52 @@
name: Documenter
# Sample workflow for building and deploying a VitePress site to GitHub Pages
#
name: Deploy documentation

on:
# Runs on pushes targeting the `main` branch. Change this to `master` if you're
# using the `master` branch as the default branch.
push:
branches: [main]
tags: [v*]
branches:
- main
tags: ['*']
pull_request:
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: write
pages: write
id-token: write
actions: write


# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
group: pages
cancel-in-progress: false

jobs:
# Build job
build:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/cache@v1
with:
cache-registries: "true"
- name: Install documentation dependencies
run: julia --project=docs -e 'using Pkg; pkg"dev ."; Pkg.instantiate()'
- name: Build and deploy
- name: Checkout
uses: actions/checkout@v4
with: # Fetches the last commit only
fetch-depth: 0
- name: Setup Julia
uses: julia-actions/setup-julia@v1
- name: Pull Julia cache
uses: julia-actions/cache@v1
- name: Generate logo
run: julia --project=docs -e "using Pkg; Pkg.instantiate()"; julia --project=docs/ --color=yes docs/logo.jl
- uses: julia-actions/julia-docdeploy@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
GKSwstype: "100" # https://discourse.julialang.org/t/generation-of-documentation-fails-qt-qpa-xcb-could-not-connect-to-display/60988
JULIA_DEBUG: "Documenter"
DATADEPS_ALWAYS_ACCEPT: true
run: |
julia --code-coverage=user --project=docs/ --color=yes docs/genfiles.jl
julia --code-coverage=user --project=docs/ --color=yes docs/make.jl
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
name: CI
on:
- push
- pull_request
push:
branches:
- main
tags: ['*']
pull_request:
defaults:
run:
shell: bash
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.allow_failure }}
strategy:
fail-fast: true
matrix:
version:
- '1.9'
- '1'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
allow_failure: [false]
include:
- version: 'nightly'
os: ubuntu-latest
arch: x64
allow_failure: true
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
Expand Down
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ build

docs/docs
docs/site
docs/docs_site
docs/build
docs/var
deps/build.jl
Manifest.toml
Manifest.toml
docs/.vitepress/dist
docs/.vitepress/cache
docs/src/.vitepress/dist
docs/src/.vitepress/cache
node_modules
docs/package-lock.json
*.png
*.svg
*.ico
20 changes: 14 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name = "DimensionalData"
uuid = "0703355e-b756-11e9-17c0-8b28908087d0"
authors = ["Rafael Schouten <[email protected]>"]
version = "0.25.8"
version = "0.27.3"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
DataAPI = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Extents = "411431e0-e8b7-467b-b5e0-f676ba4f2910"
Interfaces = "85a1e053-f937-4924-92a5-1367d23b7b87"
IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
InvertedIndices = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
Expand All @@ -22,36 +24,41 @@ TableTraits = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

[weakdeps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"

[extensions]
DimensionalDataMakie = "Makie"
DimensionalDataCategoricalArraysExt = "CategoricalArrays"
DimensionalDataInterpolations = "Interpolations"
DimensionalDataMakie = "Makie"

[compat]
Adapt = "2, 3.0, 4"
Aqua = "0.8"
ArrayInterface = "7"
BenchmarkTools = "1"
CairoMakie = "0.10, 0.11"
CategoricalArrays = "0.10"
CairoMakie = "0.10, 0.11, 0.12"
ColorTypes = "0.11"
Combinatorics = "1"
ConstructionBase = "1"
CoordinateTransformations = "0.6"
DataAPI = "1.16"
DataFrames = "1"
Dates = "1"
Distributions = "0.25"
Documenter = "1"
Extents = "0.1"
ImageFiltering = "0.7"
ImageTransformations = "0.10"
Interfaces = "0.3"
Interpolations = "0.15"
IntervalSets = "0.5, 0.6, 0.7"
InvertedIndices = "1"
IteratorInterfaceExtensions = "1"
LinearAlgebra = "1"
Makie = "0.19, 0.20"
Makie = "0.19, 0.20, 0.21"
OffsetArrays = "1"
Plots = "1"
PrecompileTools = "1"
Expand All @@ -65,13 +72,14 @@ TableTraits = "1"
Tables = "1"
Test = "1"
Unitful = "1"
julia = "1.6"
julia = "1.9"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
Expand All @@ -91,4 +99,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[targets]
test = ["Aqua", "ArrayInterface", "BenchmarkTools", "ColorTypes", "Combinatorics", "CoordinateTransformations", "DataFrames", "Distributions", "Documenter", "ImageFiltering", "ImageTransformations", "Interpolations", "CairoMakie", "OffsetArrays", "Plots", "Random", "SafeTestsets", "StatsPlots", "Test", "Unitful"]
test = ["Aqua", "ArrayInterface", "BenchmarkTools", "CategoricalArrays", "ColorTypes", "Combinatorics", "CoordinateTransformations", "DataFrames", "Distributions", "Documenter", "ImageFiltering", "ImageTransformations", "Interpolations", "CairoMakie", "OffsetArrays", "Plots", "Random", "SafeTestsets", "StatsPlots", "Test", "Unitful"]
Loading

0 comments on commit d4b47d6

Please sign in to comment.