update .omero, some test failing

ome · Jan 24, 2024 · 86c17b1 · 86c17b1
1 parent d2dff35
commit 86c17b1
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/.omero b/.omero
diff --git a/.omeroci/cli-build b/.omeroci/cli-build
@@ -11,15 +11,7 @@ cd $TARGET
 GUESS=${PWD#*omero-cli-*}
 PLUGIN=${PLUGIN:-$GUESS}
 
-export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:/bin/java::")
-export JAVA_LD_LIBRARY_PATH="$JAVA_HOME/lib/:$JAVA_HOME/lib/server"
-export CONDA_BACKUP_JAVA_HOME=$JAVA_HOME
-export CONDA_BACKUP_JAVA_LD_LIBRARY_PATH=$JAVA_LD_LIBRARY_PATH
-
-source /tmp/miniconda/bin/activate
-conda init
-conda activate omero
-
 export OMERO_DIST=${OMERO_DIST:-/opt/omero/server/OMERO.server}
 omero $PLUGIN -h
+
 python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -vs
diff --git a/.omeroci/py-setup b/.omeroci/py-setup
@@ -8,6 +8,7 @@ set -x
 TARGET=${TARGET:-..}
 PLUGIN=${PLUGIN:-}
 
+<<<<<<< HEAD:.omeroci/py-setup
 export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:/bin/java::")
 export JAVA_LD_LIBRARY_PATH="$JAVA_HOME/lib/:$JAVA_HOME/lib/server"
 export CONDA_BACKUP_JAVA_HOME=$JAVA_HOME
@@ -21,8 +22,11 @@ conda activate omero
 conda install -c conda-forge zeroc-ice=3.6.5
 conda install -c bioconda bftools
 
+=======
+>>>>>>> be5209a (update .omero, some test failing):.omero/py-setup
 cd $TARGET
 cd $(setup_dir)
-pip install .
+python setup.py sdist
+pip install -U dist/*.tar.gz
 python setup.py clean
 rm -rf dist *egg-info src/*egg-info
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
diff --git a/test/integration/test_transfer.py b/test/integration/test_transfer.py
@@ -205,7 +205,7 @@ def test_pack_metadata_only(self, target_name, tmpdir):
         args = self.args + ["pack", target, "--binaries", "none", "--simple",
                             str(tmpdir)]
         with pytest.raises(ValueError):
-                self.cli.invoke(args, strict=True)
+            self.cli.invoke(args, strict=True)
         self.delete_all()
 
     @pytest.mark.parametrize('folder_name', TEST_FOLDERS)