* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
@ 2020-04-23 20:00 ` rien
2020-04-25 16:22 ` sgn
` (18 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-23 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 1152 bytes --]
From d85d461f4d80c262f43ff451a243becf088e5444 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
srcpkgs/alot/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..60134d66054 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,10 +1,9 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
@@ -13,4 +12,4 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
2020-04-23 20:00 ` [PR PATCH] [Updated] " rien
@ 2020-04-25 16:22 ` sgn
2020-04-25 16:29 ` rien
` (17 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: sgn @ 2020-04-25 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4420 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619404330
Comment:
I would love to have this as an addition:
```diff
...arning-is-with-a-literal.-from-Python-3.8.patch | 60 ++++++++++++++++++++++
srcpkgs/alot/template | 12 ++++-
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 0000000000..6d3aaf514e
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,60 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Upstream: https://github.com/pazz/alot/commit/916b446317980e9794a02bfb79456da4fc2768a4
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc5..ba0b4dbc 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ class BodyConvertCommand(Command):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95..4aaf28e7 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
+--
+2.26.2.526.g744177e7f7
+
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 60134d6605..f8fed37163 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -4,12 +4,22 @@ version=0.9
revision=1
archs=noarch
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
```
The check step is failing, though.
Can you check?
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
2020-04-23 20:00 ` [PR PATCH] [Updated] " rien
2020-04-25 16:22 ` sgn
@ 2020-04-25 16:29 ` rien
2020-04-25 16:33 ` [PR PATCH] [Updated] " rien
` (16 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-25 16:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 143 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619405329
Comment:
Sure!
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (2 preceding siblings ...)
2020-04-25 16:29 ` rien
@ 2020-04-25 16:33 ` rien
2020-04-25 17:38 ` rien
` (15 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-25 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 5260 bytes --]
From d85d461f4d80c262f43ff451a243becf088e5444 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH 1/2] alot: update to 0.9
---
srcpkgs/alot/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..60134d66054 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,10 +1,9 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
@@ -13,4 +12,4 @@ maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
From 3b44bdff5deae4b1ba19af9b1daf9e8396c5f70e Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Sat, 25 Apr 2020 18:33:18 +0200
Subject: [PATCH 2/2] alot: add patch to fix syntaxwarning
---
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 12 ++++-
2 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 60134d66054..f8fed371633 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -4,12 +4,22 @@ version=0.9
revision=1
archs=noarch
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (3 preceding siblings ...)
2020-04-25 16:33 ` [PR PATCH] [Updated] " rien
@ 2020-04-25 17:38 ` rien
2020-04-25 18:01 ` Piraty
` (14 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-25 17:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619415064
Comment:
Local install is indeed failing, I'll take a look tomorrow. Should I squash the results in a single commit or are multiple commits fine?
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (4 preceding siblings ...)
2020-04-25 17:38 ` rien
@ 2020-04-25 18:01 ` Piraty
2020-04-26 17:44 ` [PR PATCH] [Updated] " rien
` (13 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Piraty @ 2020-04-25 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619418180
Comment:
it's fine to squash them into the 'update' commit
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (5 preceding siblings ...)
2020-04-25 18:01 ` Piraty
@ 2020-04-26 17:44 ` rien
2020-04-26 17:52 ` rien
` (12 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-26 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 4255 bytes --]
From 61837a8737444dbf607ad30bdc8481c026daf698 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 19 +++++--
2 files changed, 66 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..f8fed371633 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,16 +1,25 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (6 preceding siblings ...)
2020-04-26 17:44 ` [PR PATCH] [Updated] " rien
@ 2020-04-26 17:52 ` rien
2020-04-26 23:32 ` Piraty
` (11 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-04-26 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619594484
Comment:
@sgn was able to reproduce the fail yesterday, but not anymore now. Even after `clean`ing and `zap`ing the repo with `xbps-src`.
I was also able to install the updated version on my own system using `xi alot` and the man page works fine. I guess this was only a temporary hiccup? Something that was recently updated?
Anyway, I've squashed the commit and this is ready to merge now.
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (7 preceding siblings ...)
2020-04-26 17:52 ` rien
@ 2020-04-26 23:32 ` Piraty
2020-05-02 18:19 ` rien
` (10 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: Piraty @ 2020-04-26 23:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-619642080
Comment:
tests fail
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (8 preceding siblings ...)
2020-04-26 23:32 ` Piraty
@ 2020-05-02 18:19 ` rien
2020-05-02 18:19 ` [PR PATCH] [Updated] " rien
` (9 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-02 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-622994157
Comment:
- 9 tests are failing, but they are 'expected' to fail (`OK (expected failures=9)`)
- I noticed that I couldn't reply because of an error, so I've also applied [this](https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55) patch.
- `$makejobs` was added.
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (9 preceding siblings ...)
2020-05-02 18:19 ` rien
@ 2020-05-02 18:19 ` rien
2020-05-02 21:18 ` rien
` (8 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-02 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 5791 bytes --]
From 0aa65d0eddea3098059bbecb346903910db4c201 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
...01-Update-reference-to-envelope.body.patch | 25 +++++++++
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 19 +++++--
3 files changed, 91 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
create mode 100644 srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
new file mode 100644
index 00000000000..110cfffe939
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
@@ -0,0 +1,25 @@
+From 28a4296c7f556c251d71d9502681980d46d9fa55 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc58120..aa1fd4368 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ async def _set_signature(self, ui):
+ mimetype = helper.guess_mimetype(sigcontent)
+ if mimetype.startswith('text'):
+ sigcontent = helper.try_decode(sigcontent)
+- self.envelope.body += '\n' + sigcontent
++ self.envelope.body_txt += '\n' + sigcontent
+ else:
+ ui.notify('could not locate signature: %s' % sig,
+ priority='error')
diff --git a/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..a445113cf9d 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,16 +1,25 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make $makejobs -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (10 preceding siblings ...)
2020-05-02 18:19 ` [PR PATCH] [Updated] " rien
@ 2020-05-02 21:18 ` rien
2020-05-02 23:09 ` rien
` (7 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-02 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 5807 bytes --]
From 1bd02748d08e67faaf931afbd98184d27685c5ca Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
...01-Update-reference-to-envelope.body.patch | 25 +++++++++
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 19 +++++--
3 files changed, 91 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
create mode 100644 srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
new file mode 100644
index 00000000000..110cfffe939
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
@@ -0,0 +1,25 @@
+From 28a4296c7f556c251d71d9502681980d46d9fa55 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc58120..aa1fd4368 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ async def _set_signature(self, ui):
+ mimetype = helper.guess_mimetype(sigcontent)
+ if mimetype.startswith('text'):
+ sigcontent = helper.try_decode(sigcontent)
+- self.envelope.body += '\n' + sigcontent
++ self.envelope.body_txt += '\n' + sigcontent
+ else:
+ ui.notify('could not locate signature: %s' % sig,
+ priority='error')
diff --git a/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..9c8c34c6659 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,16 +1,25 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends gpgme procps-ng"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make $makejobs -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (11 preceding siblings ...)
2020-05-02 21:18 ` rien
@ 2020-05-02 23:09 ` rien
2020-05-03 10:46 ` rien
` (6 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-02 23:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 5857 bytes --]
From 427b343ccfe96e7bdfd1f1a858252864fdacd6e3 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
...01-Update-reference-to-envelope.body.patch | 25 +++++++++
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 21 +++++---
3 files changed, 92 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
create mode 100644 srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
new file mode 100644
index 00000000000..110cfffe939
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
@@ -0,0 +1,25 @@
+From 28a4296c7f556c251d71d9502681980d46d9fa55 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc58120..aa1fd4368 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ async def _set_signature(self, ui):
+ mimetype = helper.guess_mimetype(sigcontent)
+ if mimetype.startswith('text'):
+ sigcontent = helper.try_decode(sigcontent)
+- self.envelope.body += '\n' + sigcontent
++ self.envelope.body_txt += '\n' + sigcontent
+ else:
+ ui.notify('could not locate signature: %s' % sig,
+ priority='error')
diff --git a/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..d8e1687770a 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,16 +1,25 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
- python3-gpg python3-magic python3-urwidtrees"
+ python3-gpg python3-magic python3-urwidtrees gnupg2"
+checkdepends="$depends procps-ng"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make $makejobs -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Updated] alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (12 preceding siblings ...)
2020-05-02 23:09 ` rien
@ 2020-05-03 10:46 ` rien
2020-05-03 12:41 ` sgn
` (5 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-03 10:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 373 bytes --]
There is an updated pull request by rien against master on the void-packages repository
https://github.com/rien/void-packages update-alot-0.9
https://github.com/void-linux/void-packages/pull/21266
alot: update to 0.9
The `pycompile_module` was removed because it is autodetected.
A patch file from https://github.com/void-linux/void-packages/pull/21266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-alot-0.9-21266.patch --]
[-- Type: text/x-diff, Size: 5808 bytes --]
From 457ce3afbff27073202cedd68679c7043cfd9e8f Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Thu, 23 Apr 2020 16:25:30 +0200
Subject: [PATCH] alot: update to 0.9
---
...01-Update-reference-to-envelope.body.patch | 25 +++++++++
...g-is-with-a-literal.-from-Python-3.8.patch | 52 +++++++++++++++++++
srcpkgs/alot/template | 19 +++++--
3 files changed, 91 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
create mode 100644 srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
diff --git a/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
new file mode 100644
index 00000000000..110cfffe939
--- /dev/null
+++ b/srcpkgs/alot/patches/0001-Update-reference-to-envelope.body.patch
@@ -0,0 +1,25 @@
+From 28a4296c7f556c251d71d9502681980d46d9fa55 Mon Sep 17 00:00:00 2001
+From: Patrick Totzke <patricktotzke@gmail.com>
+Date: Sun, 16 Feb 2020 10:24:59 +0000
+Subject: [PATCH] Update reference to envelope.body
+
+which now should be body_txt as of e067ea2037c10224645f0cb7ab2e020772e612ac
+
+fixes #1468
+---
+ alot/commands/globals.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/alot/commands/globals.py b/alot/commands/globals.py
+index f9dc58120..aa1fd4368 100644
+--- a/alot/commands/globals.py
++++ b/alot/commands/globals.py
+@@ -869,7 +869,7 @@ async def _set_signature(self, ui):
+ mimetype = helper.guess_mimetype(sigcontent)
+ if mimetype.startswith('text'):
+ sigcontent = helper.try_decode(sigcontent)
+- self.envelope.body += '\n' + sigcontent
++ self.envelope.body_txt += '\n' + sigcontent
+ else:
+ ui.notify('could not locate signature: %s' % sig,
+ priority='error')
diff --git a/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
new file mode 100644
index 00000000000..8e65d5575fd
--- /dev/null
+++ b/srcpkgs/alot/patches/0002-Fix-SyntaxWarning-is-with-a-literal.-from-Python-3.8.patch
@@ -0,0 +1,52 @@
+From 916b446317980e9794a02bfb79456da4fc2768a4 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Thu, 9 Apr 2020 02:26:27 -0700
+Subject: [PATCH] Fix 'SyntaxWarning: "is" with a literal.' from Python 3.8
+
+alot/alot/widgets/ansi.py:84: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if code is 0:
+alot/alot/commands/envelope.py:762: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ if self.action is "txt2html":
+alot/alot/commands/envelope.py:768: SyntaxWarning: "is" with a literal. Did you mean "=="?
+ elif self.action is "html2txt":
+
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955193
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+---
+ alot/commands/envelope.py | 4 ++--
+ alot/widgets/ansi.py | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
+index 9c2fbbc54..ba0b4dbc9 100644
+--- a/alot/commands/envelope.py
++++ b/alot/commands/envelope.py
+@@ -759,13 +759,13 @@ def apply(self, ui):
+ ebuffer = ui.current_buffer
+ envelope = ebuffer.envelope
+
+- if self.action is "txt2html":
++ if self.action == "txt2html":
+ fallbackcmd = settings.get('envelope_txt2html')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+ envelope.body_html = self.convert(cmd, envelope.body_txt)
+
+- elif self.action is "html2txt":
++ elif self.action == "html2txt":
+ fallbackcmd = settings.get('envelope_html2txt')
+ cmd = self.cmd or split_commandstring(fallbackcmd)
+ if cmd:
+diff --git a/alot/widgets/ansi.py b/alot/widgets/ansi.py
+index 97a4fb95c..4aaf28e7e 100644
+--- a/alot/widgets/ansi.py
++++ b/alot/widgets/ansi.py
+@@ -81,7 +81,7 @@ def parse_escapes_to_urwid(text, default_attr=None, default_attr_focus=None,
+ i = 0
+ while i < len(esc_code):
+ code = esc_code[i]
+- if code is 0:
++ if code == 0:
+ attr.update({'bold': default_attr.bold,
+ 'underline': default_attr.underline,
+ 'standout': default_attr.standout})
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index c8e29e36297..94b0b1b5a7a 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -1,16 +1,25 @@
# Template file for 'alot'
pkgname=alot
-version=0.8.1
-revision=2
+version=0.9
+revision=1
archs=noarch
build_style=python3-module
-pycompile_module="alot"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
+checkdepends="$depends gnupg2 procps-ng"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/pazz/alot"
distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
-checksum=823e2fae014c1036609068c6109042b676113a382eacbd04eb3dfa461ef53953
+checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
+patch_args="-Np1"
+
+post_build() {
+ make $makejobs -C docs man
+}
+
+post_install() {
+ vman docs/build/man/alot.1
+}
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (13 preceding siblings ...)
2020-05-03 10:46 ` rien
@ 2020-05-03 12:41 ` sgn
2020-05-03 14:03 ` rien
` (4 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: sgn @ 2020-05-03 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-623104143
Comment:
There're still 1 test failure, which I think not important.
```diff
diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template
index 94b0b1b5a7..c63da85a10 100644
--- a/srcpkgs/alot/template
+++ b/srcpkgs/alot/template
@@ -7,7 +7,7 @@ build_style=python3-module
hostmakedepends="python3-setuptools python3-Sphinx"
depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj
python3-gpg python3-magic python3-urwidtrees"
-checkdepends="$depends gnupg2 procps-ng"
+checkdepends="$depends gnupg2 procps-ng python3-pytest"
short_desc="Terminal-based mail user agent based on the notmuch mail indexer"
maintainer="Felix Van der Jeugt <felix.vanderjeugt@gmail.com>"
license="GPL-3.0-or-later"
@@ -16,6 +16,10 @@ distfiles="https://github.com/pazz/${pkgname}/archive/${version}.tar.gz"
checksum=64bfa2f550d775940348c93532bf5cbdde57b9fcec4bcf2447a72510d2add6cf
patch_args="-Np1"
+do_check() {
+ pytest3 -k 'not test_no_spawn_no_stdin_attached'
+}
+
post_build() {
make $makejobs -C docs man
}
```
I'll fix up this patch if @Piraty is fine with my suggestion to remove gpgme/gnupg2 out of `$depends`
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (14 preceding siblings ...)
2020-05-03 12:41 ` sgn
@ 2020-05-03 14:03 ` rien
2020-05-03 14:39 ` sgn
` (3 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-03 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-623115029
Comment:
I don't have that test failure, even after `zap`ing and bootstrapping the repo...
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (15 preceding siblings ...)
2020-05-03 14:03 ` rien
@ 2020-05-03 14:39 ` sgn
2020-05-03 16:15 ` rien
` (2 subsequent siblings)
19 siblings, 0 replies; 21+ messages in thread
From: sgn @ 2020-05-03 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-623120240
Comment:
I get that test failure if I run `./xbps-src check alot` inside `tmux`.
The check runs fine out of tmux.
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (16 preceding siblings ...)
2020-05-03 14:39 ` sgn
@ 2020-05-03 16:15 ` rien
2020-05-03 23:24 ` Piraty
2020-05-04 0:35 ` [PR PATCH] [Closed]: " sgn
19 siblings, 0 replies; 21+ messages in thread
From: rien @ 2020-05-03 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by rien on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-623134025
Comment:
I am running everything inside tmux, but the error you describe hasn't occurred here. I guess there is something going wrong very specific to your setup?
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (17 preceding siblings ...)
2020-05-03 16:15 ` rien
@ 2020-05-03 23:24 ` Piraty
2020-05-04 0:35 ` [PR PATCH] [Closed]: " sgn
19 siblings, 0 replies; 21+ messages in thread
From: Piraty @ 2020-05-03 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21266#issuecomment-623200568
Comment:
This PR is taking way too long!
1. make sure checkdepends is as complete as possible to not fail during `do_check()` as people may have `XBPS_CHECK_PKGS=yes`, else it breaks their builds.
This is not related to what the package actually depends on.
2. I'm fine with aligning the dependencies with mutt (not having gpg as a hard dependency)
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PR PATCH] [Closed]: alot: update to 0.9
2020-04-23 14:26 [PR PATCH] alot: update to 0.9 rien
` (18 preceding siblings ...)
2020-05-03 23:24 ` Piraty
@ 2020-05-04 0:35 ` sgn
19 siblings, 0 replies; 21+ messages in thread
From: sgn @ 2020-05-04 0:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
There's a closed pull request on the void-packages repository
alot: update to 0.9
https://github.com/void-linux/void-packages/pull/21266
Description:
The `pycompile_module` was removed because it is autodetected.
^ permalink raw reply [flat|nested] 21+ messages in thread