3 Commits
0.7.7 ... 0.7.8

Author SHA1 Message Date
9e6fc04d63 Updating for version 0.7.8 2023-08-16 17:15:16 +02:00
779426f4bb add bokeh word to server output 2023-08-16 16:59:44 +02:00
1a5d61a9f7 Update .gitlab-ci.yml 2023-08-16 14:18:59 +02:00
3 changed files with 18 additions and 8 deletions

View File

@ -1,9 +1,20 @@
stages:
- deploy-test
- deploy-prod
- build-and-publish
- 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:
stage: deploy-test
stage: deploy
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script:
@ -12,11 +23,10 @@ deploy-test:
- sudo systemctl restart pyzebra-test.service
deploy-prod:
stage: deploy-prod
stage: deploy
needs: ["build-and-publish"]
rules:
- if: $CI_COMMIT_TAG
when: delayed
start_in: 10 minutes
script:
- source /opt/miniconda3/etc/profile.d/conda.sh
- conda activate prod

View File

@ -6,4 +6,4 @@ from pyzebra.sxtal_refgen import *
from pyzebra.utils import *
from pyzebra.xtal import *
__version__ = "0.7.7"
__version__ = "0.7.8"

View File

@ -47,7 +47,7 @@ doc.sxtal_refgen_path = args.sxtal_refgen_path
bokeh_stream = logging.getLogger("bokeh").handlers[0].stream
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):