Skip to content

Commit

Permalink
Work around Pkg3 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottPJones committed May 25, 2018
1 parent e2072d4 commit 899dd23
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ git:
# - julia: nightly

# uncomment the following lines to override the default test script
#script:
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# - julia -e 'Pkg.clone("https://github.com/JuliaString/StrTables.jl.git"); Pkg.add("JSON"); Pkg.clone(pwd()); Pkg.build("Emoji_Entities"); Pkg.test("Emoji_Entities"; coverage=true)'
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'if VERSION < v"0.7.0-DEV" ; Pkg.add("StrTables"); Pkg.add("JSON"); Pkg.clone(pwd()); Pkg.build("Emoji_Entities"); else ; using Pkg ; end ; Pkg.test("Emoji_Entities"; coverage=true)'
after_success:
# push coverage results to Coveralls
- julia -e 'VERSION < v"0.7.0-DEV" || (using Pkg); cd(Pkg.dir("Emoji_Entities")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
Expand Down
8 changes: 6 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name = "Emoji_Entities"
desc = "Entities from Emoji data tables"
keywords = ["Entities", "Emoji"]
authors = ["ScottPJones <scottjones@alum.mit.edu>"]
license = "MIT"
name = "Emoji_Entities"
uuid = "fd8f23de-bd2f-5c75-921c-0c9ab51355f5"
repo = "https://github.com/JuliaString/Emoji_Entities.jl.git"
git-tree-sha1 = "30baf46453092c81f312ca4013018f7691f524aa"
uuid = "fd8f23de-bd2f-5c75-921c-0c9ab51355f5"
version = "0.2.2"
#deps = ["JSON", "Pkg", "StrTables", "Test"]
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ environment:

## 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"
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"

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const vers = "master" # Julia used 0f0cf4ea8845eb52d26df2a48c3c31c3b8cad14e
const dpath = "https://raw.githubusercontent.com/iamcal/emoji-data/"

const fname = "emoji.dat"
const datapath = joinpath(pkg_dir(), "Emoji_Entities", "data")
const datapath = "../data"

const disp = [false]

Expand Down
2 changes: 1 addition & 1 deletion src/Emoji_Entities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ end

function __init__()
global default =
Emoji_Table(StrTables.load(joinpath(pkg_dir("Emoji_Entities"), "data", "emoji.dat"))...)
Emoji_Table(StrTables.load(joinpath(@__DIR__, "../data", "emoji.dat"))...)
nothing
end

Expand Down

0 comments on commit 899dd23

Please sign in to comment.