From 2c8b64644d796b243537b2b562a547ed1a593475 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 29 Apr 2024 12:59:48 +0100 Subject: [PATCH 1/3] review instructions to use conda-forge channel --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index f067f6892..0c42e4056 100644 --- a/README.rst +++ b/README.rst @@ -33,12 +33,12 @@ to install it first, see `miniconda`_ for more details. To install ``omero-py`` using conda (preferred):: - conda create -n myenv -c conda-forge python=3.8 omero-py + conda create -n myenv python=3.9 conda-forge::zeroc-ice==3.6.5 omero-py conda activate myenv Alternatively install ``omero-py`` using venv:: - python3.8 -m venv myenv + python3.9 -m venv myenv . myenv/bin/activate pip install omero-py @@ -84,7 +84,7 @@ For a development installation we recommend creating a virtualenv with the follo To install using venv:: - python3.8 -mvenv myenv + python3.9 -mvenv myenv . myenv/bin/activate git clone https://github.com/ome/omero-py cd omero-py @@ -93,7 +93,7 @@ To install using venv:: To install ``omero-py`` using conda (preferred):: - conda create -n myenv -c ome python=3.8 zeroc-ice36-python + conda create -n myenv python=3.9 conda-forge::zeroc-ice==3.6.5 conda activate myenv git clone https://github.com/ome/omero-py cd omero-py From c770e4e49bc62c41a7451ef5c034974218e98dac Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 29 Apr 2024 13:14:47 +0100 Subject: [PATCH 2/3] use 12 --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 2444a3a0f..bdadfb2f4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,7 +24,7 @@ jobs: - windows-2019 include: - python-version: '3.8' - os: macos-latest + os: macos-12 runs-on: ${{ matrix.os }} steps: - name: Get tox target From 48ee525426aef7e8f8701c27d99ee24dbe13af02 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 29 Apr 2024 14:44:09 +0100 Subject: [PATCH 3/3] adjust installation --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 0c42e4056..977182375 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,6 @@ Dependencies Direct dependencies of OMERO.py are: - `ZeroC IcePy 3.6`_ -- future (deprecated) - numpy - Pillow >= 10.0.0 @@ -38,11 +37,11 @@ To install ``omero-py`` using conda (preferred):: Alternatively install ``omero-py`` using venv:: - python3.9 -m venv myenv + python3 -m venv myenv . myenv/bin/activate pip install omero-py -You may need to replace ``python3.8`` with ``python`` or ``python3`` depending on your Python distribution. +You may need to replace ``python3`` with ``python`` depending on your Python distribution. Setting of the environment variable ``OMERODIR`` is required for some functionality. @@ -80,14 +79,15 @@ Developer installation OMERO.py currently depends on an externally built artifact which is automatically bundled in the PyPI package. -For a development installation we recommend creating a virtualenv with the following setup (example assumes ``python3.8`` but you can create and activate the virtualenv using any compatible Python): +For a development installation we recommend creating a virtualenv with the following setup (example assumes ``python3.9`` but you can create and activate the virtualenv using any compatible Python): To install using venv:: - python3.9 -mvenv myenv + python3 -mvenv myenv . myenv/bin/activate git clone https://github.com/ome/omero-py cd omero-py + # Install zeroc Ice Python corresponding to your operation system see tox.ini for example python setup.py devtarget pip install -e .