Rebase fixes from Gourmet

GourmandRecipeManager · Jul 20, 2021 · 521043c · 521043c
2 parents 35d2aca + c9318c1
commit 521043c
Show file tree

Hide file tree

Showing 7 changed files with 220 additions and 126 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -17,9 +17,9 @@ jobs:
       run: |
         sudo apt-get update -q
         sudo apt-get -y install python3-testresources intltool imagemagick libgirepository1.0-dev
-        wget https://github.com/niess/python-appimage/releases/download/python3.8/python3.8.10-cp38-cp38-manylinux1_x86_64.AppImage
-        chmod +x ./python3.8.10-cp38-cp38-manylinux1_x86_64.AppImage
-        ./python3.8.10-cp38-cp38-manylinux1_x86_64.AppImage --appimage-extract
+        wget -c https://github.com/$(wget -q https://github.com/niess/python-appimage/releases/tag/python3.8 -O - | grep "python3.8.*-cp38-cp38-manylinux1_x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
+        chmod +x ./python3*.AppImage
+        ./python3*.AppImage --appimage-extract
         wget -c https://github.com/$(wget -q https://github.com/probonopd/go-appimage/releases -O - | grep "appimagetool-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
         chmod +x appimagetool-*.AppImage
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,7 @@ jobs:
         run: sudo pip3 install -r development.in
 
       - name: Test with pytest
-        run: xvfb-run -a pytest -vv tests/test_*
+        run: LANGUAGE=de_DE.utf-8 xvfb-run -a pytest -vv tests/test_*
 
       - name: Check imports ordering
         run: >

diff --git a/src/gourmand/gtk_extras/optionTable.py b/src/gourmand/gtk_extras/optionTable.py
@@ -91,7 +91,9 @@ def createOptionWidgets (self):
                 if self.changedcb:
                     w.connect('changed',self.changedcb)
             elif isinstance(v, (int, float)):
-                adj = Gtk.Adjustment(value=0, lower=0, upper=100*(v or 1), step_incr=(v or 1)*0.1, page_incr=(v or 1)*0.5)
+                adj = Gtk.Adjustment(value=0, lower=0, upper=100*(v or 1),
+                        step_increment=(v or 1)*0.1,
+                        page_increment=(v or 1)*0.5)
                 if isinstance(v, int):
                     # if an integer...
                     w = Gtk.SpinButton()