Merge branch 'master' into abstracted-uids-in-docker

Author: skytreader

components/__init__.py

@@ -1,4 +1,6 @@
 """
 Just my __init__.py to conform to standards.
 """
+
 __version__ = "3.1.0-alpha"
+

components/tools/dialog.py

@@ -129,7 +129,7 @@ def get_section(normal=True):
                     eat_empty_lines()
 
                 if BranchingDialogParser.LABEL_LIST.match(lstring[self.__lineno]):
-                    labels = lstring[self.__lineno].split(",\s*")
+                    labels = lstring[self.__lineno].split(r",\s*")
                     labels = re.split(r",\s*", lstring[self.__lineno])
                     self.__lineno += 1
                     return (label, DialogSection(prompt=option_s, reply=reply_s, cont=labels))

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+python_files = *_tests.py

requirements.txt

@@ -1,2 +1 @@
-nose==1.3.7
-mock==2.0.0
+pytest==6.0.1

runtests

@@ -11,7 +11,7 @@ $XVFB :99 -ac &
 PID_XVFB="$!"
 export DISPLAY=:99
 
-nosetests tests --with-xcoverage
+coverage run --source=components -m pytest
 result=$?
 
 kill $PID_XVFB

test-requirements.txt

@@ -1,4 +1,3 @@
-coverage==3.7.1
-nosexcover==1.0.10
-python-coveralls==2.5.0
-mock==2.0.0
+coverage==5.2.1
+coveralls==2.1.2
+pytest-cov==2.10.1

tests/__init__.py

@@ -1,4 +1,4 @@
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 def make_mock_clock():
     mock_clock = MagicMock()

tests/components/helpers/scheduler_test.py

@@ -1,5 +1,5 @@
 from components.helpers.scheduler import Scheduler
-from mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import unittest