Merge branch 'main' into 20-update-spherepy-function

NeuroHackademy2024 · Aug 5, 2024 · 3732df7 · 3732df7
2 parents 5be3462 + 18e476a
commit 3732df7
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -2,4 +2,13 @@ this is a README that I want to change like this.
 
 and now it's got a second line!
 
-MF: Making a change.
+Checking out how to complete work and open a pull request!
+
+MF: Making a change.
+
+ML: making another change. 
+
+I changed a README file.
+
+JW: Making more changes.
+
diff --git a/annachiara b/annachiara
@@ -0,0 +1 @@
+This is an example 
diff --git a/clothes.txt b/clothes.txt
@@ -0,0 +1,3 @@
+help
+clothes stolen
+am cold
diff --git a/clothes2.txt b/clothes2.txt
@@ -0,0 +1,2 @@
+lost clothes again
+how does this keep happening
diff --git a/figuring-out-who-to-call b/figuring-out-who-to-call
@@ -0,0 +1 @@
+echo 'Ghostbusters!'
diff --git a/naming my file b/naming my file
@@ -0,0 +1 @@
+file 
diff --git a/src/geometry/sphere.py b/src/geometry/sphere.py
@@ -19,4 +19,18 @@ def calculate_volume(r):
     """
 
     volume = (4 * pi * r **3) / 3
-    return volume
+    return volume
+
+
+def calculate_surface_area(r):
+    """ 
+    Calculate the surface area of a sphere. 
+
+    This uses the standard mathematical calculation: 
+
+    $4\pi r ^2$
+
+    float : the surface area of the sphere
+    """
+    surface_area = 4 * pi * r **2
+    return surface_area
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		lost clothes again
		how does this keep happening