diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 10af753..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,36 +0,0 @@ -environment: - matrix: - - julia_version: 1.5 - # - julia_version: latest - -platform: - - x86 # 32-bit - - x64 # 64-bit - -## uncomment the following lines to allow failures on nightly julia -## (tests will run but not make your overall status red) -#matrix: -# allow_failures: -# - julia_version: latest - -branches: - only: - - master - - /release-.*/ - -notifications: - - provider: Email - on_build_success: false - on_build_failure: false - on_build_status_changed: false - -install: - - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) - -build_script: - - echo "%JL_BUILD_SCRIPT%" - - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" - -test_script: - - echo "%JL_TEST_SCRIPT%" - - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..0b6bbb5 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,53 @@ +name: CI + +on: + push: + branches: + - 'master' + - 'release-' + tags: '*' + pull_request: + +jobs: + test: + name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ github.event_name }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + version: + - '1.0' + - '1' + - 'nightly' + os: + - ubuntu-latest + include: + - os: windows-latest + version: '1' + - os: macOS-latest + version: '1' + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: ${{ matrix.version }} + - uses: julia-actions/julia-buildpkg@v1 + - uses: julia-actions/julia-runtest@v1 + - uses: julia-actions/julia-processcoverage@v1 + - uses: codecov/codecov-action@v1 + with: + file: lcov.info + docs: + name: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: julia-actions/setup-julia@v1 + with: + version: '1' + - name: Install dependencies + run: julia --project=docs -e 'using Pkg; Pkg.instantiate()' + - name: Build and deploy + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} + run: julia --project=docs --color=yes docs/make.jl diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 0fedbd0..0000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Documentation - -on: - push: - branches: - - 'master' - - 'release-' - tags: '*' - pull_request: - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - matrix: - julia-version: [1.5] - julia-arch: [x86] - os: [ubuntu-latest] - steps: - - uses: actions/checkout@v1.0.0 - - uses: julia-actions/setup-julia@latest - with: - version: ${{ matrix.julia-version }} - - name: Install dependencies - run: julia --project=docs -e 'using Pkg; Pkg.instantiate()' - - name: Build and deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} - run: julia --project=docs --color=yes docs/make.jl diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4792f26..0000000 --- a/.travis.yml +++ /dev/null @@ -1,31 +0,0 @@ -## Documentation: http://docs.travis-ci.com/user/languages/julia/ -language: julia -os: - - linux - - osx -julia: - - 1.0 - - 1.5 - - nightly -branches: - only: - - master - - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ -after_success: - - if [[ $TRAVIS_JULIA_VERSION = 1.5 ]] && [[ $TRAVIS_OS_NAME = linux ]]; then - julia --project=test/coverage -e 'using Pkg; Pkg.instantiate(); - using Coverage; Codecov.submit(Codecov.process_folder())'; - fi -# jobs: -# include: -# - stage: Documentation -# julia: 1.5 -# os: linux -# script: -# - julia --project=docs -e 'using Pkg; Pkg.instantiate()' -# - julia --project=docs --color=yes docs/make.jl -# after_success: skip -notifications: - email: false -git: - depth: 99999999 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1db3d5b..b1b2dd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Literate.jl changelog +## Version `v2.8` + +* ![Feature][badge-feature] Execution of notebooks now capture output of `display(x)` + and `display(mime, x)` ([ceff7a3][ceff7a3]). + ## Version `v2.7` * ![Feature][badge-feature] Multiline-style Julia comments (`#= ... =#`) can now be @@ -87,6 +92,7 @@ [e08ca0a]: https://github.com/fredrikekre/Literate.jl/commit/e08ca0a19bd5e61dac778ddf4aaf6cef37532e48 [6d1aec9]: https://github.com/fredrikekre/Literate.jl/commit/6d1aec90b13c6ad888be0fdc77583e9c525b5dc1 [dc409d0]: https://github.com/fredrikekre/Literate.jl/commit/dc409d0f43a6282bee4e28e8e12bb6309942e5d5 +[ceff7a3]: https://github.com/fredrikekre/Literate.jl/commit/ceff7a36be2a9152d853257bac97be00d915ba8e [badge-breaking]: https://img.shields.io/badge/BREAKING-red.svg [badge-deprecation]: https://img.shields.io/badge/deprecation-orange.svg diff --git a/Project.toml b/Project.toml index d3c14c5..ab92494 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Literate" uuid = "98b081ad-f1c9-55d3-8b20-4c87d4299306" -version = "2.7.0" +version = "2.8.0" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" diff --git a/README.md b/README.md index 6e53755..90df6e1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Literate -| **Documentation** | **Build Status** | -|:------------------------- |:----------------------------------------------------------------------------------------------- | -| [![][docs-img]][docs-url] | [![][travis-img]][travis-url] [![][appveyor-img]][appveyor-url] [![][codecov-img]][codecov-url] | +| **Documentation** | **Build Status** | +|:------------------------- |:--------------------------------------------------------------------- | +| [![][docs-img]][docs-url] | [![][gh-actions-img]][gh-actions-url] [![][codecov-img]][codecov-url] | Literate is a package for [Literate Programming](https://en.wikipedia.org/wiki/Literate_programming). The main purpose is to facilitate writing Julia examples/tutorials that can be included in @@ -27,11 +27,8 @@ Literate.markdown("examples/README.jl", "."; documenter=false) [docs-img]: https://img.shields.io/badge/docs-latest%20release-blue.svg [docs-url]: https://fredrikekre.github.io/Literate.jl/ -[travis-img]: https://travis-ci.org/fredrikekre/Literate.jl.svg?branch=master -[travis-url]: https://travis-ci.org/fredrikekre/Literate.jl - -[appveyor-img]: https://ci.appveyor.com/api/projects/status/xe0ghtyas12wv555/branch/master?svg=true -[appveyor-url]: https://ci.appveyor.com/project/fredrikekre/Literate-jl/branch/master +[gh-actions-img]: https://github.com/fredrikekre/Literate.jl/workflows/CI/badge.svg +[gh-actions-url]: https://github.com/fredrikekre/Literate.jl/actions?query=workflow%3ACI [codecov-img]: https://codecov.io/gh/fredrikekre/Literate.jl/branch/master/graph/badge.svg [codecov-url]: https://codecov.io/gh/fredrikekre/Literate.jl diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 2799413..63e1ad7 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -2,24 +2,36 @@ [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "0fac443759fa829ed8066db6cf1077d888bb6573" +git-tree-sha1 = "345a14764e43fe927d6f5c250fe4c8e4664e6ee8" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "2.0.2" +version = "2.4.0" + +[[Artifacts]] +deps = ["Pkg"] +git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" +uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" +version = "1.3.0" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[Bzip2_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "03a44490020826950c68005cafb336e5ba08b7e8" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "c3598e525718abcc440f69cc6d5f60dda0a1b61e" uuid = "6e34b625-4abd-537c-b88f-471c36dfa7a0" -version = "1.0.6+4" +version = "1.0.6+5" + +[[Cairo_jll]] +deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "e2f47f6d8337369411569fd45ae5753ca10394c6" +uuid = "83423d85-b0ee-5818-9007-b63ccbeb887a" +version = "1.16.0+6" [[ColorSchemes]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "7a15e3690529fd1042f0ab954dff7445b1efc8a5" +git-tree-sha1 = "3141757b5832ee7a0386db87997ee5a23ff20f4d" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.9.0" +version = "3.10.2" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] @@ -29,32 +41,44 @@ version = "0.10.9" [[Colors]] deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "008d6bc68dea6beb6303fdc37188cb557391ebf2" +git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.4" +version = "0.12.6" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "215f1c81cfd1c5416cd78740bff8ef59b24cd7c0" +git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.15.0" +version = "3.25.0" + +[[CompilerSupportLibraries_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" +uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" +version = "0.3.4+0" + +[[Conda]] +deps = ["JSON", "VersionParsing"] +git-tree-sha1 = "c0647249d785f1d5139c0cc96db8f6b32f7ec416" +uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" +version = "1.5.0" [[Contour]] deps = ["StaticArrays"] -git-tree-sha1 = "d05a3a25b762720d40246d5bedf518c9c2614ef5" +git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7" uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" -version = "0.5.5" +version = "0.5.7" [[DataAPI]] -git-tree-sha1 = "176e23402d80e7743fc26c19c681bfb11246af32" +git-tree-sha1 = "ad84f52c0b8f05aa20839484dbaf01690b41ff84" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.3.0" +version = "1.4.0" [[DataStructures]] deps = ["Compat", "InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "6189e66c78a2d840db5ee530ac2326505b3cc7ae" +git-tree-sha1 = "fb0aa371da91c1ff9dc7fbed6122d3e411420b9c" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.18.4" +version = "0.18.8" [[DataValueInterfaces]] git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" @@ -69,6 +93,11 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" +[[DisplayAs]] +git-tree-sha1 = "44e8d47bc0b56ec09115056a692e5fa0976bfbff" +uuid = "0b91fe84-8a4c-11e9-3e1d-67c38462b6d6" +version = "0.1.2" + [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -80,10 +109,22 @@ uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.8.3" [[Documenter]] -deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "fb1ff838470573adc15c71ba79f8d31328f035da" +deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] +git-tree-sha1 = "b7715ae18be02110a8cf9cc8ed2ccdb1e3e3aba2" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.25.2" +version = "0.26.1" + +[[EarCut_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d" +uuid = "5ae413db-bbd1-5e63-b57d-d24a61df00f5" +version = "2.1.5+1" + +[[Expat_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "1402e52fcda25064f51c77a9655ce8680b76acf0" +uuid = "2e619515-83b5-522b-bb60-26c02a35a201" +version = "2.2.7+6" [[FFMPEG]] deps = ["FFMPEG_jll", "x264_jll"] @@ -92,10 +133,13 @@ uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" version = "0.4.0" [[FFMPEG_jll]] -deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] -git-tree-sha1 = "13a934b9e74a8722bf1786c989de346a9602e695" +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] +git-tree-sha1 = "3cc57ad0a213808473eafef4845a74766242e05f" uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5" -version = "4.3.1+2" +version = "4.3.1+4" + +[[FileWatching]] +uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[FixedPointNumbers]] deps = ["Statistics"] @@ -103,41 +147,88 @@ git-tree-sha1 = "335bfdceacc84c5cdf16aadc768aa5ddfc5383cc" uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.8.4" +[[Fontconfig_jll]] +deps = ["Artifacts", "Bzip2_jll", "Expat_jll", "FreeType2_jll", "JLLWrappers", "Libdl", "Libuuid_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "35895cf184ceaab11fd778b4590144034a167a2f" +uuid = "a3f928ae-7b40-5064-980b-68af3947d34b" +version = "2.13.1+14" + +[[Formatting]] +deps = ["Printf"] +git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" +uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" +version = "0.4.2" + [[FreeType2_jll]] -deps = ["Bzip2_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "720eee04e3b496c15e5e2269669c2532fb5005c0" +deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "cbd58c9deb1d304f5a245a0b7eb841a2560cfec6" uuid = "d7e528f0-a631-5988-bf34-fe36492bcfd7" -version = "2.10.1+4" +version = "2.10.1+5" [[FriBidi_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "cfc3485a0a968263c789e314fca5d66daf75ed6c" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "0d20aed5b14dd4c9a2453c1b601d08e1149679cc" uuid = "559328eb-81f9-559d-9380-de523a88c83c" -version = "1.0.5+5" +version = "1.0.5+6" + +[[GLFW_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] +git-tree-sha1 = "a1bbf700b5388bffc3d882f4f4d625cf1c714fd7" +uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" +version = "3.3.2+1" [[GR]] -deps = ["Base64", "DelimitedFiles", "HTTP", "JSON", "LinearAlgebra", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] -git-tree-sha1 = "cd0f34bd097d4d5eb6bbe01778cf8a7ed35f29d9" +deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] +git-tree-sha1 = "b90b826782cb3ac5b7a7f41b3fd0113180257ed4" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.52.0" +version = "0.53.0" + +[[GR_jll]] +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "8aee6fa096b0cbdb05e71750c978b96a08c78951" +uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" +version = "0.53.0+0" [[GeometryBasics]] -deps = ["IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "119f32f9c2b497b49cd3f7f513b358b82660294c" +deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] +git-tree-sha1 = "876f77f0d3253e882ff588af1c95d0e4a86c9766" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.2.15" - -[[GeometryTypes]] -deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "StaticArrays"] -git-tree-sha1 = "34bfa994967e893ab2f17b864eec221b3521ba4d" -uuid = "4d00f742-c7ba-57c2-abde-4428a4b178cb" -version = "0.8.3" +version = "0.3.5" + +[[Gettext_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "8c14294a079216000a0bdca5ec5a447f073ddc9d" +uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" +version = "0.20.1+7" + +[[Glib_jll]] +deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "04690cc5008b38ecbdfede949220bc7d9ba26397" +uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" +version = "2.59.0+4" + +[[Grisu]] +git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995" +uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" +version = "1.0.0" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "2ac03263ce44be4222342bca1c51c36ce7566161" +git-tree-sha1 = "c7ec02c4c6a039a98a15f955462cd7aea5df4508" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.17" +version = "0.8.19" + +[[IJulia]] +deps = ["Base64", "Conda", "Dates", "InteractiveUtils", "JSON", "Markdown", "MbedTLS", "Pkg", "Printf", "REPL", "Random", "SoftGlobalScope", "Test", "UUIDs", "ZMQ"] +git-tree-sha1 = "0862f73c51b49d80168e75b141a26d1cbb9a7295" +uuid = "7073ff75-c697-5162-941a-fcdaad2a7d2a" +version = "1.23.1" + +[[IOCapture]] +deps = ["Logging"] +git-tree-sha1 = "377252859f740c217b936cebcd918a44f9b53b59" +uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" +version = "0.1.1" [[IniFile]] deps = ["Test"] @@ -159,37 +250,113 @@ git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" +[[JLLWrappers]] +git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" +version = "1.2.0" + [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.1" +[[JpegTurbo_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "9aff0587d9603ea0de2c6f6300d9f9492bbefbd3" +uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" +version = "2.0.1+3" + [[LAME_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "a7999edc634307964d5651265ebf7c2e14b4ef91" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "df381151e871f41ee86cee4f5f6fd598b8a68826" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" -version = "3.100.0+2" +version = "3.100.0+3" + +[[LZO_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f128cd6cd05ffd6d3df0523ed99b90ff6f9b349a" +uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" +version = "2.10.0+3" + +[[LaTeXStrings]] +git-tree-sha1 = "c7aebfecb1a60d59c0fe023a68ec947a208b1e6b" +uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +version = "1.2.0" + +[[Latexify]] +deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] +git-tree-sha1 = "3a0084cec7bf157edcb45a67fac0647f88fe5eaf" +uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" +version = "0.14.7" [[LibGit2]] deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[LibVPX_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e02378f5707d0f94af22b99e4aba798e20368f6e" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "85fcc80c3052be96619affa2fe2e6d2da3908e11" uuid = "dd192d2f-8180-539f-9fb4-cc70b1dcf69a" -version = "1.9.0+0" +version = "1.9.0+1" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" +[[Libffi_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "a2cd088a88c0d37eef7d209fd3d8712febce0d90" +uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" +version = "3.2.1+4" + +[[Libgcrypt_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] +git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999" +uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" +version = "1.8.5+4" + +[[Libglvnd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] +git-tree-sha1 = "7739f837d6447403596a75d19ed01fd08d6f56bf" +uuid = "7e76a0d4-f3c7-5321-8279-8d96eeed0f29" +version = "1.3.0+3" + +[[Libgpg_error_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7" +uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" +version = "1.36.0+3" + +[[Libiconv_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" +uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" +version = "1.16.0+7" + +[[Libmount_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "51ad0c01c94c1ce48d5cad629425035ad030bfd5" +uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" +version = "2.34.0+3" + +[[Libtiff_jll]] +deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] +git-tree-sha1 = "291dd857901f94d683973cdf679984cdf73b56d0" +uuid = "89763e89-9b03-5906-acba-b20f662cd828" +version = "4.1.0+2" + +[[Libuuid_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f879ae9edbaa2c74c922e8b85bb83cc84ea1450b" +uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" +version = "2.34.0+7" + [[LinearAlgebra]] deps = ["Libdl"] uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" [[Literate]] -deps = ["Base64", "JSON", "REPL"] +deps = ["Base64", "DisplayAs", "IJulia", "JSON", "REPL"] path = ".." uuid = "98b081ad-f1c9-55d3-8b20-4c87d4299306" version = "2.7.0" @@ -197,21 +364,27 @@ version = "2.7.0" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" +[[MacroTools]] +deps = ["Markdown", "Random"] +git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0" +uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +version = "0.5.6" + [[Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MbedTLS]] deps = ["Dates", "MbedTLS_jll", "Random", "Sockets"] -git-tree-sha1 = "426a6978b03a97ceb7ead77775a1da066343ec6e" +git-tree-sha1 = "1c38e51c3d08ef2278062ebceade0e46cefc96fe" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.0.2" +version = "1.0.3" [[MbedTLS_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "c0b1286883cac4e2b617539de41111e0776d02e8" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6" uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.16.8+0" +version = "2.16.8+1" [[Measures]] git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f" @@ -228,38 +401,50 @@ version = "0.4.4" uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[NaNMath]] -git-tree-sha1 = "c84c576296d0e2fbb3fc134d3e09086b3ea617cd" +git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.4" +version = "0.3.5" [[Ogg_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "4c3275cda1ba99d1244d0b82a9d0ca871c3cf66b" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "a42c0f138b9ebe8b58eba2271c5053773bde52d0" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" -version = "1.3.4+1" +version = "1.3.4+2" [[OpenSSL_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "997359379418d233767f926ea0c43f0e731735c0" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "71bbbc616a1d710879f5a1021bcba65ffba6ce58" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+5" +version = "1.1.1+6" [[Opus_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "cc90a125aa70dbb069adbda2b913b02cf2c5f6fe" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "f9d57f4126c39565e05a2b0264df99f497fc6f37" uuid = "91d4177d-7536-5919-b921-800302f37372" -version = "1.3.1+2" +version = "1.3.1+3" [[OrderedCollections]] -git-tree-sha1 = "293b70ac1780f9584c89268a6e2a560d938a7065" +git-tree-sha1 = "cf59cfed2e2c12e8a2ff0a4f1e9b2cd8650da6db" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.3.0" +version = "1.3.2" + +[[PCRE_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "1b556ad51dceefdbf30e86ffa8f528b73c7df2bb" +uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc" +version = "8.42.0+4" [[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "8077624b3c450b15c087944363606a6ba12f925e" +deps = ["Dates"] +git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.10" +version = "1.0.15" + +[[Pixman_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6a20a83c1ae86416f0a5de605eaea08a552844a3" +uuid = "30392449-352a-5448-841d-b1acce4e97dc" +version = "0.40.0+0" [[Pkg]] deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] @@ -273,20 +458,26 @@ version = "2.0.0" [[PlotUtils]] deps = ["ColorSchemes", "Colors", "Dates", "Printf", "Random", "Reexport", "Statistics"] -git-tree-sha1 = "8d23333aee2e2733a5cd4e1985462df8203f47f7" +git-tree-sha1 = "ae9a295ac761f64d8c2ec7f9f24d21eb4ffba34d" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "1.0.6" +version = "1.0.10" [[Plots]] -deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "GeometryTypes", "JSON", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] -git-tree-sha1 = "b81e3dfb1f0ece1e170b8768d2d0f10a78dfb4d7" +deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] +git-tree-sha1 = "4797acb266b8d9ff316f4581924e71c6709f152d" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.6.3" +version = "1.10.1" [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" +[[Qt_jll]] +deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] +git-tree-sha1 = "7760cfea90bec61814e31dfb204fa4b81bba7b57" +uuid = "ede63266-ebff-546c-83e0-1c6fb6d0efc8" +version = "5.15.2+1" + [[REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" @@ -296,31 +487,36 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[RecipesBase]] -git-tree-sha1 = "6ee6c35fe69e79e17c455a386c1ccdc66d9f7da4" +git-tree-sha1 = "b3fb709f3c97bfc6e948be68beeecb55a0b340ae" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "1.1.0" +version = "1.1.1" [[RecipesPipeline]] deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"] -git-tree-sha1 = "4a325c9bcc2d8e62a8f975b9666d0251d53b63b9" +git-tree-sha1 = "9ea2f5bf1b26918b16e9f885bb8e05206bfc2144" uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c" -version = "0.1.13" +version = "0.2.1" [[Reexport]] -deps = ["Pkg"] -git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" +git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "0.2.0" +version = "1.0.0" [[Requires]] deps = ["UUIDs"] -git-tree-sha1 = "8c08d0c7812169e438a8478dae2a529377ad13f7" +git-tree-sha1 = "cfbac6c1ed70c002ec6361e7fd334f02820d6419" uuid = "ae029012-a4dd-5104-9daa-d747884805df" -version = "1.0.2" +version = "1.1.2" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" +[[Scratch]] +deps = ["Dates"] +git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" +uuid = "6c6a2e73-6563-6170-7368-637461726353" +version = "1.0.3" + [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -329,14 +525,20 @@ deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[Showoff]] -deps = ["Dates"] -git-tree-sha1 = "e032c9df551fb23c9f98ae1064de074111b7bc39" +deps = ["Dates", "Grisu"] +git-tree-sha1 = "ee010d8f103468309b8afac4abb9be2e18ff1182" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" -version = "0.3.1" +version = "0.3.2" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" +[[SoftGlobalScope]] +deps = ["REPL"] +git-tree-sha1 = "986ec2b6162ccb95de5892ed17832f95badf770c" +uuid = "b85f4697-e234-5449-a836-ec8e2f98b302" +version = "1.1.0" + [[SortingAlgorithms]] deps = ["DataStructures", "Random", "Test"] git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" @@ -349,9 +551,9 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "016d1e1a00fabc556473b07161da3d39726ded35" +git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.12.4" +version = "1.0.1" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] @@ -359,9 +561,9 @@ uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[StatsBase]] deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "d72a47c47c522e283db774fc8c459dd5ed773710" +git-tree-sha1 = "7bab7d4eb46b225b35179632852b595a3162cb61" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.1" +version = "0.33.2" [[StructArrays]] deps = ["Adapt", "DataAPI", "Tables"] @@ -377,9 +579,9 @@ version = "1.0.0" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "b7f762e9820b7fab47544c36f26f54ac59cf8abf" +git-tree-sha1 = "240d19b8762006ff04b967bdd833269ad642d550" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.0.5" +version = "1.2.2" [[Test]] deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] @@ -392,38 +594,223 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +[[VersionParsing]] +git-tree-sha1 = "80229be1f670524750d905f8fc8148e5a8c4537f" +uuid = "81def892-9a0e-5fdd-b105-ffc91e053289" +version = "1.2.0" + +[[Wayland_jll]] +deps = ["Artifacts", "Expat_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "dc643a9b774da1c2781413fd7b6dcd2c56bb8056" +uuid = "a2964d1f-97da-50d4-b82a-358c7fce9d89" +version = "1.17.0+4" + +[[Wayland_protocols_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll"] +git-tree-sha1 = "2839f1c1296940218e35df0bbb220f2a79686670" +uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91" +version = "1.18.0+4" + +[[XML2_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] +git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" +uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" +version = "2.9.10+3" + +[[XSLT_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497" +uuid = "aed1982a-8fda-507f-9586-7b0439959a61" +version = "1.1.33+4" + +[[Xorg_libX11_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] +git-tree-sha1 = "5be649d550f3f4b95308bf0183b82e2582876527" +uuid = "4f6342f7-b3d2-589e-9d20-edeb45f2b2bc" +version = "1.6.9+4" + +[[Xorg_libXau_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "4e490d5c960c314f33885790ed410ff3a94ce67e" +uuid = "0c0b7dd1-d40b-584c-a123-a41640f87eec" +version = "1.0.9+4" + +[[Xorg_libXcursor_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXfixes_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "12e0eb3bc634fa2080c1c37fccf56f7c22989afd" +uuid = "935fb764-8cf2-53bf-bb30-45bb1f8bf724" +version = "1.2.0+4" + +[[Xorg_libXdmcp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "4fe47bd2247248125c428978740e18a681372dd4" +uuid = "a3789734-cfe1-5b06-b2d0-1dd0d9d62d05" +version = "1.1.3+4" + +[[Xorg_libXext_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "b7c0aa8c376b31e4852b360222848637f481f8c3" +uuid = "1082639a-0dae-5f34-9b06-72781eeb8cb3" +version = "1.3.4+4" + +[[Xorg_libXfixes_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "0e0dc7431e7a0587559f9294aeec269471c991a4" +uuid = "d091e8ba-531a-589c-9de9-94069b037ed8" +version = "5.0.3+4" + +[[Xorg_libXi_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXfixes_jll"] +git-tree-sha1 = "89b52bc2160aadc84d707093930ef0bffa641246" +uuid = "a51aa0fd-4e3c-5386-b890-e753decda492" +version = "1.7.10+4" + +[[Xorg_libXinerama_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll"] +git-tree-sha1 = "26be8b1c342929259317d8b9f7b53bf2bb73b123" +uuid = "d1454406-59df-5ea1-beac-c340f2130bc3" +version = "1.1.4+4" + +[[Xorg_libXrandr_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll"] +git-tree-sha1 = "34cea83cb726fb58f325887bf0612c6b3fb17631" +uuid = "ec84b674-ba8e-5d96-8ba1-2a689ba10484" +version = "1.5.2+4" + +[[Xorg_libXrender_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "19560f30fd49f4d4efbe7002a1037f8c43d43b96" +uuid = "ea2f1a96-1ddc-540d-b46f-429655e07cfa" +version = "0.9.10+4" + +[[Xorg_libpthread_stubs_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6783737e45d3c59a4a4c4091f5f88cdcf0908cbb" +uuid = "14d82f49-176c-5ed1-bb49-ad3f5cbd8c74" +version = "0.1.0+3" + +[[Xorg_libxcb_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "XSLT_jll", "Xorg_libXau_jll", "Xorg_libXdmcp_jll", "Xorg_libpthread_stubs_jll"] +git-tree-sha1 = "daf17f441228e7a3833846cd048892861cff16d6" +uuid = "c7cfdc94-dc32-55de-ac96-5a1b8d977c5b" +version = "1.13.0+3" + +[[Xorg_libxkbfile_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll"] +git-tree-sha1 = "926af861744212db0eb001d9e40b5d16292080b2" +uuid = "cc61e674-0454-545c-8b26-ed2c68acab7a" +version = "1.1.0+4" + +[[Xorg_xcb_util_image_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "0fab0a40349ba1cba2c1da699243396ff8e94b97" +uuid = "12413925-8142-5f55-bb0e-6d7ca50bb09b" +version = "0.4.0+1" + +[[Xorg_xcb_util_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll"] +git-tree-sha1 = "e7fd7b2881fa2eaa72717420894d3938177862d1" +uuid = "2def613f-5ad1-5310-b15b-b15d46f528f5" +version = "0.4.0+1" + +[[Xorg_xcb_util_keysyms_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "d1151e2c45a544f32441a567d1690e701ec89b00" +uuid = "975044d2-76e6-5fbe-bf08-97ce7c6574c7" +version = "0.4.0+1" + +[[Xorg_xcb_util_renderutil_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "dfd7a8f38d4613b6a575253b3174dd991ca6183e" +uuid = "0d47668e-0667-5a69-a72c-f761630bfb7e" +version = "0.3.9+1" + +[[Xorg_xcb_util_wm_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xcb_util_jll"] +git-tree-sha1 = "e78d10aab01a4a154142c5006ed44fd9e8e31b67" +uuid = "c22f9ab0-d5fe-5066-847c-f4bb1cd4e361" +version = "0.4.1+1" + +[[Xorg_xkbcomp_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxkbfile_jll"] +git-tree-sha1 = "4bcbf660f6c2e714f87e960a171b119d06ee163b" +uuid = "35661453-b289-5fab-8a00-3d9160c6a3a4" +version = "1.4.2+4" + +[[Xorg_xkeyboard_config_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_xkbcomp_jll"] +git-tree-sha1 = "5c8424f8a67c3f2209646d4425f3d415fee5931d" +uuid = "33bec58e-1273-512f-9401-5d533626f822" +version = "2.27.0+4" + +[[Xorg_xtrans_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "79c31e7844f6ecf779705fbc12146eb190b7d845" +uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" +version = "1.4.0+3" + +[[ZMQ]] +deps = ["FileWatching", "Sockets", "ZeroMQ_jll"] +git-tree-sha1 = "fc68e8a3719166950a0f3e390a14c7302c48f8de" +uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1" +version = "1.2.1" + +[[ZeroMQ_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "bba617292e040408cb72baa03c20f43583bf239f" +uuid = "8f1865be-045e-5c20-9c9f-bfbfb0764568" +version = "4.3.2+5" + [[Zlib_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "fdd89e5ab270ea0f2a0174bd9093e557d06d4bfa" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+16" +version = "1.2.11+18" + +[[Zstd_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "6f1abcb0c44f184690912aa4b0ba861dd64f11b9" +uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" +version = "1.4.5+2" [[libass_jll]] -deps = ["Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "f02d0db58888592e98c5f4953cef620ce9274eee" +deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "acc685bcf777b2202a904cdcb49ad34c2fa1880c" uuid = "0ac62f75-1d6f-5e53-bd7c-93b484bb37c0" -version = "0.14.0+3" +version = "0.14.0+4" [[libfdk_aac_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e17b4513993b4413d31cffd1b36a63625ebbc3d3" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "7a5780a0d9c6864184b3a2eeeb833a0c871f00ab" uuid = "f638f0a6-7fb0-5443-88ba-1cc74229b280" -version = "0.1.6+3" +version = "0.1.6+4" + +[[libpng_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] +git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee" +uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" +version = "1.6.37+6" [[libvorbis_jll]] -deps = ["Libdl", "Ogg_jll", "Pkg"] -git-tree-sha1 = "8014e1c1033009edcfe820ec25877a9f1862ba4c" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] +git-tree-sha1 = "fa14ac25af7a4b8a7f61b287a124df7aab601bcd" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" -version = "1.3.6+5" +version = "1.3.6+6" [[x264_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "e496625b900df1b02ab0e02fad316b77446616ef" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "d713c1ce4deac133e3334ee12f4adff07f81778f" uuid = "1270edf5-f2f9-52d2-97e9-ab00b5d0237a" -version = "2020.7.14+1" +version = "2020.7.14+2" [[x265_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "ac7d44fa1639a780d0ae79ca1a5a7f4181131825" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] +git-tree-sha1 = "487da2f8f2f0c8ee0e83f39d13037d6bbf0a45ab" uuid = "dfaa095f-4041-5dcd-9319-2fabd8486b76" -version = "3.0.0+2" +version = "3.0.0+3" + +[[xkbcommon_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Wayland_jll", "Wayland_protocols_jll", "Xorg_libxcb_jll", "Xorg_xkeyboard_config_jll"] +git-tree-sha1 = "ece2350174195bb31de1a63bea3a41ae1aa593b6" +uuid = "d8fb68d0-12a3-5cfd-a85a-d49703b185fd" +version = "0.9.1+5" diff --git a/examples/README.jl b/examples/README.jl index e0227ad..337c008 100644 --- a/examples/README.jl +++ b/examples/README.jl @@ -1,8 +1,8 @@ # # Literate # -# | **Documentation** | **Build Status** | -# |:------------------------- |:----------------------------------------------------------------------------------------------- | -# | [![][docs-img]][docs-url] | [![][travis-img]][travis-url] [![][appveyor-img]][appveyor-url] [![][codecov-img]][codecov-url] | +# | **Documentation** | **Build Status** | +# |:------------------------- |:--------------------------------------------------------------------- | +# | [![][docs-img]][docs-url] | [![][gh-actions-img]][gh-actions-url] [![][codecov-img]][codecov-url] | # # Literate is a package for [Literate Programming](https://en.wikipedia.org/wiki/Literate_programming). # The main purpose is to facilitate writing Julia examples/tutorials that can be included in @@ -25,12 +25,8 @@ Literate.markdown("examples/README.jl", "."; documenter=false) # [docs-img]: https://img.shields.io/badge/docs-latest%20release-blue.svg # [docs-url]: https://fredrikekre.github.io/Literate.jl/ # -# [travis-img]: https://travis-ci.org/fredrikekre/Literate.jl.svg?branch=master -# [travis-url]: https://travis-ci.org/fredrikekre/Literate.jl -# -# [appveyor-img]: https://ci.appveyor.com/api/projects/status/xe0ghtyas12wv555/branch/master?svg=true -# [appveyor-url]: https://ci.appveyor.com/project/fredrikekre/Literate-jl/branch/master +# [gh-actions-img]: https://github.com/fredrikekre/Literate.jl/workflows/CI/badge.svg +# [gh-actions-url]: https://github.com/fredrikekre/Literate.jl/actions?query=workflow%3ACI # # [codecov-img]: https://codecov.io/gh/fredrikekre/Literate.jl/branch/master/graph/badge.svg # [codecov-url]: https://codecov.io/gh/fredrikekre/Literate.jl -# diff --git a/examples/example.jl b/examples/example.jl index 511600a..70ede00 100644 --- a/examples/example.jl +++ b/examples/example.jl @@ -46,7 +46,7 @@ y = 2//5 # `#md`, `#nb`, `#jl` and `#src` tags (see [Filtering Lines](@ref)): #md # - This line starts with `#md` and is thus only visible in the markdown output. #nb # - This line starts with `#nb` and is thus only visible in the notebook output. -#jl # - This line starts with `#jl` and is thus only visible in the notebook output. +#jl # - This line starts with `#jl` and is thus only visible in the script output. #src # - This line starts with `#src` and is thus only visible in the source file. #nb # %% A slide [markdown] {"slideshow": {"slide_type": "subslide"}} diff --git a/src/IJulia.jl b/src/IJulia.jl index 75ec946..f1fb302 100644 --- a/src/IJulia.jl +++ b/src/IJulia.jl @@ -29,6 +29,7 @@ function display_dict(x) elseif showable(image_jpeg, x) # don't send jpeg if we have png data[string(image_jpeg)] = limitstringmime(image_jpeg, x) end + # TODO: IJulia logic has changed? Seems to send both html and latex for DataFrame for example if showable(text_markdown, x) data[string(text_markdown)] = limitstringmime(text_markdown, x) elseif showable(text_html, x) diff --git a/src/Literate.jl b/src/Literate.jl index 22063bd..d88aae8 100644 --- a/src/Literate.jl +++ b/src/Literate.jl @@ -473,7 +473,8 @@ function markdown(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...) end function execute_markdown!(io::IO, sb::Module, block::String, outputdir) - r, str = execute_block(sb, block) + # TODO: Deal with explicit display(...) calls + r, str, _ = execute_block(sb, block) plain_fence = "\n```\n" => "\n```" # issue #101: consecutive codefenced blocks need newline if r !== nothing && !REPL.ends_with_semicolon(block) for (mime, ext) in [(MIME("image/png"), ".png"), (MIME("image/jpeg"), ".jpeg")] @@ -619,7 +620,7 @@ function execute_notebook(nb) execution_count += 1 cell["execution_count"] = execution_count block = join(cell["source"]) - r, str = execute_block(sb, block) + r, str, display_dicts = execute_block(sb, block) # str should go into stream if !isempty(str) @@ -630,6 +631,27 @@ function execute_notebook(nb) push!(cell["outputs"], stream) end + # Some mimes need to be split into vectors of lines instead of a single string + # TODO: Seems like text/plain and text/latex are also split now, but not doing + # it seems to work fine. Leave for now. + function split_mime(dict) + for mime in ("image/svg+xml", "text/html") + if haskey(dict, mime) + dict[mime] = collect(Any, eachline(IOBuffer(dict[mime]), keep = true)) + end + end + return dict + end + + # Any explicit calls to display(...) + for dict in display_dicts + display_data = Dict{String,Any}() + display_data["output_type"] = "display_data" + display_data["metadata"] = Dict() + display_data["data"] = split_mime(dict) + push!(cell["outputs"], display_data) + end + # check if ; is used to suppress output r = REPL.ends_with_semicolon(block) ? nothing : r @@ -639,18 +661,10 @@ function execute_notebook(nb) execute_result["output_type"] = "execute_result" execute_result["metadata"] = Dict() execute_result["execution_count"] = execution_count - dd = Base.invokelatest(IJulia.display_dict, r) - # we need to split some mime types into vectors of lines instead of a single string - for mime in ("image/svg+xml", "text/html") - if haskey(dd, mime) - dd[mime] = collect(Any, eachline(IOBuffer(dd[mime]), keep = true)) - end - end - execute_result["data"] = dd - + dict = Base.invokelatest(IJulia.display_dict, r) + execute_result["data"] = split_mime(dict) push!(cell["outputs"], execute_result) end - end return nb end @@ -666,11 +680,40 @@ function sandbox() return m end +# Capture display for notebooks +struct LiterateDisplay <: AbstractDisplay + data::Vector + LiterateDisplay() = new([]) +end +function Base.display(ld::LiterateDisplay, x) + push!(ld.data, Base.invokelatest(IJulia.display_dict, x)) + return nothing +end +# TODO: Problematic to accept mime::MIME here? +function Base.display(ld::LiterateDisplay, mime::MIME, x) + r = Base.invokelatest(IJulia.limitstringmime, mime, x) + display_dicts = Dict{String,Any}(string(mime) => r) + # TODO: IJulia does this part below for unknown mimes + # if istextmime(mime) + # display_dicts["text/plain"] = r + # end + push!(ld.data, display_dicts) + return nothing +end + # Execute a code-block in a module and capture stdout/stderr and the result function execute_block(sb::Module, block::String) + # Push a capturing display on the displaystack + disp = LiterateDisplay() + pushdisplay(disp) + # r is the result + # status = (true|false) + # _: backtrace + # str combined stdout, stderr output c = IOCapture.iocapture(throwerrors=false) do include_string(sb, block) end + popdisplay(disp) # Documenter.withoutput has a try-catch so should always end up here if c.error error(""" $(sprint(showerror, c.value)) @@ -681,7 +724,7 @@ function execute_block(sb::Module, block::String) ``` """) end - return c.value, c.output + return c.value, c.output, disp.data end end # module diff --git a/test/runtests.jl b/test/runtests.jl index 2a7b135..0854671 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,4 +1,4 @@ -import Literate +import Literate, JSON import Literate: Chunk, MDChunk, CodeChunk using Test @@ -1110,6 +1110,42 @@ end end end write(inputfile, script) Literate.notebook(inputfile, outdir) + + # Calls to display(x) and display(mime, x) + script = """ + struct DF x end + Base.show(io::IO, ::MIME"text/plain", df::DF) = print(io, "DF(\$(df.x)) as text/plain") + Base.show(io::IO, ::MIME"text/html", df::DF) = print(io, "DF(\$(df.x)) as text/html") + Base.show(io::IO, ::MIME"text/latex", df::DF) = print(io, "DF(\$(df.x)) as text/latex") + #- + foreach(display, [DF(1), DF(2)]) + DF(3) + #- + display(MIME("text/latex"), DF(4)) + """ + write(inputfile, script) + Literate.notebook(inputfile, outdir) + json = JSON.parsefile(joinpath(outdir, "inputfile.ipynb")) + cells = json["cells"] + @test length(cells) == 4 + # Cell 2 has 3 outputs: 2 display and one execute result + cellout = cells[2]["outputs"] + @test length(cellout) == 3 + for i in 1:3 + exe_res = i == 3 + @test cellout[i]["output_type"] == (exe_res ? "execute_result" : "display_data") + @test keys(cellout[i]["data"]) == Set(("text/plain", "text/html")) + @test cellout[i]["data"]["text/plain"] == "DF($i) as text/plain" + @test cellout[i]["data"]["text/html"] == Any["DF($i) as text/html"] + @test haskey(cellout[i], "execution_count") == exe_res + end + # Cell 3 has one output from a single display call + cellout = cells[3]["outputs"] + @test length(cellout) == 1 + @test cellout[1]["output_type"] == "display_data" + @test keys(cellout[1]["data"]) == Set(("text/latex",)) + @test cellout[1]["data"]["text/latex"] == "DF(4) as text/latex" + @test !haskey(cellout[1], "execution_count") end end end end