Skip to content

Commit a3402e3

Browse files
GeoLarryLaiGeoLarryLai
committed
Full Google Colab support and version update
1 parent 5366a4f commit a3402e3

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

‎Example_pycwtmexhat.ipynb‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@
7777
},
7878
{
7979
"cell_type": "code",
80-
"execution_count": 39,
80+
"execution_count": 3,
8181
"metadata": {},
8282
"outputs": [
8383
{
8484
"name": "stdout",
8585
"output_type": "stream",
8686
"text": [
87-
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.0)\n",
87+
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.1)\n",
8888
"Requirement already satisfied: numpy>=1.20 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.26.4)\n",
8989
"Requirement already satisfied: scipy>=1.5 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.14.1)\n",
9090
"Requirement already satisfied: rasterio>=1.2 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.3.11)\n",
91-
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2025.1.0)\n",
91+
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2024.9.0)\n",
9292
"Requirement already satisfied: matplotlib>=3.3 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (3.9.2)\n",
9393
"Requirement already satisfied: tqdm>=4.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (4.66.5)\n",
9494
"Requirement already satisfied: numba>=0.50 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (0.60.0)\n",
@@ -155,9 +155,23 @@
155155
},
156156
{
157157
"cell_type": "code",
158-
"execution_count": 40,
158+
"execution_count": 1,
159159
"metadata": {},
160-
"outputs": [],
160+
"outputs": [
161+
{
162+
"ename": "ModuleNotFoundError",
163+
"evalue": "No module named 'dask.array'",
164+
"output_type": "error",
165+
"traceback": [
166+
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
167+
"\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)",
168+
"Cell \u001b[0;32mIn[1], line 2\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mos\u001b[39;00m\n\u001b[0;32m----> 2\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mpytopocomplexity\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m CWTMexHat\n",
169+
"File \u001b[0;32m~/Library/CloudStorage/Dropbox/My Documents/Paper manuscripts/2025-pyTopoComplexity/pyTopoComplexity/pytopocomplexity/__init__.py:2\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mMeasure Topographic Complexity\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[0;32m----> 2\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mpycwtmexhat\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m CWTMexHat\n\u001b[1;32m 3\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mpyfracd\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m FracD\n\u001b[1;32m 4\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mpyrugosity\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m RugosityIndex\n",
170+
"File \u001b[0;32m~/Library/CloudStorage/Dropbox/My Documents/Paper manuscripts/2025-pyTopoComplexity/pyTopoComplexity/pytopocomplexity/pycwtmexhat.py:5\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mrasterio\u001b[39;00m\n\u001b[1;32m 4\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mdask\u001b[39;00m\n\u001b[0;32m----> 5\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mdask\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01marray\u001b[39;00m \u001b[38;5;28;01mas\u001b[39;00m \u001b[38;5;21;01mda\u001b[39;00m\n\u001b[1;32m 6\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mdask\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mdiagnostics\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m ProgressBar\n\u001b[1;32m 7\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mscipy\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01msignal\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m fftconvolve, convolve2d\n",
171+
"\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'dask.array'"
172+
]
173+
}
174+
],
161175
"source": [
162176
"import os\n",
163177
"from pytopocomplexity import CWTMexHat"

‎Example_pyfracd.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,18 @@
8686
},
8787
{
8888
"cell_type": "code",
89-
"execution_count": 53,
89+
"execution_count": 1,
9090
"metadata": {},
9191
"outputs": [
9292
{
9393
"name": "stdout",
9494
"output_type": "stream",
9595
"text": [
96-
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.0)\n",
96+
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.1)\n",
9797
"Requirement already satisfied: numpy>=1.20 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.26.4)\n",
9898
"Requirement already satisfied: scipy>=1.5 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.14.1)\n",
9999
"Requirement already satisfied: rasterio>=1.2 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.3.11)\n",
100-
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2025.1.0)\n",
100+
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2024.9.0)\n",
101101
"Requirement already satisfied: matplotlib>=3.3 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (3.9.2)\n",
102102
"Requirement already satisfied: tqdm>=4.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (4.66.5)\n",
103103
"Requirement already satisfied: numba>=0.50 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (0.60.0)\n",

‎Example_pyrugosity.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@
6868
"name": "stdout",
6969
"output_type": "stream",
7070
"text": [
71-
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.0)\n",
71+
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.1)\n",
7272
"Requirement already satisfied: numpy>=1.20 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.26.4)\n",
7373
"Requirement already satisfied: scipy>=1.5 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.14.1)\n",
7474
"Requirement already satisfied: rasterio>=1.2 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.3.11)\n",
75-
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2025.1.0)\n",
75+
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2024.9.0)\n",
7676
"Requirement already satisfied: matplotlib>=3.3 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (3.9.2)\n",
7777
"Requirement already satisfied: tqdm>=4.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (4.66.5)\n",
7878
"Requirement already satisfied: numba>=0.50 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (0.60.0)\n",

‎Example_pytpi.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@
6868
"name": "stdout",
6969
"output_type": "stream",
7070
"text": [
71-
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.0)\n",
71+
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.1)\n",
7272
"Requirement already satisfied: numpy>=1.20 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.26.4)\n",
7373
"Requirement already satisfied: scipy>=1.5 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.14.1)\n",
7474
"Requirement already satisfied: rasterio>=1.2 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.3.11)\n",
75-
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2025.1.0)\n",
75+
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2024.9.0)\n",
7676
"Requirement already satisfied: matplotlib>=3.3 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (3.9.2)\n",
7777
"Requirement already satisfied: tqdm>=4.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (4.66.5)\n",
7878
"Requirement already satisfied: numba>=0.50 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (0.60.0)\n",

‎Landlab_simulation.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@
9797
},
9898
{
9999
"cell_type": "code",
100-
"execution_count": 15,
100+
"execution_count": 1,
101101
"metadata": {},
102102
"outputs": [
103103
{
104104
"name": "stdout",
105105
"output_type": "stream",
106106
"text": [
107-
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.0)\n",
107+
"Requirement already satisfied: pytopocomplexity in /Users/larryslai/miniforge3/lib/python3.12/site-packages (1.1.1)\n",
108108
"Requirement already satisfied: numpy>=1.20 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.26.4)\n",
109109
"Requirement already satisfied: scipy>=1.5 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.14.1)\n",
110110
"Requirement already satisfied: rasterio>=1.2 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (1.3.11)\n",
111-
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2025.1.0)\n",
111+
"Requirement already satisfied: dask>=2021.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (2024.9.0)\n",
112112
"Requirement already satisfied: matplotlib>=3.3 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (3.9.2)\n",
113113
"Requirement already satisfied: tqdm>=4.0 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (4.66.5)\n",
114114
"Requirement already satisfied: numba>=0.50 in /Users/larryslai/miniforge3/lib/python3.12/site-packages (from pytopocomplexity) (0.60.0)\n",

0 commit comments

Comments
 (0)