|  | 
| 2 | 2 | import os | 
| 3 | 3 | import voluptuous as v | 
| 4 | 4 | import yaml | 
| 5 |  | -import six | 
| 6 | 5 | import logging | 
| 7 | 6 | import logging.config | 
| 8 | 7 | 
 | 
|  | 
| 11 | 10 | 
 | 
| 12 | 11 | config_schema = v.Schema({ | 
| 13 | 12 |     v.Optional('ccwatch', default={}): v.Schema({ | 
| 14 |  | -        v.Optional('broker', default=None): v.Any(None, six.binary_type), | 
| 15 |  | -        v.Optional('camera', default="celery_cloudwatch.CloudWatchCamera"): v.Any(str, six.binary_type), | 
|  | 13 | +        v.Optional('broker', default=None): v.Any(None, str), | 
|  | 14 | +        v.Optional('camera', default="celery_cloudwatch.CloudWatchCamera"): str, | 
| 16 | 15 |         v.Optional('verbose', default=False): bool | 
| 17 | 16 |     }, extra=False), | 
| 18 | 17 |     v.Optional('camera', default={}): v.Schema({ | 
|  | 
| 21 | 20 |     }, extra=False), | 
| 22 | 21 |     v.Optional('cloudwatch-camera', default={}): v.Schema({ | 
| 23 | 22 |         v.Optional('dryrun', default=False): bool, | 
| 24 |  | -        v.Optional('namespace', default='celery'): six.binary_type, | 
|  | 23 | +        v.Optional('namespace', default='celery'): str, | 
| 25 | 24 |         v.Optional('tasks', default=[]): v.Schema([ | 
| 26 |  | -            six.binary_type, v.Schema({ | 
| 27 |  | -                'name': six.binary_type, | 
|  | 25 | +            str, v.Schema({ | 
|  | 26 | +                'name': str, | 
| 28 | 27 |                 'dimensions': v.Schema({ | 
| 29 |  | -                    v.Extra: six.binary_type | 
|  | 28 | +                    v.Extra: str | 
| 30 | 29 |                 }, extra=True) | 
| 31 | 30 |             }, extra=False) | 
| 32 | 31 |         ]), | 
| 33 | 32 |         v.Optional('task-groups', default=[]): [ | 
| 34 | 33 |             v.Schema({ | 
| 35 |  | -                'tasks': [six.binary_type], | 
|  | 34 | +                'tasks': [str], | 
| 36 | 35 |                 'dimensions': v.Schema({ | 
| 37 |  | -                    v.Extra: six.binary_type | 
|  | 36 | +                    v.Extra: str | 
| 38 | 37 |                 }) | 
| 39 | 38 |             }) | 
| 40 | 39 |         ], | 
|  | 
0 commit comments