Resolve merge conflict in test_basic_calculator.py

MIT-Emerging-Talent · Jan 12, 2025 · b182ef5 · b182ef5
2 parents 7b91346 + b796016
commit b182ef5
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 23 deletions.
diff --git a/collaboration/communication.md b/collaboration/communication.md
@@ -7,42 +7,58 @@
         you can share the rest in confidence with you group by another channel
 -->
 
+<!-- markdownlint-disable MD013 -->
 # Communication
 
 ______________________________________________________________________
 
 ## Communication Schedule
 
-| Day  | How  | The topic of discussion |
-|------|:----:|-------------------------|
-|      |      |                         |
+| **Date**                     | **Time (EST)** | **Platform**   | **Agenda**                                                                 |
+|-------------------------------|----------------|----------------|-----------------------------------------------------------------------------|
+| Sunday, December 22nd         | 9 AM           | Google Meet    | - Discuss and vote on team name ideas. - Establish guidelines for collaboration and communication. - Review and decide on tools for efficient teamwork. - Plan action items and next milestones. |
+| Friday, December 27th         | 5 PM           | Google Meet    | - Review the collaboration tools document synchronously. - Discuss and propose challenges. - Solve any doubts or blockages we may have. |
+
+______________________________________________________________________
 
 ## Communication Channels
 
 how often will we get in touch on each channel, and what we will discuss there:
 
-- **Issues**:
-- **Pull Requests**:
-- **Slack/Discord**:
-- **Video Calls**:
+| **Channel**      | **Purpose**                                                          | **Frequency**                     |
+|-------------------|----------------------------------------------------------------------|-----------------------------------|
+| **Issues**        | Report and discuss bugs, tasks, and enhancements.                   | On Demand                         |
+| **Pull Requests** | Review and discuss code changes before they are merged.             | On Demand                         |
+| **Slack**         | Quick questions, informal discussions, and real-time updates.       | On Demand                         |
+| **Video Calls**   | Discuss complex issues, planning meetings, and team sync-ups.       | On Demand                         |
 
 ______________________________________________________________________
 
 ## Availability
 
 ### Availability for calling/messaging
 
-| Day      | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | Sunday|
-|----------|:------:|:-------:|:---------:|:--------:|:------:|:--------:|:----:|
-|          |        |         |           |          |        |          |      |
+| **Team Member**         | **Monday**   | **Tuesday**   | **Wednesday** | **Thursday**  | **Friday**    | **Saturday**    | **Sunday**     |
+|--------------------------|--------------|---------------|---------------|---------------|---------------|-----------------|----------------|
+| **Ramon Colmenares**     | 4 - 8 PM EST | 4 - 8 PM EST  | 4 - 8 PM EST  | 4 - 8 PM EST  | 4 - 8 PM EST  | 4 - 8 PM EST    | 4 - 8 PM EST   |
+| **Hector Colmenares**    | 4 - 7 PM EST | 4 - 5.5 PM EST| 4 - 7 PM EST  | 4 - 5.5 PM EST| 4 - 7 PM EST  | 12 - 4 PM EST   | Not available  |
+| **Semira Tesfai**        | 5 - 8 PM EST | 5 - 8 PM EST  | 5 - 8 PM EST  | 5 - 8 PM EST  | 5 - 8 PM EST  | 6 - 8 PM EST    | 5 - 8 PM EST   |
+| **Chrismy Augustin**     | 5 - 9 PM EST | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST    | 5 - 9 PM EST   |
+| **Ana Isabel Murillo**   | 7 - 10 PM EST| 7 - 10 PM EST | 7 - 10 PM EST | 7 - 10 PM EST | 7 - 10 PM EST | 12 - 4 PM EST   | Not available  |
+| **Pierre Kenley MERVIL** | 7 AM - 10 PM | 5 - 10 PM EST | 7 AM - 10 PM  | 5 - 10 PM EST | 5 - 10 PM EST | 7 AM - 10 PM    | 5 - 10 PM EST  |
+| **Cliforde Exael**       | 5 - 9 PM EST | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST  | 5 - 9 PM EST    | 5 - 9 PM EST   |
 
+______________________________________________________________________
+<!-- markdownlint-enable MD013 -->
 ### How many hours everyone has per day
 
-- name: _5h_;
-- name: _6h_;
-- name: _5h_;
-- name: _4h_;
-- name: _3h_;
+- **Ramon Colmenares**: 4 hours
+- **Hector Colmenares**: 3.5 hours
+- **Ana Isabel Murillo**: 3 hours
+- **Chrismy Augustin**: 4 hours
+- **Pierre Kenley MERVIL**: 5 hours
+- **Cliforde Exael**: 4 hours
+- **Semira Tesfai**: 3 hours
 
 ## Asking for Help
 

diff --git a/solutions/basic_calculator/basic_calculator.py b/solutions/basic_calculator/basic_calculator.py
@@ -1,5 +1,3 @@
-
-
 """
 A module for performing basic arithmetic operations: addition, subtraction,
 multiplication, and division.
@@ -11,11 +9,13 @@
 Author: Ana Isabel Murillo
 """
 
+
 def calculate(operation: str, num1: float, num2: float) -> float:
     """Performs the specified arithmetic operation on two numbers.
 
     Parameters:
-        operation: str, the operation to perform ('add', 'subtract', 'multiply', 'divide')
+        operation: str, the operation to perform
+        ('add', 'subtract', 'multiply', 'divide')
         num1: float, the first number
         num2: float, the second number
 
@@ -38,15 +38,18 @@ def calculate(operation: str, num1: float, num2: float) -> float:
             ...
         ValueError: Cannot divide by zero.
     """
-    if operation == 'add':
+    if operation == "add":
         return num1 + num2
-    elif operation == 'subtract':
+    elif operation == "subtract":
         return num1 - num2
-    elif operation == 'multiply':
+    elif operation == "multiply":
         return num1 * num2
-    elif operation == 'divide':
+    elif operation == "divide":
         if num2 == 0:
             raise ValueError("Cannot divide by zero.")
         return num1 / num2
     else:
-        raise ValueError(f"Invalid operation '{operation}'. Valid operations are: add, subtract, multiply, divide.")
+        raise ValueError(
+            f"Invalid operation '{operation}'. Valid operations are: "
+            "add, subtract, multiply, divide."
+        )
diff --git a/solutions/tests/test_basic_calculator.py b/solutions/tests/test_basic_calculator.py
@@ -11,6 +11,7 @@
 """
 
 from solutions.basic_calculator.basic_calculator import calculate
+
 import unittest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,7 @@
		"""

		from solutions.basic_calculator.basic_calculator import calculate

		import unittest


Expand Down