Merge branch 'develop'

.gitlab-ci.yml

@@ -5,7 +5,7 @@ variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.pip"
 
 package:
-  image: lasnq/nqlab
+  image: lasnq/openqlab
   stage: build
   before_script:
   script:
@@ -34,7 +34,7 @@ test wheel installation:
       - .pip/
 
 test:
-  image: lasnq/nqlab
+  image: lasnq/openqlab
   stage: test
   before_script:
   script:
@@ -44,7 +44,7 @@ test:
       - htmlcov
     expire_in: 30 days
 
-deploy staging:
+.deploy staging:
   image: alpine
   before_script:
     # bring ssh to work for deployment
@@ -71,8 +71,6 @@ deploy production:
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
   script:
-    # Apache server
-    - scp $SCP_PARAMS dist/*.whl $SSH_SERVER:$SERVER_ROOT/software-builds/nq-lab
     # PyPi server
     - scp $SCP_PARAMS dist/*.whl $SSH_SERVER:/var/www/packages
   only:

Makefile

@@ -7,16 +7,16 @@ requirements-user:
 	@pip3 install --user -r requirements.txt
 
 doc:
-	@export PYTHONPATH=`pwd`/src; cd doc; make html
+	@export PYTHONPATH=`pwd`/src:$(PYTHONPATH); cd doc; make html
 
 upload-doc:
 	@cd doc; make upload
 
 bdist:
-	@export PYTHONPATH=`pwd`/src; python3 setup.py bdist_wheel
+	@export PYTHONPATH=`pwd`/src:$(PYTHONPATH); python3 setup.py bdist_wheel
 
 test:
-	@export PYTHONPATH=`pwd`/src; cd src/tests; py.test --cov-report=html .
+	@export PYTHONPATH=`pwd`/src:$(PYTHONPATH); cd src/tests; py.test -x --cov-report=html .
 
 clean:
 	@rm -r dist/ build/

doc/usage.rst

@@ -55,4 +55,3 @@ To work with measurement data and do further analysis, here is some further read
 
     Working with DataFrames/DataContainer <dataframes>
     Designing a Servo <servodesign>
-    Fitting Measured Beam Parameters <fit_beam_data>

src/OpenQlab/analysis/__init__.py

+from .servo_design import ServoDesign

src/OpenQlab/io/importers/OldImporters/agilent.py

-from nqlab.io.importers import utils
+from OpenQlab.io.importers import utils
 
 try:
     import numpy as np

src/tests/test_servo_design.py

@@ -228,7 +228,7 @@ class TestServoDesign(unittest.TestCase):
             self.assertIsInstance(plt, matplotlib.figure.Figure)
             ax = plt.axes[0]
             self.assertLessEqual(ax.get_xlim()[1], 1e6)
-            self.assertGreaterEqual(ax.get_xlim()[1], 5e5)
+            self.assertGreaterEqual(ax.get_xlim()[1], 1e5)
             self.sd.integrator(500)
             self.sd.integrator(500)
             self.sd.integrator(500)
@@ -242,7 +242,7 @@ class TestServoDesign(unittest.TestCase):
             plt = self.sd.plot(freq=np.logspace(1, 3, num=100))
             ax = plt.axes[0]
             self.assertLessEqual(ax.get_xlim()[1], 1e4)
-            self.assertGreaterEqual(ax.get_xlim()[1], 2e3)
+            self.assertGreaterEqual(ax.get_xlim()[1], 1e3)
 
     def test_plot_with_plant(self):
         if self.display_available: