added tests, updated requirements

.github/workflows/omero_plugin.yml

@@ -36,5 +36,7 @@ jobs:
           repository: ome/omero-test-infra
           path: .omero
           ref: ${{ secrets.OMERO_TEST_INFRA_REF }}
-      - name: Build and run OMERO tests
+      - name: Build and run standard tests
         run: POLICY_BINARY_ACCESS=+read,+write,+image,+plate .omero/docker $STAGE
+      - name: Build and run no-plate tests
+        run: .omero/docker $STAGE

.omeroci/cli-build

@@ -8,6 +8,8 @@ set -x
 TARGET=${TARGET:-..}
 cd $TARGET
 
+BIN_ACCESS=$(/opt/omero/server/venv3/bin/omero config get omero.policy.binary_access)
+
 GUESS=${PWD#*omero-cli-*}
 PLUGIN=${PLUGIN:-$GUESS}
 
@@ -22,5 +24,8 @@ 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
+if [[ $BIN_ACCESS =~ "+plate" ]]; then
+    python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -vs -m "not limit_plate"
+else
+    python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -vs -m limit_plate
+fi

requirements.txt

@@ -1,3 +1,3 @@
-ezomero>=2.0.0
-ome-types>=0.4.2
+ezomero>=2.0.0<3.0.0
+ome-types>=0.5.0<0.6.0
 setuptools>=58.0.0

setup.py

@@ -96,7 +96,7 @@ def read(fname):
     url="https://github.com/TheJacksonLaboratory/omero-cli-transfer",
     install_requires=[
         'ezomero>=2.1.0, <3.0.0',
-        'ome-types>=0.5.0,<0.6.0'
+        'ome-types==0.5.1.post1'
     ],
     extras_require={
         "rocrate": ["rocrate==0.7.0"],

src/omero_cli_transfer.py

@@ -504,7 +504,6 @@ def __pack(self, args):
                                          args.barchive, args.simple,
                                          args.figure,
                                          self.metadata)
-
         if args.binaries == "all":
             print("Starting file copy...")
             self._copy_files(path_id_dict, folder, args.ignore_errors,

test/integration/test_transfer.py

@@ -8,6 +8,7 @@
 from omero_cli_transfer import TransferControl
 from cli import CLITest
 from omero.gateway import BlitzGateway
+from omero.cli import NonZeroReturnCode
 
 import ezomero
 import pytest
@@ -17,6 +18,9 @@
 SUPPORTED = [
     "idonly", "imageid", "datasetid", "projectid", "plateid", "screenid"]
 
+PLATESONLY = [
+    "plateid", "screenid"]
+
 TEST_FILES = [
         "test/data/valid_single_image.tar",
         "test/data/valid_single_image.zip",
@@ -149,6 +153,28 @@ def test_pack(self, target_name, tmpdir):
                 self.cli.invoke(args, strict=True)
         self.delete_all()
 
+    @pytest.mark.parametrize('target_name', sorted(PLATESONLY))
+    @pytest.mark.limit_plate
+    def test_pack_noplate(self, target_name, tmpdir):
+        self.create_plate(target_name=target_name)
+        target = getattr(self, target_name)
+        args = self.args + ["pack", target, str(tmpdir / 'test.tar')]
+        with pytest.raises(NonZeroReturnCode):
+            self.cli.invoke(args, strict=True)
+        assert not (os.path.exists(str(tmpdir / 'test.tar')))
+        assert not (os.path.exists(str(tmpdir / 'test.tar_folder')))
+        args = self.args + ["pack", "--binaries", "none", target,
+                            str(tmpdir / 'test.tar')]
+        self.cli.invoke(args, strict=True)
+        assert os.path.exists(str(tmpdir / "test" / "transfer.xml"))
+        assert os.path.getsize(str(tmpdir / "test" / "transfer.xml")) > 0
+        args = self.args + ["pack", "--ignore_errors", target,
+                            str(tmpdir / 'test_ignore.tar')]
+        self.cli.invoke(args, strict=True)
+        assert os.path.exists(str(tmpdir / 'test_ignore.tar'))
+        assert os.path.getsize(str(tmpdir / 'test_ignore.tar')) > 0
+        self.delete_all()
+
     @pytest.mark.parametrize('target_name', sorted(SUPPORTED))
     def test_pack_special(self, target_name, tmpdir):
         if target_name == "datasetid" or target_name == "projectid" or\