Merge pull request #3 from JuliaString/spj/updateci

Clean up for Julia 1.0, use GitHub Actions for CI

Author: ScottPJones

.drone.yml

@@ -1,44 +1,3 @@
----
-kind: pipeline
-name: linux - arm - Julia 1.0
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: julia:1.0
-  commands:
-  - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
-
----
-kind: pipeline
-name: linux - arm - Julia 1.5
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: julia:1.5
-  commands:
-  - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
-
----
-kind: pipeline
-name: linux - arm64 - Julia 1.0
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: julia:1.0
-  commands:
-  - "julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
-
 ---
 kind: pipeline
 name: linux - arm64 - Julia 1.5

.travis.yml

@@ -4,7 +4,7 @@ keywords = ["Strings", "Characters", "Encodings"]
 license = "MIT"
 desc = "Basic API for string encodings, character sets, etc."
 authors = ["ScottPJones <scottjones@alum.mit.edu>"]
-version = "1.0.0"
+version = "1.1.0"
 
 [deps]
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
@@ -18,5 +18,5 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 test = ["Test"]
 
 [compat]
-julia = "^1.0.0"
-ModuleInterfaceTools = "≥ 1.0.0"
+julia = "1"
+ModuleInterfaceTools = "1"

Project.toml

@@ -2,16 +2,14 @@ __precompile__(true)
 """
 StrAPI package
 
-Copyright 2017-2018 Gandalf Software, Inc., Scott P. Jones
+Copyright 2017-2020 Gandalf Software, Inc., Scott P. Jones
 Licensed under MIT License, see LICENSE.md
 """
 module StrAPI
 
 using ModuleInterfaceTools
 using ModuleInterfaceTools: m_eval, _stdout, _stderr
 
-const NEW_ITERATE = VERSION >= v"0.7.0-DEV.5127"
-
 const MaybeSub{T} = Union{T, SubString{T}} where {T<:AbstractString}
 
 const CodeUnitTypes = Union{UInt8, UInt16, UInt32}
@@ -23,8 +21,7 @@ quotesym(s...) = Expr(:quote, symstr(s...))
 
 @api public StringError
 
-@api develop NEW_ITERATE, CodeUnitTypes, CodePoints, MaybeSub, symstr, quotesym,
-             _stdout, "@preserve"
+@api develop CodeUnitTypes, CodePoints, MaybeSub, symstr, quotesym, _stdout, "@preserve"
 
 @api base convert, getindex, length, map, collect, hash, sizeof, size, strides,
           pointer, unsafe_load, string, read, write, reverse,
@@ -37,48 +34,43 @@ quotesym(s...) = Expr(:quote, symstr(s...))
 # Conditionally import or export names that are only in v0.6 or in master
 @api base! codeunit, codeunits, ncodeunits, codepoint, thisind, firstindex, lastindex
 
-@static NEW_ITERATE ? (@api base iterate) : (@api base start, next, done)
-
-@static if V6_COMPAT
-    include("compat.jl")
-else # !V6_COMPAT
-    import Base.GC: @preserve
+@api base iterate
 
-    function find end
-    function ind2chr end
-    function chr2ind end
+import Base.GC: @preserve
 
-    # Handle changes in array allocation
-    create_vector(T, len)  = Vector{T}(undef, len)
+function find end
+function ind2chr end
+function chr2ind end
 
-    # Add new short name for deprecated hex function
-    outhex(v, p=1) = string(v, base=16, pad=p)
+# Handle changes in array allocation
+create_vector(T, len)  = Vector{T}(undef, len)
 
-    get_iobuffer(siz) = IOBuffer(sizehint=siz)
+# Add new short name for deprecated hex function
+outhex(v, p=1) = string(v, base=16, pad=p)
 
-    const utf8crc         = Base._crc32c
-    const is_lowercase    = islowercase
-    const is_uppercase    = isuppercase
-    const lowercase_first = lowercasefirst
-    const uppercase_first = uppercasefirst
+get_iobuffer(siz) = IOBuffer(sizehint=siz)
 
-    using Base: unsafe_crc32c, Fix2
+const utf8crc         = Base._crc32c
+const is_lowercase    = islowercase
+const is_uppercase    = isuppercase
+const lowercase_first = lowercasefirst
+const uppercase_first = uppercasefirst
 
-    # Location of some methods moved from Base.UTF8proc to Base.Unicode
-    const UC = Base.Unicode
-    const Unicode = UC
+using Base: unsafe_crc32c, Fix2
 
-    import Base.CodeUnits
+# Location of some methods moved from Base.UTF8proc to Base.Unicode
+const UC = Base.Unicode
+const Unicode = UC
 
-    @api base IteratorSize
+import Base.CodeUnits
 
-    const is_letter = isletter
+@api base IteratorSize
 
-    pwc(c, io, str) = printstyled(io, str; color = c)
+const is_letter = isletter
 
-    const graphemes = UC.graphemes
+pwc(c, io, str) = printstyled(io, str; color = c)
 
-end # !V6_COMPAT
+const graphemes = UC.graphemes
 
 @api base isequal, ==, in
 
@@ -89,10 +81,9 @@ pr_ul(io, l) = pwc(:underline, io, l)
 
 @api develop! pwc, pr_ul
 
-const str_next = @static NEW_ITERATE ? iterate : next
 str_done(str::AbstractString, i::Integer) = i > ncodeunits(str)
 
-@api develop! str_next, str_done
+@api develop! str_done
 @api develop unsafe_crc32c, Fix2, CodeUnits
 @api public! is_lowercase, is_uppercase, lowercase_first, uppercase_first
 
@@ -119,8 +110,6 @@ function _uppercase end
 function _titlecase end
 @api develop! _write, _print, _isvalid, _lowercase, _uppercase, _titlecase
 
-const curmod = @static V6_COMPAT ? current_module() : @__MODULE__
-
 include("errors.jl")
 include("traits.jl")
 include("codepoints.jl")
@@ -159,7 +148,7 @@ for (pref, lst) in
          ? (symstr("is", nam[1]), symstr("is_", nam[2]))
          : (symstr("is", nam), symstr("is_", nam)))
 
-    m_eval(curmod,
+    m_eval(@__MODULE__,
            (isdefined(Base, oldname)
             ? Expr(:const, Expr(:(=), newname, oldname))
             : Expr(:function, newname)))

src/StrAPI.jl

@@ -1,6 +1,6 @@
 # CodePoints iterator
 #
-# Copyright 2017-2018 Gandalf Software, Inc., Scott P. Jones
+# Copyright 2017-2020 Gandalf Software, Inc., Scott P. Jones
 # Licensed under MIT License, see LICENSE.md
 
 struct CodePoints{T<:AbstractString}
@@ -24,10 +24,4 @@ julia> collect(codepoints(a))
 codepoints(xs) = CodePoints(xs)
 eltype(::Type{<:CodePoints{S}}) where {S} = eltype(S)
 length(it::CodePoints) = length(it.xs)
-@static if NEW_ITERATE
 iterate(it::CodePoints, state=1) = iterate(it.xs, state)
-else
-start(it::CodePoints) = 1
-done(it::CodePoints, state) = state > ncodeunits(it.xs)
-next(it::CodePoints, state) = next(it.xs, state)
-end