Make onionshare_cli an actual dependency of the GUI version

desktop/README.md

@@ -90,4 +90,29 @@ If you want to run tests while hiding the GUI, you must have the `xvfb` package
 xvfb-run ./tests/run.sh
 ```
 
-## Making a release
+## Making a release
+
+First, build a wheel package for OnionShare CLI:
+
+```sh
+cd onionshare/cli
+poetry install
+poetry build
+```
+
+This will make a file like `dist/onionshare_cli-$VERSION-py3-none-any.whl` (except with your specific version number). Move it into `../desktop/linux`:
+
+```
+mkdir -p ../desktop/linux
+mv dist/onionshare_cli-*-py3-none-any.whl ../desktop/linux
+# change back to the desktop directory
+cd ../desktop
+```
+
+Make sure the virtual environment is active, and then run `briefcase create` and `briefcase build`:
+
+```sh
+. venv/bin/activate
+briefcase create
+briefcase build
+```

desktop/pyproject.toml

@@ -13,6 +13,7 @@ description = "OnionShare lets you securely and anonymously send and receive fil
 icon = "src/onionshare/resources/onionshare"
 sources = ['src/onionshare']
 requires = [
+    "./onionshare_cli-2.3.dev1-py3-none-any.whl",
     "Click",
     "eventlet",
     "Flask",

desktop/src/onionshare/__init__.py

@@ -29,17 +29,6 @@ import psutil
 import getpass
 from PySide2 import QtCore, QtWidgets
 
-# Allow importing onionshare_cli from the source tree
-sys.path.insert(
-    0,
-    os.path.join(
-        os.path.dirname(
-            os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-        ),
-        "cli",
-    ),
-)
-
 from onionshare_cli.common import Common
 
 from .gui_common import GuiCommon