Skip to content

Commit

Permalink
bump Makie compat (#112)
Browse files Browse the repository at this point in the history 
* bump Makie compat

* makesize -> markersize

* try deleting `markerstrokewidth`
  • Loading branch information
@ericphanson
ericphanson authored Jul 23, 2024
1 parent 2feb223 commit 2a4494e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- x64
makie:
- '0.20'
- '0.21'
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Lighthouse"
uuid = "ac2c24cd-07f0-4848-96b2-1b82c3ea0e59"
authors = ["Beacon Biosignals, Inc."]
version = "0.17.0"
version = "0.17.1"

[deps]
ArrowTypes = "31f734f8-188a-4ce0-8406-c8a06bd891cd"
Expand Down Expand Up @@ -30,7 +30,7 @@ ArrowTypes = "1, 2"
CairoMakie = "0.11"
DataFrames = "1.3"
Legolas = "0.5"
Makie = "0.20"
Makie = "0.20, 0.21"
StatsBase = "0.33, 0.34"
Tables = "1.7"
TensorBoardLogger = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions ext/LighthouseMakieExt.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function Lighthouse.plot_binary_discrimination_calibration_curves!(subfig::GridP
# but we want kw > BinaryDiscriminationCalibrationCurves > Scatter, so we need to somehow set things
# after the theme merging above, especially, since we also pass those to series!,
# which then again tries to merge the kw args with the theme.
set_from_kw!(scatter_theme, :makersize, kw, 5)
set_from_kw!(scatter_theme, :markersize, kw, 5)
set_from_kw!(scatter_theme, :marker, kw, :rect)

if ismissing(per_expert_calibration_curves)
Expand All @@ -179,7 +179,7 @@ function Lighthouse.plot_binary_discrimination_calibration_curves!(subfig::GridP

calibration = get_theme(subfig, :BinaryDiscriminationCalibrationCurves,
:CalibrationCurve;
solid_color=:navyblue, markerstrokewidth=0)
solid_color=:navyblue)

set_from_kw!(calibration, :markersize, kw, 5)
set_from_kw!(calibration, :marker, kw, :rect)
Expand Down

2 comments on commit 2a4494e

@ericphanson
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/111610

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.17.1 -m "<description of version>" 2a4494e4f7531d060b927ef60fa1dc5851be085a
git push origin v0.17.1

Please sign in to comment.