Merge pull request openedx-unsupported#26

* stv/coverage:
  Bump opaque keys version
  Fix boto
  Skip coverage of __main__
  Add invalid element type to cert-data
  Skip coverage for S3 uploads

.travis.yml

@@ -2,6 +2,8 @@
 language: python
 python:
   - "2.7"
+env:
+  - BOTO_CONFIG=/dev/null
 before_install:
   - pip install pep8
   - pep8 --verbose

cert-data.yml

@@ -358,6 +358,8 @@ course-v1:edX+DemoX_v4+Custom_Instructor_Block_v4:
               x_end: 200
           - image:
               <<: *default_instructor_signature_image
+          - invalid_element_type:
+              this: should be silently ignored
         name_string: '<b>M. Guillaume Hébert</b>'
         title_string: 'Head Concierge'
         supplemental_title_string: 'Lifestyle Manager'

create_pdfs.py

@@ -168,6 +168,6 @@ def main():
         for row in certificate_data:
             print '\t'.join(row)
 
-if __name__ == '__main__':
+if __name__ == '__main__':  # pragma: no cover
     args = parse_args()
     main()

gen_cert.py

@@ -276,7 +276,7 @@ def create_and_upload(
         # or copy them to the web root. Or both.
         my_certs_path = os.path.join(certificates_path, download_uuid)
         my_verify_path = os.path.join(verify_path, verify_uuid)
-        if upload:
+        if upload:  # pragma: no cover
             s3_conn = boto.connect_s3(settings.CERT_AWS_ID, settings.CERT_AWS_KEY)
             bucket = s3_conn.get_bucket(BUCKET)
         if upload or copy_to_webroot:
@@ -287,7 +287,7 @@ def create_and_upload(
                         dest_path = os.path.relpath(local_path, start=self.dir_prefix)
                         publish_dest = os.path.join(cert_web_root, dest_path)
 
-                        if upload:
+                        if upload:  # pragma: no cover
                             key = Key(bucket, name=dest_path)
                             key.set_contents_from_filename(local_path, policy='public-read')
                             log.info("uploaded {local} to {s3path}".format(local=local_path, s3path=dest_path))

requirements.txt

@@ -1,6 +1,7 @@
 argparse==1.2.1
 boto==2.27.0
 ddt
+edx-opaque-keys==0.4.0
 gnupg==1.4.0
 nose==1.2.1
 path.py==2.4.1
@@ -10,5 +11,4 @@ python-bidi==0.3.4
 PyYAML==3.11
 reportlab==3.1.44
 requests==2.3.0
-git+https://github.com/edx/opaque-keys.git@1254ed4d615a428591850656f39f26509b86d30a#egg=opaque-keys
 babel==1.3