kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

py-octoprint: update to version 1.6.1

Browse source 
This is a bugfix release to fix two bugs in 1.6.0.

The full list of changes from version 1.5.3 to 1.6.0 can be found at
https://github.com/OctoPrint/OctoPrint/releases/tag/1.6.0.

This also improves the RC script provided to not longer assume Python 3.8
specifically.
This commit is contained in:
khorben 2021-05-30 21:53:10 +00:00
parent c64695c9e3
commit 1729677c0d
5 changed files with 51 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
print/py-octoprint/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 2021/02/25 16:35:23 khorben Exp $
# $NetBSD: Makefile,v 1.2 2021/05/30 21:53:10 khorben Exp $
DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
PKGNAME= ${PYPKGPREFIX}-octoprint-1.5.3
PKGNAME= ${PYPKGPREFIX}-octoprint-1.6.1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GITHUB:=OctoPrint/}
GITHUB_PROJECT= OctoPrint
@ -14,7 +14,7 @@ LICENSE= gnu-agpl-v3
RCD_SCRIPTS= octoprint
PYTHON_VERSIONS_ACCEPTED= 38 37 36
PYTHON_VERSIONS_ACCEPTED= 39 38 37 36
DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
DEPENDS+= ${PYPKGPREFIX}-cachelib>=0.1:../../devel/py-cachelib
@ -26,33 +26,34 @@ DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask
DEPENDS+= ${PYPKGPREFIX}-flask-assets>=2.0:../../www/py-flask-assets
DEPENDS+= ${PYPKGPREFIX}-flask-babel>=1.0:../../www/py-flask-babel
DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.5:../../www/py-flask-login
DEPENDS+= ${PYPKGPREFIX}-frozendict>=1.2:../../devel/py-frozendict
DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
DEPENDS+= ${PYPKGPREFIX}-immutabledict>=2.0.0:../../devel/py-immutabledict
DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.18.2:../../devel/py-importlib-metadata
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-markdown>=3.1:../../textproc/py-markdown
DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.19:../../net/py-netaddr
DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.10.9:../../net/py-netifaces
DEPENDS+= ${PYPKGPREFIX}-octoprint-filecheck>=2020.8.7:../../print/py-octoprint-filecheck
DEPENDS+= ${PYPKGPREFIX}-octoprint-firmwarecheck>=2020.9.23:../../print/py-octoprint-firmwarecheck
DEPENDS+= ${PYPKGPREFIX}-octoprint-filecheck>=2021.2.23:../../print/py-octoprint-filecheck
DEPENDS+= ${PYPKGPREFIX}-octoprint-firmwarecheck>=2021.2.4:../../print/py-octoprint-firmwarecheck
DEPENDS+= ${PYPKGPREFIX}-octoprint-pisupport>=2021.3.26:../../print/py-octoprint-pisupport
DEPENDS+= ${PYPKGPREFIX}-pkginfo>=1.5.0.1:../../devel/py-pkginfo
DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7:../../sysutils/py-psutil
DEPENDS+= ${PYPKGPREFIX}-pylru>=1.2:../../devel/py-pylru
DEPENDS+= ${PYPKGPREFIX}-regex>2018.11.6:../../textproc/py-regex
DEPENDS+= ${PYPKGPREFIX}-requests>=2.23.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-rsa>=4.0:../../security/py-rsa
DEPENDS+= ${PYPKGPREFIX}-sarge>=0.1.5:../../devel/py-sarge
DEPENDS+= ${PYPKGPREFIX}-semantic_version>=2.8.5:../../devel/py-semantic_version
DEPENDS+= ${PYPKGPREFIX}-serial>=3.4:../../comms/py-serial
DEPENDS+= ${PYPKGPREFIX}-sentry-sdk>=0.15.1:../../devel/py-sentry-sdk
DEPENDS+= ${PYPKGPREFIX}-tornado>=5.1.1:../../www/py-tornado
DEPENDS+= ${PYPKGPREFIX}-Unidecode>=0.04.14:../../textproc/py-Unidecode
DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.10.2:../../sysutils/py-watchdog
DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.10.4:../../sysutils/py-watchdog
DEPENDS+= ${PYPKGPREFIX}-websocket-client>=0.57:../../www/py-websocket-client
DEPENDS+= ${PYPKGPREFIX}-werkzeug>=1.0.1:../../www/py-werkzeug
DEPENDS+= ${PYPKGPREFIX}-wrapt>=1.12.1:../../devel/py-wrapt
DEPENDS+= ${PYPKGPREFIX}-yaml>=5.3.1:../../textproc/py-yaml
DEPENDS+= ${PYPKGPREFIX}-zeroconf>=0.24:../../net/py-zeroconf
DEPENDS+= ${PYPKGPREFIX}-zipstream>=1.1.8:../../archivers/py-zipstream
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/octoprint \

