Skip to content

Commit

Permalink
1.0 compliance. Fix of the build scripts.
Browse files Browse the repository at this point in the history
  • Loading branch information
sambitdash committed Aug 12, 2018
1 parent 12af581 commit 2ffba32
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 47 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ os:
- linux
- osx
julia:
- 0.6
- 0.7
- 1.0
- nightly
notifications:
email: false
Expand All @@ -30,7 +29,5 @@ git:
#script:
# - julia -e 'Pkg.clone(pwd()); Pkg.build("LabelNumerals"); Pkg.test("LabelNumerals"; coverage=true)'
after_success:
# push coverage results to Coveralls
- julia -e 'cd(Pkg.dir("LabelNumerals")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
# push coverage results to Codecov
- julia -e 'cd(Pkg.dir("LabelNumerals")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
# push coverage results to Codecov
- julia -e 'import LabelNumerals; cd(joinpath(dirname(pathof(LabelNumerals)), "..")); using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
3 changes: 1 addition & 2 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
julia 0.6
Compat
julia 1.0
RomanNumerals 0.3.1
51 changes: 23 additions & 28 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
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://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"

## uncomment the following lines to allow failures on nightly julia
## (tests will run but not make your overall status red)
#matrix:
# allow_failures:
# - 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

# # Uncomment the following lines to allow failures on nightly julia
# # (tests will run but not make your overall status red)
# matrix:
# allow_failures:
# - julia_version: latest

branches:
only:
Expand All @@ -24,24 +25,18 @@ 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(), \"LabelNumerals\"); Pkg.build(\"LabelNumerals\")"
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
- C:\projects\julia\bin\julia -e "Pkg.test(\"LabelNumerals\")"
- echo "%JL_TEST_SCRIPT%"
- C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

# # Uncomment to support code coverage upload. Should only be enabled for packages
# # which would have coverage gaps without running on Windows
# on_success:
# - echo "%JL_CODECOV_SCRIPT%"
# - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
1 change: 0 additions & 1 deletion src/AlphaNumNumeral.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Compat
# Base 26 number where alphabets are numbers.

"""
Expand Down
1 change: 0 additions & 1 deletion src/AlphaNumeral.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Compat
"""
```
AlphaNumeral
Expand Down
1 change: 0 additions & 1 deletion src/ExtNumerals.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Compat
# Regex to validate a Roman numeral
using RomanNumerals

Expand Down
2 changes: 0 additions & 2 deletions src/LabelNumeral.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Compat

# Base 26 number where alphabets are numbers.

"""
Expand Down
2 changes: 0 additions & 2 deletions src/LabelNumerals.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ export LabelNumeral, findLabels,
@ln_str, LookupNumeral, registerLookupNumerals,
@ann_str, AlphaNumNumeral

using Compat

allNumerals = [AlphaNumeral, RomanNumeral, Int, LookupNumeral, AlphaNumNumeral]

"""
Expand Down
2 changes: 0 additions & 2 deletions src/LookupNumeral.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Compat

"""
```
LookupNumeral
Expand Down
3 changes: 1 addition & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Compat
using Compat.Test
using Test
using LabelNumerals
using RomanNumerals

Expand Down

0 comments on commit 2ffba32

Please sign in to comment.