Skip to content

Commit

Permalink
Merge pull request #144 from JuliaTime/cv/1.0-ready
Browse files Browse the repository at this point in the history
Julia 1.0 ready
  • Loading branch information
omus authored Aug 10, 2018
2 parents 187e9e0 + e638f1e commit 2affcd4
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 42 deletions.
21 changes: 18 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ os:
julia:
- 0.6
- 0.7
- 1.0
- nightly
env:
- JULIA_PROJECT="@."
notifications:
email: false
env:
Expand All @@ -14,7 +17,19 @@ script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# Avoid setting JULIA_TZ_VERSION if the deps/build.jl file has been modified
- git fetch origin +:refs/remotes/origin/HEAD; if ! git diff --quiet origin/HEAD HEAD -- deps/build.jl; then unset JULIA_TZ_VERSION; fi
- julia -e 'Pkg.clone(pwd()); Pkg.build("TimeZones"); Pkg.test("TimeZones"; coverage=true)'
- |
julia -e '
VERSION >= v"0.7.0-DEV.3656" && using Pkg
if VERSION >= v"0.7.0-DEV.5183" && (isfile("Project.toml") || isfile("JuliaProject.toml"))
Pkg.build(); Pkg.test(coverage=true)
else
Pkg.clone(pwd()); Pkg.build("TimeZones"); Pkg.test("TimeZones"; coverage=true)
end'
after_success:
- julia -e 'cd(Pkg.dir("TimeZones")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
- julia -e 'cd(Pkg.dir("TimeZones")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
- |
julia -e '
VERSION >= v"0.7.0-DEV.3656" && using Pkg
VERSION >= v"0.7.0-DEV.5183" || cd(Pkg.dir("TimeZones"))
Pkg.add("Coverage"); using Coverage
Codecov.submit(process_folder())
Coveralls.submit(Coveralls.process_folder())'
6 changes: 3 additions & 3 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
julia 0.6
Compat 0.66
Mocking 0.4.1
Nullables 0.0.3
@windows EzXML 0.6
Mocking 0.5.6
Nullables 0.0.7
@windows EzXML 0.7.3
47 changes: 15 additions & 32 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,26 @@ environment:
JULIA_TZ_VERSION: "2016j"

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/0.7/julia-0.7-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-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: 0.6
- julia_version: 0.7
- julia_version: 1.0
- julia_version: latest

matrix:
allow_failures:
# Failing due to https://github.com/bicycle1885/EzXML.jl/issues/66
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-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"
platform:
- x86 # 32-bit
- x64 # 64-bit

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 --depwarn=no -e "versioninfo();
Pkg.clone(pwd(), \"TimeZones\"); Pkg.build(\"TimeZones\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"TimeZones\", coverage=true)"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

after_test:
- C:\projects\julia\bin\julia -e "cd(Pkg.dir(\"TimeZones\")); Pkg.add(\"Coverage\"); using Coverage; Codecov.submit(process_folder())"
on_success:
- echo "%JL_CODECOV_SCRIPT%"
- C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
2 changes: 1 addition & 1 deletion src/TimeZones.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__precompile__()
VERSION < v"0.7.0-beta2.199" && __precompile__()

module TimeZones

Expand Down
2 changes: 1 addition & 1 deletion src/arithmetic.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Base: +, -, .+, .-
import Base: +, -
import Compat: @static

if VERSION < v"0.7.0-DEV.4955"
Expand Down
4 changes: 2 additions & 2 deletions src/winzone/WindowsTimeZoneIDs.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module WindowsTimeZoneIDs

using Compat: @info
using Compat: @info, findall

import ...TimeZones: DEPS_DIR
using EzXML
Expand All @@ -20,7 +20,7 @@ function compile(xml_file::AbstractString)
doc = readxml(xml_file)

# Territory "001" is the global default
map_zones = find(doc, "//mapZone[@territory='001']")
map_zones = findall(doc, "//mapZone[@territory='001']")

# TODO: Eliminate the Etc/* POSIX names here? See Windows section of `localzone`

Expand Down

0 comments on commit 2affcd4

Please sign in to comment.