Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ref to ome channel for zeroc-ice #407

Merged
merged 3 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Dependencies
Direct dependencies of OMERO.py are:

- `ZeroC IcePy 3.6`_
- future (deprecated)
- numpy
- Pillow >= 10.0.0

Expand All @@ -33,16 +32,16 @@ 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 -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.
Expand Down Expand Up @@ -80,20 +79,21 @@ 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.8 -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 .

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
Expand Down