Skip to content

Commit

Permalink
Merge branch 'master' into compathelper/new_version/2021-05-05-08-09-…
Browse files Browse the repository at this point in the history
…05-846-4183537007
  • Loading branch information
terasakisatoshi authored May 5, 2021
2 parents a29375c + 7d484d8 commit 93026f6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM julia:1.6.0
FROM julia:1.6.1

RUN apt-get update && \
apt-get install -y \
Expand Down
27 changes: 14 additions & 13 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,28 @@ WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29"
Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"

[compat]
ArrayInterface = "2.14.17"
BenchmarkTools = "0.5.0"
ArrayInterface = "2.14.17, 3.1"
BenchmarkTools = "0.5.0, 0.7"
CSV = "0.8.4"
Colors = "0.12.6"
Combinatorics = "1.0.2"
DataFrames = "0.22.6"
DataFrames = "0.22.6, 1.1"
DiffEqFlux = "1.24.0"
DifferentialEquations = "6.16.0"
Distributions = "0.23.8"
Distributions = "0.23.8, 0.25"
Example = "0.5.3"
FillArrays = "0.8.14"
FillArrays = "0.8.14, 0.11"
ForwardDiff = "0.10.17"
GR = "0.55.0"
GalacticOptim = "1.1"
GR = "0.55.0, 0.57"
Glob = "1.3.0"
IJulia = "1.23.2"
ImageFiltering = "0.6.20"
ImageMagick = "1.2.0"
ImageShow = "0.2.3"
Images = "0.23.3"
ImageShow = "0.2.3, 0.3"
Images = "0.23.3, 0.24"
Interact = "0.10.3"
JSExpr = "0.5.2"
JSExpr = "0.5.2, 1.0"
JSXGraph = "0.1.6"
JuMP = "0.21.4"
LaTeXStrings = "1.2.1"
Expand All @@ -102,10 +103,10 @@ OffsetArrays = "1.6.2"
OhMyREPL = "0.5.10"
PackageCompiler = "1.2.5"
Pandas = "1.4.0"
Plotly = "0.3.0"
Plotly = "0.3.0, 0.4"
PlotlyJS = "0.14.1"
Plots = "1.11.0"
Pluto = "0.12.21"
Pluto = "0.12.21, 0.14"
PlutoUI = "0.7.1"
PyCall = "1.92.2"
PyPlot = "2.9.0"
Expand All @@ -115,7 +116,7 @@ Revise = "3.1.14"
Rotations = "1.0.2"
ScikitLearn = "0.6.3"
Seaborn = "0.4.1"
SpecialFunctions = "0.10.3"
SpecialFunctions = "0.10.3, 1.3"
StaticArrays = "0.12.5, 1.1"
StatsBase = "0.33.4"
StatsPlots = "0.14.19"
Expand All @@ -126,7 +127,7 @@ Tulip = "0.7.3"
UnicodePlots = "1.3.0"
WAV = "1.1.0"
WebIO = "0.8.15"
Zygote = "0.5.17"
Zygote = "0.5.17, 0.6"
julia = "1.5"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion binder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM julia:1.6.0
FROM julia:1.6.1

ARG NB_USER=jovyan
ARG NB_UID=1000
Expand Down

0 comments on commit 93026f6

Please sign in to comment.