From 8b0e451ea079490c0c8c450dc71365f2948db721 Mon Sep 17 00:00:00 2001 From: lrennels Date: Wed, 11 Sep 2019 21:17:28 -0700 Subject: [PATCH 1/8] Update manifest --- test/dependencies/Manifest.toml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index b87b9c76d..41433100f 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -40,10 +40,10 @@ uuid = "5d742f6a-9f54-50ce-8119-2520741973ca" version = "0.16.0" [[CategoricalArrays]] -deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport"] -git-tree-sha1 = "13240cfcc884837fc1aa89b60d500a652bcc3f10" +deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport", "Unicode"] +git-tree-sha1 = "5f4400b24adb1fbed17a9dcc1e8ab8aaf5b03d1f" uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" -version = "0.5.5" +version = "0.6.0" [[CodecZlib]] deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] @@ -94,9 +94,9 @@ version = "1.0.1" [[DataFrames]] deps = ["CategoricalArrays", "Compat", "DataAPI", "InvertedIndices", "IteratorInterfaceExtensions", "Missings", "PooledArrays", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "934b75a90b6cb315f9ea0df961768a02c1da1612" +git-tree-sha1 = "271528230c65a4517522e2968c3deed76b92b998" uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "0.19.3" +version = "0.19.4" [[DataStructures]] deps = ["InteractiveUtils", "OrderedCollections"] @@ -135,9 +135,9 @@ version = "0.21.1" [[DoubleFloats]] deps = ["GenericSVD", "GenericSchur", "LinearAlgebra", "Polynomials", "Quadmath", "Random", "Requires"] -git-tree-sha1 = "dd2b360df2bbbc7f0f76e1d5a872dc9448948c83" +git-tree-sha1 = "26ad37f7744efa575185b2eab0cc87216f589355" uuid = "497a8b3b-efae-58df-a0af-a86822472b78" -version = "0.9.7" +version = "0.9.8" [[Electron]] deps = ["Base64", "JSON", "Sockets", "URIParser"] @@ -204,9 +204,9 @@ version = "0.3.1" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "c4a527dba1d26add0e85946e1a53f42a1b343acc" +git-tree-sha1 = "f1e1b417a34cf73a70cbed919915bf8f8bad1806" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.5" +version = "0.8.6" [[Inflate]] deps = ["Pkg", "Printf", "Random", "Test"] @@ -315,7 +315,7 @@ version = "0.6.4" deps = ["CSVFiles", "Compose", "DataFrames", "DataStructures", "Dates", "DelimitedFiles", "Distributions", "Electron", "FileIO", "FilePaths", "GlobalSensitivityAnalysis", "GraphPlot", "IterTools", "IteratorInterfaceExtensions", "JSON", "LightGraphs", "LinearAlgebra", "Logging", "MacroTools", "MetaGraphs", "NamedArrays", "Pkg", "ProgressMeter", "Random", "Serialization", "Statistics", "StatsBase", "StringBuilders", "TableTraits", "VegaLite"] path = "../.." uuid = "e4e893b0-ee5e-52ea-8111-44b3bdec128c" -version = "0.9.2-DEV" +version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] @@ -334,10 +334,9 @@ uuid = "54b9761e-41d9-11e9-3151-3dc5fec6a45b" version = "2.0.3+" [[Missings]] -deps = ["SparseArrays", "Test"] -git-tree-sha1 = "f0719736664b4358aa9ec173077d4285775f8007" +git-tree-sha1 = "29858ce6c8ae629cf2d733bffa329619a1c843d0" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.1" +version = "0.4.2" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" @@ -459,9 +458,9 @@ version = "0.9.0" [[Sobol]] deps = ["Random"] -git-tree-sha1 = "5573a7dfa088be45601a4d6a3e9841d1ac9a755e" +git-tree-sha1 = "f8afbde90f4e2d5e579dae4b0e71f931b2e194ca" uuid = "ed01d8cd-4d21-5b2a-85b4-cc3bdc58bad4" -version = "1.2.0" +version = "1.3.0" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" From 5570ff1cfd9f133265b580ebf3231a3fc40c9f5a Mon Sep 17 00:00:00 2001 From: lrennels Date: Wed, 11 Sep 2019 22:28:17 -0700 Subject: [PATCH 2/8] Update FUND version --- test/dependencies/Manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index 41433100f..6c7eabbae 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -319,11 +319,11 @@ version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] -git-tree-sha1 = "91cc70d96a3e338aa25379b4b9f1b22c03970804" -repo-rev = "426328c5d7b3d1dba8da406be32e5eff00c61ee1" +git-tree-sha1 = "c85a400e6908cf1eb3cf2bc69301718f7e248dc3" +repo-rev = "master" repo-url = "https://github.com/fund-model/MimiFUND.jl.git" uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -version = "3.11.2" +version = "3.11.6-DEV" [[MimiRICE2010]] deps = ["ExcelReaders", "Mimi"] From b1e4b08e000cf0cb32d7c7b04d89e6c330777695 Mon Sep 17 00:00:00 2001 From: lrennels Date: Wed, 11 Sep 2019 22:35:06 -0700 Subject: [PATCH 3/8] Fix MimiFUND version --- test/dependencies/Manifest.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index 6c7eabbae..f64411ac7 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -319,11 +319,9 @@ version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] -git-tree-sha1 = "c85a400e6908cf1eb3cf2bc69301718f7e248dc3" -repo-rev = "master" -repo-url = "https://github.com/fund-model/MimiFUND.jl.git" +git-tree-sha1 = "1b25e13b45c148b348a51e01c515c757f9dc13f9" uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -version = "3.11.6-DEV" +version = "3.11.5" [[MimiRICE2010]] deps = ["ExcelReaders", "Mimi"] From 59161f1719a494f61cf9390d5fda441f6107e11f Mon Sep 17 00:00:00 2001 From: lrennels Date: Wed, 11 Sep 2019 23:13:03 -0700 Subject: [PATCH 4/8] Use MimiFUND master branch --- test/dependencies/Manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index f64411ac7..6c7eabbae 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -319,9 +319,11 @@ version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] -git-tree-sha1 = "1b25e13b45c148b348a51e01c515c757f9dc13f9" +git-tree-sha1 = "c85a400e6908cf1eb3cf2bc69301718f7e248dc3" +repo-rev = "master" +repo-url = "https://github.com/fund-model/MimiFUND.jl.git" uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -version = "3.11.5" +version = "3.11.6-DEV" [[MimiRICE2010]] deps = ["ExcelReaders", "Mimi"] From 9555c4abf97b963d924a933b42fcca4c652f6772 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 12 Sep 2019 13:12:34 -0700 Subject: [PATCH 5/8] Update dependency testing Manifest.toml --- test/dependencies/Manifest.toml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index 6c7eabbae..3a7008e23 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -294,10 +294,10 @@ deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" [[MbedTLS]] -deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"] -git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6" +deps = ["BinaryProvider", "Dates", "Libdl", "Random", "Sockets"] +git-tree-sha1 = "85f5947b53c8cfd53ccfa3f4abae31faa22c2181" uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "0.6.8" +version = "0.7.0" [[Measures]] deps = ["Test"] @@ -319,19 +319,15 @@ version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] -git-tree-sha1 = "c85a400e6908cf1eb3cf2bc69301718f7e248dc3" -repo-rev = "master" -repo-url = "https://github.com/fund-model/MimiFUND.jl.git" +git-tree-sha1 = "1b25e13b45c148b348a51e01c515c757f9dc13f9" uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -version = "3.11.6-DEV" +version = "3.11.5" [[MimiRICE2010]] deps = ["ExcelReaders", "Mimi"] -git-tree-sha1 = "ee60602a5cd82ef92ae110b8a53e5306bc23bc5d" -repo-rev = "dc359f9350b2cfde51574e29070b9b8b162de1ec" -repo-url = "https://github.com/anthofflab/MimiRICE2010.jl.git" +git-tree-sha1 = "5616f8b99a51456a7e58de32bceabdbb848c3c9f" uuid = "54b9761e-41d9-11e9-3151-3dc5fec6a45b" -version = "2.0.3+" +version = "2.0.3" [[Missings]] git-tree-sha1 = "29858ce6c8ae629cf2d733bffa329619a1c843d0" @@ -510,7 +506,7 @@ uuid = "db12335b-fddc-5e1b-b0ee-42071d21ae50" version = "0.2.0" [[SuiteSparse]] -deps = ["Libdl", "LinearAlgebra", "SparseArrays"] +deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" [[TableShowUtils]] From 54251aab850911a2349ac3d3d3086c9a8b2b46de Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 12 Sep 2019 13:30:44 -0700 Subject: [PATCH 6/8] Update test deps Manifest.toml --- test/dependencies/Manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml index 3a7008e23..a5f361e3b 100644 --- a/test/dependencies/Manifest.toml +++ b/test/dependencies/Manifest.toml @@ -320,12 +320,16 @@ version = "0.9.3-DEV" [[MimiFUND]] deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] git-tree-sha1 = "1b25e13b45c148b348a51e01c515c757f9dc13f9" +repo-rev = "v3.11.5" +repo-url = "https://github.com/fund-model/MimiFUND.jl.git" uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" version = "3.11.5" [[MimiRICE2010]] deps = ["ExcelReaders", "Mimi"] git-tree-sha1 = "5616f8b99a51456a7e58de32bceabdbb848c3c9f" +repo-rev = "v2.0.3" +repo-url = "https://github.com/anthofflab/MimiRICE2010.jl.git" uuid = "54b9761e-41d9-11e9-3151-3dc5fec6a45b" version = "2.0.3" From 83722c861a74195d5c89fb3b897d6d961e021335 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 12 Sep 2019 13:54:52 -0700 Subject: [PATCH 7/8] Change how we do dependency testing --- test/dependencies/Manifest.toml | 590 ---------------------- test/dependencies/Project.toml | 4 - test/dependencies/run_dependency_tests.jl | 18 +- 3 files changed, 15 insertions(+), 597 deletions(-) delete mode 100644 test/dependencies/Manifest.toml delete mode 100644 test/dependencies/Project.toml diff --git a/test/dependencies/Manifest.toml b/test/dependencies/Manifest.toml deleted file mode 100644 index a5f361e3b..000000000 --- a/test/dependencies/Manifest.toml +++ /dev/null @@ -1,590 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[ArnoldiMethod]] -deps = ["DelimitedFiles", "LinearAlgebra", "Random", "SparseArrays", "StaticArrays", "Test"] -git-tree-sha1 = "2b6845cea546604fb4dca4e31414a6a59d39ddcd" -uuid = "ec485272-7323-5ecc-a04f-4719b315124d" -version = "0.0.4" - -[[Arpack]] -deps = ["BinaryProvider", "Libdl", "LinearAlgebra"] -git-tree-sha1 = "07a2c077bdd4b6d23a40342a8a108e2ee5e58ab6" -uuid = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97" -version = "0.3.1" - -[[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", "Logging", "SHA"] -git-tree-sha1 = "c7361ce8a2129f20b0e05a89f7070820cfed6648" -uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.6" - -[[CSTParser]] -deps = ["Tokenize"] -git-tree-sha1 = "c69698c3d4a7255bc1b4bc2afc09f59db910243b" -uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "0.6.2" - -[[CSVFiles]] -deps = ["CodecZlib", "DataValues", "FileIO", "HTTP", "IterableTables", "IteratorInterfaceExtensions", "TableShowUtils", "TableTraits", "TableTraitsUtils", "TextParse"] -git-tree-sha1 = "f76fb6827964abff9364137ceb56eb9f7c065137" -uuid = "5d742f6a-9f54-50ce-8119-2520741973ca" -version = "0.16.0" - -[[CategoricalArrays]] -deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport", "Unicode"] -git-tree-sha1 = "5f4400b24adb1fbed17a9dcc1e8ab8aaf5b03d1f" -uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" -version = "0.6.0" - -[[CodecZlib]] -deps = ["BinaryProvider", "Libdl", "TranscodingStreams"] -git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e" -uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.6.0" - -[[ColorTypes]] -deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965" -uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.8.0" - -[[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport"] -git-tree-sha1 = "c9c1845d6bf22e34738bee65c357a69f416ed5d1" -uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.9.6" - -[[Combinatorics]] -deps = ["LinearAlgebra", "Polynomials", "Test"] -git-tree-sha1 = "50b3ae4d643dc27eaff69fb6be06ee094d5500c9" -uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" -version = "0.7.0" - -[[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 = "84aa74986c5b9b898b0d1acaf3258741ee64754f" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "2.1.0" - -[[Compose]] -deps = ["Base64", "Colors", "DataStructures", "Dates", "IterTools", "JSON", "LinearAlgebra", "Measures", "Printf", "Random", "Requires", "Test", "UUIDs"] -git-tree-sha1 = "7d8fe0ad6f73c40ccc4e01f426a700c5a843a1d3" -uuid = "a81c6b42-2e10-5240-aca2-a61377ecd94b" -version = "0.7.3" - -[[Conda]] -deps = ["JSON", "VersionParsing"] -git-tree-sha1 = "9a11d428dcdc425072af4aea19ab1e8c3e01c032" -uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" -version = "1.3.0" - -[[DataAPI]] -git-tree-sha1 = "8903f0219d3472543fc4b2f5ebaf675a07f817c0" -uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" -version = "1.0.1" - -[[DataFrames]] -deps = ["CategoricalArrays", "Compat", "DataAPI", "InvertedIndices", "IteratorInterfaceExtensions", "Missings", "PooledArrays", "Printf", "REPL", "Reexport", "SortingAlgorithms", "Statistics", "TableTraits", "Tables", "Unicode"] -git-tree-sha1 = "271528230c65a4517522e2968c3deed76b92b998" -uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" -version = "0.19.4" - -[[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections"] -git-tree-sha1 = "0809951a1774dc724da22d26e4289bbaab77809a" -uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.17.0" - -[[DataValueInterfaces]] -git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" -uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" -version = "1.0.0" - -[[DataValues]] -deps = ["DataValueInterfaces", "Dates"] -git-tree-sha1 = "b65fd071ca17aa265eb8c5ab0e522faa03a50d34" -uuid = "e7dc6d0d-1eca-5fa6-8ad6-5aecde8b7ea5" -version = "0.4.12" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[DelimitedFiles]] -deps = ["Mmap"] -uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[Distributions]] -deps = ["LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"] -git-tree-sha1 = "baaf9e165ba8a2d11fb4fb3511782ee070ee3694" -uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.21.1" - -[[DoubleFloats]] -deps = ["GenericSVD", "GenericSchur", "LinearAlgebra", "Polynomials", "Quadmath", "Random", "Requires"] -git-tree-sha1 = "26ad37f7744efa575185b2eab0cc87216f589355" -uuid = "497a8b3b-efae-58df-a0af-a86822472b78" -version = "0.9.8" - -[[Electron]] -deps = ["Base64", "JSON", "Sockets", "URIParser"] -git-tree-sha1 = "7731daad05c67a98995152990630555ec0c0b4ee" -uuid = "a1bb12fb-d4d1-54b4-b10a-ee7951ef7ad3" -version = "1.0.0" - -[[ExcelReaders]] -deps = ["DataValues", "Dates", "PyCall", "Test"] -git-tree-sha1 = "6f9db420dd362bd5bcea3a0f6dabf8bda587fec3" -uuid = "c04bee98-12a5-510c-87df-2a230cb6e075" -version = "0.11.0" - -[[FileIO]] -deps = ["Pkg"] -git-tree-sha1 = "351f001a78aa1b7ad2696e386e110b5abd071c71" -uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.0.7" - -[[FilePaths]] -deps = ["FilePathsBase", "MacroTools", "Reexport", "URIParser"] -git-tree-sha1 = "191796576b7f69cfe66d63b3d66a2741783204eb" -uuid = "8fc22ac5-c921-52a6-82fd-178b2807b824" -version = "0.8.0" - -[[FilePathsBase]] -deps = ["Dates", "LinearAlgebra", "Printf", "Test", "UUIDs"] -git-tree-sha1 = "2ee1d999c462425e2f848524f732ed51bc1ab63a" -uuid = "48062228-2e41-5def-b9a4-89aafe57970f" -version = "0.6.2" - -[[FixedPointNumbers]] -git-tree-sha1 = "d14a6fa5890ea3a7e5dcab6811114f132fec2b4b" -uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" -version = "0.6.1" - -[[Future]] -deps = ["Random"] -uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" - -[[GenericSVD]] -deps = ["LinearAlgebra", "Random", "Test"] -git-tree-sha1 = "8aa93c3f3d81562a8962047eafcc5712af0a0f59" -uuid = "01680d73-4ee2-5a08-a1aa-533608c188bb" -version = "0.2.1" - -[[GenericSchur]] -deps = ["LinearAlgebra", "Printf"] -git-tree-sha1 = "25992e6d023b72860348553f976599184c85d914" -uuid = "c145ed77-6b09-5dd9-b285-bf645a82121e" -version = "0.2.3" - -[[GlobalSensitivityAnalysis]] -deps = ["DataStructures", "Distributions", "Sobol", "Statistics", "Test"] -git-tree-sha1 = "2abf79d132fc3732dc4aded2f256047ab6fa8f8e" -uuid = "1b10255b-6da3-57ce-9089-d24e8517b87e" -version = "0.0.5" - -[[GraphPlot]] -deps = ["ArnoldiMethod", "ColorTypes", "Colors", "Compose", "DelimitedFiles", "LightGraphs", "LinearAlgebra", "Random", "SparseArrays", "Test"] -git-tree-sha1 = "f4435ce0055d4da938f3bab0c0e523826735c96a" -uuid = "a2cc645c-3eea-5389-862e-a155d0052231" -version = "0.3.1" - -[[HTTP]] -deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"] -git-tree-sha1 = "f1e1b417a34cf73a70cbed919915bf8f8bad1806" -uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.8.6" - -[[Inflate]] -deps = ["Pkg", "Printf", "Random", "Test"] -git-tree-sha1 = "b7ec91c153cf8bff9aff58b39497925d133ef7fd" -uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9" -version = "0.1.1" - -[[IniFile]] -deps = ["Test"] -git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8" -uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f" -version = "0.5.0" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[InvertedIndices]] -deps = ["Test"] -git-tree-sha1 = "15732c475062348b0165684ffe28e85ea8396afc" -uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" -version = "1.0.0" - -[[IterTools]] -git-tree-sha1 = "2ebe60d7343962966d1779a74a760f13217a6901" -uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" -version = "1.2.0" - -[[IterableTables]] -deps = ["DataValues", "IteratorInterfaceExtensions", "Requires", "TableTraits", "TableTraitsUtils", "Test"] -git-tree-sha1 = "18d6084924b2ac78deb65229cbcaa04d56ecb075" -uuid = "1c8ee90f-4401-5389-894e-7a04a3dc0f4d" -version = "0.11.0" - -[[IteratorInterfaceExtensions]] -git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" -uuid = "82899510-4779-5014-852e-03e436cf321d" -version = "1.0.0" - -[[JLD2]] -deps = ["CodecZlib", "DataStructures", "FileIO", "LinearAlgebra", "Mmap", "Printf", "Random", "Test"] -git-tree-sha1 = "3ba90ff93e1d5b9b2103588051c2d349fae54dac" -uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.1.2" - -[[JSON]] -deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] -git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.20.0" - -[[JSONSchema]] -deps = ["HTTP", "JSON", "Test"] -git-tree-sha1 = "6f80c4ea9ccf648766380b28b63efd1050dee940" -uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692" -version = "0.1.1" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Libdl]] -uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" - -[[LightGraphs]] -deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "a0d4bcea4b9c056da143a5ded3c2b7f7740c2d41" -uuid = "093fc24a-ae57-5d10-9952-331d41423f4d" -version = "1.3.0" - -[[LinearAlgebra]] -deps = ["Libdl"] -uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[MacroTools]] -deps = ["CSTParser", "Compat", "DataStructures", "Test", "Tokenize"] -git-tree-sha1 = "d6e9dedb8c92c3465575442da456aec15a89ff76" -uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" -version = "0.5.1" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[MbedTLS]] -deps = ["BinaryProvider", "Dates", "Libdl", "Random", "Sockets"] -git-tree-sha1 = "85f5947b53c8cfd53ccfa3f4abae31faa22c2181" -uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "0.7.0" - -[[Measures]] -deps = ["Test"] -git-tree-sha1 = "ddfd6d13e330beacdde2c80de27c1c671945e7d9" -uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e" -version = "0.3.0" - -[[MetaGraphs]] -deps = ["JLD2", "LightGraphs", "Random"] -git-tree-sha1 = "43ebbe06b22d213e4a8750424f9c7d1311bee2a6" -uuid = "626554b9-1ddb-594c-aa3c-2596fe9399a5" -version = "0.6.4" - -[[Mimi]] -deps = ["CSVFiles", "Compose", "DataFrames", "DataStructures", "Dates", "DelimitedFiles", "Distributions", "Electron", "FileIO", "FilePaths", "GlobalSensitivityAnalysis", "GraphPlot", "IterTools", "IteratorInterfaceExtensions", "JSON", "LightGraphs", "LinearAlgebra", "Logging", "MacroTools", "MetaGraphs", "NamedArrays", "Pkg", "ProgressMeter", "Random", "Serialization", "Statistics", "StatsBase", "StringBuilders", "TableTraits", "VegaLite"] -path = "../.." -uuid = "e4e893b0-ee5e-52ea-8111-44b3bdec128c" -version = "0.9.3-DEV" - -[[MimiFUND]] -deps = ["Dates", "DelimitedFiles", "Distributions", "Mimi", "StatsBase"] -git-tree-sha1 = "1b25e13b45c148b348a51e01c515c757f9dc13f9" -repo-rev = "v3.11.5" -repo-url = "https://github.com/fund-model/MimiFUND.jl.git" -uuid = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -version = "3.11.5" - -[[MimiRICE2010]] -deps = ["ExcelReaders", "Mimi"] -git-tree-sha1 = "5616f8b99a51456a7e58de32bceabdbb848c3c9f" -repo-rev = "v2.0.3" -repo-url = "https://github.com/anthofflab/MimiRICE2010.jl.git" -uuid = "54b9761e-41d9-11e9-3151-3dc5fec6a45b" -version = "2.0.3" - -[[Missings]] -git-tree-sha1 = "29858ce6c8ae629cf2d733bffa329619a1c843d0" -uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.2" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[NamedArrays]] -deps = ["Combinatorics", "DataStructures", "DelimitedFiles", "InvertedIndices", "LinearAlgebra", "Random", "Requires", "SparseArrays", "Statistics"] -git-tree-sha1 = "2681361e30e0ee97aad617f1a6a728e53179bd15" -uuid = "86f7a689-2022-50b4-a561-43c23ac3c673" -version = "0.9.3" - -[[NodeJS]] -deps = ["Test"] -git-tree-sha1 = "74b1bd25ec1709609462c1ab4b383dd463c57df9" -uuid = "2bd173c7-0d6d-553b-b6af-13a54713934c" -version = "0.6.0" - -[[Nullables]] -deps = ["Compat"] -git-tree-sha1 = "ae1a63457e14554df2159b0b028f48536125092d" -uuid = "4d1e1d77-625e-5b40-9113-a560ec7a8ecd" -version = "0.0.8" - -[[OrderedCollections]] -deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" -uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.1.0" - -[[PDMats]] -deps = ["Arpack", "LinearAlgebra", "SparseArrays", "SuiteSparse", "Test"] -git-tree-sha1 = "9d6a9b3e19634612fb1edcafc4b1d75242b24bde" -uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.9.9" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Polynomials]] -deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "62142bd65d3f8aeb2226ec64dd8493349147df94" -uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "0.5.2" - -[[PooledArrays]] -git-tree-sha1 = "6e8c38927cb6e9ae144f7277c753714861b27d14" -uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" -version = "0.5.2" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[ProgressMeter]] -deps = ["Distributed", "Printf"] -git-tree-sha1 = "0f08e0e74e5b160ca20d3962a2620038b75881c7" -uuid = "92933f4c-e287-5a05-a399-4b506db050ca" -version = "1.0.0" - -[[PyCall]] -deps = ["Conda", "Dates", "Libdl", "LinearAlgebra", "MacroTools", "Pkg", "Serialization", "Statistics", "Test", "VersionParsing"] -git-tree-sha1 = "6e5bac1b1faf3575731a6a5b76f638f2389561d3" -uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" -version = "1.91.2" - -[[QuadGK]] -deps = ["DataStructures", "LinearAlgebra", "Test"] -git-tree-sha1 = "3ce467a8e76c6030d4c3786e7d3a73442017cdc0" -uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" -version = "2.0.3" - -[[Quadmath]] -deps = ["Random", "Requires"] -git-tree-sha1 = "0d177ab3217bd6347d01bdf56e5da0571222d7f3" -uuid = "be4d8f0f-7fa4-5f49-b795-2f01399ab2dd" -version = "0.5.0" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[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" - -[[Rmath]] -deps = ["BinaryProvider", "Libdl", "Random", "Statistics", "Test"] -git-tree-sha1 = "9a6c758cdf73036c3239b0afbea790def1dabff9" -uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa" -version = "0.5.0" - -[[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" - -[[SimpleTraits]] -deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "05bbf4484b975782e5e54bb0750f21f7f2f66171" -uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.0" - -[[Sobol]] -deps = ["Random"] -git-tree-sha1 = "f8afbde90f4e2d5e579dae4b0e71f931b2e194ca" -uuid = "ed01d8cd-4d21-5b2a-85b4-cc3bdc58bad4" -version = "1.3.0" - -[[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 = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "db23bbf50064c582b6f2b9b043c8e7e98ea8c0c6" -uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.11.0" - -[[Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[[StatsBase]] -deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "c53e809e63fe5cf5de13632090bc3520649c9950" -uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.32.0" - -[[StatsFuns]] -deps = ["Rmath", "SpecialFunctions", "Test"] -git-tree-sha1 = "b3a4e86aa13c732b8a8c0ba0c3d3264f55e6bb3e" -uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.8.0" - -[[StringBuilders]] -deps = ["Test"] -git-tree-sha1 = "f1ca94badd76e66cf86402516079ffc792e12a98" -uuid = "db12335b-fddc-5e1b-b0ee-42071d21ae50" -version = "0.2.0" - -[[SuiteSparse]] -deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] -uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" - -[[TableShowUtils]] -deps = ["DataValues", "Dates", "JSON", "Markdown", "Test"] -git-tree-sha1 = "14c54e1e96431fb87f0d2f5983f090f1b9d06457" -uuid = "5e66a065-1f0a-5976-b372-e0b8c017ca10" -version = "0.2.5" - -[[TableTraits]] -deps = ["IteratorInterfaceExtensions"] -git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" -uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "1.0.0" - -[[TableTraitsUtils]] -deps = ["DataValues", "IteratorInterfaceExtensions", "Missings", "TableTraits"] -git-tree-sha1 = "fbc53f586630fa2a72190f7a792ba4106fd0776a" -uuid = "382cd787-c1b6-5bf2-a167-d5b971a19bda" -version = "1.0.0" - -[[Tables]] -deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "aaed7b3b00248ff6a794375ad6adf30f30ca5591" -uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "0.2.11" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[TextParse]] -deps = ["CodecZlib", "DataStructures", "Dates", "DoubleFloats", "Mmap", "Nullables", "PooledArrays", "WeakRefStrings"] -git-tree-sha1 = "26b43d6746b52cca13c4cdef90f89652273b413e" -uuid = "e0df1984-e451-5cb5-8b61-797a481e67e3" -version = "0.9.1" - -[[Tokenize]] -git-tree-sha1 = "dfcdbbfb2d0370716c815cbd6f8a364efb6f42cf" -uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" -version = "0.5.6" - -[[TranscodingStreams]] -deps = ["Random", "Test"] -git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c" -uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" -version = "0.9.5" - -[[URIParser]] -deps = ["Test", "Unicode"] -git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69" -uuid = "30578b45-9adc-5946-b283-645ec420af67" -version = "0.4.0" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[VegaLite]] -deps = ["DataValues", "Dates", "FileIO", "FilePaths", "IterableTables", "IteratorInterfaceExtensions", "JSON", "JSONSchema", "MacroTools", "NodeJS", "REPL", "Random", "TableTraits", "URIParser"] -git-tree-sha1 = "0f27d73647e61e039d43d6087d1eee4c5171dafa" -uuid = "112f6efa-9a02-5b7d-90c0-432ed331239a" -version = "0.7.0" - -[[VersionParsing]] -deps = ["Compat"] -git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669" -uuid = "81def892-9a0e-5fdd-b105-ffc91e053289" -version = "1.1.3" - -[[WeakRefStrings]] -deps = ["Random", "Test"] -git-tree-sha1 = "9a0bb82eede528debe631b642eeb48a631a69bc2" -uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" -version = "0.6.1" diff --git a/test/dependencies/Project.toml b/test/dependencies/Project.toml deleted file mode 100644 index 49697bd8d..000000000 --- a/test/dependencies/Project.toml +++ /dev/null @@ -1,4 +0,0 @@ -[deps] -Mimi = "e4e893b0-ee5e-52ea-8111-44b3bdec128c" -MimiFUND = "b3ba11de-429f-11e9-29f7-cb478ab96e7c" -MimiRICE2010 = "54b9761e-41d9-11e9-3151-3dc5fec6a45b" diff --git a/test/dependencies/run_dependency_tests.jl b/test/dependencies/run_dependency_tests.jl index b3308f1ce..b17075742 100644 --- a/test/dependencies/run_dependency_tests.jl +++ b/test/dependencies/run_dependency_tests.jl @@ -1,6 +1,18 @@ using Pkg -Pkg.instantiate() +packages_to_test = [ + ("https://github.com/anthofflab/MimiRICE2010.jl.git", "v2.0.3", "MimiRICE2010"), + ("https://github.com/fund-model/MimiFUND.jl.git", "v3.11.5", "MimiFUND") +] -Pkg.test("MimiRICE2010") -Pkg.test("MimiFUND") +for (pkg_url, pkg_rev, pkg_name) in packages_to_test + mktempdir() do folder + Pkg.activate(folder) + + Pkg.develop(joinpath(@__DIR__, "..", "..")) + + Pkg.add(PackageSpec(url=pkg_url, rev=pkg_rev)) + + Pkg.test(pkg_name) + end +end From d5ad4ea41b795f18f7cea8a4062dcfebef815338 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Thu, 12 Sep 2019 14:16:44 -0700 Subject: [PATCH 8/8] Fix a bug --- test/dependencies/run_dependency_tests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dependencies/run_dependency_tests.jl b/test/dependencies/run_dependency_tests.jl index b17075742..5833e46e1 100644 --- a/test/dependencies/run_dependency_tests.jl +++ b/test/dependencies/run_dependency_tests.jl @@ -9,7 +9,7 @@ for (pkg_url, pkg_rev, pkg_name) in packages_to_test mktempdir() do folder Pkg.activate(folder) - Pkg.develop(joinpath(@__DIR__, "..", "..")) + Pkg.develop(PackageSpec(path=joinpath(@__DIR__, "..", ".."))) Pkg.add(PackageSpec(url=pkg_url, rev=pkg_rev))