From 340fc289cf997f916a2ec62d39ccc67be5ae3e7f Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 01:25:04 +0100 Subject: [PATCH 1/9] Update to julia 1.x --- Manifest.toml | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ Project.toml | 13 +++++++ REQUIRE | 2 -- test/runtests.jl | 2 +- 4 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 Manifest.toml create mode 100644 Project.toml delete mode 100644 REQUIRE diff --git a/Manifest.toml b/Manifest.toml new file mode 100644 index 0000000..9b2bcb6 --- /dev/null +++ b/Manifest.toml @@ -0,0 +1,94 @@ +# This file is machine-generated - editing it directly is not advised + +[[Base64]] +uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" + +[[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 = "c437ba8bb82f5ec9a5d8cb881031ffa2dbe1038c" +uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" +version = "3.6.0" + +[[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" + +[[InteractiveUtils]] +deps = ["Markdown"] +uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" + +[[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" + +[[Markdown]] +deps = ["Base64"] +uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" + +[[Mmap]] +uuid = "a63ad114-7e13-5084-954f-fe012c677804" + +[[Pkg]] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" + +[[Printf]] +deps = ["Unicode"] +uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" + +[[REPL]] +deps = ["InteractiveUtils", "Markdown", "Sockets"] +uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" + +[[Random]] +deps = ["Serialization"] +uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" + +[[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" + +[[SparseArrays]] +deps = ["LinearAlgebra", "Random"] +uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" + +[[Statistics]] +deps = ["LinearAlgebra", "SparseArrays"] +uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" + +[[Test]] +deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[[UUIDs]] +deps = ["Random", "SHA"] +uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + +[[Unicode]] +uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/Project.toml b/Project.toml new file mode 100644 index 0000000..7567c76 --- /dev/null +++ b/Project.toml @@ -0,0 +1,13 @@ +name = "DeepDiffs" +uuid = "ab62b9b5-e342-54a8-a765-a90f495de1a6" +keywords = ["diff"] +version = "0.1.0" + +[deps] +Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" + +[extras] +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["Test"] diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index 913499f..0000000 --- a/REQUIRE +++ /dev/null @@ -1,2 +0,0 @@ -julia 0.6 -Compat 0.62.0 diff --git a/test/runtests.jl b/test/runtests.jl index d5d08fc..6ce250f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,6 +1,6 @@ using DeepDiffs using Compat -using Compat.Test +using Test if isdefined(Base, :have_color) # Capture the original state of the global flag From b65f84cd0013b20a4d0c95046abdf963c8d08cf2 Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 01:26:14 +0100 Subject: [PATCH 2/9] Add license and description in Project.toml --- Project.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Project.toml b/Project.toml index 7567c76..beb8001 100644 --- a/Project.toml +++ b/Project.toml @@ -1,5 +1,7 @@ name = "DeepDiffs" uuid = "ab62b9b5-e342-54a8-a765-a90f495de1a6" +license = "MIT" +desc = "Compute and pretty-print diffs for data structures like arrays and dictionaries" keywords = ["diff"] version = "0.1.0" From fcd684c2e6b74b8ff92f8339bf10a01b9472a409 Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 01:27:41 +0100 Subject: [PATCH 3/9] Add [compat] to Project.toml --- Project.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Project.toml b/Project.toml index beb8001..04fb3d8 100644 --- a/Project.toml +++ b/Project.toml @@ -8,6 +8,10 @@ version = "0.1.0" [deps] Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" +[compat] +Compat = "3" +julia = "1" + [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From ab25c0404a469f1ff669dabc8b02dfd54520b42a Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 16:18:38 +0100 Subject: [PATCH 4/9] Upadte travis.yml and appveyor.yml --- .travis.yml | 2 +- Manifest.toml | 94 --------------------------------------------------- appveyor.yml | 4 +-- 3 files changed, 3 insertions(+), 97 deletions(-) delete mode 100644 Manifest.toml diff --git a/.travis.yml b/.travis.yml index 03c88c1..a4a533c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ os: - linux - osx julia: - - 0.6 + - 1.3 - nightly notifications: email: false diff --git a/Manifest.toml b/Manifest.toml deleted file mode 100644 index 9b2bcb6..0000000 --- a/Manifest.toml +++ /dev/null @@ -1,94 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[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 = "c437ba8bb82f5ec9a5d8cb881031ffa2dbe1038c" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.6.0" - -[[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" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[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" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[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" - -[[SparseArrays]] -deps = ["LinearAlgebra", "Random"] -uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - -[[Statistics]] -deps = ["LinearAlgebra", "SparseArrays"] -uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/appveyor.yml b/appveyor.yml index 90029fa..976e76e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ environment: matrix: - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe" + - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0.5-win32.exe" + - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0.5-win64.exe" - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" From e071a098416740efb94d736edcfb86ef2f7b8a77 Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 16:24:38 +0100 Subject: [PATCH 5/9] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8c960ec..3f02ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.jl.cov *.jl.*.cov *.jl.mem +Manifest.toml From 1b0df2a8a48cd8ec5cb4018596bb32835ff12fcc Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 16:25:16 +0100 Subject: [PATCH 6/9] Remove compat dependency and version <0.7 checking --- Project.toml | 6 +----- src/DeepDiffs.jl | 11 +++-------- test/display.jl | 6 ------ test/runtests.jl | 1 - 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Project.toml b/Project.toml index 04fb3d8..152dea3 100644 --- a/Project.toml +++ b/Project.toml @@ -1,15 +1,11 @@ name = "DeepDiffs" uuid = "ab62b9b5-e342-54a8-a765-a90f495de1a6" +keywords = ["diff"] license = "MIT" desc = "Compute and pretty-print diffs for data structures like arrays and dictionaries" -keywords = ["diff"] version = "0.1.0" -[deps] -Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" - [compat] -Compat = "3" julia = "1" [extras] diff --git a/src/DeepDiffs.jl b/src/DeepDiffs.jl index f534f7d..e37ebd6 100644 --- a/src/DeepDiffs.jl +++ b/src/DeepDiffs.jl @@ -1,7 +1,5 @@ module DeepDiffs -using Compat - export deepdiff, added, removed, changed, before, after export SimpleDiff, VectorDiff, StringDiff, DictDiff @@ -13,12 +11,9 @@ function fieldequal(x::T, y::T) where T true end -# Determine whether color is supported by the given stream -@static if VERSION >= v"0.7.0-DEV.3077" - hascolor(io::IO) = get(IOContext(io), :color, false) -else - hascolor(io::IO) = Base.have_color -end + +hascolor(io::IO) = get(IOContext(io), :color, false) + """ diff = deepdiff(obj1, obj2) diff --git a/test/display.jl b/test/display.jl index 3c34ae7..175c352 100644 --- a/test/display.jl +++ b/test/display.jl @@ -2,17 +2,11 @@ # Return a stream with color set as specified. On 0.6 this requires setting # a global flag, and the :color property in the IOContext has no effect. function setcolor(yn::Bool) - if VERSION < v"0.7.0-DEV.3077" - eval(Base, :(have_color = $yn)) - end IOContext(IOBuffer(), :color=>yn) end function resetcolor() global orig_color - if VERSION < v"0.7.0-DEV.3077" - eval(Base, :(have_color = $orig_color)) - end nothing end diff --git a/test/runtests.jl b/test/runtests.jl index 6ce250f..38c1960 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,5 +1,4 @@ using DeepDiffs -using Compat using Test if isdefined(Base, :have_color) From c77f5a8d47a6f9ea832c22459988c778e0ae8dff Mon Sep 17 00:00:00 2001 From: Luciano Rolando Lorenti Date: Tue, 25 Feb 2020 16:28:43 +0100 Subject: [PATCH 7/9] Update appveyor.yml --- appveyor.yml | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 976e76e..c083dbf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,11 @@ environment: matrix: - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0.5-win32.exe" - - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0.5-win64.exe" - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe" - - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe" + - julia_version: 1 + - julia_version: nightly + +platform: + - x86 # 32-bit + - x64 # 64-bit branches: only: @@ -17,24 +19,12 @@ notifications: on_build_status_changed: false install: - - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12" -# if there's a newer build queued for the same PR, cancel this one - - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` - https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` - Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` - throw "There are newer queued builds for this pull request, failing early." } -# Download most recent Julia Windows binary - - ps: (new-object net.webclient).DownloadFile( - $env:JULIA_URL, - "C:\projects\julia-binary.exe") -# Run installer silently, output to C:\projects\julia - - C:\projects\julia-binary.exe /S /D=C:\projects\julia + - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) build_script: -# Need to convert from shallow to complete for Pkg.clone to work - - IF EXIST .git\shallow (git fetch --unshallow) - - C:\projects\julia\bin\julia -e "versioninfo(); - Pkg.clone(pwd(), \"DeepDiffs\"); Pkg.build(\"DeepDiffs\")" + - echo "%JL_BUILD_SCRIPT%" + - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" test_script: - - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"DeepDiffs\")" + - echo "%JL_TEST_SCRIPT%" + - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" \ No newline at end of file From 41de9f073fd2d910c5bebd04870735b30be4daf3 Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Wed, 18 Mar 2020 20:52:17 -0400 Subject: [PATCH 8/9] Some minor CI tweaks --- appveyor.yml => .appveyor.yml | 3 ++- Project.toml | 2 +- test/Project.toml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) rename appveyor.yml => .appveyor.yml (89%) create mode 100644 test/Project.toml diff --git a/appveyor.yml b/.appveyor.yml similarity index 89% rename from appveyor.yml rename to .appveyor.yml index c083dbf..a22bcdb 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,6 @@ environment: matrix: + - julia_version: 1.0 - julia_version: 1 - julia_version: nightly @@ -27,4 +28,4 @@ build_script: test_script: - echo "%JL_TEST_SCRIPT%" - - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" \ No newline at end of file + - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" diff --git a/Project.toml b/Project.toml index 152dea3..c775d68 100644 --- a/Project.toml +++ b/Project.toml @@ -3,7 +3,7 @@ uuid = "ab62b9b5-e342-54a8-a765-a90f495de1a6" keywords = ["diff"] license = "MIT" desc = "Compute and pretty-print diffs for data structures like arrays and dictionaries" -version = "0.1.0" +version = "1.1.1" [compat] julia = "1" diff --git a/test/Project.toml b/test/Project.toml new file mode 100644 index 0000000..9cccdcf --- /dev/null +++ b/test/Project.toml @@ -0,0 +1,2 @@ +[deps] +DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6" From 31d813da14e230d640533e65deb695e295b4dd82 Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Wed, 18 Mar 2020 21:01:36 -0400 Subject: [PATCH 9/9] adds Test to test/project.toml --- test/Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/Project.toml b/test/Project.toml index 9cccdcf..645bfa5 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,2 +1,3 @@ [deps] DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"