From eff9353435eab839fcfa7f17a60e24afe954bce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Agas=C3=B8ster=20Haaga?= Date: Sat, 9 Nov 2019 15:16:23 +0100 Subject: [PATCH 1/4] Add upper bounds to AbstractFFts. This fixes error due to import conflicts between DSP and FFTW (ref https://github.com/JuliaDSP/DSP.jl/issues/320) --- Manifest.toml | 459 ++++++++++++++++++++++++++++++++------------------ Project.toml | 19 ++- 2 files changed, 312 insertions(+), 166 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 4f713aea..c381278a 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -1,22 +1,28 @@ # This file is machine-generated - editing it directly is not advised [[AbstractFFTs]] -deps = ["Compat", "LinearAlgebra"] -git-tree-sha1 = "8d59c3b1463b5e0ad05a3698167f85fac90e184d" +deps = ["LinearAlgebra"] +git-tree-sha1 = "380e36c66edfa099cd90116b24c1ce8cafccac40" uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "0.3.2" +version = "0.4.1" [[Arpack]] -deps = ["BinaryProvider", "Libdl", "LinearAlgebra", "Random", "SparseArrays", "Test"] -git-tree-sha1 = "1ce1ce9984683f0b6a587d5bdbc688ecb480096f" +deps = ["BinaryProvider", "Libdl", "LinearAlgebra"] +git-tree-sha1 = "07a2c077bdd4b6d23a40342a8a108e2ee5e58ab6" uuid = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97" -version = "0.3.0" +version = "0.3.1" + +[[ArrayInterface]] +deps = ["LinearAlgebra", "Requires", "SparseArrays"] +git-tree-sha1 = "981354dab938901c2b607a213e62d9defa50b698" +uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" +version = "1.2.1" [[AxisAlgorithms]] -deps = ["Compat", "WoodburyMatrices"] -git-tree-sha1 = "99dabbe853e4f641ab21a676131f2cf9fb29937e" +deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] +git-tree-sha1 = "a4d07a1c313392a77042855df46c5f534076fab9" uuid = "13072b0f-2c55-5437-9ae7-d433b7a33950" -version = "0.3.0" +version = "1.0.0" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -28,16 +34,16 @@ uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee" version = "0.8.10" [[BinaryProvider]] -deps = ["Libdl", "Pkg", "SHA", "Test"] -git-tree-sha1 = "055eb2690182ebc31087859c3dd8598371d3ef9e" +deps = ["Libdl", "SHA"] +git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c" uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" -version = "0.5.3" +version = "0.5.8" [[Bootstrap]] -deps = ["DataFrames", "Distributions", "Random", "Statistics", "StatsBase", "StatsModels", "Test"] -git-tree-sha1 = "b97249dedcdacc869c8545ebb856a97d4415641b" +deps = ["DataFrames", "Distributions", "Random", "Statistics", "StatsBase", "StatsModels"] +git-tree-sha1 = "f5fd761d56150b1100e44b747b9ef493ad0b6113" uuid = "e28b5b4c-05e8-5b66-bc03-6f0c0a0a06e0" -version = "2.0.1" +version = "2.2.0" [[CRlibm]] deps = ["Libdl", "Test"] @@ -45,35 +51,35 @@ git-tree-sha1 = "805164abcd31facf3a7e5b7d803a0d16b23329bc" uuid = "96374032-68de-5a5b-8d9e-752f78720389" version = "0.7.1" +[[CSTParser]] +deps = ["Tokenize"] +git-tree-sha1 = "99dda94f5af21a4565dc2b97edf6a95485f116c3" +uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" +version = "1.0.0" + [[Calculus]] deps = ["Compat"] -git-tree-sha1 = "f60954495a7afcee4136f78d1d60350abd37a409" +git-tree-sha1 = "bd8bbd105ba583a42385bd6dc4a20dad8ab3dc11" uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9" -version = "0.4.1" +version = "0.5.0" [[CategoricalArrays]] -deps = ["Compat", "Future", "Missings", "Printf", "Reexport", "Requires"] -git-tree-sha1 = "94d16e77dfacc59f6d6c1361866906dbb65b6f6b" +deps = ["Compat", "DataAPI", "Future", "JSON", "Missings", "Printf", "Reexport", "Unicode"] +git-tree-sha1 = "45101c4d0df3946acb6e9bfcfd3a8c32abbd421b" uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" -version = "0.5.2" - -[[CodecZlib]] -deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"] -git-tree-sha1 = "e3df104c84dfc108f0ca203fd7f5bbdc98641ae9" -uuid = "944b1d66-785c-5afd-91f1-9de20f533193" -version = "0.5.1" +version = "0.7.1" [[ColorTypes]] -deps = ["FixedPointNumbers", "Random", "Test"] -git-tree-sha1 = "f73b0e10f2a5756de7019818a41654686da06b09" +deps = ["FixedPointNumbers", "Random"] +git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.7.5" +version = "0.8.0" [[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport", "Test"] -git-tree-sha1 = "9f0a0210450acb91c730b730a994f8eef1d3d543" +deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport"] +git-tree-sha1 = "c9c1845d6bf22e34738bee65c357a69f416ed5d1" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.9.5" +version = "0.9.6" [[Combinatorics]] deps = ["LinearAlgebra", "Polynomials", "Test"] @@ -89,15 +95,15 @@ version = "0.2.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 = "49269e311ffe11ac5b334681d212329002a9832a" +git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "1.5.1" +version = "2.2.0" [[Conda]] -deps = ["Compat", "JSON", "VersionParsing"] -git-tree-sha1 = "b625d802587c2150c279a40a646fba63f9bd8187" +deps = ["JSON", "VersionParsing"] +git-tree-sha1 = "9a11d428dcdc425072af4aea19ab1e8c3e01c032" uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" -version = "1.2.0" +version = "1.3.0" [[Contour]] deps = ["LinearAlgebra", "StaticArrays", "Test"] @@ -111,37 +117,53 @@ git-tree-sha1 = "5ec38ebc4ddf6320ad50b826eb8fd7fb521993a5" uuid = "717857b8-e6f2-59f4-9121-6e50c889abd2" version = "0.5.2" +[[DataAPI]] +git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" +uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" +version = "1.1.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 = "9cfed75401d25d281076eb5d82de148ac2933f9e" +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.17.1" - -[[DataStreams]] -deps = ["Dates", "Missings", "Test", "WeakRefStrings"] -git-tree-sha1 = "69c72a1beb4fc79490c361635664e13c8e4a9548" -uuid = "9a8bc11e-79be-5b39-94d7-1ccc349a1a85" -version = "0.4.1" +version = "0.19.4" [[DataStructures]] -deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"] -git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038" +deps = ["InteractiveUtils", "OrderedCollections"] +git-tree-sha1 = "1fe8fad5fc84686dcbc674aa255bc867a64f8132" uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" -version = "0.15.0" +version = "0.17.5" + +[[DataValueInterfaces]] +git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6" +uuid = "e2d170a0-9d28-54be-80f0-106bbe20a464" +version = "1.0.0" [[Dates]] deps = ["Printf"] uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" +[[DelayEmbeddings]] +deps = ["Distances", "LinearAlgebra", "NearestNeighbors", "RecipesBase", "StaticArrays", "Statistics", "StatsBase"] +git-tree-sha1 = "3403a390323d208f773bb38938bb50fc5beae0fb" +uuid = "5732040d-69e3-5649-938a-b6b4f237613f" +version = "1.2.0" + [[DelimitedFiles]] deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" +[[DiffEqBase]] +deps = ["ArrayInterface", "Compat", "DiffEqDiffTools", "Distributed", "DocStringExtensions", "FunctionWrappers", "IterativeSolvers", "IteratorInterfaceExtensions", "LinearAlgebra", "MuladdMacro", "Parameters", "Printf", "RecipesBase", "RecursiveArrayTools", "RecursiveFactorization", "Requires", "Roots", "SparseArrays", "StaticArrays", "Statistics", "SuiteSparse", "TableTraits", "TreeViews"] +git-tree-sha1 = "05a10ee594cc6a810b3c0e337b6b61405f387ef3" +uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" +version = "6.4.2" + [[DiffEqDiffTools]] -deps = ["LinearAlgebra", "Test"] -git-tree-sha1 = "4b21dd83c341412a0607334ac64bb5593a4bd583" +deps = ["ArrayInterface", "LinearAlgebra", "Requires", "SparseArrays", "StaticArrays"] +git-tree-sha1 = "21b855cb29ec4594f9651e0e9bdc0cdcfdcd52c1" uuid = "01453d9d-ee7c-5054-8395-0335cb756afa" -version = "0.8.0" +version = "1.3.0" [[DiffResults]] deps = ["Compat", "StaticArrays"] @@ -150,32 +172,55 @@ uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" version = "0.0.4" [[DiffRules]] -deps = ["Random", "Test"] -git-tree-sha1 = "26b96a1a506b06cb272ef60568d478adab039b96" +deps = ["NaNMath", "Random", "SpecialFunctions"] +git-tree-sha1 = "f734b5f6bc9c909027ef99f6d91d5d9e4b111eed" uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "0.0.9" +version = "0.1.0" + +[[Distances]] +deps = ["LinearAlgebra", "Statistics"] +git-tree-sha1 = "23717536c81b63e250f682b0e0933769eecd1411" +uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" +version = "0.8.2" [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[Distributions]] -deps = ["Distributed", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns", "Test"] -git-tree-sha1 = "c24e9b6500c037673f0241a2783472b8c3d080c7" +deps = ["LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"] +git-tree-sha1 = "444fc445f7805a1abe2868ccfa933c5b2bb29a08" uuid = "31c24e10-a181-5473-b8eb-7969acd0382f" -version = "0.16.4" +version = "0.21.6" + +[[DocStringExtensions]] +deps = ["LibGit2", "Markdown", "Pkg", "Test"] +git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a" +uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" +version = "0.8.1" + +[[DocumenterTools]] +deps = ["Base64", "DocStringExtensions", "LibGit2"] +git-tree-sha1 = "58db9d1c626de92318ee35cbaf466739f4b5a09a" +uuid = "35a29f4d-8980-5a13-9543-d66fff28ecb8" +version = "0.1.2" + +[[DynamicalSystemsBase]] +deps = ["DelayEmbeddings", "DiffEqBase", "ForwardDiff", "LinearAlgebra", "Reexport", "SimpleDiffEq", "SparseArrays", "StaticArrays", "Statistics"] +git-tree-sha1 = "aaa2cf0500efe2ce9f0b3e92f1d0a65dc8089777" +uuid = "6e36e845-645a-534a-86f2-f5d4aa5a06b4" +version = "1.3.1" [[ErrorfreeArithmetic]] -deps = ["Test"] -git-tree-sha1 = "1d6e9d759a3cefca9b96ab91cba43a8578048923" +git-tree-sha1 = "a2b7d5a7962e5bfaab0e2e87c9cde7d3087f4e2c" uuid = "90fa49ef-747e-5e6f-a989-263ba693cf1a" -version = "0.3.1" +version = "0.4.0" [[FFTW]] -deps = ["AbstractFFTs", "BinaryProvider", "Compat", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] -git-tree-sha1 = "29cda58afbf62f35b1a094882ad6c745a47b2eaa" +deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport", "Test"] +git-tree-sha1 = "e1a479d3c972f20c9a70563eec740bbfc786f515" uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "0.2.4" +version = "0.3.0" [[FastRounding]] deps = ["ErrorfreeArithmetic", "Test"] @@ -183,6 +228,12 @@ git-tree-sha1 = "224175e213fd4fe112db3eea05d66b308dc2bf6b" uuid = "fa42c844-2597-5d31-933b-ebd51ab2693f" version = "0.2.0" +[[FillArrays]] +deps = ["LinearAlgebra", "Random", "SparseArrays"] +git-tree-sha1 = "de38b0253ade98340fabaf220f368f6144541938" +uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" +version = "0.7.4" + [[FixedPointNumbers]] deps = ["Test"] git-tree-sha1 = "b8045033701c3b10bf2324d7203404be7aef88ba" @@ -190,10 +241,16 @@ uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" version = "0.5.3" [[ForwardDiff]] -deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "InteractiveUtils", "LinearAlgebra", "NaNMath", "Random", "SparseArrays", "SpecialFunctions", "StaticArrays", "Test"] -git-tree-sha1 = "e393bd3b9102659fb24fe88caedec41f2bc2e7de" +deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] +git-tree-sha1 = "4407e7b76999eca2646abdb68203bd4302476168" uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.2" +version = "0.10.6" + +[[FunctionWrappers]] +deps = ["Compat"] +git-tree-sha1 = "49bf793ebd37db5adaa7ac1eae96c2c97ec86db5" +uuid = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e" +version = "1.0.0" [[Future]] deps = ["Random"] @@ -201,9 +258,9 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[GR]] deps = ["Base64", "DelimitedFiles", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test"] -git-tree-sha1 = "73f1b2d1e18c2511ba858ac9a9da872d41cef795" +git-tree-sha1 = "2b29ed254586324366e43f4283880978e6956d1f" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.38.0" +version = "0.42.0" [[HypothesisTests]] deps = ["Combinatorics", "Distributions", "LinearAlgebra", "Random", "Rmath", "Roots", "Statistics", "StatsBase", "Test"] @@ -222,28 +279,39 @@ deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" [[Interpolations]] -deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "Test", "WoodburyMatrices"] -git-tree-sha1 = "e8d1c381b1dc5343e5b6d37265acbe1de493d512" +deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] +git-tree-sha1 = "f5bf159a7705e2a705b0effa1be0c3d18e288fe1" uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.11.2" +version = "0.12.5" [[IntervalArithmetic]] -deps = ["CRlibm", "FastRounding", "LinearAlgebra", "Markdown", "RecipesBase", "SetRounding", "StaticArrays", "Test"] -git-tree-sha1 = "88fbfcc040299c99f9093f13539e26b165b6803a" +deps = ["CRlibm", "FastRounding", "LinearAlgebra", "Markdown", "RecipesBase", "SetRounding", "StaticArrays"] +git-tree-sha1 = "f97d8d63c3f849b0f545062de4634bc9f100d8ec" uuid = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253" -version = "0.15.1" +version = "0.16.1" -[[IteratorInterfaceExtensions]] +[[InvertedIndices]] deps = ["Test"] -git-tree-sha1 = "5484e5ede2a4137b9643f4d646e8e7b87b794415" +git-tree-sha1 = "15732c475062348b0165684ffe28e85ea8396afc" +uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f" +version = "1.0.0" + +[[IterativeSolvers]] +deps = ["LinearAlgebra", "Printf", "Random", "RecipesBase", "SparseArrays", "Test"] +git-tree-sha1 = "5687f68018b4f14c0da54d402bb23eecaec17f37" +uuid = "42fd0dbc-a981-5370-80f2-aaf504508153" +version = "0.8.1" + +[[IteratorInterfaceExtensions]] +git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" uuid = "82899510-4779-5014-852e-03e436cf321d" -version = "0.1.1" +version = "1.0.0" [[JSON]] -deps = ["Dates", "Distributed", "Mmap", "Sockets", "Test", "Unicode"] -git-tree-sha1 = "1f7a25b53ec67f5e9422f1f551ee216503f4a0fa" +deps = ["Dates", "Mmap", "Parsers", "Unicode"] +git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.20.0" +version = "0.21.0" [[KernelDensity]] deps = ["Distributions", "FFTW", "Interpolations", "Optim", "StatsBase", "Test"] @@ -270,10 +338,22 @@ 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" +[[Measurements]] +deps = ["Calculus", "LinearAlgebra", "RecipesBase", "Requires"] +git-tree-sha1 = "f65e8d655774a16e15938339a43ec47bcfc84cf2" +uuid = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" +version = "2.1.1" + [[Measures]] deps = ["Test"] git-tree-sha1 = "ddfd6d13e330beacdde2c80de27c1c671945e7d9" @@ -281,19 +361,25 @@ uuid = "442fdcdd-2543-5da2-b0f3-8c86c306513e" version = "0.3.0" [[Missings]] -deps = ["Dates", "InteractiveUtils", "SparseArrays", "Test"] -git-tree-sha1 = "d1d2585677f2bd93a97cfeb8faa7a0de0f982042" +deps = ["DataAPI"] +git-tree-sha1 = "de0a5ce9e5289f27df672ffabef4d1e5861247d5" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.0" +version = "0.4.3" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[MuladdMacro]] +deps = ["MacroTools", "Test"] +git-tree-sha1 = "41e6e7c4b448afeaddaac7f496b414854f83b848" +uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" +version = "0.2.1" + [[NLSolversBase]] -deps = ["Calculus", "DiffEqDiffTools", "DiffResults", "Distributed", "ForwardDiff", "LinearAlgebra", "Random", "SparseArrays", "Test"] -git-tree-sha1 = "0c6f0e7f2178f78239cfb75310359eed10f2cacb" +deps = ["Calculus", "DiffEqDiffTools", "DiffResults", "Distributed", "ForwardDiff"] +git-tree-sha1 = "f1b8ed89fa332f410cfc7c937682eb4d0b361521" uuid = "d41bc354-129a-5804-8e4c-c37616107c6c" -version = "7.3.1" +version = "7.5.0" [[NaNMath]] deps = ["Compat"] @@ -301,79 +387,95 @@ git-tree-sha1 = "ce3b85e484a5d4c71dd5316215069311135fa9f2" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.2" +[[NearestNeighbors]] +deps = ["Distances", "LinearAlgebra", "Mmap", "StaticArrays", "Test"] +git-tree-sha1 = "f47c5d97cf9a8caefa47e9fa9d99d8fda1a65154" +uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce" +version = "0.4.3" + [[OffsetArrays]] -deps = ["DelimitedFiles", "Test"] -git-tree-sha1 = "e6893807f09c1d5517861ded8b203cb96cb7d44a" +git-tree-sha1 = "1af2f79c7eaac3e019a0de41ef63335ff26a0a57" uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "0.10.0" +version = "0.11.1" [[Optim]] -deps = ["Calculus", "DiffEqDiffTools", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "Random", "SparseArrays", "StatsBase", "Test"] -git-tree-sha1 = "0f2a6c6ff9db396cc7af15bb1cf057a26662ff17" +deps = ["Calculus", "DiffEqDiffTools", "FillArrays", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "Random", "SparseArrays", "StatsBase"] +git-tree-sha1 = "82fef839bdb869674b4cdce178f15f7a49f00b0b" uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "0.17.2" +version = "0.19.4" [[OrderedCollections]] deps = ["Random", "Serialization", "Test"] -git-tree-sha1 = "85619a3f3e17bb4761fe1b1fd47f0e979f964d5b" +git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.0.2" +version = "1.1.0" [[PDMats]] deps = ["Arpack", "LinearAlgebra", "SparseArrays", "SuiteSparse", "Test"] -git-tree-sha1 = "b6c91fc0ab970c0563cbbe69af18d741a49ce551" +git-tree-sha1 = "035f8d60ba2a22cb1d2580b1e0e5ce0cb05e4563" uuid = "90014a1f-27ba-587c-ab20-58faa44d9150" -version = "0.9.6" +version = "0.9.10" [[Parameters]] -deps = ["Markdown", "OrderedCollections", "REPL", "Test"] -git-tree-sha1 = "70bdbfb2bceabb15345c0b54be4544813b3444e4" +deps = ["OrderedCollections"] +git-tree-sha1 = "b62b2558efb1eef1fa44e4be5ff58a515c287e38" uuid = "d96e819e-fc66-5662-9728-84c9c7592b0a" -version = "0.10.3" +version = "0.12.0" + +[[Parsers]] +deps = ["Dates", "Test"] +git-tree-sha1 = "c56ecb484f286639f161e712b8311f5ab77e8d32" +uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" +version = "0.3.8" [[Pkg]] deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[PlotThemes]] -deps = ["PlotUtils", "Requires", "Test"] -git-tree-sha1 = "f3afd2d58e1f6ac9be2cea46e4a9083ccc1d990b" +deps = ["PlotUtils", "Requires", "Statistics"] +git-tree-sha1 = "d2f3a41081a72815f5c59eacdc8046237a7cbe12" uuid = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a" -version = "0.3.0" +version = "0.4.0" [[PlotUtils]] -deps = ["Colors", "Dates", "Printf", "Random", "Reexport", "Test"] -git-tree-sha1 = "fd28f30a294a38ec847de95d8ac7ac916ccd7c06" +deps = ["Colors", "Dates", "Printf", "Random", "Reexport"] +git-tree-sha1 = "259a8d3399ea7ba23553aa91eafdf0640f5199f1" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" -version = "0.5.5" +version = "0.6.0" [[Plots]] deps = ["Base64", "Contour", "Dates", "FixedPointNumbers", "GR", "JSON", "LinearAlgebra", "Measures", "NaNMath", "Pkg", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "Reexport", "Requires", "Showoff", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "Test", "UUIDs"] -git-tree-sha1 = "1c345ad538fa31ea6953d89a9d0cbef21e86a3ed" +git-tree-sha1 = "30ba6839fca563b9753f6e77085b408265b36598" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "0.23.0" +version = "0.23.2" [[Polynomials]] -deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "62142bd65d3f8aeb2226ec64dd8493349147df94" +deps = ["LinearAlgebra", "RecipesBase"] +git-tree-sha1 = "ae71c2329790af97b7682b11241b3609e4d48626" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" +version = "0.6.0" + +[[PooledArrays]] +git-tree-sha1 = "6e8c38927cb6e9ae144f7277c753714861b27d14" +uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "0.5.2" [[PositiveFactorizations]] deps = ["LinearAlgebra", "Test"] -git-tree-sha1 = "86ae7329c4b5c266acf5c7c524a972300d991e1c" +git-tree-sha1 = "127c47b91990c101ee3752291c4f45640eeb03d1" uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" -version = "0.2.1" +version = "0.2.3" [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" [[QuadGK]] -deps = ["DataStructures", "LinearAlgebra", "Test"] -git-tree-sha1 = "3ce467a8e76c6030d4c3786e7d3a73442017cdc0" +deps = ["DataStructures", "LinearAlgebra"] +git-tree-sha1 = "1af46bf083b9630a5b27d4fd94f496c5fca642a8" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" -version = "2.0.3" +version = "2.1.1" [[REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets"] @@ -385,15 +487,26 @@ uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" [[Ratios]] deps = ["Compat"] -git-tree-sha1 = "fd159bead0a24e6270fd0573a340312bd4645cc2" +git-tree-sha1 = "cdbbe0f350581296f3a2e3e7a91b214121934407" uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.3.0" +version = "0.3.1" [[RecipesBase]] -deps = ["Random", "Test"] -git-tree-sha1 = "0b3cb370ee4dc00f47f1193101600949f3dcf884" +git-tree-sha1 = "7bdce29bc9b2f5660a6e5e64d64d91ec941f6aa2" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" -version = "0.6.0" +version = "0.7.0" + +[[RecursiveArrayTools]] +deps = ["ArrayInterface", "RecipesBase", "Requires", "StaticArrays", "Statistics"] +git-tree-sha1 = "ca98c030a187586521fb72d396e14482365ef77f" +uuid = "731186ca-8d62-57ce-b412-fbd966d074cd" +version = "1.0.2" + +[[RecursiveFactorization]] +deps = ["LinearAlgebra"] +git-tree-sha1 = "6761a5d1f9646affb2a369ff932841fff77934a3" +uuid = "f2c3362d-daeb-58d1-803e-2bc74f2840b4" +version = "0.1.0" [[Reexport]] deps = ["Pkg"] @@ -408,16 +521,16 @@ uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "0.5.2" [[Rmath]] -deps = ["BinaryProvider", "Libdl", "Random", "Statistics", "Test"] -git-tree-sha1 = "9a6c758cdf73036c3239b0afbea790def1dabff9" +deps = ["BinaryProvider", "Libdl", "Random", "Statistics"] +git-tree-sha1 = "9825383d3453f4606d77f0a5722495f38001c09e" uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa" -version = "0.5.0" +version = "0.5.1" [[Roots]] -deps = ["Compat", "Printf"] -git-tree-sha1 = "2e7171b6f3b58b81201ba37d9e1220aff6d904a1" +deps = ["Printf"] +git-tree-sha1 = "9cc4b586c71f9aea25312b94be8c195f119b0ec3" uuid = "f2b01f46-fcfa-551c-844a-d8ac1e96c665" -version = "0.7.4" +version = "0.8.3" [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -435,11 +548,22 @@ version = "0.2.0" deps = ["Distributed", "Mmap", "Random", "Serialization"] uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" +[[ShiftedArrays]] +git-tree-sha1 = "22395afdcf37d6709a5a0766cc4a5ca52cb85ea0" +uuid = "1277b4bf-5013-50f5-be3d-901d8477a67a" +version = "1.0.0" + [[Showoff]] -deps = ["Compat"] -git-tree-sha1 = "276b24f3ace98bec911be7ff2928d497dc759085" +deps = ["Dates"] +git-tree-sha1 = "e032c9df551fb23c9f98ae1064de074111b7bc39" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" -version = "0.2.1" +version = "0.3.1" + +[[SimpleDiffEq]] +deps = ["DiffEqBase", "RecursiveArrayTools", "Reexport", "StaticArrays"] +git-tree-sha1 = "e7fc59142274f72bbe20445fd4a967e9d9765266" +uuid = "05bca326-078c-5bf0-a5bf-ce7c7982d7fd" +version = "0.5.0" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -455,64 +579,69 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[SpecialFunctions]] -deps = ["BinDeps", "BinaryProvider", "Libdl", "Test"] -git-tree-sha1 = "0b45dc2e45ed77f445617b99ff2adf0f5b0f23ea" +deps = ["BinDeps", "BinaryProvider", "Libdl"] +git-tree-sha1 = "3bdd374b6fd78faf0119b8c5d538788dbf910c6e" uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.7.2" +version = "0.8.0" [[StaticArrays]] -deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"] -git-tree-sha1 = "1eb114d6e23a817cd3e99abc3226190876d7c898" +deps = ["LinearAlgebra", "Random", "Statistics"] +git-tree-sha1 = "1085ffbf5fd48fdba64ef8e902ca429c4e1212d3" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "0.10.2" +version = "0.11.1" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" [[StatsBase]] -deps = ["DataStructures", "DelimitedFiles", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "Test"] -git-tree-sha1 = "7b596062316c7d846b67bf625d5963a832528598" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] +git-tree-sha1 = "c53e809e63fe5cf5de13632090bc3520649c9950" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.27.0" +version = "0.32.0" [[StatsFuns]] -deps = ["Rmath", "SpecialFunctions", "Test"] -git-tree-sha1 = "b3a4e86aa13c732b8a8c0ba0c3d3264f55e6bb3e" +deps = ["Rmath", "SpecialFunctions"] +git-tree-sha1 = "67745a79d8e83a83737a7e17a383c54720a97f41" uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c" -version = "0.8.0" +version = "0.9.0" [[StatsModels]] -deps = ["Compat", "DataFrames", "StatsBase", "Test"] -git-tree-sha1 = "b5a735dcd2be05f0af86709750d4d5f62ca4a25d" +deps = ["CategoricalArrays", "DataStructures", "LinearAlgebra", "ShiftedArrays", "SparseArrays", "StatsBase", "Tables"] +git-tree-sha1 = "0d0e21a1c3e8043cbc1c4dd4b4e4189b0449e8cf" uuid = "3eaba693-59b7-5ba5-a881-562e759f1c8d" -version = "0.5.0" +version = "0.6.6" [[SuiteSparse]] -deps = ["Libdl", "LinearAlgebra", "SparseArrays"] +deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"] uuid = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9" [[TableTraits]] -deps = ["IteratorInterfaceExtensions", "Test"] -git-tree-sha1 = "eba4b1d0a82bdd773307d652c6e5f8c82104c676" +deps = ["IteratorInterfaceExtensions"] +git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "0.4.1" +version = "1.0.0" [[Tables]] -deps = ["IteratorInterfaceExtensions", "LinearAlgebra", "Requires", "TableTraits", "Test"] -git-tree-sha1 = "37be2ed169d5771c1ac8d516d3bcb0093c49966e" +deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] +git-tree-sha1 = "aaed7b3b00248ff6a794375ad6adf30f30ca5591" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "0.1.15" +version = "0.2.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" +[[Tokenize]] +git-tree-sha1 = "dfcdbbfb2d0370716c815cbd6f8a364efb6f42cf" +uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" +version = "0.5.6" + +[[TreeViews]] +deps = ["Test"] +git-tree-sha1 = "8d0d7a3fe2f30d6a7f833a5f19f7c7a5b396eae6" +uuid = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7" +version = "0.3.0" [[URIParser]] deps = ["Test", "Unicode"] @@ -525,14 +654,20 @@ deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[UncertainData]] -deps = ["Bootstrap", "Combinatorics", "Distributions", "HypothesisTests", "Interpolations", "IntervalArithmetic", "KernelDensity", "Printf", "RecipesBase", "Reexport", "StaticArrays", "Statistics", "StatsBase", "Test"] -git-tree-sha1 = "4d36f7e0345dabf8fb413146df1c3927176f970d" +deps = ["Bootstrap", "Combinatorics", "Distributions", "DocumenterTools", "DynamicalSystemsBase", "HypothesisTests", "Interpolations", "IntervalArithmetic", "KernelDensity", "Measurements", "Printf", "RecipesBase", "Reexport", "StaticArrays", "Statistics", "StatsBase", "Unitful"] +git-tree-sha1 = "e203192b739132e67c0a366c1e28860d1ac0173b" uuid = "dcd9ba68-c27b-5cea-ae21-829cd07325bf" -version = "0.1.8" +version = "0.9.2" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" +[[Unitful]] +deps = ["LinearAlgebra", "Random"] +git-tree-sha1 = "92bdf0ccfa9612b167d0adaadef832a09971ceb0" +uuid = "1986cc42-f94f-5a68-af5c-568840ba703d" +version = "0.17.0" + [[VersionParsing]] deps = ["Compat"] git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669" @@ -545,12 +680,6 @@ git-tree-sha1 = "4a53da1099523e7191ee5b95d6e5e32a88913b6d" uuid = "29a6e085-ba6d-5f35-a997-948ac2efa89a" version = "0.8.0" -[[WeakRefStrings]] -deps = ["Missings", "Random", "Test"] -git-tree-sha1 = "cf70c71939e621a3fac4156a8bfb3c80d745794a" -uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5" -version = "0.5.7" - [[WoodburyMatrices]] deps = ["LinearAlgebra", "Random", "SparseArrays", "Test"] git-tree-sha1 = "21772c33b447757ec7d3e61fcdfb9ea5c47eedcf" diff --git a/Project.toml b/Project.toml index 8ea2f369..1844938b 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,23 @@ Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Requires = "ae029012-a4dd-5104-9daa-d747884805df" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" UncertainData = "dcd9ba68-c27b-5cea-ae21-829cd07325bf" Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a" + +[compat] +AbstractFFTs = "= 0.4.1" +DSP = "^0.5.2, ^1" +Distributions = "0.21, 1" +InplaceOps = "^0.3.0, ^1" +Interpolations = "^0.12, ^1" +Plots = "^0.23.0, ^1" +Requires = "^0.5.2, ^1" +StatsBase = "^0.32.0, ^1" +UncertainData = "^0.9.2, ^1" +Wavelets = "^0.8.0, ^1" + +[extras] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test"] From 95706de203f182a5df68e49d59870c4b99643e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Agas=C3=B8ster=20Haaga?= Date: Sat, 9 Nov 2019 15:18:53 +0100 Subject: [PATCH 2/4] Add version field to Project.toml --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index 1844938b..9bc36320 100644 --- a/Project.toml +++ b/Project.toml @@ -2,6 +2,7 @@ name = "TimeseriesSurrogates" uuid = "c804724b-8c18-5caa-8579-6025a0767c70" authors = ["Kristian Agasøster Haaga "] repo = "https://github.com/kahaaga/TimeseriesSurrogates.jl.git" +version = "0.3.2" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" From 673a5fe2b55a31a8161abe6ac7b93f7186cac14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Agas=C3=B8ster=20Haaga?= Date: Sat, 9 Nov 2019 15:30:57 +0100 Subject: [PATCH 3/4] Up minor version and require Julia 1.1 UncertainData >= v0.9 only supports Julia >= 1.1 --- Project.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 9bc36320..c057a9e0 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "TimeseriesSurrogates" uuid = "c804724b-8c18-5caa-8579-6025a0767c70" authors = ["Kristian Agasøster Haaga "] repo = "https://github.com/kahaaga/TimeseriesSurrogates.jl.git" -version = "0.3.2" +version = "0.4.0" [deps] AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c" @@ -17,6 +17,7 @@ UncertainData = "dcd9ba68-c27b-5cea-ae21-829cd07325bf" Wavelets = "29a6e085-ba6d-5f35-a997-948ac2efa89a" [compat] +julia = "^1.1" AbstractFFTs = "= 0.4.1" DSP = "^0.5.2, ^1" Distributions = "0.21, 1" From fc38b0a7aacad6c3f13c2bee187db023a66b87fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Agas=C3=B8ster=20Haaga?= Date: Sat, 9 Nov 2019 15:40:14 +0100 Subject: [PATCH 4/4] Drop travis build on 1.0, do for 1.1, 1.2 and nightly --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66de165d..582f665a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,8 @@ os: - linux julia: - nightly - - 1.0 + - 1.1 + - 1.2 matrix: allow_failures: -- julia: nightly - -script: - - julia -e 'using Pkg; Pkg.test()' +- julia: nightly \ No newline at end of file