Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
b41ab102b1 | |||
bc791b1028 | |||
3ab4420912 | |||
90552cee2c | |||
6164be16f0 | |||
07f03a2a04 |
24
.gitlab-ci.yml
Normal file
24
.gitlab-ci.yml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
stages:
|
||||||
|
- deploy-test
|
||||||
|
- deploy-prod
|
||||||
|
|
||||||
|
deploy-test:
|
||||||
|
stage: deploy-test
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||||
|
script:
|
||||||
|
- cd /opt/pyzebra
|
||||||
|
- git pull origin master --tags
|
||||||
|
- sudo systemctl restart pyzebra-test.service
|
||||||
|
|
||||||
|
deploy-prod:
|
||||||
|
stage: deploy-prod
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
when: delayed
|
||||||
|
start_in: 10 minutes
|
||||||
|
script:
|
||||||
|
- source /opt/miniconda3/etc/profile.d/conda.sh
|
||||||
|
- conda activate prod
|
||||||
|
- conda update pyzebra -y
|
||||||
|
- sudo systemctl restart pyzebra.service
|
@ -6,4 +6,4 @@ from pyzebra.sxtal_refgen import *
|
|||||||
from pyzebra.utils import *
|
from pyzebra.utils import *
|
||||||
from pyzebra.xtal import *
|
from pyzebra.xtal import *
|
||||||
|
|
||||||
__version__ = "0.7.5"
|
__version__ = "0.7.7"
|
||||||
|
@ -275,7 +275,7 @@ def create():
|
|||||||
frame_range.bounds = (0, n_im)
|
frame_range.bounds = (0, n_im)
|
||||||
|
|
||||||
scan_motor = scan["scan_motor"]
|
scan_motor = scan["scan_motor"]
|
||||||
proj_y_plot.axis[1].axis_label = f"Scanning motor, {scan_motor}"
|
proj_y_plot.yaxis.axis_label = f"Scanning motor, {scan_motor}"
|
||||||
|
|
||||||
var = scan[scan_motor]
|
var = scan[scan_motor]
|
||||||
var_start = var[0]
|
var_start = var[0]
|
||||||
|
@ -406,7 +406,7 @@ def create():
|
|||||||
frame_range.bounds = (0, n_im)
|
frame_range.bounds = (0, n_im)
|
||||||
|
|
||||||
scan_motor = scan["scan_motor"]
|
scan_motor = scan["scan_motor"]
|
||||||
proj_y_plot.axis[1].axis_label = f"Scanning motor, {scan_motor}"
|
proj_y_plot.yaxis.axis_label = f"Scanning motor, {scan_motor}"
|
||||||
|
|
||||||
var = scan[scan_motor]
|
var = scan[scan_motor]
|
||||||
var_start = var[0]
|
var_start = var[0]
|
||||||
|
Reference in New Issue
Block a user