Skip to content

Commit 97e6dec

Browse files
committed
fixes keychain handling on linux
1 parent 0fbea9e commit 97e6dec

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

src/artisanlib/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20539,7 +20539,7 @@ def eventactionx(self,a,cmd):
2053920539
# 20= Artisan Command; 21= RC Command; 22= WebSocket Command
2054020540
def eventaction(self,action,cmd,parallel=True):
2054120541
if action:
20542-
if not parallel or action==3: # subactions of multiple event actions, may crash if run in parallel, especially if they update the UI like button shape!
20542+
if not parallel:# or action==3: # subactions of multiple event actions, may crash if run in parallel, especially if they update the UI like button shape!
2054320543
self.eventaction_internal(action,cmd,doupdategraphics=True,doupdatebackground=True)
2054420544
else:
2054520545
eventActionThread = EventActionThread(action,cmd)
@@ -34515,7 +34515,7 @@ def realignbuttons(self):
3451534515
p.setText(l)
3451634516
p.setFocusPolicy(Qt.NoFocus)
3451734517
p.clicked.connect(self.recordextraevent_slot)
34518-
self.buttonlist.append(p)
34518+
self.buttonlist.append(p)
3451934519
self.buttonStates.append(0)
3452034520
#add button to row
3452134521
if row1count < self.buttonlistmaxlen:

src/requirements-linux.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ pyinstaller==4.1 # 3.6
1010
#jeepney==0.4
1111
#cryptography==2.6.1
1212
keyring==21.5.0 #19.2.0 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
13-
#SecretStorage==3.1.2 # no need any longer to install this separately
13+
SecretStorage==3.3.0 # no need any longer to install this separately # 3.3.0 not on Stretch
1414
lxml==4.6.2
1515
distro==1.5.0

src/requirements-rpi.txt

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pyinstaller==3.3.1 # 3.5 seems to hang!?
1515
cffi==1.12.3 # 1.13.2 fails, 1.12.3 is needed by crypto v2.5
1616
cryptography==3.2.1 # 3.2.1 is the last version supporting Python 3.5 # 2.5 worked but has a security issue # 2.8 fails with libcrypto.so.1.1: version `OPENSSL_1_1_0j' not found, required by cryptography.hazmat.bindings._openssl.so
1717
keyring==19.2.0 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller; Python 3.5 support was dropped
18+
SecretStorage==3.2.0 # 3.3.0 not available on piwheels for Stretch
1819
lxml==4.6.2
1920
distro==1.5.0
2021

src/translations/artisan_zh_TW.qm

157 Bytes
Binary file not shown.

wiki/ReleaseHistory.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ v2.4.4 (xx.12.2020)
4040
- [special events annotations](https://artisan-roasterscope.blogspot.com/2020/05/special-events-annotations.html) respect the decimal places setting
4141
- updated Spanish translations ([PR #525](../../../pull/525), [PR #527](../../../pull/427), [PR #530](../../../pull/530), [PR #535](../../../pull/535), [PR #536](../../../pull/536) and [PR #537](../../../pull/537) by [
4242
Richard Rodrigues](https://github.com/rich1n))
43-
- updated Chinese translations ([PR #532](../../../pull/532) by [wuyi-ligux](https://github.com/wuyi-levard))
43+
- updated Chinese translations ([PR #532](../../../pull/532) and [PR #538](../../../pull/538) by [wuyi-ligux](https://github.com/wuyi-levard))
4444
* Fixes
4545
- fixes regression which broke the event picker in v2.4.2
4646
- fixes another issue with the multiple event button action processing ([Issue #504](../../../issues/504))

0 commit comments

Comments
 (0)