Skip to content

Commit

Permalink
Merge branch 'main' into 32bit
Browse files Browse the repository at this point in the history
  • Loading branch information
ThummeTo authored Aug 19, 2024
2 parents b9a0d24 + e776903 commit a3ca2e3
Show file tree
Hide file tree
Showing 31 changed files with 2,935 additions and 1,239 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/Formatter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Format suggestions
on:
pull_request:
# this argument is not required if you don't use the `suggestion-label` input
types: [ opened, reopened, synchronize, labeled, unlabeled ]
jobs:
code-style:
runs-on: ubuntu-latest
steps:
- uses: julia-actions/julia-format@v3
with:
version: '1' # Set `version` to '1.0.54' if you need to use JuliaFormatter.jl v1.0.54 (default: '1')
suggestion-label: 'format-suggest' # leave this unset or empty to show suggestions for all PRs

6 changes: 1 addition & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name = "FMIImport"
uuid = "9fcbc62e-52a0-44e9-a616-1359a0008194"
authors = ["TT <[email protected]>", "LM <[email protected]>", "JK <[email protected]>"]
version = "1.0.1"
version = "1.0.4"

[deps]
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
FMIBase = "900ee838-d029-460e-b485-d98a826ceef2"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"

[weakdeps]
FMIZoo = "724179cf-c260-40a9-bd27-cccc6fe2f195"
Expand All @@ -21,7 +19,5 @@ FMIZooExt = ["FMIZoo"]
Downloads = "1"
FMIBase = "1.0.0"
Libdl = "1"
PackageExtensionCompat = "1.0.0"
RelocatableFolders = "1"
Requires = "1.3.0"
julia = "1.6"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
[![Run PkgEval](https://github.com/ThummeTo/FMIImport.jl/actions/workflows/Eval.yml/badge.svg)](https://github.com/ThummeTo/FMIImport.jl/actions/workflows/Eval.yml)
[![Coverage](https://codecov.io/gh/ThummeTo/FMIImport.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/ThummeTo/FMIImport.jl)
[![ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://img.shields.io/badge/ColPrac-Contributor's%20Guide-blueviolet)](https://github.com/SciML/ColPrac)
[![SciML Code Style](https://img.shields.io/static/v1?label=code%20style&message=SciML&color=9558b2&labelColor=389826)](https://github.com/SciML/SciMLStyle)

## How can I use FMIImport.jl?
[*FMIImport.jl*](https://github.com/ThummeTo/FMIImport.jl) is part of [*FMI.jl*](https://github.com/ThummeTo/FMI.jl). However, if you only need the import functionality without anything around and want to keep the dependencies as small as possible, [*FMIImport.jl*](https://github.com/ThummeTo/FMIImport.jl) might be the right way to go. You can install it via:
Expand Down
8 changes: 7 additions & 1 deletion ext/FMIZooExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ module FMIZooExt

using FMIImport, FMIZoo

function FMIImport.loadFMU(modelName::AbstractString, tool::AbstractString, version::AbstractString, fmiversion::AbstractString="2.0"; kwargs...)
function FMIImport.loadFMU(
modelName::AbstractString,
tool::AbstractString,
version::AbstractString,
fmiversion::AbstractString = "2.0";
kwargs...,
)
fname = get_model_filename(modelName, tool, version, fmiversion)
return FMIImport.loadFMU(fname; kwargs...)
end
Expand Down
Loading

0 comments on commit a3ca2e3

Please sign in to comment.