diff --git a/.gitignore b/.gitignore index 61f5f393..1e725e8b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ deps/custom_preamble.tex deps/deps.jl deps/pdf2svg.svg deps/showed_warning +/Manifest.toml diff --git a/Project.toml b/Project.toml new file mode 100644 index 00000000..2d0dbde8 --- /dev/null +++ b/Project.toml @@ -0,0 +1,24 @@ +name = "PGFPlotsX" +uuid = "8314cec4-20b6-5062-9cdb-752b83310925" + +[deps] +ArgCheck = "dce04be8-c92d-5529-be00-80e4d2c0e197" +Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" +DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" +Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" +DefaultApplication = "3f0dd361-4fe0-5fc6-8523-80b14ec94d85" +DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +Missings = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" +Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a" +Requires = "ae029012-a4dd-5104-9daa-d747884805df" +StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" +Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + +[extras] +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test", "Measurements", "DataFrames"] diff --git a/docs/Manifest.toml b/docs/Manifest.toml new file mode 100644 index 00000000..1f592373 --- /dev/null +++ b/docs/Manifest.toml @@ -0,0 +1,330 @@ +[[ArgCheck]] +deps = ["Random", "Test"] +git-tree-sha1 = "9e3bff61bc46d3420d903b53ad07f85325fddc28" +uuid = "dce04be8-c92d-5529-be00-80e4d2c0e197" +version = "1.0.0" + +[[Base64]] +uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" + +[[BinDeps]] +deps = ["Compat", "Libdl", "SHA", "URIParser"] +git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9" +uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" +version = "0.8.10" + +[[BinaryProvider]] +deps = ["Libdl", "Pkg", "SHA", "Test"] +git-tree-sha1 = "9930c1a6cd49d9fcd7218df6be417e6ae4f1468a" +uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" +version = "0.5.2" + +[[Calculus]] +deps = ["Compat"] +git-tree-sha1 = "f60954495a7afcee4136f78d1d60350abd37a409" +uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" +version = "0.4.1" + +[[CategoricalArrays]] +deps = ["Compat", "Future", "JSON", "Missings", "Printf", "Reexport"] +git-tree-sha1 = "6362c49130b5888f5628bc197ee5f17aec7d2a88" +uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" +version = "0.4.0" + +[[CodecZlib]] +deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"] +git-tree-sha1 = "e3df104c84dfc108f0ca203fd7f5bbdc98641ae9" +uuid = "944b1d66-785c-5afd-91f1-9de20f533193" +version = "0.5.1" + +[[ColorTypes]] +deps = ["FixedPointNumbers", "Random", "Test"] +git-tree-sha1 = "f73b0e10f2a5756de7019818a41654686da06b09" +uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" +version = "0.7.5" + +[[Colors]] +deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport", "Test"] +git-tree-sha1 = "9f0a0210450acb91c730b730a994f8eef1d3d543" +uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" +version = "0.9.5" + +[[Compat]] +deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] +git-tree-sha1 = "2d9e14d19bad3f9ad5cc5e4cffabc3cfa59de825" +uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" +version = "1.3.0" + +[[Contour]] +deps = ["LinearAlgebra", "StaticArrays", "Test"] +git-tree-sha1 = "b974e164358fea753ef853ce7bad97afec15bb80" +uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" +version = "0.5.1" + +[[Crayons]] +deps = ["Test"] +git-tree-sha1 = "3017c662a988bcb8a3f43306a793617c6524d476" +uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" +version = "1.0.0" + +[[DataFrames]] +deps = ["CategoricalArrays", "CodecZlib", "Compat", "DataStreams", "Dates", "InteractiveUtils", "IteratorInterfaceExtensions", "LinearAlgebra", "Missings", "Printf", "Random", "Reexport", "SortingAlgorithms", "Statistics", "StatsBase", "TableTraits", "Tables", "Test", "TranscodingStreams", "Unicode", "WeakRefStrings"] +git-tree-sha1 = "ad34fefb72b18a8dd5c17fab9089d11111b61935" +uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +version = "0.14.1" + +[[DataStreams]] +deps = ["Dates", "Missings", "Test", "WeakRefStrings"] +git-tree-sha1 = "69c72a1beb4fc79490c361635664e13c8e4a9548" +uuid = "9a8bc11e-79be-5b39-94d7-1ccc349a1a85" +version = "0.4.1" + +[[DataStructures]] +deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"] +git-tree-sha1 = "8fc6e166e24fda04b2b648d4260cdad241788c54" +uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" +version = "0.14.0" + +[[Dates]] +deps = ["Printf"] +uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" + +[[DefaultApplication]] +deps = ["Test"] +git-tree-sha1 = "a51d16b075dc52e22cde13b4a6e0ba4ba86649ee" +uuid = "3f0dd361-4fe0-5fc6-8523-80b14ec94d85" +version = "0.1.3" + +[[DelimitedFiles]] +deps = ["Mmap"] +uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" + +[[Distributed]] +deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"] +uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" + +[[DocStringExtensions]] +deps = ["LibGit2", "Markdown", "Pkg", "Test"] +git-tree-sha1 = "a016e0bfe98a748c4488e2248c2ef4c67d6fdd35" +uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +version = "0.5.0" + +[[Documenter]] +deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "LibGit2", "Logging", "Markdown", "Pkg", "REPL", "Random", "Test", "Unicode"] +git-tree-sha1 = "9f2135e0e7ecb63f9c3ef73ea15a31d8cdb79bb7" +uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +version = "0.20.0" + +[[FixedPointNumbers]] +deps = ["Test"] +git-tree-sha1 = "b8045033701c3b10bf2324d7203404be7aef88ba" +uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" +version = "0.5.3" + +[[Future]] +deps = ["Random"] +uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" + +[[InteractiveUtils]] +deps = ["LinearAlgebra", "Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[IteratorInterfaceExtensions]] +deps = ["Test"] +git-tree-sha1 = "5484e5ede2a4137b9643f4d646e8e7b87b794415" +uuid = "82899510-4779-5014-852e-03e436cf321d" +version = "0.1.1" + +[[JSON]] +deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] +git-tree-sha1 = "fec8e4d433072731466d37ed0061b3ba7f70eeb9" +uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +version = "0.19.0" + +[[LaTeXStrings]] +deps = ["Compat"] +git-tree-sha1 = "7ab9b8788cfab2bdde22adf9004bda7ad9954b6c" +uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +version = "1.0.3" + +[[LibGit2]] +uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" + +[[Libdl]] +uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" + +[[LinearAlgebra]] +deps = ["Libdl"] +uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" + +[[Logging]] +uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" + +[[MacroTools]] +deps = ["Compat"] +git-tree-sha1 = "c443e1c8d58a4e9f61b708ad0a88286c7042145b" +uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" +version = "0.4.4" + +[[Markdown]] +deps = ["Base64"] +uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[[Measurements]] +deps = ["Calculus", "LinearAlgebra", "QuadGK", "RecipesBase", "Requires", "SpecialFunctions", "Statistics", "Test"] +git-tree-sha1 = "aa89b6d70bde19575ca650fba0320cc43ab17b0a" +uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +version = "1.0.2" + +[[Missings]] +deps = ["Dates", "InteractiveUtils", "SparseArrays", "Test"] +git-tree-sha1 = "adc26d2ee85a49c413464110d922cf21efc9d233" +uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" +version = "0.3.1" + +[[Mmap]] +uuid = "a63ad114-7e13-5084-954f-fe012c677804" + +[[OrderedCollections]] +deps = ["Random", "Serialization", "Test"] +git-tree-sha1 = "85619a3f3e17bb4761fe1b1fd47f0e979f964d5b" +uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" +version = "1.0.2" + +[[PGFPlotsX]] +deps = ["ArgCheck", "Crayons", "DataStructures", "Dates", "DefaultApplication", "DocStringExtensions", "MacroTools", "Missings", "Parameters", "Pkg", "Requires", "StatsBase", "Test", "Unicode"] +path = ".." +uuid = "8314cec4-20b6-5062-9cdb-752b83310925" +version = "0.3.2+" + +[[Parameters]] +deps = ["Markdown", "OrderedCollections", "REPL", "Test"] +git-tree-sha1 = "40f540ec96e50c0b2b9efdb11b5e4d0c63f90923" +uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" +version = "0.10.1" + +[[Pkg]] +deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" + +[[Printf]] +deps = ["Unicode"] +uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" + +[[QuadGK]] +deps = ["DataStructures", "LinearAlgebra", "Test"] +git-tree-sha1 = "7e8dff9c205f36eceaf6e62a43ff851637ca45fc" +uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" +version = "2.0.2" + +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + +[[Random]] +deps = ["Serialization"] +uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" + +[[RecipesBase]] +deps = ["Random", "Test"] +git-tree-sha1 = "0b3cb370ee4dc00f47f1193101600949f3dcf884" +uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" +version = "0.6.0" + +[[Reexport]] +deps = ["Pkg"] +git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0" +uuid = "189a3867-3050-52da-a836-e630ba90ab69" +version = "0.2.0" + +[[Requires]] +deps = ["Test"] +git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1" +uuid = "ae029012-a4dd-5104-9daa-d747884805df" +version = "0.5.2" + +[[SHA]] +uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" + +[[Serialization]] +uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" + +[[SharedArrays]] +deps = ["Distributed", "Mmap", "Random", "Serialization"] +uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" + +[[Sockets]] +uuid = "6462fe0b-24de-5631-8697-dd941f90decc" + +[[SortingAlgorithms]] +deps = ["DataStructures", "Random", "Test"] +git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" +version = "0.3.1" + +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[SpecialFunctions]] +deps = ["BinDeps", "BinaryProvider", "Libdl", "Test"] +git-tree-sha1 = "0b45dc2e45ed77f445617b99ff2adf0f5b0f23ea" +uuid = "276daf66-3868-5448-9aa4-cd146d93841b" +version = "0.7.2" + +[[StaticArrays]] +deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"] +git-tree-sha1 = "ebc5c2a27d91d5ec611a9861168182e2168effd3" +uuid = "90137ffa-7385-5640-81b9-e52037218182" +version = "0.9.2" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[StatsBase]] +deps = ["DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "Test"] +git-tree-sha1 = "723193a13e8078cec6dcd0b8fe245c8bfd81690e" +uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" +version = "0.25.0" + +[[TableTraits]] +deps = ["IteratorInterfaceExtensions", "Test"] +git-tree-sha1 = "da062a2c31f16178f68190243c24140801720a43" +uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" +version = "0.4.0" + +[[Tables]] +deps = ["Requires", "Test"] +git-tree-sha1 = "c7fb447deab835fa70ce6717e78c68b0f466a42c" +uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" +version = "0.1.11" + +[[Test]] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[[TranscodingStreams]] +deps = ["Pkg", "Random", "Test"] +git-tree-sha1 = "a34a2d588e2d2825602bf14a24216d5c8b0921ec" +uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" +version = "0.8.1" + +[[URIParser]] +deps = ["Test", "Unicode"] +git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" +uuid = "30578b45-9adc-5946-b283-645ec420af67" +version = "0.4.0" + +[[UUIDs]] +deps = ["Random"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + +[[Unicode]] +uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" + +[[WeakRefStrings]] +deps = ["Missings", "Random", "Test"] +git-tree-sha1 = "1087e8be380f2c8b96434b02bb1150fc1c511135" +uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" +version = "0.5.3" diff --git a/docs/Project.toml b/docs/Project.toml new file mode 100644 index 00000000..5eee52f7 --- /dev/null +++ b/docs/Project.toml @@ -0,0 +1,9 @@ +[deps] +Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" +Contour = "d38c429a-6771-53c6-b99e-75d170b6e991" +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" +StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" diff --git a/docs/make.jl b/docs/make.jl index 4d099ce5..688b9ebc 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,10 +1,10 @@ using Documenter, PGFPlotsX +PGFPlotsX.latexengine!(PGFPlotsX.PDFLATEX) using Contour, Colors, DataFrames makedocs( modules = [PGFPlotsX], - format = :html, sitename = "PGFPlotsX.jl", doctest = true, strict = true, @@ -37,7 +37,4 @@ makedocs( deploydocs( repo = "github.com/KristofferC/PGFPlotsX.jl.git", - target = "build", - deps = nothing, - make = nothing ) diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index 8ed23c19..00000000 --- a/test/REQUIRE +++ /dev/null @@ -1,7 +0,0 @@ -Documenter 0.19 0.20- -LaTeXStrings -Colors -Contour -DataFrames -StatsBase -Measurements diff --git a/test/runtests.jl b/test/runtests.jl index 2a615ca7..64327c46 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,11 +1,8 @@ using Test using PGFPlotsX using PGFPlotsX: Options -using Colors -using Contour using DataFrames using Dates -using LaTeXStrings using Measurements if get(ENV, "CI", false) == true @@ -25,10 +22,13 @@ mktempdir() do tmp; cd(tmp) do include("test_build.jl") end end -Base.CoreLogging.disable_logging(Base.CoreLogging.Warn) # no deprecation messages -include("../docs/make.jl") - -# Run doc stuff, turn off deprecations (this doesn't seem to work on .travis) -# cd(joinpath(@__DIR__, "..", "docs")) do -# run(`$(Base.julia_cmd()) --depwarn=no --color=yes -L make.jl`) -#end +# Build the docs on Julia v1.0 +if get(ENV, "TRAVIS_JULIA_VERSION", nothing) == "1.0" + cd(joinpath(@__DIR__, "..")) do + withenv("JULIA_LOAD_PATH" => nothing) do + cmd = `$(Base.julia_cmd()) --depwarn=no --color=yes --project=docs/` + run(`$(cmd) -e 'using Pkg; Pkg.instantiate()'`) + run(`$(cmd) docs/make.jl`) + end + end +end diff --git a/travis_docker_env.list b/travis_docker_env.list index 6fed1146..97bd597b 100644 --- a/travis_docker_env.list +++ b/travis_docker_env.list @@ -6,5 +6,4 @@ TRAVIS_REPO_SLUG TRAVIS_TAG TRAVIS_OS_NAME TRAVIS_JULIA_VERSION -# comment this out to debug Documenter.jl -# DOCUMENTER_DEBUG=true +JULIA_PROJECT diff --git a/travis_docker_test_script.sh b/travis_docker_test_script.sh index 7a99328c..acde9b24 100755 --- a/travis_docker_test_script.sh +++ b/travis_docker_test_script.sh @@ -2,7 +2,6 @@ JULIAVER=$1 # the first and only argument to the script is the version JULIABIN=/test/julia-$JULIAVER/bin/julia -PKGNAME="PGFPlotsX" ## install the image (when necessary) /test/install-julia.sh $JULIAVER @@ -10,10 +9,4 @@ PKGNAME="PGFPlotsX" cd /mnt && if [[ -a .git/shallow ]]; then git fetch --unshallow; fi # run tests -$JULIABIN -e "import Pkg; Pkg.clone(\"/mnt/\", \"$PKGNAME\"); Pkg.build(\"$PKGNAME\"); Pkg.test(\"$PKGNAME\"; coverage=true)" -TEST_EXIT=$? # return with this - -# save coverage results back to host -PKGDIR=`$JULIABIN -e "import Pkg, $PKGNAME; print(joinpath(dirname(pathof($PKGNAME)), ".."))"` -rsync -mav --include="*/" --include="*.cov" --exclude="*" $PKGDIR/ /mnt/ -exit $TEST_EXIT +$JULIABIN -e "import Pkg; Pkg.build(); Pkg.test(; coverage=true)"