diff --git a/docs/src/index.md b/docs/src/index.md index df5650045..644c1501e 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -11,7 +11,7 @@ This software provides extensive control over the modelling, simulation, visuali ## Installation Install the Julia programming language from the [official download page](https://julialang.org/downloads/). -OpticSim.jl is optimized for use with Julia 1.5.2-1.6.0; using other versions may result in reduced performance. +OpticSim.jl is optimized for use with Julia 1.7.x; using other versions will probably not work. The system will automatically download glass catalog (.agf) files from some manufacturers when the package is built for the first time. These files are in an industry standard format and can be downloaded from many optical glass manufacturers. diff --git a/src/Cloud/dockerfile b/src/Cloud/dockerfile index 34827ec53..8d41eedf5 100644 --- a/src/Cloud/dockerfile +++ b/src/Cloud/dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/azureml/openmpi3.1.2-ubuntu18.04 -ENV JULIA_VERSION_MAJOR 1.6 +ENV JULIA_VERSION_MAJOR 1.7 ENV JULIA_VERSION_MINOR 0 # install stuff for xvfb-run diff --git a/test/testsets/JuliaLang.jl b/test/testsets/JuliaLang.jl index 75f8b4c79..1a4ac3dfe 100644 --- a/test/testsets/JuliaLang.jl +++ b/test/testsets/JuliaLang.jl @@ -19,7 +19,7 @@ and pop it from the set # here we ignore the specific methods which we know are ok but are still failing # for some weird reason the unbound args check seems to fail for some (seemingly random) methods with Vararg arguments methods_to_ignore = Dict( - OpticSim => VERSION >= v"1.6.0-DEV" ? [ + OpticSim => VERSION >= v"1.7" ? [ (OpticSim.LensAssembly, Tuple{Vararg{Union{CSGTree{T},LensAssembly{T},OpticSim.Surface{T}},N} where N} where {T<:Real}), (OpticSim.MultiHologramInterface, Tuple{Vararg{HologramInterface{T},N}} where {N} where {T<:Real}), ] : [],