diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bb8f496add75c1015fa8edb32d791c1887b5957..f8da4a6f2c75e7d426d3d9a92ec9575a2e13acaa 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/Makefile b/Makefile index 900ed067d8f7c37b811e7ae05de07e91bde5f4ee..ca67bb04c1eb6d21cd1d9bc10fa6c9554ddf3431 100644 --- a/Makefile +++ b/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/ diff --git a/doc/usage.rst b/doc/usage.rst index b16c014f1456e89f8bb7709d073ab94445f3c622..683f6dc0f2e98acb85f8c0ff58d94dab35070b14 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -52,7 +52,6 @@ To work with measurement data and do further analysis, here is some further read .. toctree:: :maxdepth: 2 - + Working with DataFrames/DataContainer <dataframes> Designing a Servo <servodesign> - Fitting Measured Beam Parameters <fit_beam_data> diff --git a/src/OpenQlab/analysis/__init__.py b/src/OpenQlab/analysis/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..233b2c327eee45db81bca916490c3cb334b4844b --- /dev/null +++ b/src/OpenQlab/analysis/__init__.py @@ -0,0 +1 @@ +from .servo_design import ServoDesign diff --git a/src/OpenQlab/io/importers/OldImporters/agilent.py b/src/OpenQlab/io/importers/OldImporters/agilent.py index f5eb5f03941bc9023a77e63a56a6392889c9f5ef..2ad32736364ed37abc91e734bd02ddb9e54b3311 100644 --- a/src/OpenQlab/io/importers/OldImporters/agilent.py +++ b/src/OpenQlab/io/importers/OldImporters/agilent.py @@ -1,4 +1,4 @@ -from nqlab.io.importers import utils +from OpenQlab.io.importers import utils try: import numpy as np diff --git a/src/OpenQlab/plots/nqlab.mplstyle b/src/OpenQlab/plots/OpenQlab.mplstyle similarity index 100% rename from src/OpenQlab/plots/nqlab.mplstyle rename to src/OpenQlab/plots/OpenQlab.mplstyle diff --git a/src/tests/test_servo_design.py b/src/tests/test_servo_design.py index 02738fc15c362b843f95383f472b775304d62218..fe89e2a902f54e4aeec428fea7eec62ed738077c 100644 --- a/src/tests/test_servo_design.py +++ b/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: