Skip to content

Commit

Permalink
Merge pull request #542 from alan-turing-institute/dev
Browse files Browse the repository at this point in the history
For a 0.18.2 release
  • Loading branch information
ablaom authored Apr 23, 2021
2 parents 773508f + 8bd6034 commit 510db30
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
- name: CompatHelper.main()
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }} # optional
run: julia -e 'using CompatHelper; CompatHelper.main()'
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
version:
- '1.0'
- '1' # automatically expands to the latest stable 1.x release of Julia.
- 'nightly'
os:
- ubuntu-latest
arch:
Expand Down
28 changes: 14 additions & 14 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MLJBase"
uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
authors = ["Anthony D. Blaom <[email protected]>"]
version = "0.18.1"
version = "0.18.2"

[deps]
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
Expand All @@ -28,21 +28,21 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

[compat]
CategoricalArrays = "^0.8.1,^0.9"
ComputationalResources = "^0.3"
CategoricalArrays = "0.8.1, 0.9"
ComputationalResources = "0.3"
Distributions = "0.22, 0.23, 0.24"
InvertedIndices = "^1"
InvertedIndices = "1"
LossFunctions = "0.5, 0.6"
MLJModelInterface = "^0.4.1, 1.0"
MLJScientificTypes = "^0.4.1"
Missings = "^0.4"
OrderedCollections = "^1.1"
Parameters = "^0.12"
PrettyTables = "^0.8,^0.9,^0.10,^0.11"
ProgressMeter = "^1.3"
StatisticalTraits = "^0.1.1, 1.0"
StatsBase = "^0.32,^0.33"
Tables = "^0.2,^1.0"
MLJModelInterface = "0.4.1, 1.0"
MLJScientificTypes = "0.4.1"
Missings = "0.4, 1"
OrderedCollections = "1.1"
Parameters = "0.12"
PrettyTables = "1"
ProgressMeter = "1.3"
StatisticalTraits = "0.1.1, 1.0"
StatsBase = "0.32, 0.33"
Tables = "0.2, 1.0"
julia = "1"

[extras]
Expand Down
8 changes: 5 additions & 3 deletions src/utilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,17 @@ function pretty(io::IO, X; showtypes=true, alignment=:l, kwargs...)
if showtypes
types = schema(X).types |> collect
scitypes = schema(X).scitypes |> collect
header = hcat(names, types, scitypes) |> permutedims
header = (names, types, scitypes)
else
header = names
header = (names, )
end
show_color = MLJBase.SHOW_COLOR
color_off()
try
PrettyTables.pretty_table(io, MLJBase.matrix(X),
header; alignment=alignment, kwargs...)
header=header;
alignment=alignment,
kwargs...)
catch
println("Trouble displaying table.")
end
Expand Down

0 comments on commit 510db30

Please sign in to comment.