attempt to fix tests

Author: alekna

requirements.txt

@@ -2,6 +2,7 @@ configargparse>=0.9.3
 PyYAML>=5.3.1
 Jinja2>=2.7.3
 boto>=2.40.0
+docker==6.1.3
 tabulate>=0.7.5
 setuptools==67.8.0
 moto[all]==4.1.11

setup.py

@@ -13,6 +13,8 @@
     'PyYAML>=4.2b1',
     'Jinja2>=2.7.3',
     'boto>=2.40.0',
+    'docker==6.1.3',
+    'openapi-spec-validator==0.5.7',
     'tabulate>=0.7.5',
     'setuptools',
     'pytz',

stacks/cf.py

@@ -7,12 +7,11 @@
 import json
 import sys
 import time
-# noinspection PyProtectedMember
-from collections import Mapping, Set, Sequence
 from datetime import datetime
 from fnmatch import fnmatch
 from operator import attrgetter
 from os import path
+from typing import Mapping, Sequence, Set
 
 import boto
 import jinja2
@@ -25,7 +24,8 @@
 
 from stacks.aws import get_stack_tag, get_stack_template, throttling_retry
 from stacks.helpers import intrinsics_multi_constructor
-from stacks.states import FAILED_STACK_STATES, COMPLETE_STACK_STATES, ROLLBACK_STACK_STATES, IN_PROGRESS_STACK_STATES
+from stacks.states import (COMPLETE_STACK_STATES, FAILED_STACK_STATES,
+                           IN_PROGRESS_STACK_STATES, ROLLBACK_STACK_STATES)
 
 YES = ['y', 'Y', 'yes', 'YES', 'Yes']
 

stacks/main.py

@@ -10,15 +10,10 @@
 import boto.vpc
 import pytz
 
-from stacks import aws
-from stacks import cf
-from stacks import cli
-from stacks.config import config_load
-from stacks.config import get_default_region_name
-from stacks.config import get_region_name
-from stacks.config import print_config
-from stacks.config import profile_exists
-from stacks.config import validate_properties
+from stacks import aws, cf, cli
+from stacks.config import (config_load, get_default_region_name,
+                           get_region_name, print_config, profile_exists,
+                           validate_properties)
 from stacks.states import FAILED_STACK_STATES, ROLLBACK_STACK_STATES
 
 

tests/test_cf.py

@@ -1,8 +1,7 @@
 import unittest
 
 from boto import cloudformation, s3
-
-from moto import mock_cloudformation_deprecated
+from moto import mock_cloudformation
 
 from stacks import cf
 
@@ -42,7 +41,7 @@ def test_gen_invalid_template_with_null_value(self):
         self.assertEqual(len(errors), 1)
 
 
-@mock_cloudformation_deprecated
+@mock_cloudformation
 class TestStackActions(unittest.TestCase):
 
     def setUp(self):