Skip to content

Commit

Permalink
Merge branch 'feature/tests' into develop
Browse files Browse the repository at this point in the history 
package tests added. Moved CCB presentations by one week.
  • Loading branch information
@awerdich
awerdich committed Oct 21, 2024
2 parents 9040361 + e5ea2c9 commit 20d1c8d
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 75 deletions.
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
app:
image: cadence:01
Expand Down
192 changes: 118 additions & 74 deletions notebooks/scheduling_ccb.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Package version: 0.0.post1.dev91+g09c3331.d20240903\n"
"Package version: 0.0.4b0.post1.dev1+g9040361\n"
]
}
],
Expand Down Expand Up @@ -80,13 +80,27 @@
"id": "e44ad800-ec7b-4c5e-8324-394d80241a57",
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"ccb_names_list.csv: 8.19kB [00:00, 25.9kB/s]"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Created .csv file.\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"\n"
]
},
{
"data": {
"text/html": [
Expand Down Expand Up @@ -545,7 +559,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 5,
"id": "ef798fa2-5ebb-4188-9d02-dbf4fcf4f64d",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -676,7 +690,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 6,
"id": "413608df-85f8-498b-be75-a44d7aafe047",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -917,80 +931,80 @@
" <tr>\n",
" <th>9</th>\n",
" <td>2024-10-23</td>\n",
" <td>Andreas</td>\n",
" <td>Devesh Surve</td>\n",
" <td>ai-data</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" <td>Candidate Presentation</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
" <td>2024-10-30</td>\n",
" <td>Anthony</td>\n",
" <td>comp-bio</td>\n",
" <td>Andreas</td>\n",
" <td>ai-data</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>11</th>\n",
" <td>2024-11-06</td>\n",
" <td>Andrew</td>\n",
" <td>Anthony</td>\n",
" <td>comp-bio</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>2024-11-13</td>\n",
" <td>Gerald</td>\n",
" <td>ai-data</td>\n",
" <td>Andrew</td>\n",
" <td>comp-bio</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>13</th>\n",
" <td>2024-11-20</td>\n",
" <td>Grey</td>\n",
" <td>comp-bio</td>\n",
" <td>Gerald</td>\n",
" <td>ai-data</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>14</th>\n",
" <td>2024-11-27</td>\n",
" <td>Nobody</td>\n",
" <td>ai-data</td>\n",
" <td>comp-bio</td>\n",
" <td>False</td>\n",
" <td>Happy Thanksgiving!</td>\n",
" </tr>\n",
" <tr>\n",
" <th>15</th>\n",
" <td>2024-12-04</td>\n",
" <td>Sam</td>\n",
" <td>ai-data</td>\n",
" <td>Grey</td>\n",
" <td>comp-bio</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>16</th>\n",
" <td>2024-12-11</td>\n",
" <td>Tyrone</td>\n",
" <td>comp-bio</td>\n",
" <td>Sam</td>\n",
" <td>ai-data</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>17</th>\n",
" <td>2024-12-18</td>\n",
" <td>Sreya</td>\n",
" <td>ai-data</td>\n",
" <td>Tyrone</td>\n",
" <td>comp-bio</td>\n",
" <td>False</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>18</th>\n",
" <td>2024-12-25</td>\n",
" <td>Tram</td>\n",
" <td>comp-bio</td>\n",
" <td>Sreya</td>\n",
" <td>ai-data</td>\n",
" <td>True</td>\n",
" <td>Christmas Day</td>\n",
" </tr>\n",
Expand All @@ -999,26 +1013,47 @@
"</div>"
],
"text/plain": [
" date name group holiday comment\n",
"0 2024-08-21 Andrew comp-bio False None\n",
"1 2024-08-28 Everyone ai-data False Repos, best practices discussion\n",
"2 2024-09-04 Gerald ai-data False None\n",
"3 2024-09-11 Grey comp-bio False None\n",
"4 2024-09-18 Sam ai-data False None\n",
"5 2024-09-25 Tyrone comp-bio False None\n",
"6 2024-10-02 Sreya ai-data False None\n",
"7 2024-10-09 Nathan comp-bio False \n",
"8 2024-10-16 Tram comp-bio False None\n",
"9 2024-10-23 Andreas ai-data False None\n",
"10 2024-10-30 Anthony comp-bio False None\n",
"11 2024-11-06 Andrew comp-bio False None\n",
"12 2024-11-13 Gerald ai-data False None\n",
"13 2024-11-20 Grey comp-bio False None\n",
"14 2024-11-27 Nobody ai-data False Happy Thanksgiving!\n",
"15 2024-12-04 Sam ai-data False None\n",
"16 2024-12-11 Tyrone comp-bio False None\n",
"17 2024-12-18 Sreya ai-data False None\n",
"18 2024-12-25 Tram comp-bio True Christmas Day"
" date name group holiday \\\n",
"0 2024-08-21 Andrew comp-bio False \n",
"1 2024-08-28 Everyone ai-data False \n",
"2 2024-09-04 Gerald ai-data False \n",
"3 2024-09-11 Grey comp-bio False \n",
"4 2024-09-18 Sam ai-data False \n",
"5 2024-09-25 Tyrone comp-bio False \n",
"6 2024-10-02 Sreya ai-data False \n",
"7 2024-10-09 Nathan comp-bio False \n",
"8 2024-10-16 Tram comp-bio False \n",
"9 2024-10-23 Devesh Surve ai-data False \n",
"10 2024-10-30 Andreas ai-data False \n",
"11 2024-11-06 Anthony comp-bio False \n",
"12 2024-11-13 Andrew comp-bio False \n",
"13 2024-11-20 Gerald ai-data False \n",
"14 2024-11-27 Nobody comp-bio False \n",
"15 2024-12-04 Grey comp-bio False \n",
"16 2024-12-11 Sam ai-data False \n",
"17 2024-12-18 Tyrone comp-bio False \n",
"18 2024-12-25 Sreya ai-data True \n",
"\n",
" comment \n",
"0 None \n",
"1 Repos, best practices discussion \n",
"2 None \n",
"3 None \n",
"4 None \n",
"5 None \n",
"6 None \n",
"7 \n",
"8 None \n",
"9 Candidate Presentation \n",
"10 None \n",
"11 None \n",
"12 None \n",
"13 None \n",
"14 Happy Thanksgiving! \n",
"15 None \n",
"16 None \n",
"17 None \n",
"18 Christmas Day "
]
},
"metadata": {},
Expand Down Expand Up @@ -1051,6 +1086,15 @@
" comment=skip_comment,\n",
" name=skip_name)\n",
"\n",
"skip_date = '2024-10-23'\n",
"skip_name = 'Devesh Surve'\n",
"skip_comment = 'Candidate Presentation'\n",
"\n",
"cal = meet.skip_date(cal_df=cal, \n",
" date=skip_date, \n",
" comment=skip_comment,\n",
" name=skip_name)\n",
"\n",
"skip_date = '2024-11-27'\n",
"skip_name = 'Nobody'\n",
"skip_comment = 'Happy Thanksgiving!'\n",
Expand All @@ -1065,7 +1109,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 13,
"id": "0f3f0be3-ab4e-49b1-8ce6-c5289fa3a36c",
"metadata": {},
"outputs": [
Expand Down Expand Up @@ -1153,31 +1197,31 @@
" <tr>\n",
" <th>9</th>\n",
" <td>2024-10-23</td>\n",
" <td>Andreas</td>\n",
" <td>None</td>\n",
" <td>Devesh Surve</td>\n",
" <td>Candidate Presentation</td>\n",
" </tr>\n",
" <tr>\n",
" <th>10</th>\n",
" <td>2024-10-30</td>\n",
" <td>Anthony</td>\n",
" <td>Andreas</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>11</th>\n",
" <td>2024-11-06</td>\n",
" <td>Andrew</td>\n",
" <td>Anthony</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>12</th>\n",
" <td>2024-11-13</td>\n",
" <td>Gerald</td>\n",
" <td>Andrew</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>13</th>\n",
" <td>2024-11-20</td>\n",
" <td>Grey</td>\n",
" <td>Gerald</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
Expand All @@ -1189,52 +1233,52 @@
" <tr>\n",
" <th>15</th>\n",
" <td>2024-12-04</td>\n",
" <td>Sam</td>\n",
" <td>Grey</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>16</th>\n",
" <td>2024-12-11</td>\n",
" <td>Tyrone</td>\n",
" <td>Sam</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>17</th>\n",
" <td>2024-12-18</td>\n",
" <td>Sreya</td>\n",
" <td>Tyrone</td>\n",
" <td>None</td>\n",
" </tr>\n",
" <tr>\n",
" <th>18</th>\n",
" <td>2024-12-25</td>\n",
" <td>Tram</td>\n",
" <td>Sreya</td>\n",
" <td>Christmas Day</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
"</div>"
],
"text/plain": [
" date name comment\n",
"0 2024-08-21 Andrew None\n",
"1 2024-08-28 Everyone Repos, best practices discussion\n",
"2 2024-09-04 Gerald None\n",
"3 2024-09-11 Grey None\n",
"4 2024-09-18 Sam None\n",
"5 2024-09-25 Tyrone None\n",
"6 2024-10-02 Sreya None\n",
"7 2024-10-09 Nathan \n",
"8 2024-10-16 Tram None\n",
"9 2024-10-23 Andreas None\n",
"10 2024-10-30 Anthony None\n",
"11 2024-11-06 Andrew None\n",
"12 2024-11-13 Gerald None\n",
"13 2024-11-20 Grey None\n",
"14 2024-11-27 Nobody Happy Thanksgiving!\n",
"15 2024-12-04 Sam None\n",
"16 2024-12-11 Tyrone None\n",
"17 2024-12-18 Sreya None\n",
"18 2024-12-25 Tram Christmas Day"
" date name comment\n",
"0 2024-08-21 Andrew None\n",
"1 2024-08-28 Everyone Repos, best practices discussion\n",
"2 2024-09-04 Gerald None\n",
"3 2024-09-11 Grey None\n",
"4 2024-09-18 Sam None\n",
"5 2024-09-25 Tyrone None\n",
"6 2024-10-02 Sreya None\n",
"7 2024-10-09 Nathan \n",
"8 2024-10-16 Tram None\n",
"9 2024-10-23 Devesh Surve Candidate Presentation\n",
"10 2024-10-30 Andreas None\n",
"11 2024-11-06 Anthony None\n",
"12 2024-11-13 Andrew None\n",
"13 2024-11-20 Gerald None\n",
"14 2024-11-27 Nobody Happy Thanksgiving!\n",
"15 2024-12-04 Grey None\n",
"16 2024-12-11 Sam None\n",
"17 2024-12-18 Tyrone None\n",
"18 2024-12-25 Sreya Christmas Day"
]
},
"metadata": {},
Expand All @@ -1244,14 +1288,14 @@
"name": "stdout",
"output_type": "stream",
"text": [
"/app/data/ccb_presentations_2024_2.csv\n"
"/app/data/ccb_presentations_2024_3.csv\n"
]
}
],
"source": [
"# Save the presentation schedule\n",
"save_cols = ['date', 'name', 'comment']\n",
"schedule_name = f'ccb_presentations_2024_2.csv'\n",
"schedule_name = f'ccb_presentations_2024_3.csv'\n",
"schedule_file = os.path.join(data_dir, schedule_name)\n",
"cal[save_cols].to_csv(schedule_file, index=False)\n",
"display(cal[save_cols])\n",
Expand Down
Loading

0 comments on commit 20d1c8d

Please sign in to comment.