Skip to content

Commit bc68ea7

Browse files
committed
Work around Pkg3 changes
1 parent d7423ad commit bc68ea7

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

.travis.yml

Lines changed: 6 additions & 6 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
21-
#script:
22-
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
23-
# - julia -e 'Pkg.clone("https://github.com/JuliaString/StrTables.jl.git"); Pkg.clone(pwd()); Pkg.build("HTML_Entities"); Pkg.test("HTML_Entities"; coverage=true)'
21+
script:
22+
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
23+
- julia -e 'f = VERSION < v"0.7.0-DEV" ; f || (using Pkg) ; const clone = ifelse(f, Pkg.clone, Pkg.add) ; p="https://github.com/JuliaString"; s=".jl.git"; clone("$p/StrTables$s"); clone(pwd()); Pkg.build("HTML_Entities"); Pkg.test("HTML_Entities"; coverage=true)'
2424
after_success:
2525
# push coverage results to Coveralls
2626
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("HTML_Entities")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# HTML_Entities
22

3-
[![HTML_Entities](http://pkg.julialang.org/badges/HTML_Entities_0.6.svg)](http://pkg.julialang.org/detail/HTML_Entities)
4-
[![HTML_Entities](http://pkg.julialang.org/badges/HTML_Entities_0.7.svg)](http://pkg.julialang.org/detail/HTML_Entities)
5-
[![Build Status](https://travis-ci.org/JuliaString/HTML_Entities.jl.svg?branch=master)](https://travis-ci.org/JuliaString/HTML_Entities.jl)
6-
7-
[![Coverage Status](https://coveralls.io/repos/github/JuliaString/HTML_Entities.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaString/HTML_Entities.jl?branch=master)
8-
[![codecov.io](http://codecov.io/github/JuliaString/HTML_Entities.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaString/HTML_Entities.jl?branch=master)
3+
| **Info** | **Package Status** | **Package Evaluator** | **Coverage** |
4+
|:------------------:|:------------------:|:---------------------:|:-----------------:|
5+
| [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)](LICENSE.md) | [![Build Status](https://travis-ci.org/JuliaString/HTML_Entities.jl.svg?branch=master)](https://travis-ci.org/JuliaString/HTML_Entities.jl) | [![HTML_Entities](http://pkg.julialang.org/badges/HTML_Entities_0.6.svg)](http://pkg.julialang.org/?pkg=HTML_Entities) | [![Coverage Status](https://coveralls.io/repos/github/JuliaString/HTML_Entities.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaString/HTML_Entities.jl?branch=master) |
6+
| [![Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JuliaString/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) | | [![HTML_Entities](http://pkg.julialang.org/badges/HTML_Entities_0.7.svg)](http://pkg.julialang.org/?pkg=HTML_Entities) | [![codecov.io](http://codecov.io/github/JuliaString/HTML_Entities.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaString/HTML_Entities.jl?branch=master) |
97

108
HTML_Entities.jl: Support for using HTML entity names for characters
119
====================================================================

appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ environment:
77

88
## uncomment the following lines to allow failures on nightly julia
99
## (tests will run but not make your overall status red)
10-
#matrix:
11-
# allow_failures:
12-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
13-
# - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
10+
matrix:
11+
allow_failures:
12+
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
13+
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
1414

1515
branches:
1616
only:

deps/build.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include(inpname)
1515
const disp = [false]
1616

1717
const fname = "html.dat"
18-
const datapath = joinpath(pkg_dir("HTML_Entities"), "data")
18+
const datapath = "../data"
1919

2020
const empty_str = ""
2121

src/HTML_Entities.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ end
3030

3131
function __init__()
3232
global default =
33-
HTML_Table(StrTables.load(joinpath(pkg_dir("HTML_Entities"), "data", "html.dat"))...)
33+
HTML_Table(StrTables.load(joinpath(@__DIR__, "../data", "html.dat"))...)
3434
nothing
3535
end
3636
end # module HTML_Entities

0 commit comments

Comments
 (0)