Updating for version 0.7.10

[skip ci]

.gitlab-ci.yml

@@ -1,43 +1,58 @@
 stages:
-  - build-and-publish
+  - build
   - deploy
+  - publish
+  - cleanup
 
-build-and-publish:
+workflow:
-  stage: build-and-publish
   rules:
     - if: $CI_COMMIT_TAG
-  script:
+      variables:
+        BUILD_PATH: /home/pyzebra/build-prod
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      variables:
+        BUILD_PATH: /home/pyzebra/build-test
+
+default:
+  before_script:
     - source /opt/miniconda3/etc/profile.d/conda.sh
+
+build-job:
+  stage: build
+  script:
     - conda config --add channels conda-forge
     - conda config --set solver libmamba
-    - conda config --set anaconda_upload yes
+    - conda build --no-anaconda-upload --output-folder $BUILD_PATH ./conda-recipe
-    - conda build --token $ANACONDA_TOKEN /opt/pyzebra/conda-recipe
 
-deploy-test:
+deploy-test-job:
   stage: deploy
   environment: testing
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
-    - cd /opt/pyzebra
-    - git pull origin main --tags
-    - source /opt/miniconda3/etc/profile.d/conda.sh
     - conda activate test
-    - conda build ./conda-recipe
+    - conda install --channel $BUILD_PATH --force-reinstall pyzebra -y
-    - conda install --use-local --only-deps pyzebra -y
-    - conda build purge-all
     - sudo systemctl restart pyzebra-test.service
 
-deploy-prod:
+deploy-prod-job:
   stage: deploy
   environment: production
-  needs: ["build-and-publish"]
   rules:
     - if: $CI_COMMIT_TAG
-      when: delayed
-      start_in: 5 seconds
   script:
-    - source /opt/miniconda3/etc/profile.d/conda.sh
     - conda activate prod
-    - conda update pyzebra -y
+    - conda install --channel $BUILD_PATH pyzebra -y
     - sudo systemctl restart pyzebra-prod.service
+
+publish-job:
+  stage: publish
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - conda activate base
+    - anaconda --token $ANACONDA_TOKEN upload $(conda build --output-folder $BUILD_PATH ./conda-recipe --output)
+
+cleanup-job:
+  stage: cleanup
+  script:
+    - conda build purge-all

conda-recipe/meta.yaml

@@ -28,7 +28,7 @@ requirements:
 
 
 about:
-  home: https://github.com/paulscherrerinstitute/pyzebra
+  home: https://gitlab.psi.ch/zebra/pyzebra
   summary: {{ data['description'] }}
   license: GNU GPLv3
   license_file: LICENSE

pyzebra/__init__.py

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

pyzebra/app/panel_hdf_param_study.py

@@ -364,7 +364,7 @@ def create():
         _update_proj_plots()
 
     proj_auto_checkbox = CheckboxGroup(
-        labels=["Projections Intensity Range"], active=[0], width=145, margin=[10, 5, 0, 5]
+        labels=["Projections Intensity Range:"], active=[0], width=145, margin=[10, 5, 0, 5]
     )
     proj_auto_checkbox.on_change("active", proj_auto_checkbox_callback)
 

pyzebra/app/panel_hdf_viewer.py

@@ -689,7 +689,7 @@ def create():
         _update_image()
 
     main_auto_checkbox = CheckboxGroup(
-        labels=["Frame Intensity Range"], active=[0], width=145, margin=[10, 5, 0, 5]
+        labels=["Frame Intensity Range:"], active=[0], width=145, margin=[10, 5, 0, 5]
     )
     main_auto_checkbox.on_change("active", main_auto_checkbox_callback)
 
@@ -721,7 +721,7 @@ def create():
         _update_proj_plots()
 
     proj_auto_checkbox = CheckboxGroup(
-        labels=["Projections Intensity Range"], active=[0], width=145, margin=[10, 5, 0, 5]
+        labels=["Projections Intensity Range:"], active=[0], width=145, margin=[10, 5, 0, 5]
     )
     proj_auto_checkbox.on_change("active", proj_auto_checkbox_callback)