From 63e63a3c30b5b77ae76f720573979658997b684d Mon Sep 17 00:00:00 2001
From: "anthony.bellino" <ab2434@att.com>
Date: Tue, 11 Sep 2018 20:39:25 +0000
Subject: [PATCH] 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                    |  6 ++----
 armada/handlers/chartbuilder.py           |  6 +++---
 armada/tests/unit/handlers/test_armada.py | 22 +++++++++++-----------
 test-requirements.txt                     |  3 +--
 tox.ini                                   |  1 +
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/armada/cli/rollback.py b/armada/cli/rollback.py
index 01453593..25143fd9 100644
--- a/armada/cli/rollback.py
+++ b/armada/cli/rollback.py
@@ -127,7 +127,5 @@ class Rollback(CliAction):
         self.output(response)
 
     def output(self, response):
-        self.logger.info(
-            ('(dry run) '
-             if self.dry_run else '') + 'Rollback of %s complete.',
-            self.release)
+        self.logger.info(('(dry run) ' if self.dry_run else '') +
+                         'Rollback of %s complete.', self.release)
diff --git a/armada/handlers/chartbuilder.py b/armada/handlers/chartbuilder.py
index ea085069..d74b2c0b 100644
--- a/armada/handlers/chartbuilder.py
+++ b/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)
-                if (source_dir and isinstance(source_dir, (list, tuple)) and
-                    len(source_dir) == 2) else "")
+        return (os.path.join(*source_dir) if
+                (source_dir and isinstance(source_dir, (list, tuple)) and
+                 len(source_dir) == 2) else "")
 
     def get_ignored_files(self):
         '''Load files to ignore from .helmignore if present.'''
diff --git a/armada/tests/unit/handlers/test_armada.py b/armada/tests/unit/handlers/test_armada.py
index 22d4ab80..e7ff0e5c 100644
--- a/armada/tests/unit/handlers/test_armada.py
+++ b/armada/tests/unit/handlers/test_armada.py
@@ -140,10 +140,10 @@ data:
       enabled: true
 """
 
-CHART_SOURCES = [('git://github.com/dummy/armada',
-                  'chart_1'), ('/tmp/dummy/armada', 'chart_2'),
-                 ('/tmp/dummy/armada', 'chart_3'), ('/tmp/dummy/armada',
-                                                    'chart_4')]
+CHART_SOURCES = [('git://github.com/dummy/armada', 'chart_1'),
+                 ('/tmp/dummy/armada', 'chart_2'),
+                 ('/tmp/dummy/armada', 'chart_3'),
+                 ('/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'][
-                                    'release_prefix'], chart['release']),
+                                armada_obj.manifest['armada']
+                                ['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'][
-                                                'release_prefix'],
+                                            armada_obj.manifest['armada']
+                                            ['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'][
-                                                'release_prefix'],
+                                            armada_obj.manifest['armada']
+                                            ['release_prefix'],
                                             chart['release']),
                                         chart['namespace'],
                                         pre_actions={},
diff --git a/test-requirements.txt b/test-requirements.txt
index cd500a4e..0f49ac07 100644
--- a/test-requirements.txt
+++ b/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<=0.23.0
+yapf
diff --git a/tox.ini b/tox.ini
index 8e489a08..768ac6e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,6 +65,7 @@ commands =
 [testenv:pep8]
 basepython = python3
 deps =
+    yapf
     .[bandit]
     {[testenv]deps}
 commands =