Merge pull request #317 from AndreWohnsland/dev

Adjust manual install for uv

Author: AndreWohnsland

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# apply alphabetic, explicit import sorting
+9b553ce9f06f5fcd9584df7d17248bd9351a1b9b

.vscode/settings.json

@@ -23,6 +23,9 @@
   "[python]": {
     "editor.defaultFormatter": "charliermarsh.ruff"
   },
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit"
+  },
   "python.analysis.autoImportCompletions": true,
   "python.testing.pytestArgs": ["tests"],
   "python.testing.unittestEnabled": false,

readme.md

@@ -68,7 +68,7 @@ In addition, there is the possibility to use and set up a second device as a das
 
 # Quickstart
 
-Here are some simple steps to get CocktailBerry running. You need to have **Python 3.9** or newer and **git** installed.
+Here are some simple steps to get CocktailBerry running. You need to have **Python 3.11** or newer and **git** installed.
 
 On the RPi, you can try the new [all in one installer script](https://github.com/AndreWohnsland/CocktailBerry/blob/master/scripts/all_in_one.sh).
 One command should install everything:
@@ -77,15 +77,15 @@ One command should install everything:
 wget -O - https://raw.githubusercontent.com/AndreWohnsland/CocktailBerry/master/scripts/all_in_one.sh | bash
 ```
 
-Otherwise, run:
+Otherwise, you can manually install it using [uv](https://docs.astral.sh/uv/getting-started/installation/):
 
 ```bash
 cd ~
 git clone https://github.com/AndreWohnsland/CocktailBerry.git
 cd CocktailBerry
-pip install -r requirements.txt
-# you can get help with python runme.py --help
-python runme.py
+uv venv --system-site-packages
+uv sync --all-extras
+uv run runme.py
 ```
 
 This will start the CocktailBerry program. You may want to run the provided installer script for the RPi instead of pip.

web_client/src/App.tsx

@@ -1,27 +1,27 @@
+import { useEffect } from 'react';
 import Modal from 'react-modal';
 import { Navigate, Route, Routes, useNavigate } from 'react-router-dom';
 import { ToastContainer } from 'react-toastify';
+import { useIssues } from './api/options.ts';
 import AvailableBottles from './components/bottle/AvailableBottles.tsx';
 import BottleList from './components/bottle/BottleList.tsx';
 import CocktailList from './components/cocktail/CocktailList.tsx';
 import GettingConfiguration from './components/common/GettingConfiguration.tsx';
 import { MakerPasswordProtected, MasterPasswordProtected } from './components/common/ProtectedRoute.tsx';
 import Header from './components/Header.tsx';
 import IngredientList from './components/ingredient/IngredientList.tsx';
+import IssuePage from './components/IssuePage.tsx';
 import AddonManager from './components/options/AddonManager.tsx';
 import CalibrationWindow from './components/options/CalibrationWindow.tsx';
 import ConfigWindow from './components/options/ConfigWindow.tsx';
 import DataWindow from './components/options/DataWindow.tsx';
 import LogWindow from './components/options/LogWindow.tsx';
 import OptionWindow from './components/options/OptionWindow.tsx';
+import TimeManager from './components/options/TimeManager.tsx';
 import WifiManager from './components/options/WifiManager.tsx';
 import RecipeList from './components/recipe/RecipeList.tsx';
 import { useConfig } from './ConfigProvider.tsx';
 import useAxiosInterceptors from './hooks/useAxiosInterceptors.ts';
-import { useIssues } from './api/options.ts';
-import { useEffect } from 'react';
-import IssuePage from './components/IssuePage.tsx';
-import TimeManager from './components/options/TimeManager.tsx';
 import { hastNotIgnoredStartupIssues } from './utils.tsx';
 
 Modal.setAppElement('#root');

web_client/src/AuthProvider.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useState, useContext, useEffect, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useConfig } from './ConfigProvider';
 

web_client/src/ConfigProvider.tsx

@@ -1,7 +1,7 @@
-import React, { createContext, useState, useEffect, useContext, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { getConfigValues } from './api/options';
 import { DefinedConfigData } from './types/models';
-import { useTranslation } from 'react-i18next';
 
 interface IConfig {
   config: DefinedConfigData;

web_client/src/CustomColorProvider.tsx

@@ -1,6 +1,6 @@
-import React, { createContext, useState, useEffect, useContext, useMemo } from 'react';
-import { CustomColors } from './types/models';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useConfig } from './ConfigProvider';
+import { CustomColors } from './types/models';
 
 interface ICustomColor {
   customColors: CustomColors;

web_client/src/api/bottles.ts

@@ -1,5 +1,5 @@
-import { Bottle } from '../types/models';
 import { useQuery, UseQueryResult } from 'react-query';
+import { Bottle } from '../types/models';
 import { axiosInstance } from './common';
 
 const bottle_url = '/bottles';

web_client/src/api/options.ts

@@ -1,15 +1,15 @@
 import { useQuery, UseQueryResult } from 'react-query';
-import { axiosInstance } from './common';
 import {
-  ConsumeData,
-  LogData,
+  AddonData,
   ConfigData,
   ConfigDataWithUiInfo,
-  AddonData,
-  WifiData,
+  ConsumeData,
   DefinedConfigData,
   IssueData,
+  LogData,
+  WifiData,
 } from '../types/models';
+import { axiosInstance } from './common';
 
 const options_url = '/options';
 

web_client/src/components/bottle/AvailableBottles.tsx

@@ -1,13 +1,13 @@
 import React, { useEffect, useState } from 'react';
-import { postAvailableIngredients, useAvailableIngredients, useIngredients } from '../../api/ingredients';
-import { Ingredient } from '../../types/models';
-import ListView from './ListView';
+import { useTranslation } from 'react-i18next';
+import { FaMinusCircle, FaPlusCircle } from 'react-icons/fa';
 import { useNavigate } from 'react-router-dom';
-import { FaPlusCircle, FaMinusCircle } from 'react-icons/fa';
 import { toast } from 'react-toastify';
+import { postAvailableIngredients, useAvailableIngredients, useIngredients } from '../../api/ingredients';
+import { Ingredient } from '../../types/models';
 import ErrorComponent from '../common/ErrorComponent';
 import LoadingData from '../common/LoadingData';
-import { useTranslation } from 'react-i18next';
+import ListView from './ListView';
 
 const AvailableBottles: React.FC = () => {
   const { data: ingredients, error: ingredientsError, isLoading: ingredientsLoading } = useIngredients();