Skip to content

Commit

Permalink
CI: updated PyQt5 version for installer
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurentRDC committed Apr 26, 2021
1 parent 3195960 commit bd92f13
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
22 changes: 19 additions & 3 deletions installer/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
"""
from pathlib import Path
import sys
from subprocess import run, check_output
import subprocess
from functools import wraps
import logging
import tempfile
import importlib.util as iutil
import shutil
import argparse

logging.basicConfig(encoding="utf-8", level=logging.INFO)

REPO_ROOT = Path(__file__).parent.parent
DESTINATION = REPO_ROOT / "dist"
INSTALLER_REQUIREMENTS_FILE = Path(__file__).parent / "inst-requirements.txt"
Expand All @@ -31,8 +35,9 @@
format=bundled
[Include]
pypi_wheels= PyQt5==5.15.2
PyQt5-sip==12.8.1
pypi_wheels=
pyqt5==5.15.4
pyqt5-sip==12.8.1
packages=
{packages}
[Build]
Expand All @@ -51,6 +56,16 @@
default=None,
)

@wraps(subprocess.run)
def run(cmd, *args, **kwargs):
logging.info("Running " + cmd)
return subprocess.run(cmd, *args, **kwargs)

@wraps(subprocess.check_output)
def check_output(cmd, *args, **kwargs):
logging.info("Checking output of " + cmd)
return subprocess.check_output(cmd, *args, **kwargs)


def importable_name(pkg):
"""
Expand Down Expand Up @@ -129,6 +144,7 @@ def generate_pynsist_config(python_exe, filename, exe_name):
run(f"python -m venv {work_dir} --upgrade --upgrade-deps --copies")

env_python = work_dir / "Scripts" / "python.exe"
run(f"{env_python} -m pip install --upgrade --force-reinstall setuptools --no-warn-script-location")
run(f"{env_python} -m pip install --upgrade wheel --no-warn-script-location")
run(f"{env_python} -m pip install {REPO_ROOT} --no-warn-script-location")

Expand Down
4 changes: 3 additions & 1 deletion installer/inst-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
pynsist >= 2, <3
pynsist >= 2, <3
pyqt5 >= 5.12
pyqt5-sip >= 12

0 comments on commit bd92f13

Please sign in to comment.