Skip to content

Commit db8471f

Browse files
authored
Merge pull request #38 from JuliaString/spj/update
Add Appveyor support, update README.md, and allow nightly failures
2 parents 2526172 + 65a5fbc commit db8471f

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ git:
1313

1414
## uncomment the following lines to allow failures on nightly julia
1515
## (tests will run but not make your overall status red)
16-
#matrix:
17-
# allow_failures:
18-
# - julia: nightly
16+
matrix:
17+
allow_failures:
18+
- julia: nightly
1919

2020
# uncomment the following lines to override the default test script
2121
script:
2222
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
23-
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg) ; if VERSION < v"0.7.0-DEV.5183" ; Pkg.add("Compat") ; Pkg.clone(pwd()) ; Pkg.build("Format"); end ; Pkg.test("Format"; coverage=true)'
23+
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg) ; if VERSION < v"0.7.0-DEV.5183" ; Pkg.add("Compat") ; Pkg.clone(pwd()) ; end ; Pkg.test("Format"; coverage=true)'
2424
after_success:
2525
# push coverage results to Coveralls
2626
- julia -e 'cd(Pkg.dir("Format")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MIT"
66
repo = "https://github.com/JuliaString/Format.jl.git"
77
git-tree-sha1 = "08516ad5a1004cfd0ac67ddf180a4e94ad7e47e2"
88
uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
9-
version = "0.6.2"
9+
version = "0.6.3"
1010

1111
[deps]
1212
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

README.md

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,38 @@
22

33
This package offers Python-style general formatting and c-style numerical formatting (for speed).
44

5-
| **Info** | **Package Status** | **Package Evaluator** | **Coverage** |
6-
|:------------------:|:------------------:|:---------------------:|:-----------------:|
7-
| [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE.md) | [![Build Status](https://travis-ci.org/JuliaString/Format.jl.svg?branch=newmaster)](https://travis-ci.org/JuliaString/Format.jl) | [![Format](http://pkg.julialang.org/badges/Format_0.6.svg)](http://pkg.julialang.org/?pkg=Format) | [![Coverage Status](https://coveralls.io/repos/github/JuliaString/Format.jl/badge.svg?branch=newmaster)](https://coveralls.io/github/JuliaString/Format.jl?branch=newmaster)
8-
| [![Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JuliaString/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | | [![Format](http://pkg.julialang.org/badges/Format_0.7.svg)](http://pkg.julialang.org/?pkg=Format) | [![codecov.io](http://codecov.io/github/JuliaString/Format.jl/coverage.svg?branch=newmaster)](http://codecov.io/github/JuliaString/Format.jl?branch=newmaster)
9-
5+
| **Info** | **Windows** | **Linux & MacOS** | **Package Evaluator** | **CodeCov** | **Coveralls** |
6+
|:------------------:|:------------------:|:---------------------:|:-----------------:|:---------------------:|:-----------------:|
7+
| [![][license-img]][license-url] | [![][app-s-img]][app-s-url] | [![][travis-s-img]][travis-url] | [![][pkg-s-img]][pkg-s-url] | [![][codecov-img]][codecov-url] | [![][coverall-s-img]][coverall-s-url]
8+
| [![][gitter-img]][gitter-url] | [![][app-m-img]][app-m-url] | [![][travis-m-img]][travis-url] | [![][pkg-m-img]][pkg-m-url] | [![][codecov-img]][codecov-url] | [![][coverall-m-img]][coverall-m-url]
9+
10+
[license-img]: http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat
11+
[license-url]: LICENSE.md
12+
13+
[gitter-img]: https://badges.gitter.im/Join%20Chat.svg
14+
[gitter-url]: https://gitter.im/JuliaString/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
15+
16+
[travis-url]: https://travis-ci.org/JuliaString/Format.jl
17+
[travis-s-img]: https://travis-ci.org/JuliaString/Format.jl.svg
18+
[travis-m-img]: https://travis-ci.org/JuliaString/Format.jl.svg?branch=newmaster
19+
20+
[app-s-url]: https://ci.appveyor.com/project/ScottPJones/format-jl
21+
[app-m-url]: https://ci.appveyor.com/project/ScottPJones/format-jl/branch/newmaster
22+
[app-s-img]: https://ci.appveyor.com/api/projects/status/9wb580eyjv4k3iej?svg=true
23+
[app-m-img]: https://ci.appveyor.com/api/projects/status/9wb580eyjv4k3iej/branch/newmaster?svg=true
24+
25+
[pkg-s-url]: http://pkg.julialang.org/?pkg=Format
26+
[pkg-m-url]: http://pkg.julialang.org/?pkg=Format
27+
[pkg-s-img]: http://pkg.julialang.org/badges/Format_0.6.svg
28+
[pkg-m-img]: http://pkg.julialang.org/badges/Format_0.7.svg
29+
30+
[codecov-url]: https://codecov.io/gh/JuliaString/Format.jl
31+
[codecov-img]: https://codecov.io/gh/JuliaString/Format.jl/branch/newmaster/graph/badge.svg
32+
33+
[coverall-s-url]: https://coveralls.io/github/JuliaString/Format.jl
34+
[coverall-m-url]: https://coveralls.io/github/JuliaString/Format.jl?branch=newmaster
35+
[coverall-s-img]: https://coveralls.io/repos/github/JuliaString/Format.jl/badge.svg
36+
[coverall-m-img]: https://coveralls.io/repos/github/JuliaString/Format.jl/badge.svg?branch=newmaster
1037

1138
## Getting Started
1239

appveyor.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ install:
3838
build_script:
3939
# Need to convert from shallow to complete for Pkg.clone to work
4040
- IF EXIST .git\shallow (git fetch --unshallow)
41-
- C:\projects\julia\bin\julia -e "versioninfo();
42-
Pkg.clone(pwd(), \"Format\"); Pkg.build(\"Format\")"
41+
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using InteractiveUtils);
42+
versioninfo();
43+
if VERSION < v\"0.7.0-DEV.5183\";
44+
Pkg.add(\"Compat\");
45+
Pkg.clone(pwd(), \"Format\");
46+
end"
4347

4448
test_script:
45-
- C:\projects\julia\bin\julia -e "Pkg.test(\"Format\")"
49+
- C:\projects\julia\bin\julia -e "VERSION < v\"0.7.0-DEV\" || (using Pkg); Pkg.test(\"Format\")"

0 commit comments

Comments
 (0)