Skip to content

Commit

Permalink
Merge branch 'master' into grid-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
koehlerson committed Oct 16, 2021
2 parents 7f5e7db + 636f273 commit 3185569
Show file tree
Hide file tree
Showing 32 changed files with 2,248 additions and 487 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
continue-on-error: ${{ matrix.julia-version == 'nightly' }}
strategy:
matrix:
julia-version: ['1.0', '1', 'nightly']
julia-version: ['1.6', '^1.7.0-0', 'nightly']
os: ['ubuntu-latest']
include:
- os: windows-latest
Expand All @@ -28,9 +28,7 @@ jobs:
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
if: ${{ matrix.julia-version == '1' && matrix.os == 'ubuntu-latest' }}
- uses: codecov/codecov-action@v1
if: ${{ matrix.julia-version == '1' && matrix.os == 'ubuntu-latest' }}
with:
file: lcov.info
docs:
Expand All @@ -47,4 +45,5 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
GKSwstype: '100'
run: julia --project=docs --color=yes docs/make.jl
13 changes: 13 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
cff-version: 1.2.0
message: "If you use Ferrite.jl, please cite it as below."
authors:
- family-names: "Carlsson"
given-names: "Kristoffer"
- family-names: "Ekre"
given-names: "Fredrik"
- family-names: "Contributors"
given-names: " "
title: "Ferrite.jl"
version: 0.3.0
date-released: 2021-03-25
url: "https://github.com/Ferrite-FEM/Ferrite.jl"
6 changes: 4 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
name = "Ferrite"
uuid = "c061ca5d-56c9-439f-9c0e-210fe06d3992"
version = "0.3.0"
version = "0.3.1"

[deps]
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
NearestNeighbors = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
Tensors = "48a634ad-e948-5137-8d70-aa71f2a747f4"
WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"

[compat]
NearestNeighbors = "0.4"
Reexport = "1"
Tensors = "1"
WriteVTK = "1"
julia = "1"
julia = "1.6"

[extras]
BlockArrays = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Contributions are very welcome, as are feature requests and suggestions.
Please keep in mind that we are part of the Julia community and adhere to the [Julia Community Standards](https://julialang.org/community/standards/).


[docs-dev-img]: https://img.shields.io/badge/docs-dev-blue.svg
[docs-dev-url]: http://ferrite-fem.github.io/Ferrite.jl/dev/
[docs-dev-img]: https://img.shields.io/badge/docs-latest%20release-blue
[docs-dev-url]: http://ferrite-fem.github.io/Ferrite.jl/
Loading

0 comments on commit 3185569

Please sign in to comment.