From 5194e49b4cbb371716ba41c9efa814a0f43d0296 Mon Sep 17 00:00:00 2001 From: Daniel Schwabeneder Date: Sun, 22 Mar 2020 18:31:08 +0100 Subject: [PATCH 1/6] test on 1.4 and update version --- .gitignore | 1 + .travis.yml | 2 +- Project.toml | 2 +- appveyor.yml | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0c89a967..6e5cdbe6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ deps/build.log deps/deps.jl Manifest.toml dev/ +test/tmpplotsave.hdf5 diff --git a/.travis.yml b/.travis.yml index b8ae53eb..113a0972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ os: # - osx julia: - 1 - - 1.3 + - 1.4 - nightly matrix: diff --git a/Project.toml b/Project.toml index f03c1ed2..26d82018 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Plots" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" author = ["Tom Breloff (@tbreloff)"] -version = "0.29.8" +version = "0.29.9" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" diff --git a/appveyor.yml b/appveyor.yml index 890f4960..61883cf7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ environment: matrix: # - julia_version: 0.7 - julia_version: 1 - - julia_version: 1.3 + - julia_version: 1.4 - julia_version: nightly platform: @@ -36,7 +36,7 @@ build_script: - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" - echo "%JL_BUILD_SCRIPT%" - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" - + test_script: - echo "%JL_TEST_SCRIPT%" - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%" From 8efd0f00c4d761031ae168ab63016ae5d22863fa Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Wed, 25 Mar 2020 10:45:46 +0100 Subject: [PATCH 2/6] fix pin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 113a0972..0ca9ae82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,4 +35,4 @@ notifications: script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi - - $TESTCMD -e 'using Pkg; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' + - $TESTCMD -e 'using Pkg; Pkg.resolve(); Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' From dd3216489b3e7e30df14cfb0409fbf7485a2d2f4 Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Wed, 25 Mar 2020 14:48:57 +0100 Subject: [PATCH 3/6] resolve conditionally --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ca9ae82..e380db24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,4 +35,4 @@ notifications: script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi - - $TESTCMD -e 'using Pkg; Pkg.resolve(); Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' + - $TESTCMD -e 'using Pkg; VERSION == v"1.4" ? Pkg.resolve() : nothing; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' From 53183529297e9aa835bd4f4dce9cdcfb1327af70 Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Wed, 25 Mar 2020 14:50:42 +0100 Subject: [PATCH 4/6] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 61883cf7..c67bb234 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) build_script: - - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" + - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; VERSION == v"""1.4""" ? Pkg.resolve() : nothing; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" - echo "%JL_BUILD_SCRIPT%" - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%" From d9a48ac7de4e67e13dfb74a1dd26c7b2eef200fa Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Wed, 25 Mar 2020 16:36:04 +0100 Subject: [PATCH 5/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e380db24..aa1f8bfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,4 +35,4 @@ notifications: script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi - - $TESTCMD -e 'using Pkg; VERSION == v"1.4" ? Pkg.resolve() : nothing; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' + - $TESTCMD -e 'using Pkg; if VERSION == v"1.4"; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="FixedPointNumbers", version="0.7")); Pkg.build(); Pkg.test(coverage=true)' From c37829eafb8d49a92e95d4a32a9c29c9386e07f8 Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Wed, 25 Mar 2020 16:55:53 +0100 Subject: [PATCH 6/6] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c67bb234..7742efb2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ install: - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1")) build_script: - - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; VERSION == v"""1.4""" ? Pkg.resolve() : nothing; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" + - C:\julia\bin\julia --project=C:\projects\plots-jl -e "using Pkg; if VERSION == v"""1.4"""; Pkg.resolve(); end; Pkg.pin(PackageSpec(name="""FixedPointNumbers""", version="""0.7"""))" - echo "%JL_BUILD_SCRIPT%" - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"