stefmolin · stefmolin · Jun 30, 2024 · Jun 29, 2024 · Jun 29, 2024 · Jun 29, 2024
diff --git a/.github/workflows/env-checks.yml b/.github/workflows/env-checks.yml
@@ -1,6 +1,6 @@
 # This workflow builds the workshop environment on Mac, Linux, and Windows for
 # multiple versions of Python to confirm it can be properly installed.
-# 
+#
 # Author: Stefanie Molin
 
 name: Env Build
@@ -33,7 +33,7 @@ jobs:
 
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
-    
+
     defaults:
       run:
         shell: bash -el {0}
@@ -42,13 +42,13 @@ jobs:
         fail-fast: false
         matrix:
             os: [macos-latest, ubuntu-latest, windows-latest]
-            python-version: ["3.8", "3.9", "3.10", "3.11"]
+            python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      
+      - uses: actions/checkout@v4
+
       # remove the Python version from the file for testing
       - name: strip hardcoded Python version from environment for testing
         run: |
@@ -59,12 +59,13 @@ jobs:
           fi;
 
       # create the conda env
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python-version }}
           auto-update-conda: true
           miniforge-variant: Mambaforge
-          use-mamba: true
+          mamba-version: "*"
+          channels: conda-forge
           channel-priority: true
           activate-environment: pandas_workshop
           environment-file: environment.yml

diff --git a/README.md b/README.md
@@ -40,7 +40,10 @@ You can work through the notebooks locally or in your browser. Pick the installa
 ### Local Installation
 **Warning**: It is highly recommended that you use your personal laptop for the installation.
 
-0. Install Python >= version 3.8 and <= version 3.11 OR install [Anaconda](https://docs.anaconda.com/anaconda/install/)/[Miniconda](https://docs.conda.io/en/latest/miniconda.html). Note that Anaconda/Miniconda is recommended if you are working on a Windows machine and are not very comfortable with the command line. Alternatively, depending on server availability, you can use [this](https://mybinder.org/v2/gh/stefmolin/pandas-workshop/main?urlpath=lab) Binder environment if you don't want to install anything on your machine.
+0. Install the following, if not already installed:
+   - Python >= version 3.9 and <= version 3.12 OR install [Anaconda](https://docs.anaconda.com/anaconda/install/)/[Miniconda](https://docs.conda.io/en/latest/miniconda.html). Note that Anaconda/Miniconda is recommended if you are working on a Windows machine and are not very comfortable with the command line.
+   - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+
 1. Fork this repository:
 
     ![location of fork button in GitHub](./media/fork_button.png)

diff --git a/asynchronous_lab/asynchronous_lab.ipynb b/asynchronous_lab/asynchronous_lab.ipynb
@@ -260,7 +260,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -274,7 +274,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.12.4"
   }
  },
  "nbformat": 4,

diff --git a/asynchronous_lab/solutions.ipynb b/asynchronous_lab/solutions.ipynb
diff --git a/environment.yml b/environment.yml
@@ -1,11 +1,11 @@
 name: pandas_workshop
-channels: 
+channels:
     - conda-forge
 dependencies:
-    - python>=3.8.0,<=3.11.30
-    - jupyterlab>=3.5.2
-    - matplotlib=3.7.1
-    - numpy=1.24.2
-    - pandas=2.0.0
+    - python>=3.9.0,<=3.12.30
+    - jupyterlab>=4.2.3
+    - matplotlib=3.8.4
+    - numpy=2.0.0
+    - pandas=2.2.2
     - requests
