CVS commit: pkgsrc/print/py-octoprint

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

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue Dec  7 10:51:22 UTC 2021

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

Log Message:
py-octoprint: fix dependencies

Bumps PKGREVISION.

Thanks wiz@ for the heads up!


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/py-octoprint/Makefile \
    pkgsrc/print/py-octoprint/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/py-octoprint/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/print/py-octoprint/Makefile
diff -u pkgsrc/print/py-octoprint/Makefile:1.4 pkgsrc/print/py-octoprint/Makefile:1.5
--- pkgsrc/print/py-octoprint/Makefile:1.4      Sun Aug 29 20:00:43 2021
+++ pkgsrc/print/py-octoprint/Makefile  Tue Dec  7 10:51:22 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/08/29 20:00:43 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2021/12/07 10:51:22 khorben Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 PKGNAME=       ${PYPKGPREFIX}-octoprint-1.6.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OctoPrint/}
 GITHUB_PROJECT=        OctoPrint
@@ -29,7 +29,6 @@ DEPENDS+=     ${PYPKGPREFIX}-flask-babel>=1.
 DEPENDS+=      ${PYPKGPREFIX}-flask-login>=0.5:../../www/py-flask-login
 DEPENDS+=      ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
 DEPENDS+=      ${PYPKGPREFIX}-immutabledict>=2.0.0:../../devel/py-immutabledict
-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
Index: pkgsrc/print/py-octoprint/distinfo
diff -u pkgsrc/print/py-octoprint/distinfo:1.4 pkgsrc/print/py-octoprint/distinfo:1.5
--- pkgsrc/print/py-octoprint/distinfo:1.4      Tue Oct 26 11:12:14 2021
+++ pkgsrc/print/py-octoprint/distinfo  Tue Dec  7 10:51:22 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:12:14 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/12/07 10:51:22 khorben Exp $
 
 BLAKE2s (OctoPrint-1.6.1.tar.gz) = 7cef202ac3c03f93060546e177cb6568fbc734224894d4f3bf83517635c846bf
 SHA512 (OctoPrint-1.6.1.tar.gz) = 4b485ea395c9012f79dd772971cfb9c3b90676d147887560bc618597f898af65bae838522a7ead75e08563d7c61a98c8b63d71c605d1c73e7b8dbd51e8090680
 Size (OctoPrint-1.6.1.tar.gz) = 6174286 bytes
-SHA1 (patch-setup.py) = ffecbfba1b52f19dfa1fd95daa9d1799fc7ae769
+SHA1 (patch-setup.py) = e205a683e90120c94ac7309dd5d8b5eb00a31b2e
 SHA1 (patch-src_octoprint_util_comm.py) = 6f73998c3b51a17436e16b9a86b1e8b368f6cd2c

Index: pkgsrc/print/py-octoprint/patches/patch-setup.py
diff -u pkgsrc/print/py-octoprint/patches/patch-setup.py:1.2 pkgsrc/print/py-octoprint/patches/patch-setup.py:1.3
--- pkgsrc/print/py-octoprint/patches/patch-setup.py:1.2        Sun May 30 21:53:11 2021
+++ pkgsrc/print/py-octoprint/patches/patch-setup.py    Tue Dec  7 10:51:22 2021
@@ -1,9 +1,27 @@
-$NetBSD: patch-setup.py,v 1.2 2021/05/30 21:53:11 khorben Exp $
+$NetBSD: patch-setup.py,v 1.3 2021/12/07 10:51:22 khorben Exp $
 
 Override some version checks
 
 --- setup.py.orig      2021-05-10 09:44:33.000000000 +0000
 +++ setup.py
+@@ -19,7 +19,7 @@ import octoprint_setuptools  # noqa: F40
+ PYTHON_REQUIRES = ">=2.7.9, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
+ 
+ # Requirements for setup.py
+-SETUP_REQUIRES = ["markdown>=3.1,<3.2"]  # newer versions require Python 3
++SETUP_REQUIRES = ["markdown>=3.1"]  # newer versions require Python 3
+ 
+ # Requirements for our application
+ INSTALL_REQUIRES = [
+@@ -32,7 +32,7 @@ INSTALL_REQUIRES = [
+     # other observed problems
+     "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
++    "markdown>=3.1",  # 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",
 @@ -46,8 +46,8 @@ INSTALL_REQUIRES = [
      "PyYAML>=5.3.1,<6",
      "pyserial>=3.4,<4",
@@ -15,7 +33,12 @@ Override some version checks
      "netifaces>=0.10.9,<1",
      "pylru>=1.2,<2",
      "pkginfo>=1.5.0.1,<2",
-@@ -63,7 +63,7 @@ INSTALL_REQUIRES = [
+@@ -59,11 +59,11 @@ INSTALL_REQUIRES = [
+     "websocket-client>=0.57,<1",
+     "wrapt>=1.12.1,<2",
+     "emoji>=0.5.4,<1",
+-    "sentry-sdk>=0.15.1,<1",
++    "sentry-sdk>=0.15.1",
      "filetype>=1.0.7,<2",
      "zipstream-new>=1.1.8,<1.2",
      # vendor bundled dependencies