diff options
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | lib/extensions/lettering.py | 6 | ||||
| -rw-r--r-- | lib/extensions/params.py | 7 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | templates/select_elements.xml | 2 |
5 files changed, 2 insertions, 18 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2bb0fe38..378c4c18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: python -m pip install pycairo 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 pyinstaller @@ -112,7 +112,6 @@ jobs: python -m pip install wheel # 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 wxpython==4.1.1 python -m pip install -r requirements.txt python -m pip install pyinstaller diff --git a/lib/extensions/lettering.py b/lib/extensions/lettering.py index c0072644..fec48100 100644 --- a/lib/extensions/lettering.py +++ b/lib/extensions/lettering.py @@ -100,12 +100,6 @@ class LetteringFrame(wx.Frame): self.load_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): """Load the settings saved into the SVG group element""" diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 12d38232..540cc7bb 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -472,13 +472,6 @@ class ParamsTab(ScrolledPanel): class SettingsFrame(wx.Frame): 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.cancel_hook = kwargs.pop('on_cancel', None) self.metadata = kwargs.pop('metadata', []) diff --git a/requirements.txt b/requirements.txt index ab99b462..0da7135b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,6 @@ # get up to date inkex version (March 18 2023) 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 backports.functools_lru_cache diff --git a/templates/select_elements.xml b/templates/select_elements.xml index 288b4aa3..bfa8d9c5 100644 --- a/templates/select_elements.xml +++ b/templates/select_elements.xml @@ -63,7 +63,7 @@ <label>Clone</label> <param indent="1" name="select-clone" type="boolean" gui-text="Clone">false</param> </vbox> - </hobx> + </hbox> </page> <page name="info" gui-text="Help"> |