pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-octoprint: update to version 1.5.1
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Mon Dec 7 21:38:41 2020 +0100
Changeset: c4842d9cdb815e3f72343f99a3c17e6ad5699602
Modified Files:
py-octoprint/Makefile
py-octoprint/PLIST
py-octoprint/distinfo
py-octoprint/patches/patch-setup.py
Log Message:
py-octoprint: update to version 1.5.1
Changes from 1.5.0 to 1.5.1:
* #3844 - Fix api/files/<origin>/<path> not returning children for
folders
* #3852 - Fix service discovery messing with hostname resolution. Still
unclear on how that even happens and unable to reproduce, but at
least simply completely ignoring loopback devices seems to do the
trick.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c4842d9cdb815e3f72343f99a3c17e6ad5699602
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-octoprint/Makefile | 2 +-
py-octoprint/PLIST | 69 ++++++++++++++++++++++---------------
py-octoprint/distinfo | 10 +++---
py-octoprint/patches/patch-setup.py | 34 +++++++++---------
4 files changed, 65 insertions(+), 50 deletions(-)
diffs:
diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile
index 68707ecb1f..4014fabb51 100644
--- a/py-octoprint/Makefile
+++ b/py-octoprint/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
-PKGNAME= ${PYPKGPREFIX}-octoprint-1.4.2
+PKGNAME= ${PYPKGPREFIX}-octoprint-1.5.1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GITHUB:=OctoPrint/}
GITHUB_PROJECT= OctoPrint
diff --git a/py-octoprint/PLIST b/py-octoprint/PLIST
index b495b8b3bd..8066e87013 100644
--- a/py-octoprint/PLIST
+++ b/py-octoprint/PLIST
@@ -49,6 +49,9 @@ ${PYSITELIB}/octoprint/cli/plugins.pyo
${PYSITELIB}/octoprint/cli/server.py
${PYSITELIB}/octoprint/cli/server.pyc
${PYSITELIB}/octoprint/cli/server.pyo
+${PYSITELIB}/octoprint/cli/systeminfo.py
+${PYSITELIB}/octoprint/cli/systeminfo.pyc
+${PYSITELIB}/octoprint/cli/systeminfo.pyo
${PYSITELIB}/octoprint/cli/user.py
${PYSITELIB}/octoprint/cli/user.pyc
${PYSITELIB}/octoprint/cli/user.pyo
@@ -102,6 +105,7 @@ ${PYSITELIB}/octoprint/plugins/action_command_notification/static/css/action_com
${PYSITELIB}/octoprint/plugins/action_command_notification/static/js/action_command_notification.js
${PYSITELIB}/octoprint/plugins/action_command_notification/templates/action_command_notification_settings.jinja2
${PYSITELIB}/octoprint/plugins/action_command_notification/templates/action_command_notification_sidebar.jinja2
+${PYSITELIB}/octoprint/plugins/action_command_notification/templates/action_command_notification_sidebar_header.jinja2
${PYSITELIB}/octoprint/plugins/action_command_prompt/__init__.py
${PYSITELIB}/octoprint/plugins/action_command_prompt/__init__.pyc
${PYSITELIB}/octoprint/plugins/action_command_prompt/__init__.pyo
@@ -183,18 +187,9 @@ ${PYSITELIB}/octoprint/plugins/logging/static/clientjs/logging.js
${PYSITELIB}/octoprint/plugins/logging/static/css/logging.css
${PYSITELIB}/octoprint/plugins/logging/static/js/logging.js
${PYSITELIB}/octoprint/plugins/logging/static/less/logging.less
-${PYSITELIB}/octoprint/plugins/logging/templates/logging_navbar.jinja2
+${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/loginui/__init__.py
-${PYSITELIB}/octoprint/plugins/loginui/__init__.pyc
-${PYSITELIB}/octoprint/plugins/loginui/__init__.pyo
-${PYSITELIB}/octoprint/plugins/loginui/static/css/loginui.css
-${PYSITELIB}/octoprint/plugins/loginui/static/js/main.js
-${PYSITELIB}/octoprint/plugins/loginui/static/js/viewmodel.js
-${PYSITELIB}/octoprint/plugins/loginui/static/less/loginui.less
-${PYSITELIB}/octoprint/plugins/loginui/templates/loginui_index.jinja2
-${PYSITELIB}/octoprint/plugins/loginui/templates/parts/loginui_css.jinja2
-${PYSITELIB}/octoprint/plugins/loginui/templates/parts/loginui_javascripts.jinja2
${PYSITELIB}/octoprint/plugins/pi_support/__init__.py
${PYSITELIB}/octoprint/plugins/pi_support/__init__.pyc
${PYSITELIB}/octoprint/plugins/pi_support/__init__.pyo
@@ -402,10 +397,12 @@ ${PYSITELIB}/octoprint/static/css/bootstrap-tabdrop.css
${PYSITELIB}/octoprint/static/css/bootstrap.css
${PYSITELIB}/octoprint/static/css/bootstrap.min.css
${PYSITELIB}/octoprint/static/css/jquery.fileupload-ui.css
+${PYSITELIB}/octoprint/static/css/login.css
${PYSITELIB}/octoprint/static/css/octoprint.css
${PYSITELIB}/octoprint/static/css/pnotify.buttons.min.css
${PYSITELIB}/octoprint/static/css/pnotify.core.min.css
${PYSITELIB}/octoprint/static/css/pnotify.history.min.css
+${PYSITELIB}/octoprint/static/css/recovery.css
${PYSITELIB}/octoprint/static/forcelogin/css/forcelogin.css
${PYSITELIB}/octoprint/static/forcelogin/js/forcelogin.js
${PYSITELIB}/octoprint/static/forcelogin/less/forcelogin.less
@@ -414,7 +411,6 @@ ${PYSITELIB}/octoprint/static/img/apple-touch-icon-144x144.png
${PYSITELIB}/octoprint/static/img/glyphicons-halflings-white.png
${PYSITELIB}/octoprint/static/img/glyphicons-halflings.png
${PYSITELIB}/octoprint/static/img/graph-background.png
-${PYSITELIB}/octoprint/static/img/icon-sd-black-14.png
${PYSITELIB}/octoprint/static/img/logo.png
${PYSITELIB}/octoprint/static/img/mask-theme.svg
${PYSITELIB}/octoprint/static/img/mask.svg
@@ -467,6 +463,7 @@ ${PYSITELIB}/octoprint/static/js/app/viewmodels/connection.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/control.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/files.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/loginstate.js
+${PYSITELIB}/octoprint/static/js/app/viewmodels/loginui.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/navigation.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/printerprofiles.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/printerstate.js
@@ -491,6 +488,8 @@ ${PYSITELIB}/octoprint/static/js/lib/bootstrap/bootstrap-slider.js
${PYSITELIB}/octoprint/static/js/lib/bootstrap/bootstrap-tabdrop.js
${PYSITELIB}/octoprint/static/js/lib/bootstrap/bootstrap.js
${PYSITELIB}/octoprint/static/js/lib/detectmobilebrowser.js
+${PYSITELIB}/octoprint/static/js/lib/hls.js
+${PYSITELIB}/octoprint/static/js/lib/jquery/jquery-ui.js
${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.bootstrap.wizard.js
${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.fileupload.js
${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.flot.crosshair.js
@@ -502,10 +501,6 @@ ${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.js
${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.min.js
${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/jquery/jquery.ui.core.js
-${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.ui.mouse.js
-${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.ui.slider.js
-${PYSITELIB}/octoprint/static/js/lib/jquery/jquery.ui.widget.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
@@ -527,11 +522,10 @@ ${PYSITELIB}/octoprint/static/js/lib/pnotify/pnotify.nonblock.min.js
${PYSITELIB}/octoprint/static/js/lib/pnotify/pnotify.reference.min.js
${PYSITELIB}/octoprint/static/js/lib/pnotify/pnotify.tooltip.min.js
${PYSITELIB}/octoprint/static/js/lib/pusher.color.min.js
-${PYSITELIB}/octoprint/static/js/lib/sockjs.js
-${PYSITELIB}/octoprint/static/js/lib/sockjs.js.map
${PYSITELIB}/octoprint/static/js/lib/sockjs.min.js
-${PYSITELIB}/octoprint/static/js/lib/sockjs.min.js.map
${PYSITELIB}/octoprint/static/js/lib/sprintf.min.js
+${PYSITELIB}/octoprint/static/js/login/login.js
+${PYSITELIB}/octoprint/static/js/recovery/recovery.js
${PYSITELIB}/octoprint/static/less/bootstrap/accordion.less
${PYSITELIB}/octoprint/static/less/bootstrap/alerts.less
${PYSITELIB}/octoprint/static/less/bootstrap/bootstrap.less
@@ -574,8 +568,10 @@ ${PYSITELIB}/octoprint/static/less/bootstrap/utilities.less
${PYSITELIB}/octoprint/static/less/bootstrap/variables.less
${PYSITELIB}/octoprint/static/less/bootstrap/wells.less
${PYSITELIB}/octoprint/static/less/font-awesome.less
+${PYSITELIB}/octoprint/static/less/login.less
${PYSITELIB}/octoprint/static/less/mixins.less
${PYSITELIB}/octoprint/static/less/octoprint.less
+${PYSITELIB}/octoprint/static/less/recovery.less
${PYSITELIB}/octoprint/static/less/variables.less
${PYSITELIB}/octoprint/static/manifest.json
${PYSITELIB}/octoprint/static/robots.txt
@@ -586,14 +582,25 @@ ${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfon
${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.svg
${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.ttf
${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/fonts/fontawesome-webfont.woff
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.css
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/css/font-awesome.min.css
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/FontAwesome.otf
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
-${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/css/all.css
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/css/all.min.css
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/css/v4-shims.css
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/css/v4-shims.min.css
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-brands-400.eot
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-brands-400.svg
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-brands-400.ttf
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-brands-400.woff
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-brands-400.woff2
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-regular-400.eot
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-regular-400.svg
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-regular-400.ttf
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-regular-400.woff
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-regular-400.woff2
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-solid-900.eot
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-solid-900.svg
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-solid-900.ttf
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-solid-900.woff
+${PYSITELIB}/octoprint/static/vendor/font-awesome-5.15.1/webfonts/fa-solid-900.woff2
${PYSITELIB}/octoprint/templates/_data/AUTHORS.md.html
${PYSITELIB}/octoprint/templates/_data/SUPPORTERS.md.html
${PYSITELIB}/octoprint/templates/_data/THIRDPARTYLICENSES.md.html
@@ -603,6 +610,7 @@ ${PYSITELIB}/octoprint/templates/dialogs/about/about.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/authors.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/license.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/supporters.jinja2
+${PYSITELIB}/octoprint/templates/dialogs/about/systeminfo.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/thirdparty.jinja2
${PYSITELIB}/octoprint/templates/dialogs/files.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings.jinja2
@@ -620,6 +628,7 @@ ${PYSITELIB}/octoprint/templates/dialogs/settings/terminalfilters.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/webcam.jinja2
${PYSITELIB}/octoprint/templates/dialogs/slicing.jinja2
${PYSITELIB}/octoprint/templates/dialogs/temperature.jinja2
+${PYSITELIB}/octoprint/templates/dialogs/timelapse.jinja2
${PYSITELIB}/octoprint/templates/dialogs/usersettings.jinja2
${PYSITELIB}/octoprint/templates/dialogs/usersettings/access.jinja2
${PYSITELIB}/octoprint/templates/dialogs/usersettings/interface.jinja2
@@ -632,12 +641,14 @@ ${PYSITELIB}/octoprint/templates/index.jinja2
${PYSITELIB}/octoprint/templates/initscript.jinja2
${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/settings.jinja2
${PYSITELIB}/octoprint/templates/navbar/systemmenu.jinja2
${PYSITELIB}/octoprint/templates/overlays/dragndrop.jinja2
${PYSITELIB}/octoprint/templates/overlays/offline.jinja2
${PYSITELIB}/octoprint/templates/overlays/reloadui.jinja2
+${PYSITELIB}/octoprint/templates/recovery.jinja2
${PYSITELIB}/octoprint/templates/sidebar/connection.jinja2
${PYSITELIB}/octoprint/templates/sidebar/connection_header.jinja2
${PYSITELIB}/octoprint/templates/sidebar/files.jinja2
@@ -672,6 +683,7 @@ ${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistD
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistEnabled.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistTtl.jinja2
${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/ffmpegPath.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegThreads.jinja2
@@ -838,6 +850,9 @@ ${PYSITELIB}/octoprint/vendor/sockjs/tornado/util.pyo
${PYSITELIB}/octoprint/vendor/sockjs/tornado/websocket.py
${PYSITELIB}/octoprint/vendor/sockjs/tornado/websocket.pyc
${PYSITELIB}/octoprint/vendor/sockjs/tornado/websocket.pyo
+${PYSITELIB}/octoprint/vendor/zeroconf.py
+${PYSITELIB}/octoprint/vendor/zeroconf.pyc
+${PYSITELIB}/octoprint/vendor/zeroconf.pyo
${PYSITELIB}/octoprint_client/__init__.py
${PYSITELIB}/octoprint_client/__init__.pyc
${PYSITELIB}/octoprint_client/__init__.pyo
diff --git a/py-octoprint/distinfo b/py-octoprint/distinfo
index 27b43ccc89..79790ff5cd 100644
--- a/py-octoprint/distinfo
+++ b/py-octoprint/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-SHA1 (OctoPrint-1.4.2.tar.gz) = f12fcb95aa49da665da5878817a7ff04591e0d13
-RMD160 (OctoPrint-1.4.2.tar.gz) = 77793c1d9ede70fc82b1be092dcf2a23718b4fe6
-SHA512 (OctoPrint-1.4.2.tar.gz) = 0af007562b4e6e295730c782cf408fff999a37493d43f533df4cefe25895d843e5fcd54b4f68caba331f11c0e9cf5fde946c8913dd623496a8df605e8cd9a0a5
-Size (OctoPrint-1.4.2.tar.gz) = 4997522 bytes
-SHA1 (patch-setup.py) = 6ad07b5d722cd7cbd63545d4ec9f4907b3cc2c7b
+SHA1 (OctoPrint-1.5.1.tar.gz) = b2bbf82d584892871a444e67424793370d40a619
+RMD160 (OctoPrint-1.5.1.tar.gz) = 331627291a7e49c870ccb1dfde088ae85b45cfae
+SHA512 (OctoPrint-1.5.1.tar.gz) = 23733bba7f6fceb4170a4df89e5bf93daf92122f2e8e38c6a230e6a52321dcdbd66c91f670d8aab5b141a3c0cedfe15f37fc3ad4c9b3565e445a907d20627cd9
+Size (OctoPrint-1.5.1.tar.gz) = 5976925 bytes
+SHA1 (patch-setup.py) = 05d52ed2a1e66867170d3394f96b3188707a11b4
diff --git a/py-octoprint/patches/patch-setup.py b/py-octoprint/patches/patch-setup.py
index 86cb6f08da..7ec0bcc2b9 100644
--- a/py-octoprint/patches/patch-setup.py
+++ b/py-octoprint/patches/patch-setup.py
@@ -2,23 +2,23 @@ $NetBSD$
Override some version checks
---- setup.py.orig 2020-08-06 10:41:11.000000000 +0000
+--- setup.py.orig 2020-12-04 09:41:45.000000000 +0000
+++ setup.py
-@@ -33,7 +33,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
-@@ -68,7 +68,7 @@ INSTALL_REQUIRES = [
- "filetype>=1.0.7,<2",
-
- # vendor bundle 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
+@@ -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",
+@@ -63,7 +63,7 @@ INSTALL_REQUIRES = [
+ "sentry-sdk>=0.15.1,<1",
+ "filetype>=1.0.7,<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
]
Home |
Main Index |
Thread Index |
Old Index