Merge 85a9e58 into 28d5144

.travis.yml

@@ -4,11 +4,19 @@ matrix:
   include:
     - dist: trusty
       python: "3.6"
-      env: TOXENV=py36
+      env: TOXENV=py36-courier_released
       after_success: coveralls
     - dist: xenial
       python: "3.7"
-      env: TOXENV=py37
+      env: TOXENV=py37-courier_released
+      after_success: coveralls
+    - dist: trusty
+      python: "3.6"
+      env: TOXENV=py36-courier_master
+      after_success: coveralls
+    - dist: xenial
+      python: "3.7"
+      env: TOXENV=py37-courier_master
       after_success: coveralls
     - dist: xenial
       python: "3.7"

omps/manifests_util.py

@@ -49,6 +49,11 @@ def bundle(self):
     def package_name(self):
         """Returns defined package name from operator bundle"""
         #  op. courier do verification, this should be never empty
-        pkgs_yaml = self.bundle['data']['packages']
+        if hasattr(self.bundle, 'bundle'):
+            # New, op. courier >= 2.0.0
+            pkgs_yaml = self.bundle.bundle['data']['packages']
+        else:
+            # Old, op. courier < 2.0.0
+            pkgs_yaml = self.bundle['data']['packages']
         pkgs = yaml.safe_load(io.StringIO(pkgs_yaml))
         return pkgs[0]['packageName']

tox.ini

@@ -1,8 +1,11 @@
 [tox]
-envlist = py36,py37,flake8
+envlist = py{36,37}-courier_{released,master},flake8
 
 [testenv]
-deps = .[test]
+deps =
+    courier_master: -e git://github.com/operator-framework/operator-courier#egg=operatorcourier
+    courier_released: operator-courier
+    .[test]
 commands = pytest --cov=omps --ignore=tests/integration tests/
 
 [coverage:report]