Merge pull request #40 from JuliaStats/aa/housekeeping

Miscellaneous housekeeping items

.github/workflows/CI.yml

@@ -1,12 +1,9 @@
 name: CI
 on:
-  pull_request:
-    branches:
-      - master
   push:
-    branches:
-      - master
-    tags: '*'
+    branches: [master]
+    tags: ["*"]
+  pull_request:
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -15,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.2'
+          - '1.6'
           - '1'
           - 'nightly'
         os:
@@ -49,20 +46,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
-        with:
-          version: '1'
-      - run: |
-          julia --project=docs -e '
-            using Pkg
-            Pkg.develop(PackageSpec(path=pwd()))
-            Pkg.instantiate()'
-      - run: |
-          julia --project=docs -e '
-            using Documenter: doctest
-            using Survival
-            doctest(Survival)'
-      - run: julia --project=docs docs/make.jl
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-docdeploy@latest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

Project.toml

@@ -3,22 +3,22 @@ uuid = "8a913413-2070-5976-9d4c-2b364fdc2f7f"
 version = "0.2.2"
 
 [deps]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
-PositiveFactorizations = "85a6dd25-e78a-55b7-8502-1745935b8125"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
 
 [compat]
-CategoricalArrays = "0.9"
+CategoricalArrays = "0.9, 0.10"
+Compat = "3.43, 4"
 DataFrames = "1"
 Distributions = "0.20, 0.21, 0.22, 0.23, 0.24, 0.25"
 Optim = "1"
-PositiveFactorizations = "0.2"
 StatsBase = "0.30, 0.31, 0.32, 0.33"
 StatsModels = "0.6"
-julia = "1.2"
+julia = "1.6"
 
 [extras]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

src/Survival.jl

@@ -1,11 +1,11 @@
 module Survival
 
+using Compat
 using Distributions
 using LinearAlgebra
-using PositiveFactorizations
+using Optim
 using StatsBase
 using StatsModels
-using Optim
 
 export
     EventTime,

src/cox.jl

@@ -1,6 +1,6 @@
 # Some utility functions to compute Cox regression
 
-promote_nonmissing(::Type{T}) where {T} = Base.promote_op(/, T, T)
+promote_nonmissing(::Type{T}) where {T} = typeof(one(T) / one(T))
 promote_nonmissing(::Type{Union{T,Missing}}) where {T} = promote_nonmissing(T)
 
 struct CoxSum{T,N}
@@ -130,10 +130,8 @@ end
 
 function _cox_fgh!(β, grad, hes, c::CoxAux{T}) where T
     update_cox!(c, β, (hes !== nothing) | (grad !== nothing))
-    X, ξ, Xβ, θ, Xθ, ξθ, λ, fs, ls  =
-        c.X, c.ξ, c.Xβ, c.θ, c.Xθ, c.ξθ, c.λ, c.fs, c.ls
-    R = Base.promote_op(/, T, T)
-    y = zero(R)
+    @compat (; X, ξ, Xβ, θ, Xθ, ξθ, λ, fs, ls) = c
+    y = zero(T) / one(T)
 
     if hes !== nothing
         fill!(hes, 0)
@@ -143,7 +141,7 @@ function _cox_fgh!(β, grad, hes, c::CoxAux{T}) where T
     end
     if grad !== nothing || hes !== nothing
         # preallocate
-        Z = zeros(R, length(β))
+        Z = zeros(typeof(y), length(β))
     end
 
     @inbounds for i in 1:length(fs)