Skip to content

Commit

Permalink
Merge pull request #54 from epatters/wedge-name-conflict
Browse files Browse the repository at this point in the history
Fix name conflict with wedge product operator
  • Loading branch information
epatters authored Oct 12, 2022
2 parents 658b833 + 84487a7 commit d0ba0a5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: "Set up Julia"
uses: julia-actions/setup-julia@latest
with:
version: '1.7'
version: '1.8'
- name: "Build package"
uses: julia-actions/julia-buildpkg@v1
- name: "Run tests"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- name: "Set up Julia"
uses: julia-actions/setup-julia@latest
with:
version: '1.7'
version: '1.8'
- name: "Install dependencies"
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: "Build and deploy"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
fail-fast: false
matrix:
julia_version: ['1.6', '1.7']
julia_version: ['1.6', '1.7', '1.8']
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion src/ArrayUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ nzbuilder(::Type{Arr}, dims::Integer...) where Arr =
ArrayBuilder(zeros(Arr, dims))
nzbuilder(::Type{<:SparseVector{Tv}}, n::Integer) where Tv =
SparseVectorBuilder(n, Int[], Tv[])
nzbuilder(::Type{<:SparseMatrixCSC{Tv}}, m::Integer, n::Integer) where {Tv,Ti} =
nzbuilder(::Type{<:SparseMatrixCSC{Tv}}, m::Integer, n::Integer) where Tv =
SparseMatrixBuilder(m, n, Int[], Int[], Tv[])

""" Apply diagonal operator to dense or sparse vector.
Expand Down
1 change: 1 addition & 0 deletions src/DiscreteExteriorCalculus.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ using StaticArrays: @SVector, SVector

using Catlab, Catlab.CategoricalAlgebra.CSets
using Catlab.CategoricalAlgebra.FinSets: deleteat
import Catlab.CategoricalAlgebra.CSets:
import Catlab.Theories: Δ

using ..ArrayUtils, ..SimplicialSets
Expand Down

0 comments on commit d0ba0a5

Please sign in to comment.