From c1b4a6e7949595c00a1af53f3fe9675e4c48a84e Mon Sep 17 00:00:00 2001 From: Dominic Date: Thu, 28 Dec 2023 15:02:26 -0500 Subject: [PATCH] Update Compatibility * Updated Julia compatibility to 1.10 * Refactored folders to match style guide --- .github/workflows/CI.yml | 2 +- .github/workflows/Documentation.yml | 2 +- .travis.yml | 2 +- Project.toml | 2 +- src/Krang.jl | 20 +++++++++---------- src/{Cameras => cameras}/IntensityCamera.jl | 0 .../SlowLightIntensityCamera.jl | 0 src/{Cameras => cameras}/camera_types.jl | 0 .../geometry_types.jl | 0 .../PowerLawPolarization.jl | 0 .../material_types.jl | 0 src/{Materials => materials}/observations.jl | 0 src/metrics/{ => Kerr}/Kerr.jl | 0 src/{ => metrics}/Kerr/api.jl | 0 src/{ => metrics}/Kerr/misc.jl | 0 src/{ => metrics}/Kerr/raytracer.jl | 0 16 files changed, 14 insertions(+), 14 deletions(-) rename src/{Cameras => cameras}/IntensityCamera.jl (100%) rename src/{Cameras => cameras}/SlowLightIntensityCamera.jl (100%) rename src/{Cameras => cameras}/camera_types.jl (100%) rename src/{Geometries => geometries}/geometry_types.jl (100%) rename src/{Materials => materials}/PowerLawPolarization.jl (100%) rename src/{Materials => materials}/material_types.jl (100%) rename src/{Materials => materials}/observations.jl (100%) rename src/metrics/{ => Kerr}/Kerr.jl (100%) rename src/{ => metrics}/Kerr/api.jl (100%) rename src/{ => metrics}/Kerr/misc.jl (100%) rename src/{ => metrics}/Kerr/raytracer.jl (100%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dac5a92..bc3cf72 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: version: - - '1.9' + - '1.10' - 'nightly' os: - ubuntu-latest diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml index 57aa681..721f856 100644 --- a/.github/workflows/Documentation.yml +++ b/.github/workflows/Documentation.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 with: - version: '1.9' + version: '1.10' - name: Install JacobiElliptic run: julia --project -e 'using Pkg; Pkg.develop([PackageSpec(path="https://github.com/dchang10/JacobiElliptic.jl.git")]); Pkg.instantiate()' - name: Install docs dependencies diff --git a/.travis.yml b/.travis.yml index d16fd61..ddf556f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ notifications: email: false julia: - 1.0 - - 1.9 + - 1.10 - nightly os: - linux diff --git a/Project.toml b/Project.toml index b15c2b0..0297f68 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" DocStringExtensions = "0.9" JacobiElliptic = "0.1" StaticArrays = "1" -julia = "1.9" +julia = "1.10" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/Krang.jl b/src/Krang.jl index 58bf503..e9d3fce 100644 --- a/src/Krang.jl +++ b/src/Krang.jl @@ -10,15 +10,15 @@ using JacobiElliptic # Write your package code here. include("metrics/AbstractMetric.jl") -include("metrics/Kerr.jl") -include("Geometries/geometry_types.jl") -include("Cameras/camera_types.jl") -include("Cameras/SlowLightIntensityCamera.jl") -include("Cameras/IntensityCamera.jl") -include("Kerr/raytracer.jl") -include("Kerr/api.jl") -include("Materials/material_types.jl") -include("Materials/PowerLawPolarization.jl") -include("Materials/observations.jl") +include("metrics/Kerr/Kerr.jl") +include("geometries/geometry_types.jl") +include("cameras/camera_types.jl") +include("cameras/SlowLightIntensityCamera.jl") +include("cameras/IntensityCamera.jl") +include("metrics/Kerr/raytracer.jl") +include("metrics/Kerr/api.jl") +include("materials/material_types.jl") +include("materials/PowerLawPolarization.jl") +include("materials/observations.jl") end diff --git a/src/Cameras/IntensityCamera.jl b/src/cameras/IntensityCamera.jl similarity index 100% rename from src/Cameras/IntensityCamera.jl rename to src/cameras/IntensityCamera.jl diff --git a/src/Cameras/SlowLightIntensityCamera.jl b/src/cameras/SlowLightIntensityCamera.jl similarity index 100% rename from src/Cameras/SlowLightIntensityCamera.jl rename to src/cameras/SlowLightIntensityCamera.jl diff --git a/src/Cameras/camera_types.jl b/src/cameras/camera_types.jl similarity index 100% rename from src/Cameras/camera_types.jl rename to src/cameras/camera_types.jl diff --git a/src/Geometries/geometry_types.jl b/src/geometries/geometry_types.jl similarity index 100% rename from src/Geometries/geometry_types.jl rename to src/geometries/geometry_types.jl diff --git a/src/Materials/PowerLawPolarization.jl b/src/materials/PowerLawPolarization.jl similarity index 100% rename from src/Materials/PowerLawPolarization.jl rename to src/materials/PowerLawPolarization.jl diff --git a/src/Materials/material_types.jl b/src/materials/material_types.jl similarity index 100% rename from src/Materials/material_types.jl rename to src/materials/material_types.jl diff --git a/src/Materials/observations.jl b/src/materials/observations.jl similarity index 100% rename from src/Materials/observations.jl rename to src/materials/observations.jl diff --git a/src/metrics/Kerr.jl b/src/metrics/Kerr/Kerr.jl similarity index 100% rename from src/metrics/Kerr.jl rename to src/metrics/Kerr/Kerr.jl diff --git a/src/Kerr/api.jl b/src/metrics/Kerr/api.jl similarity index 100% rename from src/Kerr/api.jl rename to src/metrics/Kerr/api.jl diff --git a/src/Kerr/misc.jl b/src/metrics/Kerr/misc.jl similarity index 100% rename from src/Kerr/misc.jl rename to src/metrics/Kerr/misc.jl diff --git a/src/Kerr/raytracer.jl b/src/metrics/Kerr/raytracer.jl similarity index 100% rename from src/Kerr/raytracer.jl rename to src/metrics/Kerr/raytracer.jl