From f50293cf77d73a51d676195bac6162ab7054c4e6 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 13 Feb 2020 16:57:23 +0300 Subject: [PATCH] Revert to wxpython 4.0.6 once again (see issue 2136) --- .appveyor.yml | 4 +++- pyfa.py | 1 - requirements.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0b897a0ef..0668853ab 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,7 +3,7 @@ clone_depth: 400 environment: matrix: - - PYTHON: "C:\\Python38-x64" + - PYTHON: "C:\\Python37-x64" # Should be enabled only for build process debugging # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) @@ -40,6 +40,8 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - ps: echo("Install pip requirements:") + # This one is needed to build wxpython 4.0.6 on windows + - cmd: "python -m pip install pathlib2" - cmd: "python -m pip install -r requirements.txt" - cmd: "python -m pip install PyInstaller==3.6" diff --git a/pyfa.py b/pyfa.py index fbc9bde1d..fbee4220b 100755 --- a/pyfa.py +++ b/pyfa.py @@ -140,7 +140,6 @@ if __name__ == "__main__": options.title = "pyfa %s - Python Fitting Assistant" % (config.getVersion()) pyfa = wx.App(False) - pyfa.ResetLocale() mf = MainFrame(options.title) ErrorHandler.SetParent(mf) diff --git a/requirements.txt b/requirements.txt index 3aa145586..1b61854f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -wxPython == 4.0.7.post2 +wxPython == 4.0.6 logbook >= 1.0.0 matplotlib >= 3.1.2 python-dateutil