mirror of https://gitlab.com/openlp/openlp.git
Force the use of SqlAlchemy 1.4 for now
This commit is contained in:
parent
5f67baa415
commit
eb1c86227a
|
@ -33,8 +33,8 @@ init:
|
|||
install:
|
||||
# Update pip
|
||||
- python -m pip install --upgrade pip
|
||||
# Install generic dependencies from pypi
|
||||
- python -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock psycopg2-binary websockets waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle python-vlc zeroconf flask-cors pytest-qt pyenchant pysword qrcode pillow
|
||||
# Install generic dependencies from pypi. sqlalchemy most be 1.4 for now
|
||||
- python -m pip install "sqlalchemy<1.5" alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock psycopg2-binary websockets waitress six webob requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle python-vlc zeroconf flask-cors pytest-qt pyenchant pysword qrcode pillow
|
||||
# Install Windows only dependencies
|
||||
- cmd: python -m pip install pyodbc pypiwin32
|
||||
- cmd: choco install vlc %CHOCO_VLC_ARG% --no-progress --limit-output
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
||||
##########################################################################
|
||||
|
||||
from PyQt5 import QtGui, QtWidgets, Qt
|
||||
from PyQt5 import QtGui, QtWidgets
|
||||
|
||||
from openlp.core.ui.icons import UiIcons
|
||||
|
||||
|
@ -54,7 +54,7 @@ class Ui_ConfirmationDialog():
|
|||
self.listview = QtWidgets.QListView(self)
|
||||
self.listview.setObjectName("confirmation listview")
|
||||
# make the entries read-only
|
||||
self.listview.setEditTriggers(Qt.QAbstractItemView.NoEditTriggers)
|
||||
self.listview.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
|
||||
self.confirmation_layout.addWidget(self.listview)
|
||||
|
||||
# add the items to the listview model
|
||||
|
|
2
setup.py
2
setup.py
|
@ -118,7 +118,7 @@ using a computer and a display/projector.""",
|
|||
'QtAwesome',
|
||||
"qrcode",
|
||||
'requests',
|
||||
'SQLAlchemy >= 0.5',
|
||||
'SQLAlchemy < 1.5',
|
||||
'waitress',
|
||||
'WebOb',
|
||||
'websockets',
|
||||
|
|
|
@ -462,7 +462,7 @@ def test_fix_font_bold_not_windows(mocked_is_win, display_window_env, mock_setti
|
|||
|
||||
|
||||
@patch('openlp.core.display.window.is_win')
|
||||
def test_fix_font_foundry(mocked_is_win, display_window_env, mock_settings, registry):
|
||||
def test_fix_font_foundry(mocked_is_win, display_window_env, mock_settings):
|
||||
"""
|
||||
Test that a font with a foundry name in it has the foundry removed
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue