diff --git a/testing/octoprint/APKBUILD b/testing/octoprint/APKBUILD index 66944a2e52f..aaec2c0c2db 100644 --- a/testing/octoprint/APKBUILD +++ b/testing/octoprint/APKBUILD @@ -1,8 +1,8 @@ # Contributor: lauren n. liberda # Maintainer: lauren n. liberda pkgname=octoprint -pkgver=1.9.3 -pkgrel=4 +pkgver=1.10.0 +pkgrel=0 pkgdesc="Snappy web interface for your 3D printer" url="https://octoprint.org/" arch="noarch" @@ -54,7 +54,6 @@ depends=" makedepends=" py3-gpep517 py3-wheel - py3-python-versioneer " checkdepends=" py3-ddt @@ -67,10 +66,8 @@ subpackages=" $pkgname-openrc $pkgname-pyc " -# upstream produces volatile tarballs: https://github.com/OctoPrint/OctoPrint/issues/4908 -# https://github.com/OctoPrint/OctoPrint/archive/refs/tags/$pkgver/OctoPrint-$pkgver.tar.gz source=" - https://dev.alpinelinux.org/archive/octoprint/OctoPrint-$pkgver.tar.gz + https://github.com/OctoPrint/OctoPrint/releases/download/$pkgver/OctoPrint-$pkgver.source.tar.gz config.yaml octoprint.initd @@ -78,15 +75,9 @@ source=" fix-tests.patch netaddr-0.10.patch pydantic-2.0.patch - py3.12-typeparams.patch " builddir="$srcdir/OctoPrint-$pkgver" -prepare() { - default_prepare - rm versioneer.py -} - build() { gpep517 build-wheel \ --wheel-dir .dist \ @@ -109,11 +100,10 @@ package() { } sha512sums=" -ec2cc8e73c3ff4855c3e389259d87d196aadf4a55f35ccef87b1ef59a0d832a29c52c4ab28db833b5ec275c5270fefb35e4c4769d692e004828b58aa6241c044 OctoPrint-1.9.3.tar.gz +e7aece7014e2c7b3c202a2fcbb6a2c43b6b15c2ae9d2534b454d4240e58512d94c66d556d8852e0c0c666864c075fa9cc4b0027ce7a5ce9239bdb97d2d1f8106 OctoPrint-1.10.0.source.tar.gz b56a37d1225d37caff1288b9c943ee86ed1f36653bbb311c835031e53e5f68e95be3ad9b53d333aad65508ba2a3ba786f80601bd74fef8efb1c3364a8fd85010 config.yaml 3edd9971cc59fb66126f063ecac50a77792c5a3f5b718e03b7cbff74ff9f842c7784e7de2a56fb2e847a2bcb8e1c4fcfc52f8d236cdf3ecd511b230eea001162 octoprint.initd d678b87aaee4529b4d96f496862e5bec86df98491330328848ac06fec8d1f4571cfac995b2e9de26dcd2efc43b9dc24578d7f50cae1893fefc76470aee074f14 fix-tests.patch f99c752dccdee4821a88ac6e7ea98ac906002d734d2672bbd513b30d596b0c54b699071679581cdc46bfcd0eb98d6d032243a6d940f64620a69623a65db229bf netaddr-0.10.patch ed0bebc3632519b0adab58f6ef4666e0192ab72021f2c127146eec9c566551f04c49f05ace5a4056177f21605064146ac6259a88db15faaf88853fd3750abe88 pydantic-2.0.patch -6845a07fbe7776b7f29a2d2a532fe5f230d40ab74705aa6dff50b777e2ac603fd88e1f5434323285895e2a8705f54c8a2970228ee1309a746e7a921229e8de4b py3.12-typeparams.patch " diff --git a/testing/octoprint/py3.12-typeparams.patch b/testing/octoprint/py3.12-typeparams.patch deleted file mode 100644 index f1f7d6ceb2c..00000000000 --- a/testing/octoprint/py3.12-typeparams.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0718dfb68eaae5d9547690458c6f33b3243d9d44 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= -Date: Wed, 4 Oct 2023 13:35:56 +0200 -Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20Fix=203.12=20unit=20tests?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - src/octoprint/plugin/core.py | 5 ++++- - tests/plugin/test_settings.py | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py -index 297386e4a9..b793f401d0 100644 ---- a/src/octoprint/plugin/core.py -+++ b/src/octoprint/plugin/core.py -@@ -115,7 +115,10 @@ def extract_names(node): - for a in reversed(assignments): - targets = extract_target_ids(a) - if key in targets: -- if isinstance(a.value, ast.Str): -+ if isinstance(a.value, ast.Constant): -+ result[key] = a.value.value -+ -+ elif isinstance(a.value, ast.Str): - result[key] = a.value.s - - elif ( -diff --git a/tests/plugin/test_settings.py b/tests/plugin/test_settings.py -index 6d5a3d4281..36f52182d1 100644 ---- a/tests/plugin/test_settings.py -+++ b/tests/plugin/test_settings.py -@@ -111,6 +111,7 @@ def test_deprecated_forwarded_getter( - called_method.__name__ = forwarded - called_method.__qualname__ = forwarded - called_method.__annotations__ = {} -+ called_method.__type_params__ = () - - method = getattr(plugin_settings, deprecated) - assert callable(method) -@@ -330,6 +331,7 @@ def test_deprecated_forwarded_setter( - called_method.__name__ = forwarded - called_method.__qualname__ = forwarded - called_method.__annotations__ = {} -+ called_method.__type_params__ = () - - method = getattr(plugin_settings, deprecated) - assert callable(method)