pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-octoprint: update to version 1.4.2
Module Name: pkgsrc-wip
Committed By: Pierre Pronchery <khorben%defora.org@localhost>
Pushed By: khorben
Date: Sun Nov 22 09:09:03 2020 +0100
Changeset: e9a27c92f447a39836953b24a77b9ec375323dd9
Modified Files:
py-octoprint/Makefile
py-octoprint/PLIST
py-octoprint/distinfo
Removed Files:
py-octoprint/patches/patch-setup.py
Log Message:
py-octoprint: update to version 1.4.2
It now seems possible to use Python 3 with OctoPrint.
A couple dependencies still need updating, before this can actually
build.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e9a27c92f447a39836953b24a77b9ec375323dd9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-octoprint/Makefile | 55 +++++-------
py-octoprint/PLIST | 170 +++++++++++++++++++++++-------------
py-octoprint/distinfo | 9 +-
py-octoprint/patches/patch-setup.py | 50 -----------
4 files changed, 136 insertions(+), 148 deletions(-)
diffs:
diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile
index b546cddcb7..0fdcc84302 100644
--- a/py-octoprint/Makefile
+++ b/py-octoprint/Makefile
@@ -1,56 +1,49 @@
# $NetBSD$
DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
-PKGNAME= ${PYPKGPREFIX}-octoprint-1.3.12
+PKGNAME= ${PYPKGPREFIX}-octoprint-1.4.2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GITHUB:=foosel/}
GITHUB_PROJECT= OctoPrint
GITHUB_TAG= ${PKGVERSION_NOREV}
MAINTAINER= khorben%defora.org@localhost
-HOMEPAGE= https://github.com/foosel/OctoPrint/
+HOMEPAGE= https://github.com/OctoPrint/OctoPrint/
COMMENT= Snappy web interface for 3D printers
LICENSE= gnu-agpl-v3
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED= 37 36
#TODO register the remaining dependencies (see https://github.com/foosel/OctoPrint/blob/master/setup.py#L19)
-DEPENDS+= ${PYPKGPREFIX}-awesome-slugify>=1.6.5:../../wip/py-awesome-slugify
DEPENDS+= ${PYPKGPREFIX}-cachelib>=0.1:../../wip/py-cachelib
-DEPENDS+= ${PYPKGPREFIX}-chainmap>=1.0.3:../../wip/py-chainmap
-DEPENDS+= ${PYPKGPREFIX}-emoji>=0.5.1:../../converters/py-emoji
-DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser5
-DEPENDS+= ${PYPKGPREFIX}-filetype>=1.0.5:../../wip/py-filetype
-DEPENDS+= ${PYPKGPREFIX}-flask>=0.10.1:../../www/py-flask
-DEPENDS+= ${PYPKGPREFIX}-flask-assets>=0.12:../../www/py-flask-assets
-DEPENDS+= ${PYPKGPREFIX}-flask-babel>=0.12:../../www/py-flask-babel
-DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.2.11:../../www/py-flask-login
-DEPENDS+= ${PYPKGPREFIX}-flask-principal>=0.4:../../www/py-flask-principal
+DEPENDS+= ${PYPKGPREFIX}-emoji>=0.5.4:../../converters/py-emoji
+DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser
+DEPENDS+= ${PYPKGPREFIX}-filetype>=1.0.7:../../sysutils/py-filetype
+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.17.1:../../devel/py-future
-DEPENDS+= ${PYPKGPREFIX}-futures>=3.2:../../devel/py-futures
-DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.8.1:../../textproc/py-jinja2
-DEPENDS+= ${PYPKGPREFIX}-markdown>=3.0:../../textproc/py-markdown
-DEPENDS+= ${PYPKGPREFIX}-monotonic>=1.5:../../time/py-monotonic
+DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
+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}-pkginfo>=1.5.0.1:../../devel/py-pkginfo
-DEPENDS+= ${PYPKGPREFIX}-psutil>=5.6.1:../../sysutils/py-psutil
-DEPENDS+= ${PYPKGPREFIX}-pylru>=1.2.0:../../wip/py-pylru
+DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7:../../sysutils/py-psutil
+DEPENDS+= ${PYPKGPREFIX}-pylru>=1.2:../../wip/py-pylru
DEPENDS+= ${PYPKGPREFIX}-regex>2018.11.6:../../textproc/py-regex
-DEPENDS+= ${PYPKGPREFIX}-requests>=2.21.0:../../devel/py-requests
-DEPENDS+= ${PYPKGPREFIX}-rsa>=4.0:../../security/py-rsa40
+DEPENDS+= ${PYPKGPREFIX}-requests>=2.23.0:../../devel/py-requests
+DEPENDS+= ${PYPKGPREFIX}-rsa>=4.0:../../security/py-rsa
DEPENDS+= ${PYPKGPREFIX}-sarge>=0.1.5:../../wip/py-sarge
-DEPENDS+= ${PYPKGPREFIX}-scandir>=1.10:../../devel/py-scandir
-DEPENDS+= ${PYPKGPREFIX}-semantic_version>=2.6:../../devel/py-semantic_version
+DEPENDS+= ${PYPKGPREFIX}-semantic_version>=2.8.5:../../devel/py-semantic_version
DEPENDS+= ${PYPKGPREFIX}-serial>=3.4:../../comms/py-serial
-DEPENDS+= ${PYPKGPREFIX}-sentry-sdk>=0.7.7:../../wip/py-sentry-sdk
-DEPENDS+= ${PYPKGPREFIX}-tornado>=4.5.3:../../www/py-tornado
-DEPENDS+= ${PYPKGPREFIX}-typing>=3.6.6:../../devel/py-typing
-DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.9.0:../../sysutils/py-watchdog
-DEPENDS+= ${PYPKGPREFIX}-websocket-client>=0.56:../../www/py-websocket-client
-DEPENDS+= ${PYPKGPREFIX}-werkzeug>=0.15.1:../../www/py-werkzeug
-DEPENDS+= ${PYPKGPREFIX}-wrapt>=1.11.1:../../devel/py-wrapt
+DEPENDS+= ${PYPKGPREFIX}-sentry-sdk>=0.15.1:../../wip/py-sentry-sdk
+DEPENDS+= ${PYPKGPREFIX}-tornado>=5.1.1:../../www/py-tornado
+DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.10.2:../../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
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-octoprint/PLIST b/py-octoprint/PLIST
index 8a15ec2361..f5ef4a5518 100644
--- a/py-octoprint/PLIST
+++ b/py-octoprint/PLIST
@@ -16,6 +16,18 @@ ${PYSITELIB}/octoprint/__main__.pyo
${PYSITELIB}/octoprint/_version.py
${PYSITELIB}/octoprint/_version.pyc
${PYSITELIB}/octoprint/_version.pyo
+${PYSITELIB}/octoprint/access/__init__.py
+${PYSITELIB}/octoprint/access/__init__.pyc
+${PYSITELIB}/octoprint/access/__init__.pyo
+${PYSITELIB}/octoprint/access/groups.py
+${PYSITELIB}/octoprint/access/groups.pyc
+${PYSITELIB}/octoprint/access/groups.pyo
+${PYSITELIB}/octoprint/access/permissions.py
+${PYSITELIB}/octoprint/access/permissions.pyc
+${PYSITELIB}/octoprint/access/permissions.pyo
+${PYSITELIB}/octoprint/access/users.py
+${PYSITELIB}/octoprint/access/users.pyc
+${PYSITELIB}/octoprint/access/users.pyo
${PYSITELIB}/octoprint/cli/__init__.py
${PYSITELIB}/octoprint/cli/__init__.pyc
${PYSITELIB}/octoprint/cli/__init__.pyo
@@ -82,6 +94,14 @@ ${PYSITELIB}/octoprint/plugin/types.pyo
${PYSITELIB}/octoprint/plugins/__init__.py
${PYSITELIB}/octoprint/plugins/__init__.pyc
${PYSITELIB}/octoprint/plugins/__init__.pyo
+${PYSITELIB}/octoprint/plugins/action_command_notification/__init__.py
+${PYSITELIB}/octoprint/plugins/action_command_notification/__init__.pyc
+${PYSITELIB}/octoprint/plugins/action_command_notification/__init__.pyo
+${PYSITELIB}/octoprint/plugins/action_command_notification/static/clientjs/action_command_notification.js
+${PYSITELIB}/octoprint/plugins/action_command_notification/static/css/action_command_notification.css
+${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_prompt/__init__.py
${PYSITELIB}/octoprint/plugins/action_command_prompt/__init__.pyc
${PYSITELIB}/octoprint/plugins/action_command_prompt/__init__.pyo
@@ -105,6 +125,7 @@ ${PYSITELIB}/octoprint/plugins/appkeys/static/clientjs/appkeys.js
${PYSITELIB}/octoprint/plugins/appkeys/static/css/appkeys.css
${PYSITELIB}/octoprint/plugins/appkeys/static/js/appkeys.js
${PYSITELIB}/octoprint/plugins/appkeys/static/less/appkeys.less
+${PYSITELIB}/octoprint/plugins/appkeys/templates/appkeys.jinja2
${PYSITELIB}/octoprint/plugins/appkeys/templates/appkeys_settings.jinja2
${PYSITELIB}/octoprint/plugins/appkeys/templates/appkeys_usersettings.jinja2
${PYSITELIB}/octoprint/plugins/backup/__init__.py
@@ -115,6 +136,8 @@ ${PYSITELIB}/octoprint/plugins/backup/static/css/backup.css
${PYSITELIB}/octoprint/plugins/backup/static/js/backup.js
${PYSITELIB}/octoprint/plugins/backup/static/less/backup.less
${PYSITELIB}/octoprint/plugins/backup/templates/backup_settings.jinja2
+${PYSITELIB}/octoprint/plugins/backup/templates/backup_wizard.jinja2
+${PYSITELIB}/octoprint/plugins/backup/templates/snippets/plugin/backup/backup_plugin_upload_form.jinja2
${PYSITELIB}/octoprint/plugins/corewizard/__init__.py
${PYSITELIB}/octoprint/plugins/corewizard/__init__.pyc
${PYSITELIB}/octoprint/plugins/corewizard/__init__.pyo
@@ -140,16 +163,19 @@ ${PYSITELIB}/octoprint/plugins/errortracking/static/js/errortracking.js
${PYSITELIB}/octoprint/plugins/errortracking/static/js/sentry.min.js
${PYSITELIB}/octoprint/plugins/errortracking/templates/errortracking_javascripts.jinja2
${PYSITELIB}/octoprint/plugins/errortracking/templates/errortracking_settings.jinja2
-${PYSITELIB}/octoprint/plugins/forcelogin/__init__.py
-${PYSITELIB}/octoprint/plugins/forcelogin/__init__.pyc
-${PYSITELIB}/octoprint/plugins/forcelogin/__init__.pyo
-${PYSITELIB}/octoprint/plugins/forcelogin/static/css/forcelogin.css
-${PYSITELIB}/octoprint/plugins/forcelogin/static/js/main.js
-${PYSITELIB}/octoprint/plugins/forcelogin/static/js/viewmodel.js
-${PYSITELIB}/octoprint/plugins/forcelogin/static/less/forcelogin.less
-${PYSITELIB}/octoprint/plugins/forcelogin/templates/forcelogin_index.jinja2
-${PYSITELIB}/octoprint/plugins/forcelogin/templates/parts/forcelogin_css.jinja2
-${PYSITELIB}/octoprint/plugins/forcelogin/templates/parts/forcelogin_javascripts.jinja2
+${PYSITELIB}/octoprint/plugins/gcodeviewer/__init__.py
+${PYSITELIB}/octoprint/plugins/gcodeviewer/__init__.pyc
+${PYSITELIB}/octoprint/plugins/gcodeviewer/__init__.pyo
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/css/gcodeviewer.css
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/js/viewer/reader.js
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/js/viewer/renderer.js
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/js/viewer/ui.js
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/js/viewer/worker.js
+${PYSITELIB}/octoprint/plugins/gcodeviewer/static/less/gcodeviewer.less
+${PYSITELIB}/octoprint/plugins/gcodeviewer/templates/gcodeviewer_initscript.jinja2
+${PYSITELIB}/octoprint/plugins/gcodeviewer/templates/gcodeviewer_settings.jinja2
+${PYSITELIB}/octoprint/plugins/gcodeviewer/templates/gcodeviewer_tab.jinja2
${PYSITELIB}/octoprint/plugins/logging/__init__.py
${PYSITELIB}/octoprint/plugins/logging/__init__.pyc
${PYSITELIB}/octoprint/plugins/logging/__init__.pyo
@@ -157,7 +183,18 @@ ${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_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
@@ -177,20 +214,6 @@ ${PYSITELIB}/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
${PYSITELIB}/octoprint/plugins/pluginmanager/static/less/pluginmanager.less
${PYSITELIB}/octoprint/plugins/pluginmanager/templates/pluginmanager_about.jinja2
${PYSITELIB}/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
-${PYSITELIB}/octoprint/plugins/printer_safety_check/__init__.py
-${PYSITELIB}/octoprint/plugins/printer_safety_check/__init__.pyc
-${PYSITELIB}/octoprint/plugins/printer_safety_check/__init__.pyo
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/__init__.py
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/__init__.pyc
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/__init__.pyo
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/firmware_unsafe.py
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/firmware_unsafe.pyc
-${PYSITELIB}/octoprint/plugins/printer_safety_check/checks/firmware_unsafe.pyo
-${PYSITELIB}/octoprint/plugins/printer_safety_check/static/clientjs/printer_safety_check.js
-${PYSITELIB}/octoprint/plugins/printer_safety_check/static/css/printer_safety_check.css
-${PYSITELIB}/octoprint/plugins/printer_safety_check/static/js/printer_safety_check.js
-${PYSITELIB}/octoprint/plugins/printer_safety_check/static/less/printer_safety_check.less
-${PYSITELIB}/octoprint/plugins/printer_safety_check/templates/printer_safety_check_sidebar.jinja2
${PYSITELIB}/octoprint/plugins/softwareupdate/__init__.py
${PYSITELIB}/octoprint/plugins/softwareupdate/__init__.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/__init__.pyo
@@ -208,7 +231,10 @@ ${PYSITELIB}/octoprint/plugins/softwareupdate/static/css/softwareupdate.css
${PYSITELIB}/octoprint/plugins/softwareupdate/static/js/softwareupdate.js
${PYSITELIB}/octoprint/plugins/softwareupdate/static/less/softwareupdate.less
${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/checkoutFolder.jinja2
+${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/pipEnableCheck.jinja2
+${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/pipTarget.jinja2
${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/releaseChannel.jinja2
+${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/trackedBranch.jinja2
${PYSITELIB}/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/versionTracking.jinja2
${PYSITELIB}/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2
${PYSITELIB}/octoprint/plugins/softwareupdate/templates/softwareupdate_wizard.jinja2
@@ -221,6 +247,9 @@ ${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/pip.pyo
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/python_updater.py
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/python_updater.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/python_updater.pyo
+${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/single_file_plugin.py
+${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/single_file_plugin.pyc
+${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/single_file_plugin.pyo
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/sleep_a_bit.py
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/sleep_a_bit.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/updaters/sleep_a_bit.pyo
@@ -251,9 +280,18 @@ ${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/github_commit.pyo
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/github_release.py
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/github_release.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/github_release.pyo
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/httpheader.py
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/httpheader.pyc
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/httpheader.pyo
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/jsondata.py
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/jsondata.pyc
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/jsondata.pyo
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/never_current.py
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/never_current.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/never_current.pyo
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/pypi_release.py
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/pypi_release.pyc
+${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/pypi_release.pyo
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/python_checker.py
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/python_checker.pyc
${PYSITELIB}/octoprint/plugins/softwareupdate/version_checks/python_checker.pyo
@@ -268,6 +306,7 @@ ${PYSITELIB}/octoprint/plugins/tracking/templates/tracking_wizard.jinja2
${PYSITELIB}/octoprint/plugins/virtual_printer/__init__.py
${PYSITELIB}/octoprint/plugins/virtual_printer/__init__.pyc
${PYSITELIB}/octoprint/plugins/virtual_printer/__init__.pyo
+${PYSITELIB}/octoprint/plugins/virtual_printer/templates/virtual_printer_settings.jinja2
${PYSITELIB}/octoprint/plugins/virtual_printer/virtual.py
${PYSITELIB}/octoprint/plugins/virtual_printer/virtual.pyc
${PYSITELIB}/octoprint/plugins/virtual_printer/virtual.pyo
@@ -289,6 +328,9 @@ ${PYSITELIB}/octoprint/server/__init__.pyo
${PYSITELIB}/octoprint/server/api/__init__.py
${PYSITELIB}/octoprint/server/api/__init__.pyc
${PYSITELIB}/octoprint/server/api/__init__.pyo
+${PYSITELIB}/octoprint/server/api/access.py
+${PYSITELIB}/octoprint/server/api/access.pyc
+${PYSITELIB}/octoprint/server/api/access.pyo
${PYSITELIB}/octoprint/server/api/connection.py
${PYSITELIB}/octoprint/server/api/connection.pyc
${PYSITELIB}/octoprint/server/api/connection.pyo
@@ -322,9 +364,6 @@ ${PYSITELIB}/octoprint/server/api/timelapse.pyo
${PYSITELIB}/octoprint/server/api/users.py
${PYSITELIB}/octoprint/server/api/users.pyc
${PYSITELIB}/octoprint/server/api/users.pyo
-${PYSITELIB}/octoprint/server/apps/__init__.py
-${PYSITELIB}/octoprint/server/apps/__init__.pyc
-${PYSITELIB}/octoprint/server/apps/__init__.pyo
${PYSITELIB}/octoprint/server/util/__init__.py
${PYSITELIB}/octoprint/server/util/__init__.pyc
${PYSITELIB}/octoprint/server/util/__init__.pyo
@@ -367,17 +406,9 @@ ${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/gcodeviewer/js/Worker.js
-${PYSITELIB}/octoprint/static/gcodeviewer/js/gCodeReader.js
-${PYSITELIB}/octoprint/static/gcodeviewer/js/renderer.js
-${PYSITELIB}/octoprint/static/gcodeviewer/js/renderer3d.js
-${PYSITELIB}/octoprint/static/gcodeviewer/js/ui.js
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/TrackballControls.js
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/codemirror.css
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/codemirror.js
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/mode_gcode/gcode_mode.js
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/three.js
-${PYSITELIB}/octoprint/static/gcodeviewer/lib/three.min.js
+${PYSITELIB}/octoprint/static/forcelogin/css/forcelogin.css
+${PYSITELIB}/octoprint/static/forcelogin/js/forcelogin.js
+${PYSITELIB}/octoprint/static/forcelogin/less/forcelogin.less
${PYSITELIB}/octoprint/static/img/apple-touch-icon-114x114.png
${PYSITELIB}/octoprint/static/img/apple-touch-icon-144x144.png
${PYSITELIB}/octoprint/static/img/glyphicons-halflings-white.png
@@ -408,6 +439,7 @@ ${PYSITELIB}/octoprint/static/js/app/bindings/slimscrolledforeach.js
${PYSITELIB}/octoprint/static/js/app/bindings/toggle.js
${PYSITELIB}/octoprint/static/js/app/bindings/togglecontent.js
${PYSITELIB}/octoprint/static/js/app/bindings/valuewithinit.js
+${PYSITELIB}/octoprint/static/js/app/client/access.js
${PYSITELIB}/octoprint/static/js/app/client/base.js
${PYSITELIB}/octoprint/static/js/app/client/browser.js
${PYSITELIB}/octoprint/static/js/app/client/connection.js
@@ -429,11 +461,11 @@ ${PYSITELIB}/octoprint/static/js/app/dataupdater.js
${PYSITELIB}/octoprint/static/js/app/helpers.js
${PYSITELIB}/octoprint/static/js/app/main.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/about.js
+${PYSITELIB}/octoprint/static/js/app/viewmodels/access.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/appearance.js
${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/gcode.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/loginstate.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/navigation.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/printerprofiles.js
@@ -444,10 +476,12 @@ ${PYSITELIB}/octoprint/static/js/app/viewmodels/system.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/temperature.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/terminal.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/timelapse.js
+${PYSITELIB}/octoprint/static/js/app/viewmodels/uistate.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/users.js
${PYSITELIB}/octoprint/static/js/app/viewmodels/usersettings.js
${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.js
${PYSITELIB}/octoprint/static/js/lib/bootstrap-slider-knockout-binding.js
@@ -543,6 +577,7 @@ ${PYSITELIB}/octoprint/static/less/font-awesome.less
${PYSITELIB}/octoprint/static/less/mixins.less
${PYSITELIB}/octoprint/static/less/octoprint.less
${PYSITELIB}/octoprint/static/less/variables.less
+${PYSITELIB}/octoprint/static/manifest.json
${PYSITELIB}/octoprint/static/robots.txt
${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.css
${PYSITELIB}/octoprint/static/vendor/font-awesome-3.2.1/css/font-awesome.min.css
@@ -559,15 +594,13 @@ ${PYSITELIB}/octoprint/static/vendor/font-awesome-4.7.0/fonts/fontawesome-webfon
${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/templates/_data/AUTHORS.md
-${PYSITELIB}/octoprint/templates/_data/CHANGELOG.md
-${PYSITELIB}/octoprint/templates/_data/SUPPORTERS.md
-${PYSITELIB}/octoprint/templates/_data/THIRDPARTYLICENSES.md
+${PYSITELIB}/octoprint/templates/_data/AUTHORS.md.html
+${PYSITELIB}/octoprint/templates/_data/SUPPORTERS.md.html
+${PYSITELIB}/octoprint/templates/_data/THIRDPARTYLICENSES.md.html
${PYSITELIB}/octoprint/templates/_data/agpl.html
${PYSITELIB}/octoprint/templates/dialogs/about.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/about.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/authors.jinja2
-${PYSITELIB}/octoprint/templates/dialogs/about/changelog.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/license.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/supporters.jinja2
${PYSITELIB}/octoprint/templates/dialogs/about/thirdparty.jinja2
@@ -579,7 +612,6 @@ ${PYSITELIB}/octoprint/templates/dialogs/settings/appearance.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/features.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/folders.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/gcodescripts.jinja2
-${PYSITELIB}/octoprint/templates/dialogs/settings/gcodevisualizer.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/printerprofiles.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/serialconnection.jinja2
${PYSITELIB}/octoprint/templates/dialogs/settings/server.jinja2
@@ -594,9 +626,11 @@ ${PYSITELIB}/octoprint/templates/dialogs/usersettings/interface.jinja2
${PYSITELIB}/octoprint/templates/dialogs/wizard.jinja2
${PYSITELIB}/octoprint/templates/dialogs/wizard/firstrun_end.jinja2
${PYSITELIB}/octoprint/templates/dialogs/wizard/firstrun_start.jinja2
+${PYSITELIB}/octoprint/templates/footer.jinja2
${PYSITELIB}/octoprint/templates/i18n.js.jinja2
${PYSITELIB}/octoprint/templates/index.jinja2
${PYSITELIB}/octoprint/templates/initscript.jinja2
+${PYSITELIB}/octoprint/templates/javascripts-preload.jinja2
${PYSITELIB}/octoprint/templates/javascripts.jinja2
${PYSITELIB}/octoprint/templates/navbar/login.jinja2
${PYSITELIB}/octoprint/templates/navbar/settings.jinja2
@@ -609,12 +643,18 @@ ${PYSITELIB}/octoprint/templates/sidebar/connection_header.jinja2
${PYSITELIB}/octoprint/templates/sidebar/files.jinja2
${PYSITELIB}/octoprint/templates/sidebar/files_header.jinja2
${PYSITELIB}/octoprint/templates/sidebar/state.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/accesscontrol/group_list.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/accesscontrol/groups.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/accesscontrol/permission_list.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/accesscontrol/subgroup_list.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/accesscontrol/users.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profileEditor.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profileEditorAxes.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profileEditorBuildvolume.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profileEditorExtruder.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profileEditorGeneral.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/server/serverAllowFraming.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverCommandServerRestart.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverCommandSystemRestart.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverCommandSystemShutdown.jinja2
@@ -623,8 +663,10 @@ ${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckDescr
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckEnabled.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckHost.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckInterval.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckName.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckPort.jinja2
-${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckTest.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckTestConnectivity.jinja2
+${PYSITELIB}/octoprint/templates/snippets/settings/server/serverOnlineCheckTestResolution.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklist.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistDescription.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistEnabled.jinja2
@@ -633,6 +675,7 @@ ${PYSITELIB}/octoprint/templates/snippets/settings/server/serverPluginBlacklistU
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/ffmpegBitrate.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
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/timelapseEnabled.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/watermark.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/webcamEnabled.jinja2
@@ -643,9 +686,9 @@ ${PYSITELIB}/octoprint/templates/snippets/settings/webcam/webcamSnapshotUrl.jinj
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/webcamStreamRatio.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/webcamStreamTimeout.jinja2
${PYSITELIB}/octoprint/templates/snippets/settings/webcam/webcamStreamUrl.jinja2
+${PYSITELIB}/octoprint/templates/stylesheets-preload.jinja2
${PYSITELIB}/octoprint/templates/stylesheets.jinja2
${PYSITELIB}/octoprint/templates/tabs/control.jinja2
-${PYSITELIB}/octoprint/templates/tabs/gcodeviewer.jinja2
${PYSITELIB}/octoprint/templates/tabs/temperature.jinja2
${PYSITELIB}/octoprint/templates/tabs/terminal.jinja2
${PYSITELIB}/octoprint/templates/tabs/timelapse.jinja2
@@ -660,27 +703,15 @@ ${PYSITELIB}/octoprint/users.pyo
${PYSITELIB}/octoprint/util/__init__.py
${PYSITELIB}/octoprint/util/__init__.pyc
${PYSITELIB}/octoprint/util/__init__.pyo
-${PYSITELIB}/octoprint/util/avr_isp/__init__.py
-${PYSITELIB}/octoprint/util/avr_isp/__init__.pyc
-${PYSITELIB}/octoprint/util/avr_isp/__init__.pyo
-${PYSITELIB}/octoprint/util/avr_isp/chipDB.py
-${PYSITELIB}/octoprint/util/avr_isp/chipDB.pyc
-${PYSITELIB}/octoprint/util/avr_isp/chipDB.pyo
-${PYSITELIB}/octoprint/util/avr_isp/intelHex.py
-${PYSITELIB}/octoprint/util/avr_isp/intelHex.pyc
-${PYSITELIB}/octoprint/util/avr_isp/intelHex.pyo
-${PYSITELIB}/octoprint/util/avr_isp/ispBase.py
-${PYSITELIB}/octoprint/util/avr_isp/ispBase.pyc
-${PYSITELIB}/octoprint/util/avr_isp/ispBase.pyo
-${PYSITELIB}/octoprint/util/avr_isp/stk500v2.py
-${PYSITELIB}/octoprint/util/avr_isp/stk500v2.pyc
-${PYSITELIB}/octoprint/util/avr_isp/stk500v2.pyo
${PYSITELIB}/octoprint/util/comm.py
${PYSITELIB}/octoprint/util/comm.pyc
${PYSITELIB}/octoprint/util/comm.pyo
${PYSITELIB}/octoprint/util/commandline.py
${PYSITELIB}/octoprint/util/commandline.pyc
${PYSITELIB}/octoprint/util/commandline.pyo
+${PYSITELIB}/octoprint/util/connectivity.py
+${PYSITELIB}/octoprint/util/connectivity.pyc
+${PYSITELIB}/octoprint/util/connectivity.pyo
${PYSITELIB}/octoprint/util/dev.py
${PYSITELIB}/octoprint/util/dev.pyc
${PYSITELIB}/octoprint/util/dev.pyo
@@ -717,6 +748,21 @@ ${PYSITELIB}/octoprint/util/version.pyo
${PYSITELIB}/octoprint/vendor/__init__.py
${PYSITELIB}/octoprint/vendor/__init__.pyc
${PYSITELIB}/octoprint/vendor/__init__.pyo
+${PYSITELIB}/octoprint/vendor/awesome_slugify/__init__.py
+${PYSITELIB}/octoprint/vendor/awesome_slugify/__init__.pyc
+${PYSITELIB}/octoprint/vendor/awesome_slugify/__init__.pyo
+${PYSITELIB}/octoprint/vendor/awesome_slugify/alt_translates.py
+${PYSITELIB}/octoprint/vendor/awesome_slugify/alt_translates.pyc
+${PYSITELIB}/octoprint/vendor/awesome_slugify/alt_translates.pyo
+${PYSITELIB}/octoprint/vendor/awesome_slugify/main.py
+${PYSITELIB}/octoprint/vendor/awesome_slugify/main.pyc
+${PYSITELIB}/octoprint/vendor/awesome_slugify/main.pyo
+${PYSITELIB}/octoprint/vendor/flask_principal.py
+${PYSITELIB}/octoprint/vendor/flask_principal.pyc
+${PYSITELIB}/octoprint/vendor/flask_principal.pyo
+${PYSITELIB}/octoprint/vendor/imp.py
+${PYSITELIB}/octoprint/vendor/imp.pyc
+${PYSITELIB}/octoprint/vendor/imp.pyo
${PYSITELIB}/octoprint/vendor/sockjs/__init__.py
${PYSITELIB}/octoprint/vendor/sockjs/__init__.pyc
${PYSITELIB}/octoprint/vendor/sockjs/__init__.pyo
diff --git a/py-octoprint/distinfo b/py-octoprint/distinfo
index 9d637d89b0..56ed8f9d0f 100644
--- a/py-octoprint/distinfo
+++ b/py-octoprint/distinfo
@@ -1,7 +1,6 @@
$NetBSD$
-SHA1 (OctoPrint-1.3.12.tar.gz) = f4997d49f2b4e45e9d5e97574c938d6270b0f345
-RMD160 (OctoPrint-1.3.12.tar.gz) = dadf5c35a134ef4243228c48d7b595b517a1b70b
-SHA512 (OctoPrint-1.3.12.tar.gz) = a9f018f484f49bb184d2ed965524bba02bbc6b125f7cb01ac56ae016a0c616cf08c9ae4ef399133f24cad552a3ec00fd1939060fb5fb5d01b49506da6ef87091
-Size (OctoPrint-1.3.12.tar.gz) = 5104305 bytes
-SHA1 (patch-setup.py) = 76a85947bae286d1abc0924eb9510078ed4cffa2
+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
diff --git a/py-octoprint/patches/patch-setup.py b/py-octoprint/patches/patch-setup.py
deleted file mode 100644
index 7963137741..0000000000
--- a/py-octoprint/patches/patch-setup.py
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-Relax some dependencies
-
---- setup.py.orig 2019-10-21 10:27:16.000000000 +0000
-+++ setup.py
-@@ -20,12 +20,12 @@ INSTALL_REQUIRES = [
- # the following dependencies are non trivial to update since later versions introduce backwards incompatible
- # changes that might affect plugins, or due to other observed problems
-
-- "flask>=0.10.1,<0.11", # newer versions require newer Jinja versions
-- "Jinja2>=2.8.1,<2.9", # Jinja 2.9 has breaking changes WRT template scope - we can't
-+ "flask>=0.10.1", # versions >= 0.11 require newer Jinja versions
-+ "Jinja2>=2.8.1,<2.11", # Jinja 2.9 has breaking changes WRT template scope - we can't
- # guarantee backwards compatibility for plugins and such with that
- # version, hence we need to pin to a lower version for now. See #1697
-- "tornado==4.5.3", # a memory leak was observed in tornado >= 5, see #2585
-- "Flask-Login>=0.2.11,<0.3", # some functions changed to properties in 0.3
-+ "tornado>=4.5.3", # a memory leak was observed in tornado >= 5, see #2585
-+ "Flask-Login>=0.2.11,<0.5", # some functions changed to properties in 0.3
- "regex!=2018.11.6", # avoid broken 2018.11.6. See #2874
-
- # anything below this should be checked on releases for new versions
-@@ -36,7 +36,7 @@ INSTALL_REQUIRES = [
- "werkzeug>=0.15.1,<0.16",
- "cachelib>=0.1,<0.2",
- "PyYAML>=5.1,<6",
-- "markdown>=3.0,<3.1",
-+ "markdown>=3.0,<3.2",
- "pyserial>=3.4,<3.5",
- "netaddr>=0.7.19,<0.8",
- "watchdog>=0.9.0,<0.10",
-@@ -46,7 +46,7 @@ INSTALL_REQUIRES = [
- "rsa>=4.0,<5",
- "pkginfo>=1.5.0.1,<1.6",
- "requests>=2.21.0,<3",
-- "semantic_version>=2.6,<2.7",
-+ "semantic_version>=2.6,<2.9",
- "psutil>=5.6.1,<5.7",
- "Click>=7,<8",
- "awesome-slugify>=1.6.5,<1.7",
-@@ -56,7 +56,7 @@ INSTALL_REQUIRES = [
- "scandir>=1.10,<1.11",
- "websocket-client>=0.56,<0.57",
- "wrapt>=1.11.1,<1.12",
-- "futures>=3.2,<3.3",
-+ "futures>=3.2,<3.4",
- "emoji>=0.5.1,<0.6",
- "monotonic>=1.5,<1.6",
- "frozendict>=1.2,<1.3",
Home |
Main Index |
Thread Index |
Old Index