Fix for yapf v0.24.0

This PS fixes yapf v0.24.0 errors. Also updates tox.ini
and test-requirements.txt accordingly.

Change-Id: If1dd0e51d328ad976bf0a7bfd512425c4da4ac0a

armada/cli/rollback.py

@@ -127,7 +127,5 @@ class Rollback(CliAction):
         self.output(response)
 
     def output(self, response):
-        self.logger.info(
+        self.logger.info(('(dry run) ' if self.dry_run else '') +
-            ('(dry run) '
+                         'Rollback of %s complete.', self.release)
-             if self.dry_run else '') + 'Rollback of %s complete.',
-            self.release)

armada/handlers/chartbuilder.py

@@ -63,9 +63,9 @@ class ChartBuilder(object):
         property from the chart, or else "" if the property isn't a 2-tuple.
         '''
         source_dir = self.chart.get('source_dir')
-        return (os.path.join(*source_dir)
+        return (os.path.join(*source_dir) if
-                if (source_dir and isinstance(source_dir, (list, tuple)) and
+                (source_dir and isinstance(source_dir, (list, tuple)) and
-                    len(source_dir) == 2) else "")
+                 len(source_dir) == 2) else "")
 
     def get_ignored_files(self):
         '''Load files to ignore from .helmignore if present.'''

armada/tests/unit/handlers/test_armada.py

@@ -140,10 +140,10 @@ data:
       enabled: true
 """
 
-CHART_SOURCES = [('git://github.com/dummy/armada',
+CHART_SOURCES = [('git://github.com/dummy/armada', 'chart_1'),
-                  'chart_1'), ('/tmp/dummy/armada', 'chart_2'),
+                 ('/tmp/dummy/armada', 'chart_2'),
-                 ('/tmp/dummy/armada', 'chart_3'), ('/tmp/dummy/armada',
+                 ('/tmp/dummy/armada', 'chart_3'),
-                                                    'chart_4')]
+                 ('/tmp/dummy/armada', 'chart_4')]
 
 
 class ArmadaHandlerTestCase(base.ArmadaTestCase):
@@ -263,7 +263,7 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
                     False
                 }]
             }
-        }
+        }  # yapf: disable
 
         self.assertTrue(hasattr(armada_obj, 'manifest'))
         self.assertIsInstance(armada_obj.manifest, dict)
@@ -384,8 +384,8 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
                         mock.call(
                             mock_chartbuilder().get_helm_chart(),
                             "{}-{}".format(
-                                armada_obj.manifest['armada'][
+                                armada_obj.manifest['armada']
-                                    'release_prefix'], chart['release']),
+                                ['release_prefix'], chart['release']),
                             chart['namespace'],
                             values=yaml.safe_dump(chart['values']),
                             wait=this_chart_should_wait,
@@ -407,8 +407,8 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
                                     mock.call(
                                         mock_chartbuilder().get_helm_chart(),
                                         "{}-{}".format(
-                                            armada_obj.manifest['armada'][
+                                            armada_obj.manifest['armada']
-                                                'release_prefix'],
+                                            ['release_prefix'],
                                             chart['release']),
                                         chart['namespace'],
                                         values=yaml.safe_dump(chart['values']),
@@ -436,8 +436,8 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
                                     mock.call(
                                         mock_chartbuilder().get_helm_chart(),
                                         "{}-{}".format(
-                                            armada_obj.manifest['armada'][
+                                            armada_obj.manifest['armada']
-                                                'release_prefix'],
+                                            ['release_prefix'],
                                             chart['release']),
                                         chart['namespace'],
                                         pre_actions={},

test-requirements.txt

@@ -13,5 +13,4 @@ os-testr>=1.0.0 # Apache-2.0
 flake8>=3.3.0
 mock
 responses>=0.8.1
-# TODO: Resolve issues with >=0.24.0
+yapf
-yapf<=0.23.0

tox.ini

@@ -65,6 +65,7 @@ commands =
 [testenv:pep8]
 basepython = python3
 deps =
+    yapf
     .[bandit]
     {[testenv]deps}
 commands =