Merge pull request ome#366 from pwalczysko/upgrade-5.6.6

Upgrade 5.6.6 and other bumps

omero/learning.yml

@@ -45,6 +45,8 @@
       lvm_shrink: False
 
     - role: ome.omero_server
+      omero_server_python_addons:
+        - "omero-py>={{ omero_py_release }}"
       omero_server_config_set:
         omero.client.ui.menu.dropdown.colleagues.enabled: False
         omero.client.ui.menu.dropdown.everyone.label: "All courses"
@@ -169,10 +171,10 @@
 
   vars:
     postgresql_version: "13"
-    omero_server_release: 5.6.5
-    omero_web_release: 5.15.0
-    omero_py_release: "{{ omero_py_release_override | default('5.12.0') }}"
+    omero_server_release: 5.6.6
+    omero_web_release: 5.16.0
+    omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
     omero_web_apps_release:
       omero_gallery: 3.4.2
-      omero_iviewer: 0.11.3
+      omero_iviewer: 0.12.0
       omero_virtual_microscope: 1.2.0

omero/nightshade-webclients.yml

@@ -104,11 +104,11 @@
         (omero_web_config_set_for_host | default({})))
       }}
 
-    omero_web_release: "{{ omero_web_release_override | default('5.15.0') }}"
-    omero_py_release: "{{ omero_py_release_override | default('5.12.0') }}"
-    omero_figure_release: "{{ omero_figure_release_override | default('5.0.0') }}"
+    omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
+    omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
+    omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
     omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.0') }}"
-    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.11.3') }}"
+    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.12.0') }}"
     omero_parade_release: "{{ omero_parade_release_override | default('0.2.3') }}"
     omero_webtagging_autotag_release: "{{ omero_webtagging_autotag_release_override | default('3.2.0') }}"
     omero_webtagging_tagsearch_release: "{{ omero_webtagging_tagsearch_release_override | default('3.2.0') }}"

omero/ome-demoserver.yml

@@ -310,18 +310,18 @@
         force: yes
 
   vars:
-    omero_figure_release: "{{ omero_figure_release_override | default('5.0.0') }}"
-    omero_figure_script_release: "{{ omero_figure_script_release_override | default('v5.0.0') }}"
+    omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
+    omero_figure_script_release: "{{ omero_figure_script_release_override | default('v5.1.0') }}"
     omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.0') }}"
-    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.11.3') }}"
+    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.12.0') }}"
     omero_parade_release: "{{ omero_parade_release_override | default('0.2.3') }}"
     omero_webtagging_autotag_release: "{{ omero_webtagging_autotag_release_override | default('3.2.0') }}"
     omero_webtagging_tagsearch_release: "{{ omero_webtagging_tagsearch_release_override | default('3.2.0') }}"
     omero_signup_release: "{{ omero_signup_release_override | default('0.3.2') }}"
 
-    omero_server_release: "{{ omero_server_release_override | default('5.6.5') }}"
-    omero_web_release: "{{ omero_web_release_override | default('5.15.0') }}"
-    omero_py_release: "{{ omero_py_release_override | default('5.12.0') }}"
+    omero_server_release: "{{ omero_server_release_override | default('5.6.6') }}"
+    omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
+    omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
     # For https://github.com/openmicroscopy/ansible-role-java, which is a dependency.
     java_jdk_install: True
 
@@ -386,6 +386,7 @@
       # For OMERO.figure script
       - "reportlab<3.6"
       - markdown
+      - "omero-py>={{ omero_py_release }}"
 
     omero_server_selfsigned_certificates: True
 

omero/ome-dundeeomero.yml

@@ -74,7 +74,7 @@
     # Note - had to have these set to `install-mock` to progress role
     # installation before changing config to restored DB from other system.
     - role: ome.omero_server
-      omero_server_release: 5.6.5
+      omero_server_release: 5.6.6
       omero_server_datadir_manage: "{{ molecule_test | default(False) }}"
       omero_server_systemd_limit_nofile: 16384
       omero_server_systemd_after: >-
@@ -208,7 +208,8 @@
     nginx_version: 1.18.0
     postgresql_version: "11"
     filesystem: "xfs"
-    omero_figure_release: "{{ omero_figure_release_override | default('5.0.0') }}"
+    omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
+    omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
 
     omero_server_config_set_production:
       omero.db.poolsize: 60
@@ -239,6 +240,7 @@
       # For OMERO.figure script
       - "reportlab<3.6"
       - markdown
+      - "omero-py>={{ omero_py_release }}"
 
     # Workaround lack of restriction on temp file sizes
     # https://github.com/ome/omero-web/issues/118

omero/training-server/playbook.yml

@@ -75,6 +75,7 @@
         - "omero-cli-duplicate=={{ omero_cli_duplicate_release }}"
         - "omero-cli-render=={{ omero_cli_render_release }}"
         - "omero-metadata=={{ omero_metadata_release }}"
+        - "omero-py>={{ omero_py_release }}"
         - "reportlab<3.6"
         - markdown
         - scipy
@@ -439,14 +440,14 @@
     omero_server_system_managedrepo_group: managed_repo_group
     omero_server_datadir_managedrepo_mode: u=rwX,g=srwX,o=rX,+t
     omero_server_datadir_chown: False
-    omero_server_release: "{{ omero_server_release_override | default('5.6.5') }}"
-    omero_web_release: "{{ omero_web_release_override | default('5.15.0') }}"
-    omero_figure_release: "{{ omero_figure_release_override | default('5.0.0') }}"
+    omero_server_release: "{{ omero_server_release_override | default('5.6.6') }}"
+    omero_web_release: "{{ omero_web_release_override | default('5.16.0') }}"
+    omero_figure_release: "{{ omero_figure_release_override | default('5.1.0') }}"
     omero_fpbioimage_release: "{{ omero_fpbioimage_release_override | default('0.4.0') }}"
-    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.11.3') }}"
+    omero_iviewer_release: "{{ omero_iviewer_release_override | default('0.12.0') }}"
     omero_mapr_release: "{{ omero_mapr_release_override | default('0.5.0') }}"
     omero_parade_release: "{{ omero_parade_release_override | default('0.2.3') }}"
-    omero_py_release: "{{ omero_py_release_override | default('5.12.0') }}"
+    omero_py_release: "{{ omero_py_release_override | default('5.13.1') }}"
 
     # The omero_web_apps_* vars are used by the ome.omero_web role under
     # Python 3 otherwise ignored