← Back to branch summary

~nskaggs/juju-release-tools/generate-release-notes

« back to all changes in this revision

Viewing changes to make_image_streams.py

  • Committer: Nicholas Skaggs
  • Date: 2017-02-14 15:58:25 UTC
  • mto: This revision was merged to the branch mainline in revision 370.
  • Revision ID: nicholas.skaggs@canonical.com-20170214155825-9t2r3rklkbybx3q2
Fix lint errors, allow for e402 to support make_image_streams.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
make_image_streams.py
5
5
from copy import deepcopy
6
6
from datetime import datetime
7
7
import logging
8
 
# Done early to prevent Simplestreams from messing with the log configuration.
9
 
logging.basicConfig(level=logging.INFO)
10
8
import os
11
9
import sys
12
10
from textwrap import dedent
13
11
import yaml
14
12
 
15
13
from boto import ec2
 
14
# Done early to prevent Simplestreams from messing with the log configuration.
 
15
logging.basicConfig(level=logging.INFO)
16
16
from simplestreams.generate_simplestreams import (
17
17
    FileNamer,
18
18
    generate_index,
19
19
    items2content_trees,
20
20
    json_dump,
21
 
    )
 
21
)
22
22
from simplestreams.json2streams import (
23
23
    Item,
24
24
    JujuFileNamer,
25
 
    )
 
25
)
26
26
from simplestreams import util
27
27
 
28
28
log = logging.getLogger(
76
76
        return {
77
77
            'aws_access_key_id': creds['access-key'],
78
78
            'aws_secret_access_key': creds['secret-key'],
79
 
            }
 
79
        }
80
80
    else:
81
81
        raise LookupError('No credentials found!')
82
82
 
116
116
            'owner_alias': 'aws-marketplace',
117
117
            'product_code': 'aw0evgkw8e5c1q413zgy5pjce',
118
118
            # 'name': 'CentOS Linux 7*',
119
 
            })
 
119
        })
120
120
        for image in images:
121
121
            yield image
122
122