22
print/py-octoprint/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2021/02/25 16:35:23 khorben Exp $
@comment $NetBSD: PLIST,v 1.2 2021/05/30 21:53:10 khorben Exp $
bin/octoprint-${PYVERSSUFFIX}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@ -82,6 +82,9 @@ ${PYSITELIB}/octoprint/filemanager/util.pyo
${PYSITELIB}/octoprint/logging/__init__.py
${PYSITELIB}/octoprint/logging/__init__.pyc
${PYSITELIB}/octoprint/logging/__init__.pyo
${PYSITELIB}/octoprint/logging/filters.py
${PYSITELIB}/octoprint/logging/filters.pyc
${PYSITELIB}/octoprint/logging/filters.pyo
${PYSITELIB}/octoprint/logging/handlers.py
${PYSITELIB}/octoprint/logging/handlers.pyc
${PYSITELIB}/octoprint/logging/handlers.pyo
@ -190,15 +193,6 @@ ${PYSITELIB}/octoprint/plugins/logging/static/less/logging.less
${PYSITELIB}/octoprint/plugins/logging/templates/logging_navbar_plugintimingslog.jinja2
${PYSITELIB}/octoprint/plugins/logging/templates/logging_navbar_seriallog.jinja2
${PYSITELIB}/octoprint/plugins/logging/templates/logging_settings.jinja2
${PYSITELIB}/octoprint/plugins/pi_support/__init__.py
${PYSITELIB}/octoprint/plugins/pi_support/__init__.pyc
${PYSITELIB}/octoprint/plugins/pi_support/__init__.pyo
${PYSITELIB}/octoprint/plugins/pi_support/static/clientjs/pi_support.js
${PYSITELIB}/octoprint/plugins/pi_support/static/css/pi_support.css
${PYSITELIB}/octoprint/plugins/pi_support/static/js/pi_support.js
${PYSITELIB}/octoprint/plugins/pi_support/templates/pi_support_about_octopi.jinja2
${PYSITELIB}/octoprint/plugins/pi_support/templates/pi_support_navbar.jinja2
${PYSITELIB}/octoprint/plugins/pi_support/templates/pi_support_settings.jinja2
${PYSITELIB}/octoprint/plugins/pluginmanager/__init__.py
${PYSITELIB}/octoprint/plugins/pluginmanager/__init__.pyc
${PYSITELIB}/octoprint/plugins/pluginmanager/__init__.pyo
@ -483,6 +477,7 @@ ${PYSITELIB}/octoprint/static/js/app/viewmodels/wizard.js
${PYSITELIB}/octoprint/static/js/lib/README.txt
${PYSITELIB}/octoprint/static/js/lib/ResizeSensor.js
${PYSITELIB}/octoprint/static/js/lib/avltree.js
${PYSITELIB}/octoprint/static/js/lib/babel-polyfill.min.js
${PYSITELIB}/octoprint/static/js/lib/babel.js
${PYSITELIB}/octoprint/static/js/lib/bootstrap-slider-knockout-binding.js
${PYSITELIB}/octoprint/static/js/lib/bootstrap/bootstrap-modal.js
@ -506,7 +501,7 @@ ${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.qrcode.min.js
${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.slimscroll.min.js
${PYSITELIB}/octoprint/static/js/lib/knockout.js
${PYSITELIB}/octoprint/static/js/lib/knockout.mapping-latest.js
${PYSITELIB}/octoprint/static/js/lib/less.min.js
${PYSITELIB}/octoprint/static/js/lib/less.js
${PYSITELIB}/octoprint/static/js/lib/lodash.js
${PYSITELIB}/octoprint/static/js/lib/lodash.min.js
${PYSITELIB}/octoprint/static/js/lib/loglevel.min.js
@ -646,6 +641,7 @@ ${PYSITELIB}/octoprint/templates/javascripts-preload.jinja2
${PYSITELIB}/octoprint/templates/javascripts.jinja2
${PYSITELIB}/octoprint/templates/login.jinja2
${PYSITELIB}/octoprint/templates/navbar/login.jinja2
${PYSITELIB}/octoprint/templates/navbar/offlineindicator.jinja2
${PYSITELIB}/octoprint/templates/navbar/settings.jinja2
${PYSITELIB}/octoprint/templates/navbar/systemmenu.jinja2
${PYSITELIB}/octoprint/templates/overlays/dragndrop.jinja2
@ -688,6 +684,7 @@ ${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistT
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistUrl.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginTimings.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegBitrate.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegCommandline.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegPath.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegThreads.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegVideoCodec.jinja2
@ -757,6 +754,9 @@ ${PYSITELIB}/octoprint/util/piptestballoon/setup.pyo
${PYSITELIB}/octoprint/util/platform/__init__.py
${PYSITELIB}/octoprint/util/platform/__init__.pyc
${PYSITELIB}/octoprint/util/platform/__init__.pyo
${PYSITELIB}/octoprint/util/text.py
${PYSITELIB}/octoprint/util/text.pyc
${PYSITELIB}/octoprint/util/text.pyo
${PYSITELIB}/octoprint/util/version.py
${PYSITELIB}/octoprint/util/version.pyc
${PYSITELIB}/octoprint/util/version.pyo

12
print/py-octoprint/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.1 2021/02/25 16:35:23 khorben Exp $
$NetBSD: distinfo,v 1.2 2021/05/30 21:53:10 khorben Exp $
SHA1 (OctoPrint-1.5.3.tar.gz) = 1bac32121a2facee291947ce8ac76a4395ee6a66
RMD160 (OctoPrint-1.5.3.tar.gz) = a75a135dc653fb0e7d3a9e2f73a9642516f03505
SHA512 (OctoPrint-1.5.3.tar.gz) = b81bb2588a6a1c3a4bba9dd1cfaa9e76cfc47e7d36f8ca570aea21fe1c1ff8ca2aa357db24934c30fcbcd38cf1aa7146bdc08cc5e26348daf8b1d342f7712f96
Size (OctoPrint-1.5.3.tar.gz) = 5984016 bytes
SHA1 (patch-setup.py) = 5aa702fd73a8d08bc827e6b590a4639cc2794dd6
SHA1 (OctoPrint-1.6.1.tar.gz) = 2ebbb5fa5c51c47fa7f8c97e9b942c6c8f5d49ce
RMD160 (OctoPrint-1.6.1.tar.gz) = 24858b068084d1ed69b02bce0e31318bee4ae9d2
SHA512 (OctoPrint-1.6.1.tar.gz) = 4b485ea395c9012f79dd772971cfb9c3b90676d147887560bc618597f898af65bae838522a7ead75e08563d7c61a98c8b63d71c605d1c73e7b8dbd51e8090680
Size (OctoPrint-1.6.1.tar.gz) = 6174286 bytes
SHA1 (patch-setup.py) = ffecbfba1b52f19dfa1fd95daa9d1799fc7ae769
SHA1 (patch-src_octoprint_util_comm.py) = 6f73998c3b51a17436e16b9a86b1e8b368f6cd2c

19
print/py-octoprint/files/octoprint.sh
View file

@ -1,15 +1,24 @@
#!/bin/sh
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: octoprint.sh,v 1.2 2021/05/30 21:53:11 khorben Exp $
#
# Startup script for OctoPrint
#
# PROVIDE: octoprint
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
# You will need to set some variables in /etc/rc.conf to start OctoPrint:
#
# octoprint=YES
$_rc_subr_loaded . /etc/rc.subr
name="octoprint"
rcvar=$name
command="@PREFIX@/bin/octoprint-3.8"
rcvar=${name}
command="@PREFIX@/bin/octoprint-@PYVERSSUFFIX@"
pidfile="/tmp/$name.pid"
procname="@PREFIX@/bin/python3.8"
procname="@PREFIX@/bin/python@PYVERSSUFFIX@"
command_args="daemon start"
load_rc_config $name

29
print/py-octoprint/patches/patch-setup.py
View file

@ -1,18 +1,9 @@
$NetBSD: patch-setup.py,v 1.1 2021/02/25 16:35:23 khorben Exp $
$NetBSD: patch-setup.py,v 1.2 2021/05/30 21:53:11 khorben Exp $
Override some version checks
--- setup.py.orig 2021-01-19 10:32:11.000000000 +0000
--- setup.py.orig 2021-05-10 09:44:33.000000000 +0000
+++ setup.py
@@ -32,7 +32,7 @@ INSTALL_REQUIRES = [
"markupsafe>=1.1,<2.0", # Jinja dependency, newer versions require Python 3
"tornado==5.1.1", # newer versions require Python 3
"markdown>=3.1,<3.2", # newer versions require Python 3
- "rsa==4.0", # newer versions require Python 3
+ "rsa>=4.0", # newer versions require Python 3
"regex!=2018.11.6", # avoid broken 2018.11.6. See #2874
# anything below this should be checked on releases for new versions
"flask>=1.1.2,<2",
@@ -46,8 +46,8 @@ INSTALL_REQUIRES = [
"PyYAML>=5.3.1,<6",
"pyserial>=3.4,<4",
@ -25,20 +16,22 @@ Override some version checks
"pylru>=1.2,<2",
"pkginfo>=1.5.0.1,<2",
@@ -63,7 +63,7 @@ INSTALL_REQUIRES = [
"sentry-sdk>=0.15.1,<1",
"filetype>=1.0.7,<2",
"zipstream-new>=1.1.8,<1.2",
# vendor bundled dependencies
- "unidecode>=0.04.14,<0.05", # dependency of awesome-slugify
+ "unidecode>=0.04.14", # dependency of awesome-slugify
"blinker>=1.4,<2", # dependency of flask_principal
]
@@ -79,7 +79,7 @@ INSTALL_REQUIRES_PYTHON2 = [
@@ -82,8 +82,8 @@ INSTALL_REQUIRES_PYTHON2 = [
# Python 3 specific requirements
INSTALL_REQUIRES_PYTHON3 = [
"feedparser>=6.0.2,<7",
- "zeroconf>=0.24,<0.25",
- "immutabledict>=1.2.0,<2",
+ "zeroconf>=0.24",
+ "immutabledict>=1.2.0",
]
# Python 3 specific requirements
-INSTALL_REQUIRES_PYTHON3 = ["feedparser>=6.0.2,<7", "zeroconf>=0.24,<0.25"]
+INSTALL_REQUIRES_PYTHON3 = ["feedparser>=6.0.2,<7", "zeroconf>=0.24"]
# OSX specific requirements
INSTALL_REQUIRES_OSX = [