diff --git a/Makefile b/Makefile index 0acdd27647ebe64c37c4dabbb4d4dd87b4a1fd2f..b41a5b6a942044ac01e4c5e8555e1fc57137277f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PIPFLAGS = -r requirements.txt --extra-index-url https://las-nq-serv.physnet.uni-hamburg.de/pypiserver +PIPFLAGS = -r requirements.txt all: requirements test doc package diff --git a/requirements.txt b/requirements.txt index b0d24ed9c58aa8eb3da9498edad8bed173d5b6d0..dbde50749859b928d0607bbe6d08b6045a779d93 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ wheel setuptools # setuptools_scm # python-dotenv -OpenQlab>=0.1 +OpenQlab>=0.1.4 jupyter_contrib_nbextensions pytest<4.0 pytest-cov diff --git a/setup.cfg b/setup.cfg index 284fd2df0c8f027e6e5eed5db15fb64d6e136536..15a592a064e52254ea260a9459f2a325841fbf1d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,7 @@ install_requires = sphinx_rtd_theme wheel setuptools - OpenQlab>=0.1 + OpenQlab>=0.1.4 jupyter_contrib_nbextensions pytest<4.0 pytest-cov diff --git a/src/tests/test_servo.py b/src/tests/test_servo.py index d0d76b8801b277ef628cdb28c3411111c0fc76bd..f1fbda9fdd9b552f603f3f6310a8b589f2e16211 100644 --- a/src/tests/test_servo.py +++ b/src/tests/test_servo.py @@ -890,6 +890,19 @@ class TestTemperatureFeedback(unittest.TestCase): self.assertIn('OK.', self.s._tempFeedback.last_answer) self.s.tempFeedbackStop() + def test_adding_plant_data_string(self): + tests_dir = os.path.dirname(os.path.abspath(__file__)) + testfile = '{}/fra.csv'.format(tests_dir) + compare = io.read(testfile) + + #file is encoded in 'cp1252' + with open(testfile, mode='rb') as file: + data_string = file.read().decode('cp1252') + + data = io.read(data_string) + + self.assertTrue(data.equals(compare)) + if __name__ == '__main__': # t = TestTemperatureFeedback()