Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

Commit

Permalink
Fix find build validator and use Python 3.8 for bundling
Browse files Browse the repository at this point in the history
  • Loading branch information
remyroy committed May 17, 2021
1 parent f6787a7 commit fbe17c9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions cddagl/ui/views/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit fbe17c9

Please sign in to comment.