Merge lp://staging/~raoul-snyman/openlp/packaging-macos-pyro into lp://staging/openlp/packaging
Proposed by
Raoul Snyman
| Status: | Merged |
|---|---|
| Approved by: | Raoul Snyman |
| Approved revision: | 35 |
| Merged at revision: | 46 |
| Proposed branch: | lp://staging/~raoul-snyman/openlp/packaging-macos-pyro |
| Merge into: | lp://staging/openlp/packaging |
| Diff against target: |
828 lines (+377/-254) 17 files modified
builders/builder.py (+21/-18) builders/macosx-builder.py (+33/-18) builders/windows-builder.py (+18/-18) osx/settings.py (+26/-3) pyinstaller-hooks/hook-mysql.connector.py (+19/-19) pyinstaller-hooks/hook-openlp.core.ui.media.py (+19/-19) pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py (+23/-0) pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py (+20/-19) pyinstaller-hooks/hook-openlp.py (+32/-30) pyinstaller-hooks/hook-sqlalchemy.py (+19/-19) pyinstaller-hooks/hook-ssl.py (+21/-0) pyinstaller-hooks/rthook_ssl.py (+21/-0) scripts/deb_version.py (+20/-18) scripts/fix_bzr.py (+21/-18) scripts/openlp_tweeter.py (+21/-18) scripts/openlp_version.py (+23/-19) scripts/openlptweet.py (+20/-18) |
| To merge this branch: | bzr merge lp://staging/~raoul-snyman/openlp/packaging-macos-pyro |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tomas Groth | Approve | ||
| Phill | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2019-05-25.
Commit message
Add Pyro4 into the Mac build, update some license headers, and add a hidden import for sqlalchemy.
Description of the change
Add Pyro4 into the Mac build, update some license headers, and add a hidden import for sqlalchemy.
To post a comment you must log in.
Revision history for this message
| Raoul Snyman (raoul-snyman) | # |
Revision history for this message
| Tomas Groth (tomasgroth) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Nothing majer