Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
9e6fc04d63 | |||
779426f4bb | |||
1a5d61a9f7 |
@ -1,9 +1,20 @@
|
|||||||
stages:
|
stages:
|
||||||
- deploy-test
|
- build-and-publish
|
||||||
- deploy-prod
|
- deploy
|
||||||
|
|
||||||
|
build-and-publish:
|
||||||
|
stage: build-and-publish
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
script:
|
||||||
|
- source /opt/miniconda3/etc/profile.d/conda.sh
|
||||||
|
- conda config --add channels conda-forge
|
||||||
|
- conda config --set solver libmamba
|
||||||
|
- conda config --set anaconda_upload yes
|
||||||
|
- conda build --token $ANACONDA_TOKEN /opt/pyzebra/conda-recipe
|
||||||
|
|
||||||
deploy-test:
|
deploy-test:
|
||||||
stage: deploy-test
|
stage: deploy
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||||
script:
|
script:
|
||||||
@ -12,11 +23,10 @@ deploy-test:
|
|||||||
- sudo systemctl restart pyzebra-test.service
|
- sudo systemctl restart pyzebra-test.service
|
||||||
|
|
||||||
deploy-prod:
|
deploy-prod:
|
||||||
stage: deploy-prod
|
stage: deploy
|
||||||
|
needs: ["build-and-publish"]
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_TAG
|
- if: $CI_COMMIT_TAG
|
||||||
when: delayed
|
|
||||||
start_in: 10 minutes
|
|
||||||
script:
|
script:
|
||||||
- source /opt/miniconda3/etc/profile.d/conda.sh
|
- source /opt/miniconda3/etc/profile.d/conda.sh
|
||||||
- conda activate prod
|
- conda activate prod
|
||||||
|
@ -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.7"
|
__version__ = "0.7.8"
|
||||||
|
@ -47,7 +47,7 @@ doc.sxtal_refgen_path = args.sxtal_refgen_path
|
|||||||
bokeh_stream = logging.getLogger("bokeh").handlers[0].stream
|
bokeh_stream = logging.getLogger("bokeh").handlers[0].stream
|
||||||
|
|
||||||
log_textareainput = TextAreaInput(title="logging output:")
|
log_textareainput = TextAreaInput(title="logging output:")
|
||||||
bokeh_log_textareainput = TextAreaInput(title="server output:")
|
bokeh_log_textareainput = TextAreaInput(title="bokeh server output:")
|
||||||
|
|
||||||
|
|
||||||
def proposal_textinput_callback(_attr, _old, _new):
|
def proposal_textinput_callback(_attr, _old, _new):
|
||||||
|
Reference in New Issue
Block a user