Skip to content
Snippets Groups Projects
Commit 492484b6 authored by Christian Darsow-Fromm's avatar Christian Darsow-Fromm
Browse files

Merge tag 'v0.6.8' into develop

readme
parents 18a53ffa 0c41410a
No related branches found
No related tags found
No related merge requests found
...@@ -140,6 +140,8 @@ deploy rrz master: ...@@ -140,6 +140,8 @@ deploy rrz master:
test pip deployment: test pip deployment:
image: python:3 image: python:3
stage: deploy-test stage: deploy-test
before_script:
- sleep 180 # wait some time for pip to be able to get the new version
script: script:
- pip install NQontrol==${CI_COMMIT_TAG:1} - pip install NQontrol==${CI_COMMIT_TAG:1}
- python3 -c "from nqontrol import Servo" - python3 -c "from nqontrol import Servo"
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
The project is a solution based on the ADwin real-time platform that is able to deliver in excess of 8 simultaneous locking loops running with 200 kHz sampling frequency, and offers five second-order filtering sections per channel for optimal control performance. The project is a solution based on the ADwin real-time platform that is able to deliver in excess of 8 simultaneous locking loops running with 200 kHz sampling frequency, and offers five second-order filtering sections per channel for optimal control performance.
This Python package, together with a web-based GUI, makes the system easy to use and adapt for a wide range of control tasks in quantum-optical experiments. This Python package, together with a web-based GUI, makes the system easy to use and adapt for a wide range of control tasks in quantum-optical experiments.
The source code can be found on our [GitLab](https://gitlab.rrz.uni-hamburg.de/las-nq/nqontrol)
## Documentation ## Documentation
For more information please read the online documentation: For more information please read the online documentation:
......
...@@ -9,7 +9,8 @@ author = LasNQ – Uni Hamburg ...@@ -9,7 +9,8 @@ author = LasNQ – Uni Hamburg
author-email = christian.darsow@physik.uni-hamburg.de author-email = christian.darsow@physik.uni-hamburg.de
license = GPL v3 license = GPL v3
# url = http:// # url = http://
long-description = file: README.rst long_description = file: README.md
long_description_content_type = text/markdown
# Change if running only on Windows, Mac or Linux (comma-separated) # Change if running only on Windows, Mac or Linux (comma-separated)
platforms = any platforms = any
# Add here all kinds of additional classifiers as defined under # Add here all kinds of additional classifiers as defined under
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment