From e335980be1e7197826687f6c322a60c61b4aa545 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 14 Feb 2024 10:09:32 +0000 Subject: [PATCH 1/5] use conda-forge channel --- README.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 611bea7fbf..9f935ffb99 100644 --- a/README.rst +++ b/README.rst @@ -34,9 +34,8 @@ other options, please see `OMERO.py`_. :: - conda create -n myenv -c ome python=3.8 zeroc-ice36-python + conda create -n myenv -c conda-forge python=3.8 omero-py conda activate myenv - conda install -c conda-forge omero-py pip install omero-web Setting of the environment variable ``OMERODIR`` is required. From 9310fc4698711989ffcc62c3f665425bdd80ba8f Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 7 May 2024 10:43:42 +0100 Subject: [PATCH 2/5] change Python version --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9f935ffb99..a3161b11a8 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ other options, please see `OMERO.py`_. :: - conda create -n myenv -c conda-forge python=3.8 omero-py + conda create -n myenv -c conda-forge python=3.9 omero-py conda activate myenv pip install omero-web From ce92df95d956f96f74aac6c9dc42c97ec151ebbf Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 7 May 2024 10:44:39 +0100 Subject: [PATCH 3/5] install Ice Python-binding from conda-forge channel --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a3161b11a8..cf3383495d 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ other options, please see `OMERO.py`_. :: - conda create -n myenv -c conda-forge python=3.9 omero-py + conda create -n myenv python=3.9 conda-forge::zeroc-ice==3.6.5 omero-py conda activate myenv pip install omero-web From 6bc299392166a82c988c7e688eb8178252990f4a Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 7 May 2024 10:45:35 +0100 Subject: [PATCH 4/5] update year --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index cf3383495d..1e422070e2 100644 --- a/README.rst +++ b/README.rst @@ -153,7 +153,7 @@ OMERO.web is released under the AGPL. Copyright --------- -2009-2022, The Open Microscopy Environment, Glencoe Software, Inc. +2009-2024, The Open Microscopy Environment, Glencoe Software, Inc. .. _OMERO: https://www.openmicroscopy.org/omero .. _OMERO.web install: https://docs.openmicroscopy.org/latest/omero/sysadmins/unix/install-web/web-deployment.html From 9a13dceec34523f81d5b6059c98b5ed05cada945 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 7 May 2024 10:46:03 +0100 Subject: [PATCH 5/5] use capital --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1e422070e2..5d10ea053f 100644 --- a/README.rst +++ b/README.rst @@ -47,7 +47,7 @@ Setting of the environment variable ``OMERODIR`` is required. Usage ----- -For running omero-web in production with nginx, see See: `OMERO.web install`_ documentation. +For running omero-web in production with NGINX, see See: `OMERO.web install`_ documentation. To run in development mode, see below. Contributing