-    - seaborn=0.12.2
+    - seaborn=0.13.2
diff --git a/notebooks/0-check_your_env.ipynb b/notebooks/0-check_your_env.ipynb
@@ -56,7 +56,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.12.4"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/1-getting_started_with_pandas.ipynb b/notebooks/1-getting_started_with_pandas.ipynb
@@ -158,8 +158,8 @@
        "</div>"
       ],
       "text/plain": [
-       "       name   id nametype     recclass  mass (g)  fall   \n",
-       "0    Aachen    1    Valid           L5        21  Fell  \\\n",
+       "       name   id nametype     recclass  mass (g)  fall  \\\n",
+       "0    Aachen    1    Valid           L5        21  Fell   \n",
        "1    Aarhus    2    Valid           H6       720  Fell   \n",
        "2      Abee    6    Valid          EH4    107000  Fell   \n",
        "3  Acapulco   10    Valid  Acapulcoite      1914  Fell   \n",
@@ -504,13 +504,13 @@
        "</div>"
       ],
       "text/plain": [
-       "     name id nametype recclass    mass  fall                     year   \n",
-       "0  Aachen  1    Valid       L5      21  Fell  1880-01-01T00:00:00.000  \\\n",
+       "     name id nametype recclass    mass  fall                     year  \\\n",
+       "0  Aachen  1    Valid       L5      21  Fell  1880-01-01T00:00:00.000   \n",
        "1  Aarhus  2    Valid       H6     720  Fell  1951-01-01T00:00:00.000   \n",
        "2    Abee  6    Valid      EH4  107000  Fell  1952-01-01T00:00:00.000   \n",
        "\n",
-       "      reclat      reclong                                        geolocation   \n",
-       "0  50.775000     6.083330     {'latitude': '50.775', 'longitude': '6.08333'}  \\\n",
+       "      reclat      reclong                                        geolocation  \\\n",
+       "0  50.775000     6.083330     {'latitude': '50.775', 'longitude': '6.08333'}   \n",
        "1  56.183330    10.233330  {'latitude': '56.18333', 'longitude': '10.23333'}   \n",
        "2  54.216670  -113.000000    {'latitude': '54.21667', 'longitude': '-113.0'}   \n",
        "\n",
@@ -809,8 +809,8 @@
        "</div>"
       ],
       "text/plain": [
-       "       name   id nametype     recclass  mass (g)  fall   \n",
-       "0    Aachen    1    Valid           L5      21.0  Fell  \\\n",
+       "       name   id nametype     recclass  mass (g)  fall  \\\n",
+       "0    Aachen    1    Valid           L5      21.0  Fell   \n",
        "1    Aarhus    2    Valid           H6     720.0  Fell   \n",
        "2      Abee    6    Valid          EH4  107000.0  Fell   \n",
        "3  Acapulco   10    Valid  Acapulcoite    1914.0  Fell   \n",
@@ -958,8 +958,8 @@
        "</div>"
       ],
       "text/plain": [
-       "             name     id nametype              recclass  mass (g)   fall   \n",
-       "45711  Zillah 002  31356    Valid               Eucrite     172.0  Found  \\\n",
+       "             name     id nametype              recclass  mass (g)   fall  \\\n",
+       "45711  Zillah 002  31356    Valid               Eucrite     172.0  Found   \n",
        "45712      Zinder  30409    Valid  Pallasite, ungrouped      46.0  Found   \n",
        "45713        Zlin  30410    Valid                    H4       3.3  Found   \n",
        "45714   Zubkovsky  31357    Valid                    L6    2167.0  Found   \n",
@@ -1380,8 +1380,8 @@
        "</div>"
       ],
       "text/plain": [
-       "              name     id nametype       recclass  mass (g)  fall   \n",
-       "100         Benton   5026    Valid            LL6    2840.0  Fell  \\\n",
+       "              name     id nametype       recclass  mass (g)  fall  \\\n",
+       "100         Benton   5026    Valid            LL6    2840.0  Fell   \n",
        "101         Berduc  48975    Valid             L6     270.0  Fell   \n",
        "102         Béréba   5028    Valid  Eucrite-mmict   18000.0  Fell   \n",
        "103  Berlanguillas   5029    Valid             L6    1440.0  Fell   \n",
@@ -1794,8 +1794,8 @@
        "</div>"
       ],
       "text/plain": [
-       "              name     id nametype    recclass    mass (g)  fall   \n",
-       "29         Allende   2278    Valid         CV3   2000000.0  Fell  \\\n",
+       "              name     id nametype    recclass    mass (g)  fall  \\\n",
+       "29         Allende   2278    Valid         CV3   2000000.0  Fell   \n",
        "419          Jilin  12171    Valid          H5   4000000.0  Fell   \n",
        "506  Kunya-Urgench  12379    Valid          H5   1100000.0  Fell   \n",
        "707  Norton County  17922    Valid     Aubrite   1100000.0  Fell   \n",
@@ -1954,8 +1954,8 @@
        "</div>"
       ],
       "text/plain": [
-       "              name     id nametype    recclass    mass (g)  fall   \n",
-       "29         Allende   2278    Valid         CV3   2000000.0  Fell  \\\n",
+       "              name     id nametype    recclass    mass (g)  fall  \\\n",
+       "29         Allende   2278    Valid         CV3   2000000.0  Fell   \n",
        "419          Jilin  12171    Valid          H5   4000000.0  Fell   \n",
        "506  Kunya-Urgench  12379    Valid          H5   1100000.0  Fell   \n",
        "707  Norton County  17922    Valid     Aubrite   1100000.0  Fell   \n",
@@ -2078,7 +2078,7 @@
     {
      "data": {
       "text/plain": [
-       "13278.078548601512"
+       "np.float64(13278.078548601512)"
       ]
      },
      "execution_count": 25,
@@ -2164,7 +2164,7 @@
     {
      "data": {
       "text/plain": [
-       "32.6"
+       "np.float64(32.6)"
       ]
      },
      "execution_count": 27,
@@ -2198,7 +2198,7 @@
     {
      "data": {
       "text/plain": [
-       "60000000.0"
+       "np.float64(60000000.0)"
       ]
      },
      "execution_count": 28,
@@ -2534,8 +2534,8 @@
        "</div>"
       ],
       "text/plain": [
-       "          name            id nametype recclass      mass (g)   fall   \n",
-       "count    45716  45716.000000    45716    45716  4.558500e+04  45716  \\\n",
+       "          name            id nametype recclass      mass (g)   fall  \\\n",
+       "count    45716  45716.000000    45716    45716  4.558500e+04  45716   \n",
        "unique   45716           NaN        2      466           NaN      2   \n",
        "top     Aachen           NaN    Valid       L6           NaN  Found   \n",
        "freq         1           NaN    45641     8285           NaN  44609   \n",
@@ -2661,7 +2661,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.12.4"
   }
  },
  "nbformat": 4,