From fbe17c930c4e06643dc7a5708becc00e44a4b4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Roy?= Date: Mon, 17 May 2021 11:14:47 -0400 Subject: [PATCH] Fix find build validator and use Python 3.8 for bundling --- cddagl/ui/views/main.py | 8 ++++++-- setup.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cddagl/ui/views/main.py b/cddagl/ui/views/main.py index d732d1dc..f11abb74 100644 --- a/cddagl/ui/views/main.py +++ b/cddagl/ui/views/main.py @@ -20,14 +20,16 @@ from urllib.parse import urljoin import arrow -from PyQt5.QtCore import Qt, QTimer, QUrl, QFileInfo, pyqtSignal, QStringListModel, QThread +from PyQt5.QtCore import ( + Qt, QTimer, QUrl, QFileInfo, pyqtSignal, QStringListModel, QThread, QRegularExpression +) from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest from PyQt5.QtWidgets import ( QApplication, QWidget, QGridLayout, QGroupBox, QVBoxLayout, QLabel, QLineEdit, QPushButton, QFileDialog, QToolButton, QProgressBar, QButtonGroup, QRadioButton, QComboBox, QTextBrowser, QMessageBox, QStyle, QHBoxLayout, QSizePolicy ) -from PyQt5.QtGui import QIntValidator +from PyQt5.QtGui import QRegularExpressionValidator from babel.dates import format_datetime from pywintypes import error as PyWinError @@ -1259,6 +1261,8 @@ def __init__(self): self.find_build_label = find_build_label find_build_value = QLineEdit() + find_build_value.setValidator(QRegularExpressionValidator( + QRegularExpression(r'\d+(-\d+)*'))) find_build_value.returnPressed.connect(self.find_build) layout.addWidget(find_build_value, layout_row, 1, 1, 2) self.find_build_value = find_build_value diff --git a/setup.py b/setup.py index 83714656..72522938 100644 --- a/setup.py +++ b/setup.py @@ -116,8 +116,8 @@ def run(self): download_path.mkdir(parents=True, exist_ok=True) # Download Python embeddable package - python_embed_url = 'https://www.python.org/ftp/python/3.9.5/python-3.9.5-embed-amd64.zip' - python_embed_name = 'python-3.9.5-embed-amd64.zip' + python_embed_url = 'https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-amd64.zip' + python_embed_name = 'python-3.8.10-embed-amd64.zip' python_embed_archive = download_path.joinpath(python_embed_name) try: