lp:~raoul-snyman/openlp/fix-circ-deps
Created by
Raoul Snyman
and last modified
- Get this branch:
- bzr branch lp:~raoul-snyman/openlp/fix-circ-deps
Only
Raoul Snyman
can upload to this branch. If you are
Raoul Snyman
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Tim Bentley: Approve
- Bastian Germann: Pending requested
-
Diff: 1753 lines (+158/-209)90 files modifiedopenlp/core/api/__init__.py (+0/-7)
openlp/core/api/endpoint/__init__.py (+0/-1)
openlp/core/api/http/__init__.py (+0/-1)
openlp/core/api/poll.py (+3/-3)
openlp/core/common/i18n.py (+1/-1)
openlp/core/lib/db.py (+4/-4)
openlp/core/lib/serviceitem.py (+1/-1)
openlp/core/projectors/manager.py (+7/-7)
openlp/core/ui/exceptiondialog.py (+1/-1)
openlp/core/ui/exceptionform.py (+1/-1)
openlp/core/ui/icons.py (+2/-2)
openlp/core/ui/maindisplay.py (+2/-2)
openlp/core/ui/mainwindow.py (+1/-1)
openlp/core/ui/media/__init__.py (+0/-7)
openlp/core/ui/media/vendor/mediainfoWrapper.py (+3/-3)
openlp/core/ui/media/vlcplayer.py (+3/-3)
openlp/core/ui/servicemanager.py (+1/-1)
openlp/core/ui/settingsform.py (+1/-1)
openlp/core/ui/slidecontroller.py (+1/-1)
openlp/core/version.py (+0/-3)
openlp/core/widgets/edits.py (+0/-1)
openlp/core/widgets/views.py (+1/-1)
openlp/core/widgets/wizard.py (+0/-1)
openlp/plugins/alerts/alertsplugin.py (+3/-2)
openlp/plugins/alerts/endpoint.py (+0/-1)
openlp/plugins/alerts/forms/__init__.py (+0/-2)
openlp/plugins/alerts/lib/__init__.py (+0/-3)
openlp/plugins/bibles/bibleplugin.py (+4/-4)
openlp/plugins/bibles/forms/bibleimportform.py (+4/-4)
openlp/plugins/bibles/lib/__init__.py (+0/-6)
openlp/plugins/bibles/lib/importers/csvbible.py (+0/-1)
openlp/plugins/bibles/lib/importers/http.py (+1/-1)
openlp/plugins/bibles/lib/manager.py (+1/-1)
openlp/plugins/bibles/lib/mediaitem.py (+3/-2)
openlp/plugins/custom/customplugin.py (+2/-2)
openlp/plugins/custom/forms/editcustomform.py (+3/-3)
openlp/plugins/custom/lib/__init__.py (+0/-4)
openlp/plugins/custom/lib/mediaitem.py (+1/-1)
openlp/plugins/images/forms/__init__.py (+0/-3)
openlp/plugins/images/imageplugin.py (+3/-1)
openlp/plugins/images/lib/__init__.py (+0/-3)
openlp/plugins/images/lib/mediaitem.py (+2/-1)
openlp/plugins/media/lib/__init__.py (+0/-5)
openlp/plugins/media/mediaplugin.py (+2/-1)
openlp/plugins/presentations/lib/__init__.py (+0/-5)
openlp/plugins/presentations/lib/impresscontroller.py (+8/-8)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/pdfcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationcontroller.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+3/-1)
openlp/plugins/songs/forms/__init__.py (+0/-1)
openlp/plugins/songs/forms/editsongform.py (+2/-2)
openlp/plugins/songs/lib/__init__.py (+1/-1)
openlp/plugins/songs/lib/importers/cclifile.py (+0/-2)
openlp/plugins/songs/lib/importers/easyslides.py (+1/-1)
openlp/plugins/songs/lib/importers/openoffice.py (+3/-3)
openlp/plugins/songs/lib/importers/songshowplus.py (+1/-1)
openlp/plugins/songs/lib/importers/sundayplus.py (+1/-1)
openlp/plugins/songs/lib/songselect.py (+2/-1)
openlp/plugins/songusage/forms/__init__.py (+0/-3)
openlp/plugins/songusage/songusageplugin.py (+2/-1)
run_openlp.py (+0/-1)
scripts/translation_utils.py (+1/-1)
setup.cfg (+2/-4)
tests/functional/openlp_core/api/http/test_wsgiapp.py (+2/-1)
tests/functional/openlp_core/api/test_tab.py (+0/-1)
tests/functional/openlp_core/common/test_db.py (+1/-1)
tests/functional/openlp_core/common/test_path.py (+1/-1)
tests/functional/openlp_core/lib/test_lib.py (+12/-12)
tests/functional/openlp_core/ui/media/test_vlcplayer.py (+5/-6)
tests/functional/openlp_core/ui/test_icons.py (+2/-2)
tests/functional/openlp_core/ui/test_maindisplay.py (+1/-1)
tests/functional/openlp_core/ui/test_servicemanager.py (+0/-1)
tests/functional/openlp_plugins/bibles/test_csvimport.py (+18/-11)
tests/functional/openlp_plugins/bibles/test_lib.py (+1/-1)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+4/-4)
tests/functional/openlp_plugins/bibles/test_upgrade.py (+0/-2)
tests/functional/openlp_plugins/custom/test_mediaitem.py (+1/-1)
tests/functional/openlp_plugins/images/test_imagetab.py (+1/-1)
tests/functional/openlp_plugins/presentations/test_impresscontroller.py (+0/-1)
tests/functional/openlp_plugins/songs/test_lib.py (+1/-1)
tests/functional/openlp_plugins/songs/test_mediashout.py (+2/-2)
tests/interfaces/openlp_core/common/test_utils.py (+0/-1)
tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py (+0/-1)
tests/interfaces/openlp_plugins/bibles/test_lib_manager.py (+2/-1)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+2/-1)
tests/interfaces/openlp_plugins/custom/forms/test_customform.py (+1/-1)
tests/interfaces/openlp_plugins/custom/forms/test_customslideform.py (+2/-2)
tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py (+4/-4)
tests/openlp_core/projectors/test_projector_sourceform.py (+1/-1)
Related source package recipes
Branch information
Recent revisions
- 2839. By Raoul Snyman
-
Fix a bunch of linting issues (which should also help resolve other circular dependencies)
- 2837. By Phill
-
Migrate bibles to use the centeral proxy settings. Upgrade settings and bible meta data accordingly.
- 2836. By Bastian Germann
-
This fixes setuptools' dependencies according to scripts/
check_dependenc ies.py.
The minimum Python version is set to 3.6 because this was agreed to on the mailing list.
Some packages which are optional in the source are declared as optional (uno, pyenchant, pyodbc).To overcome a module conflict, openlp.py is replaced with run_openlp.py which setuptools installs as /usr/bin/openlp (or openlp.exe on Windows).
Additionally, pyxdg is replaced with appdirs (see License violations issue).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openlp
