From 368ebaf35790b07972744ad4a76d9fc9b3f105aa Mon Sep 17 00:00:00 2001 From: colevandersWands <18554853+colevandersWands@users.noreply.github.com> Date: Thu, 26 Dec 2024 16:53:34 -0500 Subject: [PATCH 1/8] md formatting fix --- .github/ISSUE_TEMPLATE/help_wanted.md | 6 +++--- .github/ISSUE_TEMPLATE/meeting_agenda.md | 3 ++- .github/ISSUE_TEMPLATE/new_challenge.md | 5 ++--- .github/ISSUE_TEMPLATE/question.md | 2 +- collaboration/guide/0_repository_setup.md | 9 +++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/help_wanted.md b/.github/ISSUE_TEMPLATE/help_wanted.md index 2ee010f2e..939dbba0a 100644 --- a/.github/ISSUE_TEMPLATE/help_wanted.md +++ b/.github/ISSUE_TEMPLATE/help_wanted.md @@ -1,10 +1,10 @@ --- name: help wanted -about: > +about: > A template issue for when you're blocked on certain lines of code. - This template has many sections to get you thinking about your problem, you don't need to fill all of them. + This template has many sections to get you thinking about your problem, + you don't need to fill all of them. labels: "help wanted" - --- - - diff --git a/collaboration/group_norms.md b/collaboration/group_norms.md new file mode 100644 index 000000000..a9a78f9ae --- /dev/null +++ b/collaboration/group_norms.md @@ -0,0 +1,68 @@ +# Group Norms + + + + + +1. **Active Listening** + + - We will listen carefully to each person without preparing a response in advance. + - We will not interrupt anyone who is speaking. + +2. **Respectful Communication** + + - We will speak respectfully and use collaborative language, even when we disagree. + - We will focus on critiquing ideas rather than criticizing individuals, sharing + both agreements and disagreements to broaden our team’s knowledge and perspective. + +3. **Supportive Environment** + + - We will foster an atmosphere where personal challenges that affect attendance can + be openly shared. + - We will work together to find individual solutions. + If someone has difficulty understanding an assignment: + - They are encouraged to consult the materials + shared by Evan and search online for up to one hour. + - If the issue remains unresolved, they should reach out to the team for help. + +4. **Timely Communication** + + - We commit to responding to messages, emails, + and inquiries without unnecessary delay, generally within 24 hours. + - Our main communication channels will be Slack and WhatsApp. + +5. **Reintegration After Absences** + + - If someone misses a group meeting or task, we + will offer helpful suggestions and + support to facilitate their reintegration. + - The individual is expected to catch up on missed + tasks to ensure the team’s progress does not stall. + +6. **Positive Support** + + - We will remain positive and offer + encouragement, especially during challenging moments. + - We will honor our commitments by arriving on + time for meetings and meeting agreed-upon deadlines. + +7. **Appreciation** + + - We will express appreciation for each other’s efforts recognizing that every + contribution, no matter how small, helps our team succeed. + +8. **Documentation and Accountability** + + - We will record all group decisions, agreements, and established norms to + maintain clarity and ensure alignment. + - We will record our meetings whenever possible. + - Within 24 hours of each meeting, a summary of + key discussions and decisions will be posted in + a shared communication channel (e.g., Slack or WhatsApp). + - Anyone who misses a meeting is encouraged to review + these materials and ask questions for clarification. + +9. **Engaged Participation** + + - We commit to being physically present, listening attentively, contributing + ideas, and staying focused on our shared objectives. From 65193433a4048928002b5d665c023d8298a42684 Mon Sep 17 00:00:00 2001 From: Evan Cole <18554853+colevandersWands@users.noreply.github.com> Date: Sat, 28 Dec 2024 10:54:46 -0500 Subject: [PATCH 4/8] Create __init__.py --- solutions/tests/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 solutions/tests/__init__.py diff --git a/solutions/tests/__init__.py b/solutions/tests/__init__.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/solutions/tests/__init__.py @@ -0,0 +1 @@ + From f592b9421ff3ee2d1c785cbf67fd6cf3f15ce7f9 Mon Sep 17 00:00:00 2001 From: Evan Cole <18554853+colevandersWands@users.noreply.github.com> Date: Sat, 28 Dec 2024 11:15:50 -0500 Subject: [PATCH 5/8] Create __init__.py --- solutions/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 solutions/__init__.py diff --git a/solutions/__init__.py b/solutions/__init__.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/solutions/__init__.py @@ -0,0 +1 @@ + From 3bea277e3faab93449bef28d3ada4996504fb3de Mon Sep 17 00:00:00 2001 From: Evan Cole <18554853+colevandersWands@users.noreply.github.com> Date: Sat, 28 Dec 2024 11:18:32 -0500 Subject: [PATCH 6/8] print found test files --- .github/workflows/ci-checks.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 48c2bad88..b3d7b0052 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -63,9 +63,13 @@ jobs: - name: Check for test files id: check_tests run: | - if find . -type f -name "test_*.py" | grep -q .; then + test_files=$(find ./solutions/tests -type f -name "test_*.py") + if [ -n "$test_files" ]; then + echo "Found test files:" + echo "$test_files" echo "has_tests=true" >> $GITHUB_OUTPUT else + echo "No test files found matching pattern ./solutions/tests/test_*.py" echo "has_tests=false" >> $GITHUB_OUTPUT fi shell: bash From 8e42c8768ebeadede5391f31dc632e3693f995f2 Mon Sep 17 00:00:00 2001 From: colevandersWands <18554853+colevandersWands@users.noreply.github.com> Date: Sat, 28 Dec 2024 14:02:25 -0500 Subject: [PATCH 7/8] use ruff as formatter --- .vscode/settings.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5a90e202f..bbda5188d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -113,5 +113,14 @@ }, // Enable/disable update table of contents on save - "markdown.extension.toc.updateOnSave": false + "markdown.extension.toc.updateOnSave": false, + + "[python]": { + "editor.defaultFormatter": "charliermarsh.ruff", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.ruff": true, + "source.organizeImports.ruff": true + } + } } From d78bc292bef2bf2beee2181304e178ad6d0d9da4 Mon Sep 17 00:00:00 2001 From: Noorelsalam Date: Sat, 28 Dec 2024 23:09:35 +0100 Subject: [PATCH 8/8] Fix line-length error in group_norms.ms --- collaboration/group_norms.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collaboration/group_norms.md b/collaboration/group_norms.md index a9a78f9ae..c65533a9c 100644 --- a/collaboration/group_norms.md +++ b/collaboration/group_norms.md @@ -17,8 +17,8 @@ 3. **Supportive Environment** - - We will foster an atmosphere where personal challenges that affect attendance can - be openly shared. + - We will foster an atmosphere where personal challenges that affect + attendance can be openly shared. - We will work together to find individual solutions. If someone has difficulty understanding an assignment: - They are encouraged to consult the materials