update libs

src/Info.plist

@@ -120,7 +120,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.0</string>
+	<string>3.1.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -131,7 +131,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>Artisan 3.1.0</string>
+	<string>Artisan 3.1.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSArchitecturePriority</key>

src/plus/schedule.py

@@ -2253,7 +2253,12 @@ def set_roast_properties(self, item:ScheduledItem, overwrite_nondefault_title:bo
             self.aw.qmc.plus_store_label = plus.stock.getStoreLabel(store_item)
             if item.coffee is not None:
                 coffee = plus.stock.getCoffee(item.coffee)
-                if coffee is not None:
+                if coffee is None:
+                    # coffee not in stock, we keep at least the coffee hr_id
+                    self.aw.qmc.plus_coffee = item.coffee
+                    self.aw.qmc.plus_coffee_label = ''
+                    self.aw.qmc.beans = ''
+                else:
                     self.aw.qmc.plus_coffee = item.coffee
                     self.aw.qmc.plus_coffee_label = plus.stock.coffeeLabel(coffee)
                     self.aw.qmc.beans = plus.stock.coffee2beans(coffee)

src/requirements-dev.txt

@@ -7,13 +7,13 @@ types-python-dateutil==2.9.0.20241003
 types-pytz>=2024.2.0.20241003
 types-pyyaml>=6.0.12.20240917
 types-requests>=2.32.0.20241016
-types-setuptools>=75.5.0.20241119
+types-setuptools>=75.5.0.20241122
 types-urllib3>=1.26.25.14
 types-docutils>=0.21.0.20241005
 lxml-stubs>=0.5.1
 mypy==1.13.0
 pyright==1.1.389
-ruff>=0.7.4
+ruff>=0.8.0
 pylint==3.3.1
 pre-commit>=4.0.1
 pytest>=8.3.3
@@ -25,7 +25,7 @@ pytest-cov==5.0.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.119.3
+hypothesis>=6.119.4
 coverage>=7.6.7
 coverage-badge==1.1.2
 codespell==2.3.0

src/requirements.txt

@@ -27,7 +27,7 @@
 # packages that are required on all platforms
 #
 setuptools==70.3.0 # py2app fails on 71.0.3 and 71.0.4; pyinstaller windows/linux fails on 71.0.0 <= < 71.0.3
-wheel==0.45.0
+wheel==0.45.1
 pyserial==3.5
 pymodbus==3.6.9; python_version < '3.9' # last Python 3.8 release
 pymodbus==3.7.4; python_version >= '3.9'
@@ -64,14 +64,14 @@ lxml==5.3.0
 matplotlib==3.7.3; python_version < '3.9' # last Python 3.8 release
 matplotlib==3.9.2; python_version >= '3.9'
 jinja2==3.1.4
-aiohttp==3.10.11 # 3.11.x only >= 3.9!
+aiohttp==3.11.7 # 3.11.x only >= 3.9!
 aiohttp_jinja2==1.6
 python-bidi==0.4.2; python_version < '3.9' # last Python 3.8 release
 python-bidi==0.6.3; python_version >= '3.9'
 arabic-reshaper==3.0.0
 pillow==10.4.0; python_version < '3.9' # last Python 3.8 release
 pillow>=11.0.0; python_version >= '3.9'
-pydantic==2.9.2; (platform_system=='Windows' and python_version>'3.10') or sys_platform=='darwin' or platform_system=='Linux'
+pydantic==2.10.1; (platform_system=='Windows' and python_version>'3.10') or sys_platform=='darwin' or platform_system=='Linux'
 pydantic==2.7.1; (platform_system=='Windows' and python_version<'3.9')  # last version working with Windows 7/8 pending resolution of pydantic Issue #9920
 babel==2.16.0
 bleak==0.22.3

src/setup-macos3.py

@@ -480,6 +480,13 @@
 except Exception: # pylint: disable=broad-except
     pass
 
+print('*** Removing Phidget driver libs not for this platforms ***')
+try:
+    subprocess.check_call(f'rm -f ./Artisan.app/Contents/Resources/lib/{python_version}/Phidget22/.libs/*.so',shell = True)
+    subprocess.check_call(f'rm -f ./Artisan.app/Contents/Resources/lib/{python_version}/Phidget22/.libs/*.dll',shell = True)
+except Exception: # pylint: disable=broad-except
+    pass
+
 ####
 
 os.chdir('..')

wiki/ReleaseHistory.md

@@ -1,6 +1,13 @@
 Detailed Release History
 ========================
 
+----
+v3.1.1
+------------------
+
+* CHANGES
+  - the Phidget driver is now bundled with the Artisan app and does no longer need to be installed separately
+
 
 ----
 v3.1.0 (November 22, 2024)