chore: Upgrade dependencies

TomBursch · Dec 13, 2024 · f6f018f · f6f018f
1 parent 4fa523c
commit f6f018f
Show file tree

Hide file tree

Showing 19 changed files with 147 additions and 136 deletions.
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -1,13 +1,13 @@
-aiohappyeyeballs==2.4.3
-aiohttp==3.11.6
+aiohappyeyeballs==2.4.4
+aiohttp==3.11.10
 aiosignal==1.3.1
 alembic==1.14.0
 amqp==5.3.1
 annotated-types==0.7.0
-anyio==4.6.2.post1
-apispec==6.7.1
+anyio==4.7.0
+apispec==6.8.0
 appdirs==1.4.4
-APScheduler==3.10.4
+APScheduler==3.11.0
 attrs==24.2.0
 autopep8==2.3.1
 bcrypt==4.2.1
@@ -26,7 +26,8 @@ click-didyoumean==0.3.1
 click-plugins==1.1.1
 click-repl==0.3.0
 contourpy==1.3.1
-cryptography==43.0.3
+coverage==7.6.9
+cryptography==44.0.0
 cycler==0.12.1
 dbscan1d==0.2.3
 defusedxml==0.7.1
@@ -38,13 +39,13 @@ Flask==3.1.0
 Flask-APScheduler==1.13.1
 Flask-BasicAuth==0.2.0
 Flask-Bcrypt==1.0.1
-Flask-JWT-Extended==4.7.0
+Flask-JWT-Extended==4.7.1
 Flask-Migrate==4.0.7
 Flask-SocketIO==5.4.1
 Flask-SQLAlchemy==3.1.1
 flexcache==0.3
 flexparser==0.4
-fonttools==4.55.0
+fonttools==4.55.3
 frozenlist==1.5.0
 fsspec==2024.10.0
 future==1.0.0
@@ -56,38 +57,38 @@ html5lib-modern==1.2
 html_text==0.6.2
 httpcore==1.0.7
 httpx==0.27.2
-huggingface-hub==0.26.2
+huggingface-hub==0.26.5
 idna==3.10
 importlib_metadata==8.5.0
-ingredient_parser_nlp==1.3.0
+ingredient_parser_nlp==1.3.2
 iniconfig==2.0.0
 isodate==0.7.2
 itsdangerous==2.2.0
 Jinja2==3.1.4
-jiter==0.7.1
+jiter==0.8.2
 joblib==1.4.2
 jsonschema==4.23.0
 jsonschema-specifications==2024.10.1
 jstyleson==0.0.2
 kiwisolver==1.4.7
 kombu==5.4.2
 lark==1.2.2
-litellm==1.52.10
+litellm==1.55.0
 lxml==5.3.0
 lxml_html_clean==0.4.1
-Mako==1.3.6
+Mako==1.3.8
 MarkupSafe==3.0.2
 marshmallow==3.23.1
-matplotlib==3.9.2
+matplotlib==3.9.4
 mccabe==0.7.0
 mf2py==2.0.1
 mlxtend==0.23.1
 multidict==6.1.0
 mypy-extensions==1.0.0
 nltk==3.9.1
-numpy==2.1.3
+numpy==2.2.0
 oic==1.7.0
-openai==1.54.5
+openai==1.57.3
 packaging==24.2
 pandas==2.2.3
 pathspec==0.12.1
@@ -96,23 +97,24 @@ Pint==0.24.4
 pip-upgrade-tool==0.7.4
 platformdirs==4.3.6
 pluggy==1.5.0
-prometheus_client==0.21.0
+prometheus_client==0.21.1
 prometheus_flask_exporter==0.23.1
 prompt_toolkit==3.0.48
-propcache==0.2.0
+propcache==0.2.1
 psycopg2-binary==2.9.10
 py==1.11.0
 pycodestyle==2.12.1
 pycparser==2.22
 pycryptodomex==3.21.0
-pydantic==2.9.2
-pydantic-settings==2.6.1
+pydantic==2.10.3
+pydantic-settings==2.7.0
 pyflakes==3.2.0
 pyjwkest==1.4.2
 PyJWT==2.9.0
 pyparsing==3.2.0
 pyRdfa3==3.6.4
-pytest==8.3.3
+pytest==8.3.4
+pytest-cov==6.0.0
 python-crfsuite==0.9.11
 python-dateutil==2.9.0.post0
 python-dotenv==1.0.1
@@ -124,27 +126,27 @@ pytz-deprecation-shim==0.1.0.post0
 PyYAML==6.0.2
 rdflib==7.1.1
 rdflib-jsonld==0.6.2
-recipe_scrapers==15.2.1
+recipe_scrapers==15.3.2
 referencing==0.35.1
 regex==2024.11.6
 requests==2.32.3
-rpds-py==0.21.0
-scikit-learn==1.5.2
+rpds-py==0.22.3
+scikit-learn==1.6.0
 scipy==1.14.1
-setuptools==75.5.0
+setuptools==75.6.0
 setuptools-scm==8.1.0
 simple-websocket==1.1.0
-six==1.16.0
+six==1.17.0
 sniffio==1.3.1
 soupsieve==2.6
 SQLAlchemy==2.0.36
 sqlite-icu==1.0
 threadpoolctl==3.5.0
 tiktoken==0.8.0
-tokenizers==0.20.3
+tokenizers==0.21.0
 toml==0.10.2
-tomli==2.1.0
-tqdm==4.67.0
+tomli==2.2.1
+tqdm==4.67.1
 typed_ast==1.5.5
 types-beautifulsoup4==4.12.0.20241020
 types-html5lib==1.1.11.20241018
@@ -162,7 +164,7 @@ wcwidth==0.2.13
 webencodings==0.5.1
 Werkzeug==3.1.3
 wsproto==1.2.0
-yarl==1.17.2
+yarl==1.18.3
 zipp==3.21.0
 zope.event==5.0
-zope.interface==7.1.1
+zope.interface==7.2
diff --git a/flutter b/flutter
diff --git a/kitchenowl/analysis_options.yaml b/kitchenowl/analysis_options.yaml
@@ -0,0 +1,3 @@
+analyzer:
+  errors:
+    deprecated_member_use: ignore # Until https://github.com/flutter/flutter/issues/160184 is fixed
diff --git a/kitchenowl/lib/cubits/expense_category_add_update_cubit.dart b/kitchenowl/lib/cubits/expense_category_add_update_cubit.dart
@@ -59,7 +59,7 @@ class AddUpdateExpenseCategoryState extends Equatable {
         color: (color ?? Nullable(this.color)).value,
       );
 
-  bool isValid() => name.isNotEmpty && (color == null || color!.alpha == 255);
+  bool isValid() => name.isNotEmpty && (color == null || color!.a == 255);
 
   @override
   List<Object?> get props => [

diff --git a/kitchenowl/lib/cubits/shoppinglist_cubit.dart b/kitchenowl/lib/cubits/shoppinglist_cubit.dart
@@ -297,7 +297,7 @@ class ShoppinglistCubit extends Cubit<ShoppinglistCubitState> {
         )
         .then((lists) => Map.fromEntries(lists
             .map((e) => e.id != null ? MapEntry(e.id!, e) : null)
-            .whereNotNull()));
+            .nonNulls));
 
     ShoppingList? shoppingList = state.selectedShoppinglist;
     if (await PreferenceStorage.getInstance()
@@ -328,7 +328,7 @@ class ShoppinglistCubit extends Cubit<ShoppinglistCubitState> {
       selectedListItems: state.selectedListItems
           .map((e) =>
               shoppingList!.items.firstWhereOrNull((item) => item.id == e.id))
-          .whereNotNull()
+          .nonNulls
           .toList(),
     );
 
@@ -357,7 +357,7 @@ class ShoppinglistCubit extends Cubit<ShoppinglistCubitState> {
         .runTransaction(TransactionShoppingListGet(household: household))
         .then((lists) => Map.fromEntries(lists
             .map((e) => e.id != null ? MapEntry(e.id!, e) : null)
-            .whereNotNull()));
+            .nonNulls));
 
     int? selectedShoppinglistId = state.selectedShoppinglistId;
     if (selectedShoppinglistId != null &&
@@ -418,7 +418,7 @@ class ShoppinglistCubit extends Cubit<ShoppinglistCubitState> {
         selectedListItems: state.selectedListItems
             .map((e) =>
                 shoppinglist?.items.firstWhereOrNull((item) => item.id == e.id))
-            .whereNotNull()
+            .nonNulls
             .toList(),
       );
     } else {
@@ -430,7 +430,7 @@ class ShoppinglistCubit extends Cubit<ShoppinglistCubitState> {
         selectedListItems: state.selectedListItems
             .map((e) =>
                 shoppinglist?.items.firstWhereOrNull((item) => item.id == e.id))
-            .whereNotNull()
+            .nonNulls
             .toList(),
       );
     }

