From 4d77c9ec27ef1b856cc44117938b008685811305 Mon Sep 17 00:00:00 2001 From: Christian Darsow-Fromm <christian.darsow@physik.uni-hamburg.de> Date: Wed, 13 Mar 2019 15:02:26 +0100 Subject: [PATCH] update openqlab --- Makefile | 2 +- requirements.txt | 2 +- setup.cfg | 2 +- src/tests/test_servo.py | 13 +++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0acdd27..b41a5b6 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 b0d24ed..dbde507 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 284fd2d..15a592a 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 d0d76b8..f1fbda9 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() -- GitLab