Merge pull request #33 from MAMBA-python/dev

Update ubuntu for tests
MAMBA-python · Jun 21, 2023 · 46b4507 · 46b4507
2 parents 4989033 + 861a087
commit 46b4507
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 106 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: [3.9]
 
     steps:
       - uses: actions/checkout@v2
@@ -30,7 +30,6 @@ jobs:
           pip install flake8 pytest
           pip install fsspec>=0.3.3
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          pip install codecov
           pip install pytest-cov
           pip install pytest-dependency
           pip install nbformat 

diff --git a/Exercise_notebooks/On_topic/06_Functions/04-riddles_and_functions_group_exercises.ipynb b/Exercise_notebooks/On_topic/06_Functions/04-riddles_and_functions_group_exercises.ipynb
@@ -17,7 +17,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -46,7 +45,7 @@
    "outputs": [],
    "source": [
     "# test if your functions works with the code below\n",
-    "if is_present_today('NotaName') is True:\n",
+    "if is_present_today('NotaName') is False:\n",
     "    print('works!')\n",
     "    \n",
     "if is_present_today('Petra') or is_present_today('Onno'):\n",
@@ -266,9 +265,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.8.6"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/practical_examples/01_GIS/02_Delfland_waterways/Delfland_waterways.ipynb b/practical_examples/01_GIS/02_Delfland_waterways/Delfland_waterways.ipynb
@@ -1,7 +1,6 @@
 {
  "cells": [
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -36,7 +35,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -50,10 +48,10 @@
    "outputs": [],
    "source": [
     "# read shapefile with the actual location of the canals\n",
-    "boezem = r\"shapefiles\\boezemwatergangen.shp\"\n",
+    "boezem = r\"shapefiles/boezemwatergangen.shp\"\n",
     "\n",
     "# read shapefile with the modelled canals\n",
-    "RTCtakken = r\"shapefiles\\RTC takken voorstel 20160203.shp\"\n",
+    "RTCtakken = r\"shapefiles/RTC takken voorstel 20160203.shp\"\n",
     "\n",
     "# read csv file with initial water levels\n",
     "csv_file = 'timeseries_0000.csv'\n",
@@ -68,7 +66,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -101,7 +98,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -128,7 +124,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -155,7 +150,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -177,7 +171,6 @@
    ]
   },
   {
-   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -193,13 +186,20 @@
     "gdf_no_x_y = gdf[['w_level', 'geometry']]\n",
     "\n",
     "gdf_no_x_y.to_crs(epsg= ref_basemap)\n",
-    "gdf_no_x_y.explore()\n"
+    "gdf_no_x_y.explore()"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -213,9 +213,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.6"
+   "version": "3.8.6"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }