Update the dependencies for wip/py-octoprint

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Thu Oct 31 21:32:11 2019 +0100
Changeset:	c47fd83eef270cde6d5983d3ba430027ecd801ab

Modified Files:
	py-octoprint/Makefile
	py-octoprint/distinfo
	py-octoprint/patches/patch-setup.py

Log Message:
Update the dependencies for wip/py-octoprint

With these changes, octoprint really starts.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c47fd83eef270cde6d5983d3ba430027ecd801ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-octoprint/Makefile               |  3 +++
 py-octoprint/distinfo               |  2 +-
 py-octoprint/patches/patch-setup.py | 39 +++++++++++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)

diffs:
diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile
index b594b77c91..7f4dcfc988 100644
--- a/py-octoprint/Makefile
+++ b/py-octoprint/Makefile
@@ -16,6 +16,7 @@ PYTHON_VERSIONS_ACCEPTED=	27
 
 #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:../../textproc/py-feedparser
@@ -34,6 +35,8 @@ 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}-regex>2018.11.6:../../textproc/py-regex
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.21.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-rsa>=4.0:../../security/py-rsa
 DEPENDS+=	${PYPKGPREFIX}-sarge>=0.1.5:../../wip/py-sarge
diff --git a/py-octoprint/distinfo b/py-octoprint/distinfo
index 34d3e58dd0..e29d4928c1 100644
--- a/py-octoprint/distinfo
+++ b/py-octoprint/distinfo
@@ -4,4 +4,4 @@ SHA1 (OctoPrint-1.3.11.tar.gz) = 112edf922af17b109fff06b08dc6a0b7f46283c3
 RMD160 (OctoPrint-1.3.11.tar.gz) = 840e8f0ef3c453e4737f1463d203972ca1d601d3
 SHA512 (OctoPrint-1.3.11.tar.gz) = 1b97cf28668cf418e55e424f2014761a3bbf9c918d21566441592a7d3b56f87c32336bf95dd163b7bd92a00003d3bf2abd71cc1aeb6482a58d5840fa5047d4cb
 Size (OctoPrint-1.3.11.tar.gz) = 5055084 bytes
-SHA1 (patch-setup.py) = b29dd06f4438d0098ba8a247b8c73a877d1281c7
+SHA1 (patch-setup.py) = 76a85947bae286d1abc0924eb9510078ed4cffa2
diff --git a/py-octoprint/patches/patch-setup.py b/py-octoprint/patches/patch-setup.py
index 07b12745e8..7963137741 100644
--- a/py-octoprint/patches/patch-setup.py
+++ b/py-octoprint/patches/patch-setup.py
@@ -1,9 +1,44 @@
 $NetBSD$
 
-Relax the dependency on devel/py-futures
+Relax some dependencies
 
---- setup.py.orig	2019-05-13 12:54:51.000000000 +0000
+--- 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",