Tue Dec 7 10:51:22 2021 UTC ()
py-octoprint: fix dependencies

Bumps PKGREVISION.

Thanks wiz@ for the heads up!


(khorben)
diff -r1.4 -r1.5 pkgsrc/print/py-octoprint/Makefile
diff -r1.4 -r1.5 pkgsrc/print/py-octoprint/distinfo
diff -r1.2 -r1.3 pkgsrc/print/py-octoprint/patches/patch-setup.py
cvs diff -r1.4 -r1.5 pkgsrc/print/py-octoprint/Makefile (expand / switch to unified diff)

--- pkgsrc/print/py-octoprint/Makefile 2021/08/29 20:00:43 1.4
+++ pkgsrc/print/py-octoprint/Makefile 2021/12/07 10:51:22 1.5
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1# $NetBSD: Makefile,v 1.4 2021/08/29 20:00:43 khorben Exp $ 1# $NetBSD: Makefile,v 1.5 2021/12/07 10:51:22 khorben Exp $
2 2
3DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV} 3DISTNAME= ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
4PKGNAME= ${PYPKGPREFIX}-octoprint-1.6.1 4PKGNAME= ${PYPKGPREFIX}-octoprint-1.6.1
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_GITHUB:=OctoPrint/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=OctoPrint/}
8GITHUB_PROJECT= OctoPrint 8GITHUB_PROJECT= OctoPrint
9GITHUB_TAG= ${PKGVERSION_NOREV} 9GITHUB_TAG= ${PKGVERSION_NOREV}
10 10
11MAINTAINER= khorben@defora.org 11MAINTAINER= khorben@defora.org
12HOMEPAGE= https://github.com/OctoPrint/OctoPrint/ 12HOMEPAGE= https://github.com/OctoPrint/OctoPrint/
13COMMENT= Snappy web interface for 3D printers 13COMMENT= Snappy web interface for 3D printers
14LICENSE= gnu-agpl-v3 14LICENSE= gnu-agpl-v3
15 15
16RCD_SCRIPTS= octoprint 16RCD_SCRIPTS= octoprint
17 17
18PYTHON_VERSIONS_INCOMPATIBLE= 27 18PYTHON_VERSIONS_INCOMPATIBLE= 27
19 19
20DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker 20DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker
21DEPENDS+= ${PYPKGPREFIX}-cachelib>=0.1:../../devel/py-cachelib 21DEPENDS+= ${PYPKGPREFIX}-cachelib>=0.1:../../devel/py-cachelib
22DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click 22DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
23DEPENDS+= ${PYPKGPREFIX}-emoji>=0.5.4:../../converters/py-emoji 23DEPENDS+= ${PYPKGPREFIX}-emoji>=0.5.4:../../converters/py-emoji
24DEPENDS+= ${PYPKGPREFIX}-feedparser>=6.0.2:../../textproc/py-feedparser 24DEPENDS+= ${PYPKGPREFIX}-feedparser>=6.0.2:../../textproc/py-feedparser
25DEPENDS+= ${PYPKGPREFIX}-filetype>=1.0.7:../../sysutils/py-filetype 25DEPENDS+= ${PYPKGPREFIX}-filetype>=1.0.7:../../sysutils/py-filetype
26DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask 26DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask
27DEPENDS+= ${PYPKGPREFIX}-flask-assets>=2.0:../../www/py-flask-assets 27DEPENDS+= ${PYPKGPREFIX}-flask-assets>=2.0:../../www/py-flask-assets
28DEPENDS+= ${PYPKGPREFIX}-flask-babel>=1.0:../../www/py-flask-babel 28DEPENDS+= ${PYPKGPREFIX}-flask-babel>=1.0:../../www/py-flask-babel
29DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.5:../../www/py-flask-login 29DEPENDS+= ${PYPKGPREFIX}-flask-login>=0.5:../../www/py-flask-login
30DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future 30DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
31DEPENDS+= ${PYPKGPREFIX}-immutabledict>=2.0.0:../../devel/py-immutabledict 31DEPENDS+= ${PYPKGPREFIX}-immutabledict>=2.0.0:../../devel/py-immutabledict
32DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=0.18.2:../../devel/py-importlib-metadata 
33DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2 32DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
34DEPENDS+= ${PYPKGPREFIX}-markdown>=3.1:../../textproc/py-markdown 33DEPENDS+= ${PYPKGPREFIX}-markdown>=3.1:../../textproc/py-markdown
35DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.19:../../net/py-netaddr 34DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.19:../../net/py-netaddr
36DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.10.9:../../net/py-netifaces 35DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.10.9:../../net/py-netifaces
37DEPENDS+= ${PYPKGPREFIX}-octoprint-filecheck>=2021.2.23:../../print/py-octoprint-filecheck 36DEPENDS+= ${PYPKGPREFIX}-octoprint-filecheck>=2021.2.23:../../print/py-octoprint-filecheck
38DEPENDS+= ${PYPKGPREFIX}-octoprint-firmwarecheck>=2021.2.4:../../print/py-octoprint-firmwarecheck 37DEPENDS+= ${PYPKGPREFIX}-octoprint-firmwarecheck>=2021.2.4:../../print/py-octoprint-firmwarecheck
39DEPENDS+= ${PYPKGPREFIX}-octoprint-pisupport>=2021.3.26:../../print/py-octoprint-pisupport 38DEPENDS+= ${PYPKGPREFIX}-octoprint-pisupport>=2021.3.26:../../print/py-octoprint-pisupport
40DEPENDS+= ${PYPKGPREFIX}-pkginfo>=1.5.0.1:../../devel/py-pkginfo 39DEPENDS+= ${PYPKGPREFIX}-pkginfo>=1.5.0.1:../../devel/py-pkginfo
41DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7:../../sysutils/py-psutil 40DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7:../../sysutils/py-psutil
42DEPENDS+= ${PYPKGPREFIX}-pylru>=1.2:../../devel/py-pylru 41DEPENDS+= ${PYPKGPREFIX}-pylru>=1.2:../../devel/py-pylru
43DEPENDS+= ${PYPKGPREFIX}-regex>2018.11.6:../../textproc/py-regex 42DEPENDS+= ${PYPKGPREFIX}-regex>2018.11.6:../../textproc/py-regex
44DEPENDS+= ${PYPKGPREFIX}-requests>=2.23.0:../../devel/py-requests 43DEPENDS+= ${PYPKGPREFIX}-requests>=2.23.0:../../devel/py-requests
45DEPENDS+= ${PYPKGPREFIX}-sarge>=0.1.5:../../devel/py-sarge 44DEPENDS+= ${PYPKGPREFIX}-sarge>=0.1.5:../../devel/py-sarge
cvs diff -r1.4 -r1.5 pkgsrc/print/py-octoprint/distinfo (expand / switch to unified diff)

