Skip to content

Commit

Permalink
Merge pull request #44 from jorgensd/dokken/v0.7.x
Browse files Browse the repository at this point in the history
Bump to v0.7.3.
  • Loading branch information
jorgensd committed May 21, 2024
2 parents 34ed5db + 8b94245 commit a9d4901
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
build-docs:
uses: ./.github/workflows/test-build.yml
with:
tag: "v0.6.0-r1"
tag: "v0.7.3"

deploy:
needs: [build-docs]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ on:
inputs:
tag:
description: "Tag of DOLFINx docker image"
default: "v0.6.0-r1"
default: "v0.7.3"
required: true
type: string
workflow_dispatch:
inputs:
tag:
description: "Tag of DOLFINx docker image"
default: "v0.6.0-r1"
default: "v0.7.3"
required: true
type: string
schedule:
- cron: "* 9 * * 1"

env:
DEFAULT_TAG: v0.6.0-r1
DEFAULT_TAG: v0.7.3

jobs:
get_image_tag:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM dolfinx/lab:v0.6.0-r1
FROM dolfinx/lab:v0.7.3

# create user with a home directory
ARG NB_USER
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ To check the config paths, call:
```bash
jupyter server --show-config
jupyter notebook --show-config
jupyer lab --show-config
```

If you run the code with `dolfinx/lab:v0.6.0-r1` using for instance:
If you run the code with `dolfinx/lab:v0.7.3` using for instance:
```bash
docker run -ti -p 8888:8888 --rm -v $(pwd):/root/shared -w /root/shared dolfinx/lab:v0.6.0-r1
docker run -ti -p 8888:8888 --rm -v $(pwd):/root/shared -w /root/shared dolfinx/lab:v0.7.3
```
no copying is required.
91 changes: 38 additions & 53 deletions comparing_elements.ipynb

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"You have DOLFINx 0.6.0 installed, based on commit \n",
"https://github.com/FEniCS/dolfinx/commit/24f86a9ce57df6978070dbee22b3eae8bb77235f\n"
"You have DOLFINx 0.7.3 installed, based on commit \n",
"https://github.com/FEniCS/dolfinx/commit/25db9a743ef95a78f686f05e38607aa18281b0d6\n"
]
}
],
Expand Down Expand Up @@ -300,7 +300,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.6"
"version": "3.10.12"
},
"vscode": {
"interpreter": {
Expand Down
1 change: 0 additions & 1 deletion jupyter_server_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
def post_save(model, os_path, contents_manager):
"""post-save hook for converting notebooks to .py scripts"""
print(model['type'])
assert False
if model['type'] != 'notebook':
return # only do this for notebooks
d, fname = os.path.split(os_path)
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"

[project]
name = "FEniCS22_Tutorial"
version = "0.6.0"
version = "0.7.0"
dependencies = [
"fenics-dolfinx>=0.6.0",
"fenics-dolfinx>=0.7.0",
]

[project.optional-dependencies]
Expand Down

0 comments on commit a9d4901

Please sign in to comment.