Skip to content

Commit 1c7e183

Browse files
stefmolinstefmolin
authored
Merge pull request #26 from stefmolin/version-update
2024 update
2 parents a679b0a + 441a70c commit 1c7e183

23 files changed

+13320
-39199
lines changed

‎.github/workflows/env-checks.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This workflow builds the workshop environment on Mac, Linux, and Windows for
22
# multiple versions of Python to confirm it can be properly installed.
3-
#
3+
#
44
# Author: Stefanie Molin
55

66
name: Env Build
@@ -33,7 +33,7 @@ jobs:
3333

3434
# The type of runner that the job will run on
3535
runs-on: ${{ matrix.os }}
36-
36+
3737
defaults:
3838
run:
3939
shell: bash -el {0}
@@ -42,13 +42,13 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
os: [macos-latest, ubuntu-latest, windows-latest]
45-
python-version: ["3.8", "3.9", "3.10", "3.11"]
45+
python-version: ["3.9", "3.10", "3.11", "3.12"]
4646

4747
# Steps represent a sequence of tasks that will be executed as part of the job
4848
steps:
4949
# checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
50-
- uses: actions/checkout@v3
51-
50+
- uses: actions/checkout@v4
51+
5252
# remove the Python version from the file for testing
5353
- name: strip hardcoded Python version from environment for testing
5454
run: |
@@ -59,12 +59,13 @@ jobs:
5959
fi;
6060
6161
# create the conda env
62-
- uses: conda-incubator/setup-miniconda@v2
62+
- uses: conda-incubator/setup-miniconda@v3
6363
with:
6464
python-version: ${{ matrix.python-version }}
6565
auto-update-conda: true
6666
miniforge-variant: Mambaforge
67-
use-mamba: true
67+
mamba-version: "*"
68+
channels: conda-forge
6869
channel-priority: true
6970
activate-environment: pandas_workshop
7071
environment-file: environment.yml

‎README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ You can work through the notebooks locally or in your browser. Pick the installa
4040
### Local Installation
4141
**Warning**: It is highly recommended that you use your personal laptop for the installation.
4242

43-
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.
43+
0. Install the following, if not already installed:
44+
- 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.
45+
- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
46+
4447
1. Fork this repository:
4548

4649
![location of fork button in GitHub](./media/fork_button.png)

‎asynchronous_lab/asynchronous_lab.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@
260260
],
261261
"metadata": {
262262
"kernelspec": {
263-
"display_name": "Python 3",
263+
"display_name": "Python 3 (ipykernel)",
264264
"language": "python",
265265
"name": "python3"
266266
},
@@ -274,7 +274,7 @@
274274
"name": "python",
275275
"nbconvert_exporter": "python",
276276
"pygments_lexer": "ipython3",
277-
"version": "3.7.3"
277+
"version": "3.12.4"
278278
}
279279
},
280280
"nbformat": 4,

‎asynchronous_lab/solutions.ipynb

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

‎environment.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: pandas_workshop
2-
channels:
2+
channels:
33
- conda-forge
44
dependencies:
5-
- python>=3.8.0,<=3.11.30
6-
- jupyterlab>=3.5.2
7-
- matplotlib=3.7.1
8-
- numpy=1.24.2
9-
- pandas=2.0.0
5+
- python>=3.9.0,<=3.12.30
6+
- jupyterlab>=4.2.3
7+
- matplotlib=3.8.4
8+
- numpy=2.0.0
9+
- pandas=2.2.2
1010
- requests
11-
- seaborn=0.12.2
11+
- seaborn=0.13.2

‎notebooks/0-check_your_env.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"name": "python",
5757
"nbconvert_exporter": "python",
5858
"pygments_lexer": "ipython3",
59-
"version": "3.11.3"
59+
"version": "3.12.4"
6060
}
6161
},
6262
"nbformat": 4,

