fix tests and such

Author: d-chambers

.pre-commit-config.yaml

@@ -12,6 +12,6 @@ repos:
         - flake8-import-order
       args:
         - "-j8"
-        - "--ignore=E203,E501,P103"
+        - "--ignore=E203,E501,P103,D105"
         - "--docstring-convention=numpy"
         - "--import-order-style=edited"

README.md

@@ -9,6 +9,8 @@ a pull request. You can check the status of the GH actions (a separate window wi
 be inserted in the PR screen) to see how your implementation is doing. Remember what
 you learned from the style assignment, readability still counts.
 
+When you are finished with *both* tasks, create a new PR and ping the instructors 
+(@opensourcecourse/instructors).
 
 # Task 1: Fun with classes (5 pts)
 
@@ -23,22 +25,22 @@ For task 2 we will create a 1D array object patterned after numpy's
 disregard efficiency. Start by looking at task_1.py and fill in the implementation to meet the
 following requirements:
 
-
-1. Implement the `__init__` to take a Sequence (tuple, lists, etc.) as the first input argument. 
+1. Implement the `__init__` to optionally take a Sequence (tuple, lists, etc.) as the first input argument.
+   If no input is provided use an empty list as input.
 
 2. Ensure each element is a basic numeric type (float, int, complex, None) else raise InvalidEntryError.
 
 3. Implement the `__str__` and `__repr__` methods. If the len < 10 'Array1D[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]'
    showing each element. If it is greater than 10 `Array1D[...]`
 
 4. Make sure the Array1D implements the Sequence protocol. Specifically, it should be iterable,
-   indexible, membership checks should work, and slicing should return Array1D instances with a
+   indexible, membership checks should work, and slicing should return Array1D instances with
    a subset of data.
 
 5. Implement operators: add, subtract, true divide, floor divide, power. Each one should work
    with an array of equal size, an array of size 1, or a single number. This should work if
    the array or the number is first. (hint: `__add__` and `__radd__` are both needed). If the
-   array's are not compatible, a IncompatibleArrayOperationError should be raised.
+   arrays are not compatible, a IncompatibleArrayOperationError should be raised.
 
 You can see how your implementation is performing by running `pytest test_task_1.py` after installing
 pytest.

test_task_2.py

@@ -7,7 +7,6 @@
 import sys
 from operator import add, floordiv, mul, pow, sub, truediv
 
-import pandas as pd
 import pytest
 
 from task_2 import Array1D, IncompatibleArrayOperationError, InvalidEntryError
@@ -28,7 +27,7 @@ def array_input(request):
     return request.param
 
 
-def test_numpy_not_in_loaded_modules(self):
+def test_numpy_not_in_loaded_modules():
     """Numpy should not be in the imported modules."""
     assert "numpy" not in sys.modules
 
@@ -83,7 +82,7 @@ def test_slice(self):
         array = Array1D(array_inp)
         array_slice = array[1:-2]
         assert isinstance(array_slice, Array1D)
-        assert list(array_slice) == array_inp[1:-2]
+        assert list(array_slice) == list(array_inp[1:-2])
 
 
 class TestRepresentation:
@@ -113,7 +112,10 @@ def test_self_operations(self, array_input):
         for op in self.operators:
             result = op(array, array)
             for el1, el2 in zip(result, array):
-                assert el1 == op(el2, el2)
+                try:
+                    assert el1 == op(el2, el2)
+                except (ZeroDivisionError, TypeError):
+                    assert el1 is None
 
     def test_uneven_array_raises(self, array_input):
         """Arrays of different lengths should not be compatible."""
@@ -133,6 +135,6 @@ def test_one_null_broadcast(self, array_input):
         null_array = Array1D([None])
         for op in self.operators:
             result1 = op(array, null_array)
-            assert all([pd.isnull(x) for x in result1])
+            assert all([x is None for x in result1])
             result2 = op(null_array, array)
-            assert all([pd.isnull(x) for x in result2])
+            assert all([x is None for x in result2])