Skip to content

Commit ced84c3

Browse files
ScottPJonesScottPJones
authored
Merge pull request #3 from JuliaString/spj/updateci
Update CI, update for Julia 1.0
2 parents 54fa84a + 05594fc commit ced84c3

File tree

6 files changed

+67
-78
lines changed

6 files changed

+67
-78
lines changed

‎.drone.yml

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,27 @@
11
---
22
kind: pipeline
3-
name: linux - arm - Julia 1.0
4-
5-
platform:
6-
os: linux
7-
arch: arm
8-
9-
steps:
10-
- name: build
11-
image: julia:1.0
12-
commands:
13-
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
14-
15-
---
16-
kind: pipeline
17-
name: linux - arm - Julia 1.5
18-
platform:
19-
os: linux
20-
arch: arm
21-
22-
steps:
23-
- name: build
24-
image: julia:1.5
25-
commands:
26-
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
27-
28-
---
29-
kind: pipeline
30-
name: linux - arm64 - Julia 1.0
3+
name: linux - arm64 - Julia 1.5
314

325
platform:
336
os: linux
347
arch: arm64
358

369
steps:
3710
- name: build
38-
image: julia:1.0
11+
image: julia:1.5
3912
commands:
4013
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
41-
14+
4215
---
4316
kind: pipeline
44-
name: linux - arm64 - Julia 1.5
17+
name: linux - arm64 - Julia 1.6
4518

4619
platform:
4720
os: linux
4821
arch: arm64
4922

5023
steps:
5124
- name: build
52-
image: julia:1.5
25+
image: julia:1.6
5326
commands:
5427
- "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

‎.github/workflows/ci.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: CI
2+
on:
3+
- push
4+
- pull_request
5+
jobs:
6+
test:
7+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
8+
runs-on: ${{ matrix.os }}
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
version:
13+
- '1.5'
14+
- '1.6'
15+
- 'nightly'
16+
os:
17+
- ubuntu-latest
18+
- macOS-latest
19+
- windows-latest
20+
arch:
21+
- x64
22+
- x86
23+
exclude:
24+
- os: macOS-latest
25+
arch: x86
26+
steps:
27+
- uses: actions/checkout@v2
28+
- uses: julia-actions/setup-julia@v1
29+
with:
30+
version: ${{ matrix.version }}
31+
arch: ${{ matrix.arch }}
32+
- uses: actions/cache@v1
33+
env:
34+
cache-name: cache-artifacts
35+
with:
36+
path: ~/.julia/artifacts
37+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
38+
restore-keys: |
39+
${{ runner.os }}-test-${{ env.cache-name }}-
40+
${{ runner.os }}-test-
41+
${{ runner.os }}-
42+
- uses: julia-actions/julia-buildpkg@v1
43+
- uses: julia-actions/julia-runtest@v1

‎.travis.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Project.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ authors = ["ScottPJones <scottjones@alum.mit.edu>"]
44
keywords = ["Strings", "Literals", "Entities", "Unicode", "HTML", "LaTeX", "Emoji"]
55
license = "MIT"
66
uuid = "42b7a45b-8021-5b99-aff5-7432580bee1c"
7-
version = "1.0.0"
7+
version = "1.0.1"
88

99
[deps]
1010
ModuleInterfaceTools = "5cb8414e-7aab-5a03-a681-351269c074bf"
@@ -22,11 +22,11 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2222
test = ["Test"]
2323

2424
[compat]
25-
julia = "^1.0.0"
26-
ModuleInterfaceTools = "≥ 1.0.0"
27-
Emoji_Entities = "≥ 1.0.0"
28-
LaTeX_Entities = "≥ 1.0.0"
29-
StrLiterals = "≥ 1.0.0"
30-
HTML_Entities = "≥ 1.0.0"
31-
StrTables = "≥ 1.0.0"
32-
Unicode_Entities = "≥ 1.0.0"
25+
julia = "^1.5"
26+
ModuleInterfaceTools = "^1.0.1"
27+
Emoji_Entities = "^1.0.3"
28+
HTML_Entities = "1"
29+
LaTeX_Entities = "^1.0.2"
30+
Unicode_Entities = "^1.1.1"
31+
StrLiterals = "^1.1"
32+
StrTables = "1"