--- pkgsrc/print/py-octoprint/distinfo 2021/10/26 11:12:14 1.4
+++ pkgsrc/print/py-octoprint/distinfo 2021/12/07 10:51:22 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 11:12:14 nia Exp $ 1$NetBSD: distinfo,v 1.5 2021/12/07 10:51:22 khorben Exp $
2 2
3BLAKE2s (OctoPrint-1.6.1.tar.gz) = 7cef202ac3c03f93060546e177cb6568fbc734224894d4f3bf83517635c846bf 3BLAKE2s (OctoPrint-1.6.1.tar.gz) = 7cef202ac3c03f93060546e177cb6568fbc734224894d4f3bf83517635c846bf
4SHA512 (OctoPrint-1.6.1.tar.gz) = 4b485ea395c9012f79dd772971cfb9c3b90676d147887560bc618597f898af65bae838522a7ead75e08563d7c61a98c8b63d71c605d1c73e7b8dbd51e8090680 4SHA512 (OctoPrint-1.6.1.tar.gz) = 4b485ea395c9012f79dd772971cfb9c3b90676d147887560bc618597f898af65bae838522a7ead75e08563d7c61a98c8b63d71c605d1c73e7b8dbd51e8090680
5Size (OctoPrint-1.6.1.tar.gz) = 6174286 bytes 5Size (OctoPrint-1.6.1.tar.gz) = 6174286 bytes
6SHA1 (patch-setup.py) = ffecbfba1b52f19dfa1fd95daa9d1799fc7ae769 6SHA1 (patch-setup.py) = e205a683e90120c94ac7309dd5d8b5eb00a31b2e
7SHA1 (patch-src_octoprint_util_comm.py) = 6f73998c3b51a17436e16b9a86b1e8b368f6cd2c 7SHA1 (patch-src_octoprint_util_comm.py) = 6f73998c3b51a17436e16b9a86b1e8b368f6cd2c
cvs diff -r1.2 -r1.3 pkgsrc/print/py-octoprint/patches/patch-setup.py (expand / switch to unified diff)

