Merge branch 'frappe:main' into main

compose.yaml

@@ -70,11 +70,11 @@ services:
 
   queue-short:
     <<: *backend_defaults
-    command: bench worker --queue short
+    command: bench worker --queue short,default
 
   queue-long:
     <<: *backend_defaults
-    command: bench worker --queue long
+    command: bench worker --queue long,default,short
 
   scheduler:
     <<: *backend_defaults

docs/development.md

@@ -295,8 +295,7 @@ honcho start \
     watch \
     schedule \
     worker_short \
-    worker_long \
+    worker_long
-    worker_default
 ```
 
 Alternatively you can use the VSCode launch configuration "Honcho SocketIO Watch Schedule Worker" which launches the same command as above.

docs/single-compose-setup.md

@@ -8,8 +8,8 @@ This setup is a very simple single compose file that does everything to start re
 
 - backend, serves gunicorn backend
 - frontend, serves static assets through nginx frontend reverse proxies websocket and gunicorn.
-- queue-long, long rq worker.
+- queue-long, long default and short rq worker.
-- queue-short, short rq worker.
+- queue-short, default and short rq worker.
 - schedule, event scheduler.
 - websocket, socketio websocket for realtime communication.
 

pwd.yml

@@ -119,7 +119,7 @@ services:
       - bench
       - worker
       - --queue
-      - long
+      - long,default,short
     volumes:
       - sites:/home/frappe/frappe-bench/sites
       - logs:/home/frappe/frappe-bench/logs
@@ -133,7 +133,7 @@ services:
       - bench
       - worker
       - --queue
-      - short
+      - short,default
     volumes:
       - sites:/home/frappe/frappe-bench/sites
       - logs:/home/frappe/frappe-bench/logs

requirements-test.txt

@@ -1 +1 @@
-pytest==7.4.2
+pytest==7.4.3