Issue 4548 - Split out Safari and add Edge release automation

packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import base64
 import hashlib
 import json
 import mimetypes
 import os
 import zipfile
 
 import packager
 import packagerChrome
+# These functions are unused here, but releaseAutomation.py expects them.
+from packager import readMetadata, getDefaultFileName

[Vasily Kuznetsov, 2016/10/25 16:16:26]

Please note that currently this causes `tox` to fail because `flake8` complains
about unused imports. This can be solved by adding `# flake8: noqa` comment to
the end of the line or (perhaps a bit more elegant) by adding those symbols (and
maybe everything else that is expected to be here) to `__all__`.

[Sebastian Noack, 2016/10/26 09:33:14]

I'd like to avoid #noqa as much as possible. But I'm not a fan of __all__
either, since "from import *" is generally discouraged.

Any reason the releaseAutomation module isn't importing those functions directly
from the packager module? It seems it isn't overridden by any platform-specific
packager anyway.

[kzar, 2016/10/26 15:19:13]

Ah sorry, I didn't realise the repository had tests! Since it took me a minute
to figure out how to run them I've opened a review to add a README for the next
person: https://codereview.adblockplus.org/29359949/

Also I found the tests fail for me even on master, this seems to be since my
system expects a different content type for OTF files. I've opened an issue for
that: https://issues.adblockplus.org/ticket/4575#ticket

Done.

[Sebastian Noack, 2016/10/27 10:57:32]

It seems you ignored my comment from above:

On 2016/10/26 09:33:14, Sebastian Noack wrote:

[kzar, 2016/10/27 15:25:58]

Whoops, so I did. Done.

 
 # Files and directories expected inside of the .APPX archive.
 MANIFEST = 'AppxManifest.xml'
 CONTENT_TYPES = '[Content_Types].xml'
 BLOCKMAP = 'AppxBlockMap.xml'
 EXTENSION_DIR = 'Extension'
 ASSETS_DIR = 'Assets'
 
 # Size of uncompressed block in the APPX block map.
 BLOCKSIZE = 64 * 1024
@@ skipping 62 matching lines @@
     params['version'] = pad_version(params['version'])
 
     translation = load_translation(files, defaultLocale)
     name_key = 'name' if release_build else 'name_devbuild'
     params['display_name'] = translation[name_key]['message']
     params['description'] = translation['description']['message']
 
     for size in ['44', '50', '150']:
         path = '{}/logo_{}.png'.format(ASSETS_DIR, size)
         if path not in files:
-            raise KeyError(path + 'is not found in files')
+            raise KeyError(path + ' is not found in files')
         params['logo_' + size] = path.replace('/', '\\')
 
     template = _get_template_for(MANIFEST)
     return template.render(params).encode('utf-8')
 
 
 def move_files_to_extension(files):
     """Move all files into `Extension` folder for APPX packaging."""
     # We sort the files to ensure that 'Extension/xyz' is moved before 'xyz'.
     # If 'xyz' is moved first, it would overwrite 'Extension/xyz' and its
@@ skipping 67 matching lines @@
     if metadata.has_section('appx_assets'):
         for name, path in metadata.items('appx_assets'):
             path = os.path.join(baseDir, path)
             files.read(path, '{}/{}'.format(ASSETS_DIR, name))
 
     files[MANIFEST] = create_appx_manifest(params, files, releaseBuild)
     files[BLOCKMAP] = create_appx_blockmap(files)
     files[CONTENT_TYPES] = create_content_types_map(files.keys() + [BLOCKMAP])
 
     files.zip(outfile, compression=zipfile.ZIP_STORED)