py-octoprint: register additional dependencies

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

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Mon Nov 23 07:56:17 2020 +0100
Changeset:	a21516ad55a8339444a4619bd2b10c2a4cd7d724

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

Log Message:
py-octoprint: register additional dependencies

While there, relax a couple version checks, and correct the upstream.

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

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

diffstat:
 py-octoprint/Makefile               |  6 ++++--
 py-octoprint/distinfo               |  1 +
 py-octoprint/patches/patch-setup.py | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs:
diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile
index a261b5c000..3a4b69b870 100644
--- a/py-octoprint/Makefile
+++ b/py-octoprint/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=	${PYPKGPREFIX}-octoprint-1.4.2
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GITHUB:=foosel/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=OctoPrint/}
 GITHUB_PROJECT=	OctoPrint
 GITHUB_TAG=	${PKGVERSION_NOREV}
 
@@ -14,7 +14,7 @@ LICENSE=	gnu-agpl-v3
 
 PYTHON_VERSIONS_ACCEPTED=	37 36
 
-#TODO register the remaining dependencies (see https://github.com/foosel/OctoPrint/blob/master/setup.py#L19)
+DEPENDS+=	${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
 DEPENDS+=	${PYPKGPREFIX}-cachelib>=0.1:../../wip/py-cachelib
 DEPENDS+=	${PYPKGPREFIX}-emoji>=0.5.4:../../converters/py-emoji
 DEPENDS+=	${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser
@@ -25,6 +25,7 @@ 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}-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
@@ -40,6 +41,7 @@ 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:../../wip/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}-websocket-client>=0.57:../../www/py-websocket-client
 DEPENDS+=	${PYPKGPREFIX}-werkzeug>=1.0.1:../../www/py-werkzeug
diff --git a/py-octoprint/distinfo b/py-octoprint/distinfo
index 56ed8f9d0f..27b43ccc89 100644
--- a/py-octoprint/distinfo
+++ b/py-octoprint/distinfo
@@ -4,3 +4,4 @@ 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
diff --git a/py-octoprint/patches/patch-setup.py b/py-octoprint/patches/patch-setup.py
new file mode 100644
index 0000000000..86cb6f08da
--- /dev/null
+++ b/py-octoprint/patches/patch-setup.py
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Override some version checks
+
+--- setup.py.orig	2020-08-06 10:41:11.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
+ ]
+