‎README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
[gitter-img]: https://badges.gitter.im/Join%20Chat.svg
1515
[gitter-url]: https://gitter.im/JuliaString/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
1616

17-
[travis-url]: https://travis-ci.org/JuliaString/StrEntities.jl
18-
[travis-s-img]: https://travis-ci.org/JuliaString/StrEntities.jl.svg
19-
[travis-m-img]: https://travis-ci.org/JuliaString/StrEntities.jl.svg?branch=master
17+
[checks]: https://img.shields.io/github/checks-status/JuliaString/StrEntities.jl/master
2018

2119
[codecov-url]: https://codecov.io/gh/JuliaString/StrEntities.jl
2220
[codecov-img]: https://codecov.io/gh/JuliaString/StrEntities.jl/branch/master/graph/badge.svg
@@ -27,8 +25,8 @@
2725

2826
| **Julia Version** | **Unit Tests** | **Coverage** |
2927
|:------------------:|:------------------:|:---------------------:|
30-
| [![][julia-release]][julia-url] | [![][travis-s-img]][travis-url] | [![][codecov-img]][codecov-url]
31-
| Julia Latest | [![][travis-m-img]][travis-url] | [![][codecov-img]][codecov-url]
28+
| [![][julia-release]][julia-url] | | [![][codecov-img]][codecov-url]
29+
| Julia Latest | [![][checks]][pkg-url] | [![][codecov-img]][codecov-url]
3230

3331
StrEntities extends the string literals provided by the [StrLiterals](https://github.com/JuliaString/StrLiterals.jl) package.
3432
It adds support for HTML, LaTeX, Unicode and Emoji entities, provided by the packages:

‎src/StrEntities.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
__precompile__(true)
21
""""
32
Add LaTeX, Emoji, HTML, and Unicode names to Str string literals
43
5-
Copyright 2018 Gandalf Software, Inc., Scott P. Jones
4+
Copyright 2018-2021 Gandalf Software, Inc., Scott P. Jones
65
Licensed under MIT License, see LICENSE.md
76
"""
87
module StrEntities
@@ -12,12 +11,15 @@ using HTML_Entities, LaTeX_Entities, Emoji_Entities, Unicode_Entities
1211

1312
@api extend! StrLiterals
1413

14+
# Export from here as well so that people can do just `using StrEntities`
15+
export @f_str, @pr_str, @F_str, @PR_str, @sym_str
16+
1517
function _parse_entity(io, str, pos, begseq, fin, tab, nam)
1618
beg = pos # start location
17-
chr, pos = str_next(str, pos)
19+
chr, pos = iterate(str, pos)
1820
while chr != fin
1921
check_done(str, pos, "\\$begseq missing ending $fin")
20-
chr, pos = str_next(str, pos)
22+
chr, pos = iterate(str, pos)
2123
end
2224
seq = lookupname(tab, str[beg:pos-2])
2325
seq == "" && throw_arg_err("Invalid $nam name in ", str)
@@ -34,7 +36,7 @@ _parse_emoji(io, str, pos, chr) =
3436

3537
function _parse_unicode(io, str, pos, chr)
3638
check_done(str, pos, "\\N incomplete")
37-
chr, pos = str_next(str, pos)
39+
chr, pos = iterate(str, pos)
3840
chr == '{' || throw_arg_err("\\N missing initial { in ", str)
3941
check_done(str, pos, "\\N{ incomplete")
4042
_parse_entity(io, str, pos, "N{", '}', Unicode_Entities.default, "Unicode")

0 commit comments

Comments
 (0)