chore: redo error messages for source code and pytest skips

Author: zmx27

src/diffpy/srfit/pdf/characteristicfunctions.py

@@ -415,11 +415,9 @@ def __call__(self, r):
         #
         # We also have to make a q-spacing small enough to compute out to at
         # least the size of the signal.
-
-        # As of release 3.2.0, these are not working but we hope to have
-        # them working again in a future release.
         raise NotImplementedError(
-            "calculate_ER() is not implemented in sasmodels"
+            "As of release 3.2.0, these are not working but we hope to have "
+            + "them working again in a future release."
         )
 
         dr = min(0.01, r[1] - r[0])

tests/test_characteristicfunctions.py

@@ -32,7 +32,13 @@
 
 
 def testSphere(sas_available):
-    pytest.skip("calculate_ER() not available")
+    # if not sas_available:
+    # pytest.skip("sas package not available")
+    pytest.skip(
+        "sas characteristic functions not currently working, "
+        + "remove skip when our code is refactored to use the "
+        + "latest sasview API"
+    )
     radius = 25
     # Calculate sphere cf from SphereModel
     SphereModel = find_model("sphere")
@@ -52,7 +58,13 @@ def testSphere(sas_available):
 
 
 def testSpheroid(sas_available):
-    pytest.skip("calculate_ER() not available")
+    # if not sas_available:
+    # pytest.skip("sas package not available")
+    pytest.skip(
+        "sas characteristic functions not currently working, "
+        + "remove skip when our code is refactored to use the "
+        + "latest sasview API"
+    )
     prad = 20.9
     erad = 33.114
     # Calculate cf from EllipsoidModel
@@ -74,7 +86,13 @@ def testSpheroid(sas_available):
 
 
 def testShell(sas_available):
-    pytest.skip("calculate_ER() not available")
+    # if not sas_available:
+    # pytest.skip("sas package not available")
+    pytest.skip(
+        "sas characteristic functions not currently working, "
+        + "remove skip when our code is refactored to use the "
+        + "latest sasview API"
+    )
     radius = 19.2
     thickness = 7.8
     # Calculate cf from VesicleModel
@@ -96,7 +114,13 @@ def testShell(sas_available):
 
 
 def testCylinder(sas_available):
-    pytest.skip("calculate_ER() not available")
+    # if not sas_available:
+    # pytest.skip("sas package not available")
+    pytest.skip(
+        "sas characteristic functions not currently working, "
+        + "remove skip when our code is refactored to use the "
+        + "latest sasview API"
+    )
     """Make sure cylinder works over different r-ranges."""
     radius = 100
     length = 30