octoprint: Update to version 1.7.3 and migrate to crossenv (SynoCommu…

…nity#5217)

* octoprint: Update to version 1.7.3 and migrate to crossenv

* octoprint: No need to re-install as already done through pip

spk/octoprint/Makefile

@@ -1,11 +1,10 @@
 SPK_NAME   = octoprint
-SPK_VERS   = 1.7.2
-SPK_REV    = 7
+SPK_VERS   = 1.7.3
+SPK_REV    = 8
 SPK_ICON   = src/octoprint.png
 DSM_UI_DIR = app
 
 BUILD_DEPENDS = cross/python310
-DEPENDS = cross/octoprint
 
 # Required for PyYAML
 DEPENDS += cross/libyaml
@@ -22,7 +21,7 @@ ADMIN_PORT   = $(SERVICE_PORT)
 DISPLAY_NAME = OctoPrint
 HOMEPAGE     = https://octoprint.org/
 LICENSE      = AGPLv3
-CHANGELOG    = "Update OctoPrint to v1.7.2 and Python 3.10"
+CHANGELOG    = "1. Update OctoPrint to v1.7.3<br/>2. Update to Python 3.10"
 
 # SERVICE_COMMAND is in src/service-setup.sh
 STARTABLE     = yes

spk/octoprint/src/requirements-crossenv.txt

@@ -3,9 +3,9 @@
 
 MarkupSafe==1.1.1
 netifaces==0.11.0
-psutil==5.8.0
+psutil==5.9.0
 PyYAML==5.4.1
-regex==2021.10.23
+regex==2022.3.15
 tornado==6.1
 Werkzeug==1.0.1
 wrapt==1.12.1

spk/octoprint/src/requirements-pure.txt

@@ -1,36 +1,53 @@
 # all requirements are taken from the list "INSTALL_REQUIRES" in the 
 # original setup.py at: https://github.com/OctoPrint/OctoPrint/blob/master/setup.py
+OctoPrint==1.7.3
+#git+https://github.com/OctoPrint/[email protected]#egg=octoprint==1.8.0
+OctoPrint-FileCheck==2021.2.23
+OctoPrint-FirmwareCheck==2021.10.11
+OctoPrint-PiSupport==2022.3.28
 
-Flask==1.1.4
-Flask_Assets==2.0
-Flask_Babel==1.0.0
-Flask_Login==0.5.0
-Jinja2==2.11.3
-Markdown==3.1.1
-OctoPrint_FileCheck==2021.2.23
-OctoPrint_FirmwareCheck==2021.10.11
-OctoPrint_PiSupport==2021.10.28
-Unidecode==1.3.2
+Babel==2.10.0
 blinker==1.4
 cachelib==0.1.1
+#certifi==2021.10.8           ==> python310
+charset-normalizer==2.0.12
 click==7.1.2
 colorlog==5.0.1
-emoji==1.6.1
+#distlib==0.3.4               ==> python310
+emoji==1.7.0
 feedparser==6.0.8
-filetype==1.0.8
+#filelock==3.6.0              ==> python310
+filetype==1.0.12
+Flask==1.1.4
+Flask-Assets==2.0
+Flask-Babel==1.0.0
+Flask-Login==0.5.0
 future==0.18.2
+idna==3.3
+ifaddr==0.1.7
 immutabledict==2.2.1
 itsdangerous==1.1.0
+Jinja2==2.11.3
+Markdown==3.1.1
 netaddr==0.8.0
+pathtools==0.1.2
 pathvalidate==2.5.0
-pkginfo==1.7.1
-pylru==1.2.0
+pkginfo==1.8.2
+#platformdirs==2.5.1          ==> python310 
+pylru==1.2.1
 pyserial==3.5
-requests==2.26.0
+pytz==2022.1
+requests==2.27.1
 sarge==0.1.6
-semantic_version==2.8.5
-sentry_sdk==1.4.3
+semantic-version==2.9.0
+sentry-sdk==1.5.10
+sgmllib3k==1.0.0
+#six==1.16.0                  ==> python310
+Unidecode==1.3.4
+urllib3==1.26.9
+#virtualenv==20.13.4          ==> python310
 watchdog==0.10.4
-websocket_client==0.59.0
+webassets==2.0
+websocket-client==0.59.0
 zeroconf==0.33.4
-zipstream_new==1.1.8
+zipstream-new==1.1.8

spk/octoprint/src/service-setup.sh

@@ -1,7 +1,7 @@
 PYTHON_DIR="/var/packages/python310/target/bin"
 PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${PATH}"
 PYTHON=${SYNOPKG_PKGDEST}/env/bin/python3
-OCTOPRINT=${SYNOPKG_PKGDEST}/share/OctoPrint/run
+OCTOPRINT=${SYNOPKG_PKGDEST}/env/bin/octoprint
 SERVICE_COMMAND="${PYTHON} ${OCTOPRINT} daemon start -b ${SYNOPKG_PKGVAR}/.octoprint -c ${SYNOPKG_PKGVAR}/.octoprint/config.yaml --pid ${PID_FILE}"
 
 service_postinst ()
@@ -11,9 +11,6 @@ service_postinst ()
 
     # Install the wheels
     install_python_wheels
-
-    # Install OctoPrint
-    cd ${SYNOPKG_PKGDEST}/share/OctoPrint && ${SYNOPKG_PKGDEST}/env/bin/python3 setup.py install
 }