Merge pull request #47 from DominicOram/master

Use mock module and move tests

Author: joeshannon

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Install Python packages
         run: |
-           pip install pytest==3.10.1; pip install pytest-xdist==1.26.1; pip install scipy==1.2.1; pip install nose==1.3.7
+           pip install pytest==3.10.1; pip install pytest-xdist==1.26.1; pip install scipy==1.2.1; pip install nose==1.3.7; pip install mock==3.0.5
            echo "PYTEST=pytest -W ignore::PendingDeprecationWarning" >> $GITHUB_ENV
         if: matrix.flavour == 'python'
 

test/__init__.py diffcalc/tests/__init__.pytest/__init__.py renamed to diffcalc/tests/__init__.py

@@ -42,10 +42,10 @@
     SixCircleGeometry, Fivec, Fourc
 from diffcalc.hardware import DummyHardwareAdapter
 from diffcalc.hardware import ScannableHardwareAdapter
-from test.tools import aneq_, mneq_
+from diffcalc.tests.tools import aneq_, mneq_
 from diffcalc.ub.persistence import UbCalculationNonPersister
 from diffcalc.util import DiffcalcException, MockRawInput
-from test.diffcalc import scenarios
+from diffcalc.tests import scenarios
 import diffcalc.util  # @UnusedImport to overide raw_input
 from diffcalc.gdasupport.minigda.command import sim
 

test/diffcalc/__init__.py diffcalc/tests/dc/__init__.pytest/diffcalc/__init__.py renamed to diffcalc/tests/dc/__init__.py

@@ -4,7 +4,7 @@
     from numpy import matrix
 except ImportError:
     from numjy import matrix
-from test.tools import mneq_, aneq_, assert_dict_almost_equal
+from diffcalc.tests.tools import mneq_, aneq_, assert_dict_almost_equal
 
 import diffcalc.util  # @UnusedImport
 from diffcalc.hardware import DummyHardwareAdapter

test/diffcalc/dc/test_dcvlieg.py diffcalc/tests/dc/test_dcvlieg.pytest/diffcalc/dc/test_dcvlieg.py renamed to diffcalc/tests/dc/test_dcvlieg.py

@@ -5,7 +5,7 @@
     from numpy import matrix
 except ImportError:
     from numjy import matrix
-from test.tools import mneq_, aneq_, dneq_
+from diffcalc.tests.tools import mneq_, aneq_, dneq_
 
 import diffcalc.util  # @UnusedImport
 from diffcalc.hardware import DummyHardwareAdapter