Merge 6c3a98f into ed95959

release-engineering · Jun 24, 2019 · 9c9982f · 9c9982f
2 parents ed95959 + 6c3a98f
commit 9c9982f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/omps/errors.py b/omps/errors.py
@@ -9,7 +9,6 @@
 from werkzeug.exceptions import HTTPException
 from operatorcourier.errors import (
     OpCourierBadYaml,
-    OpCourierBadArtifact,
     OpCourierBadBundle,
     OpCourierQuayErrorResponse
 )
@@ -181,7 +180,7 @@ def raise_for_courier_exception(e, new_msg=None):
 
     if isinstance(e, OpCourierBadBundle):
         raise PackageValidationError(msg, e.validation_info)
-    elif isinstance(e, (OpCourierBadYaml, OpCourierBadArtifact)):
+    elif isinstance(e, OpCourierBadYaml):
         raise PackageValidationError(msg)
     elif isinstance(e, OpCourierQuayErrorResponse):
         if e.code == 403:

diff --git a/setup.py b/setup.py
@@ -62,7 +62,7 @@ def get_project_version(version_file='omps/__init__.py'):
         'koji',
         'PyYAML',
         'requests',
-        'operator-courier>=1.3.0',
+        'operator-courier>=2.1.1',
     ],
     extras_require={
         'test': [

diff --git a/tests/test_quay.py b/tests/test_quay.py
@@ -16,7 +16,6 @@
     OpCourierQuayError,
     OpCourierQuayCommunicationError,
     OpCourierValueError,
-    OpCourierBadArtifact,
     OpCourierBadYaml
 )
 
@@ -151,7 +150,6 @@ def test_generic_courier_error(self, courier_exception,
                                      op_courier_push_raising)
 
     @pytest.mark.parametrize('courier_exception', [
-        OpCourierBadArtifact('Bad artifact.'),
         OpCourierBadYaml('Bad yaml.')
     ])
     def test_courier_invalid_files_error(self, courier_exception,