‎notebooks/1-getting_started_with_pandas.ipynb

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
"</div>"
159159
],
160160
"text/plain": [
161-
" name id nametype recclass mass (g) fall \n",
162-
"0 Aachen 1 Valid L5 21 Fell \\\n",
161+
" name id nametype recclass mass (g) fall \\\n",
162+
"0 Aachen 1 Valid L5 21 Fell \n",
163163
"1 Aarhus 2 Valid H6 720 Fell \n",
164164
"2 Abee 6 Valid EH4 107000 Fell \n",
165165
"3 Acapulco 10 Valid Acapulcoite 1914 Fell \n",
@@ -504,13 +504,13 @@
504504
"</div>"
505505
],
506506
"text/plain": [
507-
" name id nametype recclass mass fall year \n",
508-
"0 Aachen 1 Valid L5 21 Fell 1880-01-01T00:00:00.000 \\\n",
507+
" name id nametype recclass mass fall year \\\n",
508+
"0 Aachen 1 Valid L5 21 Fell 1880-01-01T00:00:00.000 \n",
509509
"1 Aarhus 2 Valid H6 720 Fell 1951-01-01T00:00:00.000 \n",
510510
"2 Abee 6 Valid EH4 107000 Fell 1952-01-01T00:00:00.000 \n",
511511
"\n",
512-
" reclat reclong geolocation \n",
513-
"0 50.775000 6.083330 {'latitude': '50.775', 'longitude': '6.08333'} \\\n",
512+
" reclat reclong geolocation \\\n",
513+
"0 50.775000 6.083330 {'latitude': '50.775', 'longitude': '6.08333'} \n",
514514
"1 56.183330 10.233330 {'latitude': '56.18333', 'longitude': '10.23333'} \n",
515515
"2 54.216670 -113.000000 {'latitude': '54.21667', 'longitude': '-113.0'} \n",
516516
"\n",
@@ -809,8 +809,8 @@
809809
"</div>"
810810
],
811811
"text/plain": [
812-
" name id nametype recclass mass (g) fall \n",
813-
"0 Aachen 1 Valid L5 21.0 Fell \\\n",
812+
" name id nametype recclass mass (g) fall \\\n",
813+
"0 Aachen 1 Valid L5 21.0 Fell \n",
814814
"1 Aarhus 2 Valid H6 720.0 Fell \n",
815815
"2 Abee 6 Valid EH4 107000.0 Fell \n",
816816
"3 Acapulco 10 Valid Acapulcoite 1914.0 Fell \n",
@@ -958,8 +958,8 @@
958958
"</div>"
959959
],
960960
"text/plain": [
961-
" name id nametype recclass mass (g) fall \n",
962-
"45711 Zillah 002 31356 Valid Eucrite 172.0 Found \\\n",
961+
" name id nametype recclass mass (g) fall \\\n",
962+
"45711 Zillah 002 31356 Valid Eucrite 172.0 Found \n",
963963
"45712 Zinder 30409 Valid Pallasite, ungrouped 46.0 Found \n",
964964
"45713 Zlin 30410 Valid H4 3.3 Found \n",
965965
"45714 Zubkovsky 31357 Valid L6 2167.0 Found \n",
@@ -1380,8 +1380,8 @@
13801380
"</div>"
13811381
],
13821382
"text/plain": [
1383-
" name id nametype recclass mass (g) fall \n",
1384-
"100 Benton 5026 Valid LL6 2840.0 Fell \\\n",
1383+
" name id nametype recclass mass (g) fall \\\n",
1384+
"100 Benton 5026 Valid LL6 2840.0 Fell \n",
13851385
"101 Berduc 48975 Valid L6 270.0 Fell \n",
13861386
"102 Béréba 5028 Valid Eucrite-mmict 18000.0 Fell \n",
13871387
"103 Berlanguillas 5029 Valid L6 1440.0 Fell \n",
@@ -1794,8 +1794,8 @@
17941794
"</div>"
17951795
],
17961796
"text/plain": [
1797-
" name id nametype recclass mass (g) fall \n",
1798-
"29 Allende 2278 Valid CV3 2000000.0 Fell \\\n",
1797+
" name id nametype recclass mass (g) fall \\\n",
1798+
"29 Allende 2278 Valid CV3 2000000.0 Fell \n",
17991799
"419 Jilin 12171 Valid H5 4000000.0 Fell \n",
18001800
"506 Kunya-Urgench 12379 Valid H5 1100000.0 Fell \n",
18011801
"707 Norton County 17922 Valid Aubrite 1100000.0 Fell \n",
@@ -1954,8 +1954,8 @@
19541954
"</div>"
19551955
],
19561956
"text/plain": [
1957-
" name id nametype recclass mass (g) fall \n",
1958-
"29 Allende 2278 Valid CV3 2000000.0 Fell \\\n",
1957+
" name id nametype recclass mass (g) fall \\\n",
1958+
"29 Allende 2278 Valid CV3 2000000.0 Fell \n",
19591959
"419 Jilin 12171 Valid H5 4000000.0 Fell \n",
19601960
"506 Kunya-Urgench 12379 Valid H5 1100000.0 Fell \n",
19611961
"707 Norton County 17922 Valid Aubrite 1100000.0 Fell \n",
@@ -2078,7 +2078,7 @@
20782078
{
20792079
"data": {
20802080
"text/plain": [
2081-
"13278.078548601512"
2081+
"np.float64(13278.078548601512)"
20822082
]
20832083
},
20842084
"execution_count": 25,
@@ -2164,7 +2164,7 @@
21642164
{
21652165
"data": {
21662166
"text/plain": [
2167-
"32.6"
2167+
"np.float64(32.6)"
21682168
]
21692169
},
21702170
"execution_count": 27,
@@ -2198,7 +2198,7 @@
21982198
{
21992199
"data": {
22002200
"text/plain": [
2201-
"60000000.0"
2201+
"np.float64(60000000.0)"
22022202
]
22032203
},
22042204
"execution_count": 28,
@@ -2534,8 +2534,8 @@
25342534
"</div>"
25352535
],
25362536
"text/plain": [
2537-
" name id nametype recclass mass (g) fall \n",
2538-
"count 45716 45716.000000 45716 45716 4.558500e+04 45716 \\\n",
2537+
" name id nametype recclass mass (g) fall \\\n",
2538+
"count 45716 45716.000000 45716 45716 4.558500e+04 45716 \n",
25392539
"unique 45716 NaN 2 466 NaN 2 \n",
25402540
"top Aachen NaN Valid L6 NaN Found \n",
25412541
"freq 1 NaN 45641 8285 NaN 44609 \n",
@@ -2661,7 +2661,7 @@
26612661
"name": "python",
26622662
"nbconvert_exporter": "python",
26632663
"pygments_lexer": "ipython3",
2664-
"version": "3.11.3"
2664+
"version": "3.12.4"
26652665
}
26662666
},
26672667
"nbformat": 4,

0 commit comments

Comments
 (0)