API updates for nightly

jorgensd · Oct 25, 2023 · c0f2b49 · c0f2b49
1 parent 13fbd9e
commit c0f2b49
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
@@ -24,7 +24,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-22.04
-    container: ghcr.io/fenics/dolfinx/dolfinx:v0.7.0
+    container: ghcr.io/fenics/dolfinx/dolfinx:nightly
     env:
       DEB_PYTHON_INSTALL_LAYOUT: deb_system
       PUBLISH_DIR: ./_build/html

diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   test-code:
     runs-on: ubuntu-22.04
-    container: ghcr.io/fenics/dolfinx/dolfinx:v0.7.0
+    container: ghcr.io/fenics/dolfinx/dolfinx:nightly
     env:
       DEB_PYTHON_INSTALL_LAYOUT: deb_system
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Use github pages for docker image
-FROM ghcr.io/jorgensd/cbcbeatx:v0.1.0
+FROM ghcr.io/jorgensd/cbcbeatx:v0.7.0
 
 # Create user with a home directory
 ARG NB_USER

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fenics/dolfinx/dolfinx:v0.7.0
+FROM ghcr.io/fenics/dolfinx/dolfinx:nightly
 
 ARG REPO_BRANCH="main"
 ENV DEB_PYTHON_INSTALL_LAYOUT=deb_system

diff --git a/pyproject.toml b/pyproject.toml
@@ -3,12 +3,12 @@ requires = ["setuptools>=61.0.0", "wheel"]
 
 [project]
 name = "cbcbeatx"
-version = "0.7.0"
+version = "0.7.0.dev0"
 description = "A framework for computational cardiac electrophysiology"
 authors = [{ name = "Jørgen S. Dokken", email = "dokken@simula.no" }]
 license = { file = "LICENSE" }
 readme = "README.md"
-dependencies = ["fenics-dolfinx>=0.7.0"]
+dependencies = ["fenics-dolfinx>0.7.0"]
 
 [project.scripts]
 cbcbeatx = "cbcbeatx.cli:main"

diff --git a/src/cbcbeatx/markerwisefield.py b/src/cbcbeatx/markerwisefield.py
@@ -71,7 +71,7 @@ def __getitem__(self, key: int) -> ufl.core.expr.Expr:
 
 
 def rhs_with_markerwise_field(
-    V: dolfinx.fem.FunctionSpaceBase,
+    V: dolfinx.fem.FunctionSpace,
     g: typing.Optional[typing.Union[ufl.core.expr.Expr, Markerwise]],
 ) -> tuple[ufl.Measure, ufl.Form]:
     """

diff --git a/src/cbcbeatx/monodomainsolver.py b/src/cbcbeatx/monodomainsolver.py
@@ -101,7 +101,7 @@ class MonodomainSolver:
     """
 
     _theta: dolfinx.fem.Constant  # Temporal discretization variable
-    _V: dolfinx.fem.FunctionSpaceBase  # Function space of solution
+    _V: dolfinx.fem.FunctionSpace  # Function space of solution
     _v: dolfinx.fem.Function  # Solution at previous time step
     _vh: dolfinx.fem.Function  # Solution at current time step