diff --git a/kitchenowl/lib/pages/household_page.dart b/kitchenowl/lib/pages/household_page.dart
@@ -106,8 +106,6 @@ class _HouseholdPageState extends State<HouseholdPage>
           ),
         );
         return;
-      default:
-        break;
     }
     context.go("/household/${widget.household.id}/${tapped.toString()}");
   }

diff --git a/kitchenowl/lib/pages/household_page/recipe_list.dart b/kitchenowl/lib/pages/household_page/recipe_list.dart
@@ -182,7 +182,7 @@ class _RecipeListPageState extends State<RecipeListPage> {
                         color: Theme.of(context)
                             .colorScheme
                             .primary
-                            .withOpacity(1),
+                            .withAlpha(0xFF),
                         boxShadow: const [
                           BoxShadow(
                             color: Colors.black54,

diff --git a/kitchenowl/lib/pages/recipe_add_update_page.dart b/kitchenowl/lib/pages/recipe_add_update_page.dart
@@ -334,7 +334,7 @@ class _AddUpdateRecipePageState extends State<AddUpdateRecipePage> {
                                                       .textTheme
                                                       .bodyMedium
                                                       ?.color
-                                                      ?.withOpacity(.8),
+                                                      ?.withAlpha(204),
                                                 ),
                                               ),
                                               TextSpan(
@@ -359,7 +359,7 @@ class _AddUpdateRecipePageState extends State<AddUpdateRecipePage> {
                                                       .textTheme
                                                       .bodyMedium
                                                       ?.color
-                                                      ?.withOpacity(.8),
+                                                      ?.withAlpha(204),
                                                 ),
                                               ),
                                             ],

diff --git a/kitchenowl/lib/pages/settings_page.dart b/kitchenowl/lib/pages/settings_page.dart
@@ -554,7 +554,7 @@ class _SettingsPageState extends State<SettingsPage> {
                             .textTheme
                             .labelSmall
                             ?.color
-                            ?.withOpacity(.3),
+                            ?.withAlpha(76),
                       ),
                   textAlign: TextAlign.center,
                 ),
@@ -566,7 +566,7 @@ class _SettingsPageState extends State<SettingsPage> {
                           .textTheme
                           .labelSmall
                           ?.color
-                          ?.withOpacity(.3),
+                          ?.withAlpha(76),
                     ),
                 textAlign: TextAlign.center,
               ),

diff --git a/kitchenowl/lib/pages/settings_user_page.dart b/kitchenowl/lib/pages/settings_user_page.dart
@@ -201,7 +201,7 @@ class _SettingsUserPageState extends State<SettingsUserPage> {
                                       .textTheme
                                       .labelMedium
                                       ?.color
-                                      ?.withOpacity(0.8),
+                                      ?.withAlpha(204),
                                 ),
                       ),
                     ],

diff --git a/kitchenowl/lib/pages/signup_page.dart b/kitchenowl/lib/pages/signup_page.dart
@@ -109,7 +109,7 @@ class _SignupPageState extends State<SignupPage> {
                                         .textTheme
                                         .labelMedium
                                         ?.color
-                                        ?.withOpacity(0.8),
+                                        ?.withAlpha(204),
                                   ),
                             ),
                             const SizedBox(height: 8),
