Skip to content

Commit

Permalink
Adapt to changes in HDF5 v0.14 release (#145)
Browse files Browse the repository at this point in the history
* Mitigate method ambiguity errors

The corresponding HDF5.read() methods are only defined on the
narrower `Union` `DatasetOrAttribute` (`HDF5Object` also includes
`HDF5Group`).

* Switch to using keyword arguments instead of HDF5Properties directly

* Adjust for difference in handling of H5T_VLEN datatypes

* Integrate with HDF5's new read() implementation

* Update for HDF5 types rename

* Update for HDF5 using Dict-like naming

* Use d_(read|write) instead of (read|write)array

* Update for HDF5.DataFile -> HDF5.H5DataStore

* Explicitly use names which are to be unexported from HDF5

* Update for HDF5 rename of middle-level API:

a_create -> create_attribute
d_create -> create_dataset
g_create -> create_group
p_create -> create_property
a_read -> read_attribute
a_write -> write_attribute
d_write -> write_attribute
attrs -> attributes

* Match native Int type

* Require HDF5v0.14

* Move from Tavis CI to GitHub Actions
  • Loading branch information
jmert authored Nov 24, 2020
1 parent 0272d7a commit e964bf0
Show file tree
Hide file tree
Showing 9 changed files with 141 additions and 152 deletions.
32 changes: 32 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: CI

on: [push, pull_request]

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.3'
- '1'
- 'nightly'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
# - uses: julia-actions/julia-uploadcoveralls@v1
# env:
# COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
7 changes: 5 additions & 2 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment:
types:
- created
workflow_dispatch:
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
Expand Down
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name = "MAT"
uuid = "23992714-dd62-5051-b70f-ba57cb901cac"
version = "0.8.1"
version = "0.9.0"

[deps]
BufferedStreams = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"

[compat]
BufferedStreams = "0.4.1, 1"
HDF5 = "0.11, 0.12, 0.13"
CodecZlib = "0.5, 0.6, 0.7"
HDF5 = "0.14"
julia = "1.3"

[extras]
Expand Down
3 changes: 2 additions & 1 deletion src/MAT.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
module MAT

using HDF5, SparseArrays
import HDF5: exists

include("MAT_HDF5.jl")
include("MAT_v5.jl")

using .MAT_HDF5, .MAT_v5

export matopen, matread, matwrite, names, exists, @read, @write
export matopen, matread, matwrite, exists, @read, @write

# Open a MATLAB file
const HDF5_HEADER = UInt8[0x89, 0x48, 0x44, 0x46, 0x0d, 0x0a, 0x1a, 0x0a]
Expand Down
Loading

2 comments on commit e964bf0

@musm
Copy link
Member

@musm musm commented on e964bf0 Nov 24, 2020

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/25241

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.0 -m "<description of version>" e964bf068ce9937a80b6ecf6e1ae94cd094cdadb
git push origin v0.9.0

Please sign in to comment.