kopia lustrzana https://github.com/inkstitch/inkstitch
wxpython version (#2360)
update windows and linux wxpython version to 4.2.1rejbasket/windows-numpy-fix
rodzic
aee7e2f626
commit
6c1a7d2ec9
|
@ -69,7 +69,7 @@ jobs:
|
||||||
python -m pip install pycairo
|
python -m pip install pycairo
|
||||||
python -m pip install PyGObject
|
python -m pip install PyGObject
|
||||||
|
|
||||||
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.1-cp38-cp38-linux_x86_64.whl
|
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.2.1-cp38-cp38-linux_x86_64.whl
|
||||||
|
|
||||||
python -m pip install -r requirements.txt
|
python -m pip install -r requirements.txt
|
||||||
python -m pip install pyinstaller
|
python -m pip install pyinstaller
|
||||||
|
@ -112,7 +112,6 @@ jobs:
|
||||||
python -m pip install wheel
|
python -m pip install wheel
|
||||||
# scipy 1.9.1 is the last version to support 32-bit windows
|
# scipy 1.9.1 is the last version to support 32-bit windows
|
||||||
python -m pip install scipy==1.9.1
|
python -m pip install scipy==1.9.1
|
||||||
python -m pip install wxpython==4.1.1
|
|
||||||
python -m pip install -r requirements.txt
|
python -m pip install -r requirements.txt
|
||||||
python -m pip install pyinstaller
|
python -m pip install pyinstaller
|
||||||
|
|
||||||
|
|
|
@ -100,12 +100,6 @@ class LetteringFrame(wx.Frame):
|
||||||
self.load_settings()
|
self.load_settings()
|
||||||
self.apply_settings()
|
self.apply_settings()
|
||||||
|
|
||||||
def InitLocale(self):
|
|
||||||
# This is necessary because of https://github.com/inkstitch/inkstitch/issues/1186
|
|
||||||
if sys.platform.startswith('win'):
|
|
||||||
import locale
|
|
||||||
locale.setlocale(locale.LC_ALL, "C")
|
|
||||||
|
|
||||||
def load_settings(self):
|
def load_settings(self):
|
||||||
"""Load the settings saved into the SVG group element"""
|
"""Load the settings saved into the SVG group element"""
|
||||||
|
|
||||||
|
|
|
@ -472,13 +472,6 @@ class ParamsTab(ScrolledPanel):
|
||||||
|
|
||||||
class SettingsFrame(wx.Frame):
|
class SettingsFrame(wx.Frame):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
# This is necessary because of https://github.com/inkstitch/inkstitch/issues/1186
|
|
||||||
if sys.platform.startswith('win'):
|
|
||||||
import locale
|
|
||||||
locale.setlocale(locale.LC_ALL, "C")
|
|
||||||
lc = wx.Locale()
|
|
||||||
lc.Init(wx.LANGUAGE_DEFAULT)
|
|
||||||
|
|
||||||
self.tabs_factory = kwargs.pop('tabs_factory', [])
|
self.tabs_factory = kwargs.pop('tabs_factory', [])
|
||||||
self.cancel_hook = kwargs.pop('on_cancel', None)
|
self.cancel_hook = kwargs.pop('on_cancel', None)
|
||||||
self.metadata = kwargs.pop('metadata', [])
|
self.metadata = kwargs.pop('metadata', [])
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
# get up to date inkex version (March 18 2023)
|
# get up to date inkex version (March 18 2023)
|
||||||
inkex @ git+https://gitlab.com/inkscape/extensions.git@29205f3cc6c39283e190a36d72d01ef428f668e5
|
inkex @ git+https://gitlab.com/inkscape/extensions.git@29205f3cc6c39283e190a36d72d01ef428f668e5
|
||||||
|
|
||||||
# lower bound to allow for the use of system packages on Debian and distros that have updated to 4.2
|
|
||||||
# CI adds an == 4.1.1 constraint for prebuilt packages
|
|
||||||
wxPython>=4.1.1
|
wxPython>=4.1.1
|
||||||
|
|
||||||
backports.functools_lru_cache
|
backports.functools_lru_cache
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
<label>Clone</label>
|
<label>Clone</label>
|
||||||
<param indent="1" name="select-clone" type="boolean" gui-text="Clone">false</param>
|
<param indent="1" name="select-clone" type="boolean" gui-text="Clone">false</param>
|
||||||
</vbox>
|
</vbox>
|
||||||
</hobx>
|
</hbox>
|
||||||
</page>
|
</page>
|
||||||
|
|
||||||
<page name="info" gui-text="Help">
|
<page name="info" gui-text="Help">
|
||||||
|
|
Ładowanie…
Reference in New Issue