@@ -141,7 +141,7 @@ class _SignupPageState extends State<SignupPage> {
                                               .textTheme
                                               .labelSmall
                                               ?.color
-                                              ?.withOpacity(.3),
+                                              ?.withAlpha(76),
                                         ),
                                     a: TextStyle(
                                       color:

diff --git a/kitchenowl/lib/widgets/chart_bar_months.dart b/kitchenowl/lib/widgets/chart_bar_months.dart
@@ -64,8 +64,8 @@ class _ChartBarMonthsState extends State<ChartBarMonths> {
             constraints.maxWidth / widget.numberOfMonthsToShow - barWidth - 10;
 
         return BarChart(
-          swapAnimationDuration: const Duration(milliseconds: 150),
-          swapAnimationCurve: Curves.linear,
+          duration: const Duration(milliseconds: 150),
+          curve: Curves.linear,
           BarChartData(
             alignment: BarChartAlignment.center,
             groupsSpace: barSpacing,

diff --git a/kitchenowl/lib/widgets/chart_pie_current_month.dart b/kitchenowl/lib/widgets/chart_pie_current_month.dart
@@ -58,8 +58,8 @@ class _ChartPieCurrentMonthState extends State<ChartPieCurrentMonth> {
         centerSpaceRadius: 0,
         sections: _getData(),
       ),
-      swapAnimationDuration: const Duration(milliseconds: 150),
-      swapAnimationCurve: Curves.linear,
+      duration: const Duration(milliseconds: 150),
+      curve: Curves.linear,
     );
   }
 

diff --git a/kitchenowl/lib/widgets/expense_category_icon.dart b/kitchenowl/lib/widgets/expense_category_icon.dart
@@ -22,7 +22,7 @@ class ExpenseCategoryIcon extends StatelessWidget {
           shape: BoxShape.circle,
           boxShadow: [
             BoxShadow(
-              color: Theme.of(context).colorScheme.shadow.withOpacity(.3),
+              color: Theme.of(context).colorScheme.shadow.withAlpha(76),
               blurRadius: 2,
               offset: const Offset(1, 1),
             ),

diff --git a/kitchenowl/lib/widgets/kitchenowl_switch.dart b/kitchenowl/lib/widgets/kitchenowl_switch.dart
@@ -23,7 +23,7 @@ class KitchenOwlSwitch extends StatelessWidget {
       scale: 0.9,
       child: CupertinoSwitch(
         value: value,
-        activeColor: Theme.of(context).colorScheme.secondary,
+        activeTrackColor: Theme.of(context).colorScheme.secondary,
         onChanged: onChanged,
       ),
     );

diff --git a/kitchenowl/lib/widgets/selectable_button_card.dart b/kitchenowl/lib/widgets/selectable_button_card.dart
@@ -106,7 +106,7 @@ class _SelectableButtonCardState extends State<SelectableButtonCard> {
                                 ? Theme.of(context)
                                     .colorScheme
                                     .onPrimary
-                                    .withOpacity(.7)
+                                    .withAlpha(178)
                                 : null,
                           ),
                       maxLines: 2,

diff --git a/kitchenowl/lib/widgets/shimmer_card.dart b/kitchenowl/lib/widgets/shimmer_card.dart
@@ -11,8 +11,8 @@ class ShimmerCard extends StatelessWidget {
     return Card(
       margin: margin,
       child: Shimmer.fromColors(
-        baseColor: Colors.grey.withOpacity(.4),
-        highlightColor: Colors.grey[300]!.withOpacity(.9),
+        baseColor: Colors.grey.withAlpha(102),
+        highlightColor: Colors.grey[300]!.withAlpha(230),
         child: ListTile(
           trailing: trailing,
           title: const Row(

diff --git a/kitchenowl/lib/widgets/shimmer_shopping_item.dart b/kitchenowl/lib/widgets/shimmer_shopping_item.dart
@@ -22,7 +22,7 @@ class ShimmerShoppingItemWidget extends StatelessWidget {
             padding: const EdgeInsets.all(4),
             child: Shimmer.fromColors(
               baseColor: color,
-              highlightColor: Colors.grey[300]!.withOpacity(.5),
+              highlightColor: Colors.grey[300]!.withAlpha(128),
               child: Material(
                 color: color,
                 shape: const RoundedRectangleBorder(
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,8 +106,6 @@ class _HouseholdPageState extends State<HouseholdPage> @@
               ),
             );
             return;
-          default:
-            break;
         }
         context.go("/household/${widget.household.id}/${tapped.toString()}");
       }
@@ Expand Down @@