Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nyx: unbreak for python 3.11, adopt.
@ 2022-11-11 15:44 steinex
  2022-11-14 16:21 ` [PR REVIEW] " paper42
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: steinex @ 2022-11-11 15:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]

There is a new pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages nyx
https://github.com/void-linux/void-packages/pull/40470

nyx: unbreak for python 3.11, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40470.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyx-40470.patch --]
[-- Type: text/x-diff, Size: 2875 bytes --]

From 4380a72104147add7f4bf8c3679af73fb1d61711 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 10 Nov 2022 15:25:11 +0100
Subject: [PATCH] nyx: unbreak for python 3.11, adopt.

---
 .../nyx/patches/unbreak-for-python-3.11.patch | 36 +++++++++++++++++++
 srcpkgs/nyx/template                          | 10 ++++--
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nyx/patches/unbreak-for-python-3.11.patch

diff --git a/srcpkgs/nyx/patches/unbreak-for-python-3.11.patch b/srcpkgs/nyx/patches/unbreak-for-python-3.11.patch
new file mode 100644
index 000000000000..28aef293a3f0
--- /dev/null
+++ b/srcpkgs/nyx/patches/unbreak-for-python-3.11.patch
@@ -0,0 +1,36 @@
+From dcaddf2ab7f9d2ef8649f98bb6870995ebe0b893 Mon Sep 17 00:00:00 2001
+From: Juan Orti Alcaine <jortialc@redhat.com>
+Date: Mon, 27 Jun 2022 19:38:34 +0200
+Subject: [PATCH] Replace inspect.getargspec usage to support python 3.11
+
+---
+ nyx/panel/__init__.py | 2 +-
+ test/__init__.py      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
+index 57ae1e30..99b36d38 100644
+--- a/nyx/panel/__init__.py
++++ b/nyx/panel/__init__.py
+@@ -78,7 +78,7 @@ def handle(self, key):
+       is_match = self._key_func(key) if self._key_func else key.match(self.key)
+ 
+       if is_match:
+-        if inspect.getargspec(self._action).args == ['key']:
++        if inspect.getfullargspec(self._action).args == ['key']:
+           self._action(key)
+         else:
+           self._action()
+diff --git a/test/__init__.py b/test/__init__.py
+index b259f7b8..d9f0875c 100644
+--- a/test/__init__.py
++++ b/test/__init__.py
+@@ -94,7 +94,7 @@ def draw_func():
+     nyx.curses.CURSES_SCREEN.erase()
+     start_time = time.time()
+ 
+-    func_args = inspect.getargspec(func).args
++    func_args = inspect.getfullargspec(func).args
+ 
+     if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']:
+       def _draw(subwindow):
diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index 78b3f58ae0d3..a8421cd8c6ce 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -1,14 +1,18 @@
 # Template file for 'nyx'
 pkgname=nyx
 version=2.1.0
-revision=5
+revision=6
 build_style=python3-module
-pycompile_module="nyx"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-stem tor"
+checkdepends="ncurses-base python3-wheel python3-pip python3-stem"
 short_desc="Command-line status monitor for tor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://nyx.torproject.org/"
 distfiles="${PYPI_SITE}/n/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=88521488d1c9052e457b9e66498a4acfaaa3adf3adc5a199892632f129a5390b
+
+do_check() {
+	./run_tests.py
+}

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-12-18 11:06 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-11 15:44 [PR PATCH] nyx: unbreak for python 3.11, adopt steinex
2022-11-14 16:21 ` [PR REVIEW] " paper42
2022-11-14 16:21 ` paper42
2022-11-14 16:21 ` paper42
2022-11-22  8:48 ` steinex
2022-11-22 10:37 ` paper42
2022-12-14  8:05 ` [PR PATCH] [Updated] " steinex
2022-12-14  8:07 ` steinex
2022-12-14  8:28 ` steinex
2022-12-14  8:42 ` [PR REVIEW] " steinex
2022-12-14  9:22 ` paper42
2022-12-14  9:25 ` [PR PATCH] [Updated] " steinex
2022-12-14  9:49 ` steinex
2022-12-18 11:06 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).