Skip to content

Commit

Permalink
Compat and CI updates (#50)
Browse files Browse the repository at this point in the history
* Don't test on Julia 1.0

* Update compat for ScientificTypes

* Formatting

* Fix problems with `scitype`

* Fix wrong import

* Remove compat bounds that are now invalid
  • Loading branch information
mtsch authored Jan 5, 2022
1 parent 3cfa088 commit 2427c10
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
julia-version: ['1.0', '1', 'nightly']
julia-version: ['1.6', '1', 'nightly']
name: ${{ matrix.julia-version }}
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PersistenceDiagrams"
uuid = "90b4794c-894b-4756-a0f8-5efeb5ddf7ae"
authors = ["mtsch <matijacufar@gmail.com>"]
version = "0.9.4"
version = "0.9.5"

[deps]
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Expand All @@ -16,10 +16,10 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
[compat]
Compat = "^3.10.0"
Hungarian = "0.6"
MLJModelInterface = "^0.3.5, 0.4, 1"
MLJModelInterface = "1"
PersistenceDiagramsBase = "^0.1.1"
RecipesBase = "1"
ScientificTypes = "2.3.2"
ScientificTypes = "3"
Tables = "1"
julia = "1"

Expand Down
2 changes: 1 addition & 1 deletion src/PersistenceDiagrams.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ using Compat
using Hungarian
using PersistenceDiagramsBase
using RecipesBase
using ScientificTypes
using Statistics
using Tables
import ScientificTypes

include("matching.jl")

Expand Down
5 changes: 3 additions & 2 deletions src/scitypes.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const ST = ScientificTypes
import ScientificTypes: DefaultConvention
const SB = ScientificTypes.ScientificTypesBase

ST.scitype(::PersistenceDiagram, ::ST.DefaultConvention; kwargs...) = PersistenceDiagram
SB.scitype(::PersistenceDiagram, ::DefaultConvention; kwargs...) = PersistenceDiagram
4 changes: 1 addition & 3 deletions test/scitypes.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using PersistenceDiagrams
using ScientificTypes

diagram = PersistenceDiagram([(1, Inf), (2, 3)], dim=0)
diagram = PersistenceDiagram([(1, Inf), (2, 3)]; dim=0)
@test scitype(diagram) == PersistenceDiagram

diagrams = [diagram, diagram, diagram]
@test scitype(diagrams) == AbstractVector{PersistenceDiagram}

true

2 comments on commit 2427c10

@mtsch
Copy link
Owner Author

@mtsch mtsch commented on 2427c10 Jan 5, 2022

Choose a reason for hiding this comment

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

@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/51688

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.9.5 -m "<description of version>" 2427c10061f5d90c3965fb42a61e260335b1fa59
git push origin v0.9.5

Please sign in to comment.