Skip to content

Commit 728580c

Browse files
kks32kks32
committed
Fix linter error
1 parent 769a18c commit 728580c

File tree

4 files changed

+102
-157
lines changed

4 files changed

+102
-157
lines changed

‎dapi/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080

8181
from pathlib import Path
8282

83+
8384
def _get_version():
8485
"""Read version from pyproject.toml, falling back for older Python."""
8586
try:
@@ -91,7 +92,7 @@ def _get_version():
9192

9293
try:
9394
pyproject_path = Path(__file__).parent / "pyproject.toml"
94-
with open(pyproject_path, "rb") as f: # tomllib expects bytes
95+
with open(pyproject_path, "rb") as f: # tomllib expects bytes
9596
data = tomllib.load(f)
9697
return data["tool"]["poetry"]["version"]
9798
except (FileNotFoundError, KeyError, ImportError, tomllib.TOMLDecodeError):

‎docs/installation.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,16 @@ cd dapi
3939
curl -sSL https://install.python-poetry.org | python3 -
4040

4141
# Install dependencies and dapi in editable mode
42+
virtualenv env && source env/bin/activate
4243
poetry install
43-
poetry shell
4444
```
4545

46+
You can also install an editable local version of dapi
47+
```
48+
pip install -e .
49+
```
50+
51+
4652
## 🏗️ DesignSafe Jupyter Environment
4753

4854
### Installing on DesignSafe Jupyter Hub

‎examples/mpm/mpm-minimal.ipynb‎

Lines changed: 66 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -19,114 +19,50 @@
1919
{
2020
"cell_type": "code",
2121
"execution_count": null,
22-
"id": "d84cd553",
22+
"id": "8ed2d128",
2323
"metadata": {},
24-
"outputs": [
25-
{
26-
"name": "stdout",
27-
"output_type": "stream",
28-
"text": [
29-
"Obtaining file:///Users/krishna/dev/DesignSafe/dapi\n",
30-
" Installing build dependencies ... \u001b[?25ldone\n",
31-
"\u001b[?25h Checking if build backend supports build_editable ... \u001b[?25ldone\n",
32-
"\u001b[?25h Getting requirements to build editable ... \u001b[?25ldone\n",
33-
"\u001b[?25h Preparing editable metadata (pyproject.toml) ... \u001b[?25ldone\n",
34-
"\u001b[?25hRequirement already satisfied: exceptiongroup<2.0.0,>=1.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.3.0)\n",
35-
"Requirement already satisfied: griffe<2.0.0,>=1.7.3 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.7.3)\n",
36-
"Requirement already satisfied: jsonschema<5.0.0,>=4.24.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (4.24.0)\n",
37-
"Requirement already satisfied: mkdocs<2.0.0,>=1.6.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.6.1)\n",
38-
"Requirement already satisfied: mkdocs-autorefs<2.0.0,>=1.4.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.4.2)\n",
39-
"Requirement already satisfied: mkdocs-material<10.0.0,>=9.6.14 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (9.6.14)\n",
40-
"Requirement already satisfied: mkdocstrings<0.30.0,>=0.29.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (0.29.1)\n",
41-
"Requirement already satisfied: numpy<2.1.0,>=1.21.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.0.2)\n",
42-
"Requirement already satisfied: pandas<3.0.0,>=1.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.3.0)\n",
43-
"Requirement already satisfied: pymysql<2.0.0,>=1.1.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.1.1)\n",
44-
"Requirement already satisfied: python-dotenv<2.0.0,>=1.1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.1.0)\n",
45-
"Requirement already satisfied: sqlalchemy<3.0.0,>=2.0.41 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.0.41)\n",
46-
"Requirement already satisfied: tapipy<2.0.0,>=1.8.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (1.8.4)\n",
47-
"Requirement already satisfied: tomli>=1.1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (2.2.1)\n",
48-
"Requirement already satisfied: tqdm<5.0.0,>=4.67.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from dapi==0.4.2) (4.67.1)\n",
49-
"Requirement already satisfied: typing-extensions>=4.6.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from exceptiongroup<2.0.0,>=1.3.0->dapi==0.4.2) (4.14.0)\n",
50-
"Requirement already satisfied: colorama>=0.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from griffe<2.0.0,>=1.7.3->dapi==0.4.2) (0.4.6)\n",
51-
"Requirement already satisfied: attrs>=22.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (25.3.0)\n",
52-
"Requirement already satisfied: jsonschema-specifications>=2023.03.6 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (2025.4.1)\n",
53-
"Requirement already satisfied: referencing>=0.28.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (0.36.2)\n",
54-
"Requirement already satisfied: rpds-py>=0.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from jsonschema<5.0.0,>=4.24.0->dapi==0.4.2) (0.25.1)\n",
55-
"Requirement already satisfied: click>=7.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (8.1.8)\n",
56-
"Requirement already satisfied: ghp-import>=1.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (2.1.0)\n",
57-
"Requirement already satisfied: importlib-metadata>=4.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (8.7.0)\n",
58-
"Requirement already satisfied: jinja2>=2.11.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.1.6)\n",
59-
"Requirement already satisfied: markdown>=3.3.6 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.8)\n",
60-
"Requirement already satisfied: markupsafe>=2.0.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.0.2)\n",
61-
"Requirement already satisfied: mergedeep>=1.3.4 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (1.3.4)\n",
62-
"Requirement already satisfied: mkdocs-get-deps>=0.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (0.2.0)\n",
63-
"Requirement already satisfied: packaging>=20.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (25.0)\n",
64-
"Requirement already satisfied: pathspec>=0.11.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (0.12.1)\n",
65-
"Requirement already satisfied: pyyaml-env-tag>=0.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (1.1)\n",
66-
"Requirement already satisfied: pyyaml>=5.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (6.0.2)\n",
67-
"Requirement already satisfied: watchdog>=2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (6.0.0)\n",
68-
"Requirement already satisfied: babel~=2.10 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.17.0)\n",
69-
"Requirement already satisfied: backrefs~=5.7.post1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (5.8)\n",
70-
"Requirement already satisfied: mkdocs-material-extensions~=1.3 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (1.3.1)\n",
71-
"Requirement already satisfied: paginate~=0.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (0.5.7)\n",
72-
"Requirement already satisfied: pygments~=2.16 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.19.1)\n",
73-
"Requirement already satisfied: pymdown-extensions~=10.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (10.15)\n",
74-
"Requirement already satisfied: requests~=2.26 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (2.32.4)\n",
75-
"Requirement already satisfied: python-dateutil>=2.8.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2.9.0.post0)\n",
76-
"Requirement already satisfied: pytz>=2020.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2025.2)\n",
77-
"Requirement already satisfied: tzdata>=2022.7 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from pandas<3.0.0,>=1.3.0->dapi==0.4.2) (2025.2)\n",
78-
"Requirement already satisfied: PyJWT>=1.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2.10.1)\n",
79-
"Requirement already satisfied: atomicwrites<2.0.0,>=1.4.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.4.1)\n",
80-
"Requirement already satisfied: certifi>=2020.11.8 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2025.4.26)\n",
81-
"Requirement already satisfied: cloudpickle>=1.6.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (3.1.1)\n",
82-
"Requirement already satisfied: cryptography>=3.3.2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (45.0.4)\n",
83-
"Requirement already satisfied: openapi_core==0.16.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.16.0)\n",
84-
"Requirement already satisfied: openapi_spec_validator<0.6.0,>=0.5.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.5.4)\n",
85-
"Requirement already satisfied: setuptools>=21.0.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (80.9.0)\n",
86-
"Requirement already satisfied: six<2.0,>=1.10 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.17.0)\n",
87-
"Requirement already satisfied: urllib3<2.0.0,>=1.26.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.26.20)\n",
88-
"Requirement already satisfied: isodate in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.7.2)\n",
89-
"Requirement already satisfied: jsonschema-spec<0.2.0,>=0.1.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.1.3)\n",
90-
"Requirement already satisfied: more-itertools in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (10.7.0)\n",
91-
"Requirement already satisfied: openapi-schema-validator<0.4.0,>=0.3.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.3.4)\n",
92-
"Requirement already satisfied: parse in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.20.2)\n",
93-
"Requirement already satisfied: pathable<0.5.0,>=0.4.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (0.4.4)\n",
94-
"Requirement already satisfied: werkzeug in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_core==0.16.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (3.1.3)\n",
95-
"Requirement already satisfied: cffi>=1.14 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from cryptography>=3.3.2->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.17.1)\n",
96-
"Requirement already satisfied: zipp>=3.20 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from importlib-metadata>=4.4->mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (3.23.0)\n",
97-
"Requirement already satisfied: platformdirs>=2.2.0 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from mkdocs-get-deps>=0.2.0->mkdocs<2.0.0,>=1.6.1->dapi==0.4.2) (4.3.8)\n",
98-
"Requirement already satisfied: lazy-object-proxy<2.0.0,>=1.7.1 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from openapi_spec_validator<0.6.0,>=0.5.0->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (1.11.0)\n",
99-
"Requirement already satisfied: charset_normalizer<4,>=2 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from requests~=2.26->mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (3.4.2)\n",
100-
"Requirement already satisfied: idna<4,>=2.5 in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from requests~=2.26->mkdocs-material<10.0.0,>=9.6.14->dapi==0.4.2) (3.10)\n",
101-
"Requirement already satisfied: pycparser in /Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages (from cffi>=1.14->cryptography>=3.3.2->tapipy<2.0.0,>=1.8.4->dapi==0.4.2) (2.22)\n",
102-
"Building wheels for collected packages: dapi\n",
103-
" Building editable for dapi (pyproject.toml) ... \u001b[?25ldone\n",
104-
"\u001b[?25h Created wheel for dapi: filename=dapi-0.4.2-py3-none-any.whl size=4067 sha256=45bb3f8236d06942da898366513f474a9fb0ab9f06eb242733edea6f7e97331f\n",
105-
" Stored in directory: /private/var/folders/w8/xz590jyd7r36zmxcspgzj3z40000gn/T/pip-ephem-wheel-cache-bbokgmyb/wheels/4c/51/46/2eb544e5cdddc745a3f608890dcac74e54c3ba4a42b4993717\n",
106-
"Successfully built dapi\n",
107-
"Installing collected packages: dapi\n",
108-
" Attempting uninstall: dapi\n",
109-
" Found existing installation: dapi 0.4.2\n",
110-
" Uninstalling dapi-0.4.2:\n",
111-
" Successfully uninstalled dapi-0.4.2\n",
112-
"Successfully installed dapi-0.4.2\n",
113-
"\n",
114-
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m24.2\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m25.1.1\u001b[0m\n",
115-
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n"
116-
]
117-
}
118-
],
24+
"outputs": [],
11925
"source": [
120-
"# Dapi installation\n",
121-
"#!pip uninstall dapi --yes\n",
122-
"\n",
123-
"#!pip install dapi --user --quiet\n",
26+
"!pip install --user --ignore-installed dapi==0.4.2 --quiet"
27+
]
28+
},
29+
{
30+
"cell_type": "code",
31+
"execution_count": null,
32+
"id": "64e3f3a3",
33+
"metadata": {},
34+
"outputs": [],
35+
"source": [
36+
"import sys, os\n",
12437
"\n",
125-
"# Install the latest development version of dapi from GitHub\n",
126-
"!pip install git+https://github.com/DesignSafe-CI/dapi.git@dev --user --quiet\n",
38+
"print(\n",
39+
" \"Old NumPy 1.24 installed!\"\n",
40+
" if sys.version_info < (3, 10)\n",
41+
" and os.system(\"pip install --user --force-reinstall numpy~=1.24.0 --quiet\") == 0\n",
42+
" else \"Skipped (Python 3.10+)\"\n",
43+
" if sys.version_info >= (3, 10)\n",
44+
" else \"Install failed!\"\n",
45+
")"
46+
]
47+
},
48+
{
49+
"cell_type": "markdown",
50+
"id": "b9fe1a7a",
51+
"metadata": {},
52+
"source": [
53+
"### ⚠️ Please restart the kernel by choosing Kernel >> Restart kernel ⚠️"
54+
]
55+
},
56+
{
57+
"cell_type": "code",
58+
"execution_count": null,
59+
"id": "58391f6c",
60+
"metadata": {},
61+
"outputs": [],
62+
"source": [
63+
"import numpy as np\n",
12764
"\n",
128-
"# Install editable local version of dapi\n",
129-
"#!pip install -e ../../"
65+
"print(np.__version__)"
13066
]
13167
},
13268
{
@@ -170,6 +106,32 @@
170106
"ds = DSClient()"
171107
]
172108
},
109+
{
110+
"cell_type": "markdown",
111+
"id": "81678a61",
112+
"metadata": {},
113+
"source": [
114+
"### Get MPM Benchmark directory"
115+
]
116+
},
117+
{
118+
"cell_type": "code",
119+
"execution_count": null,
120+
"id": "29172af2",
121+
"metadata": {},
122+
"outputs": [],
123+
"source": [
124+
"![ ! -d ~/MyData/mpm-benchmarks-develop ] && wget https://github.com/cb-geo/mpm-benchmarks/archive/refs/heads/develop.zip -P ~/MyData/ && cd ~/MyData/ && unzip develop.zip && rm develop.zip"
125+
]
126+
},
127+
{
128+
"cell_type": "markdown",
129+
"id": "e4ac6312",
130+
"metadata": {},
131+
"source": [
132+
"### MPM Job configuration"
133+
]
134+
},
173135
{
174136
"cell_type": "code",
175137
"execution_count": 3,

‎examples/mpm/mpm.ipynb‎

Lines changed: 27 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19,59 +19,11 @@
1919
{
2020
"cell_type": "code",
2121
"execution_count": null,
22-
"id": "839fa332-70a6-4818-a190-18c9ca109c28",
22+
"id": "dabd7715",
2323
"metadata": {},
24-
"outputs": [
25-
{
26-
"name": "stdout",
27-
"output_type": "stream",
28-
"text": [
29-
"\n",
30-
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m A new release of pip is available: \u001b[0m\u001b[31;49m24.2\u001b[0m\u001b[39;49m -> \u001b[0m\u001b[32;49m25.1.1\u001b[0m\n",
31-
"\u001b[1m[\u001b[0m\u001b[34;49mnotice\u001b[0m\u001b[1;39;49m]\u001b[0m\u001b[39;49m To update, run: \u001b[0m\u001b[32;49mpip install --upgrade pip\u001b[0m\n",
32-
"\u001b[31mERROR: Can not perform a '--user' install. User site-packages are not visible in this virtualenv.\u001b[0m\u001b[31m\n",
33-
"\u001b[0m"
34-
]
35-
}
36-
],
37-
"source": [
38-
"# Dapi installation\n",
39-
"# !pip uninstall dapi --yes\n",
40-
"!pip install --user --ignore-installed dapi==0.4.2\n",
41-
"# !pip install dapi --user --quiet\n",
42-
"\n",
43-
"# Install the latest development version of dapi from GitHub\n",
44-
"# !pip install git+https://github.com/DesignSafe-CI/dapi.git@dev --quiet\n",
45-
"\n",
46-
"# Install editable local version of dapi\n",
47-
"# !pip install -e ../../"
48-
]
49-
},
50-
{
51-
"cell_type": "code",
52-
"execution_count": 1,
53-
"id": "ad634b9b",
54-
"metadata": {},
55-
"outputs": [
56-
{
57-
"name": "stderr",
58-
"output_type": "stream",
59-
"text": [
60-
"/Users/krishna/dev/DesignSafe/dapi/env/lib/python3.9/site-packages/tqdm/auto.py:21: TqdmWarning: IProgress not found. Please update jupyter and ipywidgets. See https://ipywidgets.readthedocs.io/en/stable/user_install.html\n",
61-
" from .autonotebook import tqdm as notebook_tqdm\n"
62-
]
63-
},
64-
{
65-
"name": "stdout",
66-
"output_type": "stream",
67-
"text": [
68-
"unknown\n"
69-
]
70-
}
71-
],
24+
"outputs": [],
7225
"source": [
73-
"import dapi\n",
74-
"print(dapi.__version__)"
26+
"!pip install --user --ignore-installed git+https://github.com/DesignSafe-CI/dapi.git@dev --quiet"
7527
]
7628
},
7729
{
@@ -141,6 +93,30 @@
14193
" raise SystemExit(\"Stopping notebook due to client initialization failure.\")"
14294
]
14395
},
96+
{
97+
"cell_type": "markdown",
98+
"id": "8889eb8d",
99+
"metadata": {},
100+
"source": [
101+
"### Get MPM benchmark dataset"
102+
]
103+
},
104+
{
105+
"cell_type": "markdown",
106+
"id": "26d2e89b",
107+
"metadata": {},
108+
"source": [
109+
"![ ! -d ~/MyData/mpm-benchmarks-develop ] && wget https://github.com/cb-geo/mpm-benchmarks/archive/refs/heads/develop.zip -P ~/MyData/ && cd ~/MyData/ && unzip develop.zip && rm develop.zip"
110+
]
111+
},
112+
{
113+
"cell_type": "markdown",
114+
"id": "da76f536",
115+
"metadata": {},
116+
"source": [
117+
"### Configure MPM job"
118+
]
119+
},
144120
{
145121
"cell_type": "code",
146122
"execution_count": 4,

0 commit comments

Comments
 (0)