--- pkgsrc/print/py-octoprint/patches/patch-setup.py 2021/05/30 21:53:11 1.2
+++ pkgsrc/print/py-octoprint/patches/patch-setup.py 2021/12/07 10:51:22 1.3
@@ -1,31 +1,54 @@ @@ -1,31 +1,54 @@
1$NetBSD: patch-setup.py,v 1.2 2021/05/30 21:53:11 khorben Exp $ 1$NetBSD: patch-setup.py,v 1.3 2021/12/07 10:51:22 khorben Exp $
2 2
3Override some version checks 3Override some version checks
4 4
5--- setup.py.orig 2021-05-10 09:44:33.000000000 +0000 5--- setup.py.orig 2021-05-10 09:44:33.000000000 +0000
6+++ setup.py 6+++ setup.py
 7@@ -19,7 +19,7 @@ import octoprint_setuptools # noqa: F40
 8 PYTHON_REQUIRES = ">=2.7.9, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 9
 10 # Requirements for setup.py
 11-SETUP_REQUIRES = ["markdown>=3.1,<3.2"] # newer versions require Python 3
 12+SETUP_REQUIRES = ["markdown>=3.1"] # newer versions require Python 3
 13
 14 # Requirements for our application
 15 INSTALL_REQUIRES = [
 16@@ -32,7 +32,7 @@ INSTALL_REQUIRES = [
 17 # other observed problems
 18 "markupsafe>=1.1,<2.0", # Jinja dependency, newer versions require Python 3
 19 "tornado==5.1.1", # newer versions require Python 3
 20- "markdown>=3.1,<3.2", # newer versions require Python 3
 21+ "markdown>=3.1", # newer versions require Python 3
 22 "regex!=2018.11.6", # avoid broken 2018.11.6. See #2874
 23 # anything below this should be checked on releases for new versions
 24 "flask>=1.1.2,<2",
7@@ -46,8 +46,8 @@ INSTALL_REQUIRES = [ 25@@ -46,8 +46,8 @@ INSTALL_REQUIRES = [
8 "PyYAML>=5.3.1,<6", 26 "PyYAML>=5.3.1,<6",
9 "pyserial>=3.4,<4", 27 "pyserial>=3.4,<4",
10 "netaddr>=0.7.19,<1", 28 "netaddr>=0.7.19,<1",
11- "watchdog==0.10.4", # watchdog dropped Py>3.6 on 0.10.5 point release... 29- "watchdog==0.10.4", # watchdog dropped Py>3.6 on 0.10.5 point release...
12- "sarge==0.1.5post0", 30- "sarge==0.1.5post0",
13+ "watchdog>=0.10.3", # watchdog dropped Py>3.6 on 0.10.5 point release... 31+ "watchdog>=0.10.3", # watchdog dropped Py>3.6 on 0.10.5 point release...
14+ "sarge>=0.1.5post0", 32+ "sarge>=0.1.5post0",
15 "netifaces>=0.10.9,<1", 33 "netifaces>=0.10.9,<1",
16 "pylru>=1.2,<2", 34 "pylru>=1.2,<2",
17 "pkginfo>=1.5.0.1,<2", 35 "pkginfo>=1.5.0.1,<2",
18@@ -63,7 +63,7 @@ INSTALL_REQUIRES = [ 36@@ -59,11 +59,11 @@ INSTALL_REQUIRES = [
 37 "websocket-client>=0.57,<1",
 38 "wrapt>=1.12.1,<2",
 39 "emoji>=0.5.4,<1",
 40- "sentry-sdk>=0.15.1,<1",
 41+ "sentry-sdk>=0.15.1",
19 "filetype>=1.0.7,<2", 42 "filetype>=1.0.7,<2",
20 "zipstream-new>=1.1.8,<1.2", 43 "zipstream-new>=1.1.8,<1.2",
21 # vendor bundled dependencies 44 # vendor bundled dependencies
22- "unidecode>=0.04.14,<0.05", # dependency of awesome-slugify 45- "unidecode>=0.04.14,<0.05", # dependency of awesome-slugify
23+ "unidecode>=0.04.14", # dependency of awesome-slugify 46+ "unidecode>=0.04.14", # dependency of awesome-slugify
24 "blinker>=1.4,<2", # dependency of flask_principal 47 "blinker>=1.4,<2", # dependency of flask_principal
25 ] 48 ]
26  49
27@@ -82,8 +82,8 @@ INSTALL_REQUIRES_PYTHON2 = [ 50@@ -82,8 +82,8 @@ INSTALL_REQUIRES_PYTHON2 = [
28 # Python 3 specific requirements 51 # Python 3 specific requirements
29 INSTALL_REQUIRES_PYTHON3 = [ 52 INSTALL_REQUIRES_PYTHON3 = [
30 "feedparser>=6.0.2,<7", 53 "feedparser>=6.0.2,<7",
31- "zeroconf>=0.24,<0.25", 54- "zeroconf>=0.24,<0.25",