* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
@ 2022-08-10 17:10 ` dataCobra
2022-08-10 17:15 ` [PR PATCH] [Updated] " dataCobra
` (60 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-10 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211007899
Comment:
Sadly the last PR #32292 doesn't explain why the make_check=ci_skip is added.
What do I need to do for xlint to not fail?
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
2022-08-10 17:10 ` dataCobra
@ 2022-08-10 17:15 ` dataCobra
2022-08-10 17:16 ` dataCobra
` (59 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-10 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 1229 bytes --]
From ce352c6dde327fe9d45a31ec119d15ea6e8f663b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 10 Aug 2022 19:14:31 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..6ddfac12ac6a 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-click python3-click-log python3-configobj
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
pre_build() {
vsed -i setup.py \
@@ -23,6 +22,5 @@ pre_build() {
}
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
2022-08-10 17:10 ` dataCobra
2022-08-10 17:15 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-10 17:16 ` dataCobra
2022-08-10 18:50 ` paper42
` (58 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-10 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211007899
Comment:
Sadly the last PR #32292 doesn't explain why the make_check=ci_skip is added.
What do I need to do for xlint to not fail?
EDIT: I removed the line for testing purposes and force-pushed.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (2 preceding siblings ...)
2022-08-10 17:16 ` dataCobra
@ 2022-08-10 18:50 ` paper42
2022-08-10 18:51 ` paper42
` (57 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: paper42 @ 2022-08-10 18:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211125374
Comment:
> Failed: DID NOT RAISE <class 'khal.khalendar.exceptions.CouldNotCreateDbDir'>
It seems like it's trying to chmod and create some directories in a place where it shouldn't be possible which succeeds in CI because there, it runs as root.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (3 preceding siblings ...)
2022-08-10 18:50 ` paper42
@ 2022-08-10 18:51 ` paper42
2022-08-11 4:41 ` classabbyamp
` (56 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: paper42 @ 2022-08-10 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211125374
Comment:
> Failed: DID NOT RAISE <class 'khal.khalendar.exceptions.CouldNotCreateDbDir'>
It seems like it's trying to chmod and create some directories in a place where it shouldn't be possible which succeeds in CI because there, it runs as root.
> What do I need to do for xlint to not fail?
Add a comment why it's happening - something like `# some tests fail when running as root`
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (4 preceding siblings ...)
2022-08-10 18:51 ` paper42
@ 2022-08-11 4:41 ` classabbyamp
2022-08-11 4:48 ` [PR PATCH] [Updated] " dataCobra
` (55 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 4:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211547789
Comment:
> CHANGE we are not shipping a zsh completion file anymore but provide documentation on how to generate completion files for bash, zsh, and fish (see the install section of the documentation)
>
> Packagers: please generate and ship those completion files if possible
`__khal` was removed because it got replaced by this mechanism
also, please add the changelog: https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst
cc maintainer @Anachron
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (5 preceding siblings ...)
2022-08-11 4:41 ` classabbyamp
@ 2022-08-11 4:48 ` dataCobra
2022-08-11 4:54 ` dataCobra
` (54 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 4:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 1344 bytes --]
From 02c145800884f0642e3ff53e9df8903692d75e7e Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 06:48:04 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..bf3f8fe28d60 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-click python3-click-log python3-configobj
@@ -13,16 +13,16 @@ maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (6 preceding siblings ...)
2022-08-11 4:48 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-11 4:54 ` dataCobra
2022-08-11 4:59 ` classabbyamp
` (53 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 4:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1004 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211552531
Comment:
> > CHANGE we are not shipping a zsh completion file anymore but provide documentation on how to generate completion files for bash, zsh, and fish (see the install section of the documentation)
> > Packagers: please generate and ship those completion files if possible
>
> `__khal` was removed because it got replaced by this mechanism
Oh, that's what I was looking for yesterday. Thank you for finding it! I read two changelogs
yesterday about 0.10.5 and none of these had this info. Because of this I just removed the
file.
I'll try to get this implemented.
>
> also, please add the changelog: https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst
Where do you want me to add the CHANGELOG.rst? -> `usr/share/doc/`?
I've also tried to create the manpage, but I couldn't really figure out how to do it the best way.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (7 preceding siblings ...)
2022-08-11 4:54 ` dataCobra
@ 2022-08-11 4:59 ` classabbyamp
2022-08-11 5:03 ` classabbyamp
` (52 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 4:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211554106
Comment:
just `changelog="url"` in the template
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (8 preceding siblings ...)
2022-08-11 4:59 ` classabbyamp
@ 2022-08-11 5:03 ` classabbyamp
2022-08-11 5:19 ` dataCobra
` (51 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211555918
Comment:
https://github.com/pimutils/khal/blob/master/doc/source/install.rst#shell-completion
just add the commands that redirect to a file, then vcomplete those files in post_install
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (9 preceding siblings ...)
2022-08-11 5:03 ` classabbyamp
@ 2022-08-11 5:19 ` dataCobra
2022-08-11 5:25 ` dataCobra
` (50 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 607 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211562124
Comment:
> https://github.com/pimutils/khal/blob/master/doc/source/install.rst#shell-completion
>
> just add the commands that redirect to a file, then vcomplete those files in post_install
I assumed you mean that and I tried, but the options for khal that are autocompleted doesn't
even work... I've also installed directly into a virtualenv with pip to check if the behavior
is different. But it's the same. The completed options are not implemented in khal.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (10 preceding siblings ...)
2022-08-11 5:19 ` dataCobra
@ 2022-08-11 5:25 ` dataCobra
2022-08-11 5:27 ` [PR PATCH] [Updated] " dataCobra
` (49 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211562124
Comment:
> https://github.com/pimutils/khal/blob/master/doc/source/install.rst#shell-completion
>
> just add the commands that redirect to a file, then vcomplete those files in post_install
I assumed you mean that and I tried, but the options for khal that are autocompleted doesn't
even work... I've also installed directly into a virtualenv with pip to check if the behavior
is different. But it's the same. The completed options are not implemented in khal.
EDIT:
Here is an error message:
```
Error: Got unexpected extra argument (configure)
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (11 preceding siblings ...)
2022-08-11 5:25 ` dataCobra
@ 2022-08-11 5:27 ` dataCobra
2022-08-11 5:29 ` dataCobra
` (48 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 4966 bytes --]
From e498185356f69213897c9e03b4c27884dfa814cd Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 07:27:11 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/files/khal.bash | 29 +++++++++++++++++++++++++++++
srcpkgs/khal/files/khal.fish | 22 ++++++++++++++++++++++
srcpkgs/khal/files/khal.zsh | 35 +++++++++++++++++++++++++++++++++++
srcpkgs/khal/template | 14 +++++++++-----
4 files changed, 95 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/khal/files/khal.bash
create mode 100644 srcpkgs/khal/files/khal.fish
create mode 100644 srcpkgs/khal/files/khal.zsh
diff --git a/srcpkgs/khal/files/khal.bash b/srcpkgs/khal/files/khal.bash
new file mode 100644
index 000000000000..1a8fd294fdf9
--- /dev/null
+++ b/srcpkgs/khal/files/khal.bash
@@ -0,0 +1,29 @@
+_khal_completion() {
+ local IFS=$'\n'
+ local response
+
+ response=$(env COMP_WORDS="${COMP_WORDS[*]}" COMP_CWORD=$COMP_CWORD _KHAL_COMPLETE=bash_complete $1)
+
+ for completion in $response; do
+ IFS=',' read type value <<< "$completion"
+
+ if [[ $type == 'dir' ]]; then
+ COMPREPLY=()
+ compopt -o dirnames
+ elif [[ $type == 'file' ]]; then
+ COMPREPLY=()
+ compopt -o default
+ elif [[ $type == 'plain' ]]; then
+ COMPREPLY+=($value)
+ fi
+ done
+
+ return 0
+}
+
+_khal_completion_setup() {
+ complete -o nosort -F _khal_completion khal
+}
+
+_khal_completion_setup;
+
diff --git a/srcpkgs/khal/files/khal.fish b/srcpkgs/khal/files/khal.fish
new file mode 100644
index 000000000000..9c02b4052bb5
--- /dev/null
+++ b/srcpkgs/khal/files/khal.fish
@@ -0,0 +1,22 @@
+function _khal_completion;
+ set -l response;
+
+ for value in (env _KHAL_COMPLETE=fish_complete COMP_WORDS=(commandline -cp) COMP_CWORD=(commandline -t) khal);
+ set response $response $value;
+ end;
+
+ for completion in $response;
+ set -l metadata (string split "," $completion);
+
+ if test $metadata[1] = "dir";
+ __fish_complete_directories $metadata[2];
+ else if test $metadata[1] = "file";
+ __fish_complete_path $metadata[2];
+ else if test $metadata[1] = "plain";
+ echo $metadata[2];
+ end;
+ end;
+end;
+
+complete --no-files --command khal --arguments "(_khal_completion)";
+
diff --git a/srcpkgs/khal/files/khal.zsh b/srcpkgs/khal/files/khal.zsh
new file mode 100644
index 000000000000..21ce8b86c3b5
--- /dev/null
+++ b/srcpkgs/khal/files/khal.zsh
@@ -0,0 +1,35 @@
+#compdef khal
+
+_khal_completion() {
+ local -a completions
+ local -a completions_with_descriptions
+ local -a response
+ (( ! $+commands[khal] )) && return 1
+
+ response=("${(@f)$(env COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) _KHAL_COMPLETE=zsh_complete khal)}")
+
+ for type key descr in ${response}; do
+ if [[ "$type" == "plain" ]]; then
+ if [[ "$descr" == "_" ]]; then
+ completions+=("$key")
+ else
+ completions_with_descriptions+=("$key":"$descr")
+ fi
+ elif [[ "$type" == "dir" ]]; then
+ _path_files -/
+ elif [[ "$type" == "file" ]]; then
+ _path_files -f
+ fi
+ done
+
+ if [ -n "$completions_with_descriptions" ]; then
+ _describe -V unsorted completions_with_descriptions -U
+ fi
+
+ if [ -n "$completions" ]; then
+ compadd -U -V unsorted -a completions
+ fi
+}
+
+compdef _khal_completion khal;
+
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..48e3de880a4b 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-click python3-click-log python3-configobj
@@ -11,18 +11,22 @@ checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
homepage="http://lostpackets.de/khal/"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ vcompletion "${FILESDIR}/khal.bash" bash
+ vcompletion "${FILESDIR}/khal.fish" fish
+ vcompletion "${FILESDIR}/khal.zsh" zsh
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (12 preceding siblings ...)
2022-08-11 5:27 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-11 5:29 ` dataCobra
2022-08-11 5:41 ` dataCobra
` (47 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 4897 bytes --]
From 04dc9a9e4fd7dd9a5891ed2c58917b8fa31032d2 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 07:29:09 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/files/khal.bash | 29 +++++++++++++++++++++++++++++
srcpkgs/khal/files/khal.fish | 22 ++++++++++++++++++++++
srcpkgs/khal/files/khal.zsh | 35 +++++++++++++++++++++++++++++++++++
srcpkgs/khal/template | 14 +++++++++-----
4 files changed, 95 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/khal/files/khal.bash
create mode 100644 srcpkgs/khal/files/khal.fish
create mode 100644 srcpkgs/khal/files/khal.zsh
diff --git a/srcpkgs/khal/files/khal.bash b/srcpkgs/khal/files/khal.bash
new file mode 100644
index 000000000000..1a8fd294fdf9
--- /dev/null
+++ b/srcpkgs/khal/files/khal.bash
@@ -0,0 +1,29 @@
+_khal_completion() {
+ local IFS=$'\n'
+ local response
+
+ response=$(env COMP_WORDS="${COMP_WORDS[*]}" COMP_CWORD=$COMP_CWORD _KHAL_COMPLETE=bash_complete $1)
+
+ for completion in $response; do
+ IFS=',' read type value <<< "$completion"
+
+ if [[ $type == 'dir' ]]; then
+ COMPREPLY=()
+ compopt -o dirnames
+ elif [[ $type == 'file' ]]; then
+ COMPREPLY=()
+ compopt -o default
+ elif [[ $type == 'plain' ]]; then
+ COMPREPLY+=($value)
+ fi
+ done
+
+ return 0
+}
+
+_khal_completion_setup() {
+ complete -o nosort -F _khal_completion khal
+}
+
+_khal_completion_setup;
+
diff --git a/srcpkgs/khal/files/khal.fish b/srcpkgs/khal/files/khal.fish
new file mode 100644
index 000000000000..9c02b4052bb5
--- /dev/null
+++ b/srcpkgs/khal/files/khal.fish
@@ -0,0 +1,22 @@
+function _khal_completion;
+ set -l response;
+
+ for value in (env _KHAL_COMPLETE=fish_complete COMP_WORDS=(commandline -cp) COMP_CWORD=(commandline -t) khal);
+ set response $response $value;
+ end;
+
+ for completion in $response;
+ set -l metadata (string split "," $completion);
+
+ if test $metadata[1] = "dir";
+ __fish_complete_directories $metadata[2];
+ else if test $metadata[1] = "file";
+ __fish_complete_path $metadata[2];
+ else if test $metadata[1] = "plain";
+ echo $metadata[2];
+ end;
+ end;
+end;
+
+complete --no-files --command khal --arguments "(_khal_completion)";
+
diff --git a/srcpkgs/khal/files/khal.zsh b/srcpkgs/khal/files/khal.zsh
new file mode 100644
index 000000000000..21ce8b86c3b5
--- /dev/null
+++ b/srcpkgs/khal/files/khal.zsh
@@ -0,0 +1,35 @@
+#compdef khal
+
+_khal_completion() {
+ local -a completions
+ local -a completions_with_descriptions
+ local -a response
+ (( ! $+commands[khal] )) && return 1
+
+ response=("${(@f)$(env COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) _KHAL_COMPLETE=zsh_complete khal)}")
+
+ for type key descr in ${response}; do
+ if [[ "$type" == "plain" ]]; then
+ if [[ "$descr" == "_" ]]; then
+ completions+=("$key")
+ else
+ completions_with_descriptions+=("$key":"$descr")
+ fi
+ elif [[ "$type" == "dir" ]]; then
+ _path_files -/
+ elif [[ "$type" == "file" ]]; then
+ _path_files -f
+ fi
+ done
+
+ if [ -n "$completions_with_descriptions" ]; then
+ _describe -V unsorted completions_with_descriptions -U
+ fi
+
+ if [ -n "$completions" ]; then
+ compadd -U -V unsorted -a completions
+ fi
+}
+
+compdef _khal_completion khal;
+
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..6b74897878f3 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-click python3-click-log python3-configobj
@@ -12,17 +12,21 @@ short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ vcompletion "${FILESDIR}/khal.bash" bash
+ vcompletion "${FILESDIR}/khal.fish" fish
+ vcompletion "${FILESDIR}/khal.zsh" zsh
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (13 preceding siblings ...)
2022-08-11 5:29 ` dataCobra
@ 2022-08-11 5:41 ` dataCobra
2022-08-11 5:41 ` dataCobra
` (46 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211571633
Comment:
This software does need further testing. I don't know yet what is causing the problems.
I'll investigate further.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (14 preceding siblings ...)
2022-08-11 5:41 ` dataCobra
@ 2022-08-11 5:41 ` dataCobra
2022-08-11 5:42 ` Anachron
` (45 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211571633
Comment:
This software does need further testing. I don't know yet what is causing these problems.
I'll investigate further.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (15 preceding siblings ...)
2022-08-11 5:41 ` dataCobra
@ 2022-08-11 5:42 ` Anachron
2022-08-11 5:42 ` Anachron
` (44 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: Anachron @ 2022-08-11 5:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by Anachron on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211571881
Comment:
This looks fine to me, do you want me to test it or just wanted to notify me?
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (16 preceding siblings ...)
2022-08-11 5:42 ` Anachron
@ 2022-08-11 5:42 ` Anachron
2022-08-11 6:07 ` classabbyamp
` (43 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: Anachron @ 2022-08-11 5:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by Anachron on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211571881
Comment:
This looks fine to me, do you want me to test it or just wanted to notify me?
Edit: Ok just tell me when you need my help.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (17 preceding siblings ...)
2022-08-11 5:42 ` Anachron
@ 2022-08-11 6:07 ` classabbyamp
2022-08-11 6:09 ` classabbyamp
` (42 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 6:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211584398
Comment:
this seems to give completions files that work (tested zsh)
```diff
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 6b74897878..2f6331ed31 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -3,10 +3,10 @@ pkgname=khal
version=0.10.5
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
+hostmakedepends="python3-setuptools python3-click python3-click-log python3-configobj
python3-dateutil python3-icalendar python3-pytz python3-tzlocal
python3-urwid python3-xdg python3-atomicwrites"
+depends="$hostmakedepends"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
@@ -25,8 +25,9 @@ pre_build() {
post_install() {
vlicense COPYING
- vcompletion "${FILESDIR}/khal.bash" bash
- vcompletion "${FILESDIR}/khal.fish" fish
- vcompletion "${FILESDIR}/khal.zsh" zsh
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
}
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (18 preceding siblings ...)
2022-08-11 6:07 ` classabbyamp
@ 2022-08-11 6:09 ` classabbyamp
2022-08-11 7:37 ` dataCobra
` (41 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211584398
Comment:
this seems to give completions files that work (tested zsh), and it doesn't require vendoring the files in filesdir
```diff
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 6b74897878..2f6331ed31 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -3,10 +3,10 @@ pkgname=khal
version=0.10.5
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
+hostmakedepends="python3-setuptools python3-click python3-click-log python3-configobj
python3-dateutil python3-icalendar python3-pytz python3-tzlocal
python3-urwid python3-xdg python3-atomicwrites"
+depends="$hostmakedepends"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
@@ -25,8 +25,9 @@ pre_build() {
post_install() {
vlicense COPYING
- vcompletion "${FILESDIR}/khal.bash" bash
- vcompletion "${FILESDIR}/khal.fish" fish
- vcompletion "${FILESDIR}/khal.zsh" zsh
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
}
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (19 preceding siblings ...)
2022-08-11 6:09 ` classabbyamp
@ 2022-08-11 7:37 ` dataCobra
2022-08-11 7:37 ` [PR PATCH] [Updated] " dataCobra
` (40 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211647163
Comment:
Well, I should've used a testuser for this purpose and not my main user. The dotfiles on my
main user where the reason for the problems while testing...
Lesson learned. I'll use a testuser from now on.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (20 preceding siblings ...)
2022-08-11 7:37 ` dataCobra
@ 2022-08-11 7:37 ` dataCobra
2022-08-11 7:39 ` dataCobra
` (39 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 1951 bytes --]
From 3be68295124e9e6f213a9b5c2b5e131388050f6b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 09:37:30 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..2f6331ed3198 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,33 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
+hostmakedepends="python3-setuptools python3-click python3-click-log python3-configobj
python3-dateutil python3-icalendar python3-pytz python3-tzlocal
python3-urwid python3-xdg python3-atomicwrites"
+depends="$hostmakedepends"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (21 preceding siblings ...)
2022-08-11 7:37 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-11 7:39 ` dataCobra
2022-08-11 7:39 ` dataCobra
` (38 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211648918
Comment:
Thanks a lot for the help. I've learned so much while updating this package.
I pushed the final version of template now.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (22 preceding siblings ...)
2022-08-11 7:39 ` dataCobra
@ 2022-08-11 7:39 ` dataCobra
2022-08-11 7:41 ` dataCobra
` (37 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211648918
Comment:
Thanks a lot for the help. I've learned so much while updating this package.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (23 preceding siblings ...)
2022-08-11 7:39 ` dataCobra
@ 2022-08-11 7:41 ` dataCobra
2022-08-11 7:50 ` dataCobra
` (36 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211650273
Comment:
The next step is to get the creation of the manpage working for khal.
At the moment I've no idea how to accomplish that.
For that I'll create a new PR.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (24 preceding siblings ...)
2022-08-11 7:41 ` dataCobra
@ 2022-08-11 7:50 ` dataCobra
2022-08-11 7:57 ` classabbyamp
` (35 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 7:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211647163
Comment:
Well, I should've used a testuser for this purpose and not my main user. The dotfiles on my
main user where the reason for the problems while testing...
Lesson learned. I'll use a testuser from now on.
EDIT: I've checked my bash aliases for possible khal stuff...
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (25 preceding siblings ...)
2022-08-11 7:50 ` dataCobra
@ 2022-08-11 7:57 ` classabbyamp
2022-08-11 8:16 ` dataCobra
` (34 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-11 7:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211665350
Comment:
```
cd doc
make man
```
should do it, but you may need some more hostmakedepends for it to work
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (26 preceding siblings ...)
2022-08-11 7:57 ` classabbyamp
@ 2022-08-11 8:16 ` dataCobra
2022-08-11 8:41 ` dataCobra
` (33 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2196 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211681698
Comment:
I've tried to add this in, but Sphinx can't find the khal module when it tries to import.
```diff
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 2f6331ed31..f06be57363 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -3,10 +3,13 @@ pkgname=khal
version=0.10.5
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
-depends="$hostmakedepends"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
@@ -30,4 +33,6 @@ post_install() {
vcompletion "khal.${sh}" $sh
done
vsconf khal.conf.sample
+ cd doc/
+ make man
}
```
The following error message is stopping the process:
```python
sphinx-build -b man -d build/doctrees source build/man
Running Sphinx v5.0.2
Configuration error:
There is a programmable error in your configuration file:
Traceback (most recent call last):
Traceback (most recent call last):
File "/usr/lib/python3.10/site-packages/sphinx/config.py", line 343, in eval_config_file
exec(code, namespace)
File "/builddir/khal-0.10.5/doc/source/conf.py", line 17, in <module>
import khal
ModuleNotFoundError: No module named 'khal'
make: *** [Makefile:131: man] Error 2
=> ERROR: khal-0.10.5_1: post_install: 'make man' exited with 2
=> ERROR: in post_install() at srcpkgs/khal/template:37
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (27 preceding siblings ...)
2022-08-11 8:16 ` dataCobra
@ 2022-08-11 8:41 ` dataCobra
2022-08-11 8:42 ` dataCobra
` (32 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211704152
Comment:
I got it working!
But it has a dependency which is not yet available in remote repositories.
Should I add the package to this PR? PKG: python3-sphinxcontrib-newsfeed
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (28 preceding siblings ...)
2022-08-11 8:41 ` dataCobra
@ 2022-08-11 8:42 ` dataCobra
2022-08-11 8:43 ` Anachron
` (31 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211704152
Comment:
I got it working!
But it has a dependency which is not yet available in remote repositories.
Should I add the package to this PR or create a new PR?
PKG: `python3-sphinxcontrib-newsfeed`
EDIT: formatting
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (29 preceding siblings ...)
2022-08-11 8:42 ` dataCobra
@ 2022-08-11 8:43 ` Anachron
2022-08-11 8:43 ` [PR PATCH] [Updated] " dataCobra
` (30 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: Anachron @ 2022-08-11 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
New comment by Anachron on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211705730
Comment:
Did you add `PYTHONPATH` as in `Arch Linux`s https://github.com/archlinux/svntogit-community/blob/packages/khal/trunk/PKGBUILD#L31?
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (30 preceding siblings ...)
2022-08-11 8:43 ` Anachron
@ 2022-08-11 8:43 ` dataCobra
2022-08-11 8:45 ` dataCobra
` (29 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 2419 bytes --]
From 9b902c4e98bc820dc9d39c5d5076b1fe76e92b44 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 10:43:25 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..6e0237e42479 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (31 preceding siblings ...)
2022-08-11 8:43 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-11 8:45 ` dataCobra
2022-08-11 8:46 ` dataCobra
` (28 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 2419 bytes --]
From d9211f1f3dcd7e03fac6469d1ef5dbfa5745c7ca Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 10:44:57 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..6e0237e42479 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (32 preceding siblings ...)
2022-08-11 8:45 ` dataCobra
@ 2022-08-11 8:46 ` dataCobra
2022-08-11 8:47 ` dataCobra
` (27 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3492 bytes --]
From d7fab660f5506c8352252a885d76b04fca06c923 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 10:46:08 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 +++++++++++++------
.../python3-sphinxcontrib-newsfeed/template | 19 ++++++++++++
2 files changed, 39 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..e49d89caffef
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-sphinxcontrib-applehelp'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Sphinx"
+short_desc="Extension for adding a simple Blog, News or Announcements section to a Sphinx website."
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="http://sphinx-doc.org"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (33 preceding siblings ...)
2022-08-11 8:46 ` dataCobra
@ 2022-08-11 8:47 ` dataCobra
2022-08-11 9:03 ` dataCobra
` (26 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 2398 bytes --]
From dc204a816f1099557f1ca03a186da3316ba3640d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 10:47:47 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (34 preceding siblings ...)
2022-08-11 8:47 ` dataCobra
@ 2022-08-11 9:03 ` dataCobra
2022-08-11 9:24 ` paper42
` (25 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 9:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 367 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211725594
Comment:
I've created a separate PR #38602 for the new host make dependency now.
I've successful tested the building process with khal and python3-sphinxcontrib-newsfeed.
I also use the packages now already on my host machine.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (35 preceding siblings ...)
2022-08-11 9:03 ` dataCobra
@ 2022-08-11 9:24 ` paper42
2022-08-11 9:31 ` [PR PATCH] [Updated] " dataCobra
` (24 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: paper42 @ 2022-08-11 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211745282
Comment:
add that commit here, it doesn't make sense separately from this PR and this PR doesn't work without it
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (36 preceding siblings ...)
2022-08-11 9:24 ` paper42
@ 2022-08-11 9:31 ` dataCobra
2022-08-11 9:32 ` dataCobra
` (23 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 9:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3785 bytes --]
From 2965f2be52b21a0e4197fcb92e5cc9a918cc54ec Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:30:41 +0200
Subject: [PATCH 1/2] New package: python3-sphinxcontrib-newsfeed-0.1.4
---
.../python3-sphinxcontrib-newsfeed/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..d9f5629db15a
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-sphinxcontrib-newsfeed'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Sphinx"
+short_desc="Adding a Blog, News or Announcements section to a Sphinx website"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="http://sphinx-doc.org"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+make_check=ci-skip # some tests fail when running as root
+
+post_install() {
+ vlicense LICENSE
+}
From b387876e9b7b0a617e8c9550c575a19a31a70703 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:31:05 +0200
Subject: [PATCH 2/2] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (37 preceding siblings ...)
2022-08-11 9:31 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-11 9:32 ` dataCobra
2022-08-11 16:18 ` dataCobra
` (22 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 9:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1211752008
Comment:
> add that commit here, it doesn't make sense separately from this PR and this PR doesn't work without it
I've done it as you said. :)
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (38 preceding siblings ...)
2022-08-11 9:32 ` dataCobra
@ 2022-08-11 16:18 ` dataCobra
2022-08-11 17:29 ` Anachron
` (21 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-11 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1212204601
Comment:
Hey @Anachron,
does this still look fine to you? :slightly_smiling_face:
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (39 preceding siblings ...)
2022-08-11 16:18 ` dataCobra
@ 2022-08-11 17:29 ` Anachron
2022-08-12 5:05 ` [PR PATCH] [Updated] " dataCobra
` (20 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: Anachron @ 2022-08-11 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New comment by Anachron on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1212277647
Comment:
Yes @dataCobra , excellent work!
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (40 preceding siblings ...)
2022-08-11 17:29 ` Anachron
@ 2022-08-12 5:05 ` dataCobra
2022-08-12 5:22 ` dataCobra
` (19 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 1229 bytes --]
From a684b48dbe539a705ad8e63885b64929517d27b9 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Wed, 10 Aug 2022 19:14:31 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
srcpkgs/khal/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..6ddfac12ac6a 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,7 +1,7 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-click python3-click-log python3-configobj
@@ -13,8 +13,7 @@ maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
pre_build() {
vsed -i setup.py \
@@ -23,6 +22,5 @@ pre_build() {
}
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
vsconf khal.conf.sample
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (41 preceding siblings ...)
2022-08-12 5:05 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-12 5:22 ` dataCobra
2022-08-12 5:26 ` [PR PATCH] [Updated] " dataCobra
` (18 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 5:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1212740269
Comment:
Ups, I did git magic and messed up my branch...
I'll fix it and send it again.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (42 preceding siblings ...)
2022-08-12 5:22 ` dataCobra
@ 2022-08-12 5:26 ` dataCobra
2022-08-12 5:30 ` dataCobra
` (17 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 5:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3785 bytes --]
From 0ad756df3e3c650b794ef7f51616b061a6158413 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:30:41 +0200
Subject: [PATCH 1/2] New package: python3-sphinxcontrib-newsfeed-0.1.4
---
.../python3-sphinxcontrib-newsfeed/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..d9f5629db15a
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-sphinxcontrib-newsfeed'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Sphinx"
+short_desc="Adding a Blog, News or Announcements section to a Sphinx website"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="http://sphinx-doc.org"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+make_check=ci-skip # some tests fail when running as root
+
+post_install() {
+ vlicense LICENSE
+}
From 7c59013cbaaf1d3893c496fd502370da152d5ed1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:31:05 +0200
Subject: [PATCH 2/2] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (43 preceding siblings ...)
2022-08-12 5:26 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-12 5:30 ` dataCobra
2022-08-12 5:31 ` dataCobra
` (16 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 5:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1212744036
Comment:
Alright, everything is again as it should be. :+1:
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (44 preceding siblings ...)
2022-08-12 5:30 ` dataCobra
@ 2022-08-12 5:31 ` dataCobra
2022-08-12 6:17 ` [PR REVIEW] " classabbyamp
` (15 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 5:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1212744253
Comment:
If something is missing to get it merged, just let me know. :slightly_smiling_face:
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR REVIEW] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (45 preceding siblings ...)
2022-08-12 5:31 ` dataCobra
@ 2022-08-12 6:17 ` classabbyamp
2022-08-12 6:17 ` classabbyamp
` (14 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#discussion_r944143833
Comment:
homepage is https://github.com/prometheusresearch/sphinxcontrib-newsfeed
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR REVIEW] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (46 preceding siblings ...)
2022-08-12 6:17 ` [PR REVIEW] " classabbyamp
@ 2022-08-12 6:17 ` classabbyamp
2022-08-12 6:17 ` classabbyamp
` (13 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#discussion_r944143603
Comment:
there are no tests, so this and `make_check=ci-skip` should be removed
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR REVIEW] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (47 preceding siblings ...)
2022-08-12 6:17 ` classabbyamp
@ 2022-08-12 6:17 ` classabbyamp
2022-08-12 12:07 ` [PR PATCH] [Updated] " dataCobra
` (12 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 6:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#discussion_r944144947
Comment:
```suggestion
depends="python3-Sphinx"
```
https://github.com/prometheusresearch/sphinxcontrib-newsfeed/blob/0.1.4/setup.py#L28
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (48 preceding siblings ...)
2022-08-12 6:17 ` classabbyamp
@ 2022-08-12 12:07 ` dataCobra
2022-08-12 12:10 ` dataCobra
` (11 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 12:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3785 bytes --]
From c444a2b1282ee46322e43d6c86b9ca8c8cbd150a Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:30:41 +0200
Subject: [PATCH 1/2] New package: python3-sphinxcontrib-newsfeed-0.1.4
---
.../python3-sphinxcontrib-newsfeed/template | 20 +++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..d9f5629db15a
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-sphinxcontrib-newsfeed'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-Sphinx"
+short_desc="Adding a Blog, News or Announcements section to a Sphinx website"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="http://sphinx-doc.org"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+make_check=ci-skip # some tests fail when running as root
+
+post_install() {
+ vlicense LICENSE
+}
From 695f2bb9d2d768c74dcd3efe773ebd107c66fad8 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 11 Aug 2022 11:31:05 +0200
Subject: [PATCH 2/2] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (49 preceding siblings ...)
2022-08-12 12:07 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-12 12:10 ` dataCobra
2022-08-12 12:13 ` dataCobra
` (10 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 12:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3741 bytes --]
From ca4e4f46aceecf4ec4a0207e3b6b4647f6a1c2fd Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 12 Aug 2022 14:10:01 +0200
Subject: [PATCH 1/2] New package: python3-sphinxcontrib-newsfeed-0.1.4
---
.../python3-sphinxcontrib-newsfeed/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..69a4a539df75
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-sphinxcontrib-newsfeed'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Sphinx"
+short_desc="Adding a Blog, News or Announcements section to a Sphinx website"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/prometheusresearch/sphinxcontrib-newsfeed"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+
+post_install() {
+ vlicense LICENSE
+}
From 8f65bff064e92eb99c47dbb63b934f6b54646ae4 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 12 Aug 2022 14:10:28 +0200
Subject: [PATCH 2/2] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (50 preceding siblings ...)
2022-08-12 12:10 ` dataCobra
@ 2022-08-12 12:13 ` dataCobra
2022-08-12 16:38 ` classabbyamp
` (9 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213048233
Comment:
It looks like the sphinxcontrib-newsfeed package does use a testing mechanism.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (51 preceding siblings ...)
2022-08-12 12:13 ` dataCobra
@ 2022-08-12 16:38 ` classabbyamp
2022-08-12 17:06 ` paper42
` (8 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213310530
Comment:
if there is, it does not have any indication of it in the repo
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (52 preceding siblings ...)
2022-08-12 16:38 ` classabbyamp
@ 2022-08-12 17:06 ` paper42
2022-08-12 18:43 ` [PR PATCH] [Updated] " dataCobra
` (7 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: paper42 @ 2022-08-12 17:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213333102
Comment:
It only checks if all required packages are installed and fails because Sphinx is not installed, add it to $checkdepends with `checkdepends="$depends" `.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (53 preceding siblings ...)
2022-08-12 17:06 ` paper42
@ 2022-08-12 18:43 ` dataCobra
2022-08-12 18:47 ` dataCobra
` (6 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3766 bytes --]
From 907ef39066d18534b0148dac0fbc98486570fe28 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 12 Aug 2022 20:42:20 +0200
Subject: [PATCH 1/2] New package: python3-sphinxcontrib-newsfeed-0.1.4
---
.../python3-sphinxcontrib-newsfeed/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-sphinxcontrib-newsfeed/template
diff --git a/srcpkgs/python3-sphinxcontrib-newsfeed/template b/srcpkgs/python3-sphinxcontrib-newsfeed/template
new file mode 100644
index 000000000000..9dd25db19199
--- /dev/null
+++ b/srcpkgs/python3-sphinxcontrib-newsfeed/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-sphinxcontrib-newsfeed'
+pkgname=python3-sphinxcontrib-newsfeed
+version=0.1.4
+revision=1
+wrksrc=sphinxcontrib-newsfeed-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Sphinx"
+checkdepends="$depends"
+short_desc="Adding a Blog, News or Announcements section to a Sphinx website"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/prometheusresearch/sphinxcontrib-newsfeed"
+distfiles="${PYPI_SITE}/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-${version}.tar.gz"
+checksum="f78c865b1a32d249644a9c46f395b547df0dc21ed69b70898d64235b4755efb4"
+
+post_install() {
+ vlicense LICENSE
+}
From 308c0d0f82858e2b59bfcbcb46b7bf72c43787a2 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 12 Aug 2022 20:43:24 +0200
Subject: [PATCH 2/2] khal: update to 0.10.5.
---
srcpkgs/khal/template | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..f2092c765e1e 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-sphinxcontrib-newsfeed python3-sphinx_rtd_theme python3-click
+ python3-click-log python3-configobj python3-dateutil python3-icalendar
+ python3-pytz python3-tzlocal python3-urwid python3-xdg python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (54 preceding siblings ...)
2022-08-12 18:43 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-12 18:47 ` dataCobra
2022-08-12 21:44 ` classabbyamp
` (5 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-12 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213416641
Comment:
Hey @paper42,
> It only checks if all required packages are installed and fails because Sphinx is not installed, add it to $checkdepends with `checkdepends="$depends" `.
I've added Sphinx, but it still fails because of a TypeError. I've tried to get rid of it
but was not able to find a solution.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (55 preceding siblings ...)
2022-08-12 18:47 ` dataCobra
@ 2022-08-12 21:44 ` classabbyamp
2022-08-12 21:45 ` classabbyamp
` (4 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 21:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213541587
Comment:
even when adding the `test_suite` argument to setup.py, `setup.py test` fails.
fwiw, sphinx doesn't even *need* `sphinxcontrib-newsfeed` for generating the manpage. with this patch and removal of `sphinx_rtd_theme` (which is just for the html docs) from the hostmakedepends it still generates the same manpages. There are warnings but they don't affect the output.
```patch
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -107,7 +107,6 @@
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
- 'sphinxcontrib.newsfeed',
]
# Add any paths that contain templates here, relative to this directory.
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (56 preceding siblings ...)
2022-08-12 21:44 ` classabbyamp
@ 2022-08-12 21:45 ` classabbyamp
2022-08-12 21:45 ` classabbyamp
` (3 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 21:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213541587
Comment:
even when adding the `test_suite` argument to setup.py, `setup.py test` fails, probably because there are no tests.
fwiw, sphinx doesn't even *need* `sphinxcontrib-newsfeed` for generating the manpage. with this patch and removal of `sphinx_rtd_theme` (which is just for the html docs) from the hostmakedepends it still generates the same manpages. There are warnings but they don't affect the output.
```patch
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -107,7 +107,6 @@
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
- 'sphinxcontrib.newsfeed',
]
# Add any paths that contain templates here, relative to this directory.
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (57 preceding siblings ...)
2022-08-12 21:45 ` classabbyamp
@ 2022-08-12 21:45 ` classabbyamp
2022-08-13 5:56 ` [PR PATCH] [Updated] " dataCobra
` (2 subsequent siblings)
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-12 21:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 858 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213541587
Comment:
even when adding the `test_suite` argument to setup.py, `setup.py test` fails, probably because there are no tests to find and run.
fwiw, sphinx doesn't even *need* `sphinxcontrib-newsfeed` for generating the manpage. with this patch and removal of `sphinx_rtd_theme` (which is just for the html docs) from the hostmakedepends it still generates the same manpages. There are warnings but they don't affect the output.
```patch
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -107,7 +107,6 @@
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
- 'sphinxcontrib.newsfeed',
]
# Add any paths that contain templates here, relative to this directory.
```
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Updated] khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (58 preceding siblings ...)
2022-08-12 21:45 ` classabbyamp
@ 2022-08-13 5:56 ` dataCobra
2022-08-13 6:15 ` dataCobra
2022-08-13 6:23 ` [PR PATCH] [Merged]: " classabbyamp
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-13 5:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages khal-update-10.5
https://github.com/void-linux/void-packages/pull/38583
khal: update to 0.10.5.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
A patch file from https://github.com/void-linux/void-packages/pull/38583.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-khal-update-10.5-38583.patch --]
[-- Type: text/x-diff, Size: 3043 bytes --]
From b867a1ff66c3a9ffbd6bef85d0a341b60b05c816 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Sat, 13 Aug 2022 07:56:14 +0200
Subject: [PATCH] khal: update to 0.10.5.
---
.../01-remove-unecessary-dependcy.patch | 10 +++++++
srcpkgs/khal/template | 29 +++++++++++++------
2 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/khal/patches/01-remove-unecessary-dependcy.patch
diff --git a/srcpkgs/khal/patches/01-remove-unecessary-dependcy.patch b/srcpkgs/khal/patches/01-remove-unecessary-dependcy.patch
new file mode 100644
index 000000000000..5e772ae995cb
--- /dev/null
+++ b/srcpkgs/khal/patches/01-remove-unecessary-dependcy.patch
@@ -0,0 +1,10 @@
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -107,7 +107,6 @@
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.intersphinx',
+ 'sphinx.ext.todo',
+- 'sphinxcontrib.newsfeed',
+ ]
+
+ # Add any paths that contain templates here, relative to this directory.
diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 91143e91002c..d4812abb9772 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,28 +1,39 @@
# Template file for 'khal'
pkgname=khal
-version=0.10.4
-revision=2
+version=0.10.5
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-click python3-click-log python3-configobj
- python3-dateutil python3-icalendar python3-pytz python3-tzlocal
- python3-urwid python3-xdg python3-atomicwrites"
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib
+ python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
+depends="python3-click python3-click-log python3-configobj python3-dateutil
+ python3-icalendar python3-pytz python3-tzlocal python3-urwid python3-xdg
+ python3-atomicwrites"
checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
short_desc="Command-line calendar build around CalDAV"
maintainer="Anachron <gith@cron.world>"
license="MIT"
homepage="http://lostpackets.de/khal/"
+changelog="https://raw.githubusercontent.com/pimutils/khal/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=3fdb980a9a61c0206d7a82b16f77b408a4f341a2b866b9c9fcf6a641850d129f
-make_check=ci-skip
+checksum=4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76
+make_check=ci-skip # some tests fail when running as root
pre_build() {
vsed -i setup.py \
-e '/setup_requires=/d' \
-e "s|use_scm_version=.*|version='${version}',|"
}
+
post_install() {
vlicense COPYING
- vinstall misc/__khal 644 usr/share/zsh/site-functions
+ for sh in bash fish zsh; do
+ env PYTHONPATH=$DESTDIR/$py3_sitelib _KHAL_COMPLETE="${sh}_source" $DESTDIR/usr/bin/khal > "khal.${sh}"
+ vcompletion "khal.${sh}" $sh
+ done
vsconf khal.conf.sample
+ cd doc/
+ PYTHONPATH=$DESTDIR/$py3_sitelib make man
+ vman build/man/khal.1
}
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (59 preceding siblings ...)
2022-08-13 5:56 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-13 6:15 ` dataCobra
2022-08-13 6:23 ` [PR PATCH] [Merged]: " classabbyamp
61 siblings, 0 replies; 63+ messages in thread
From: dataCobra @ 2022-08-13 6:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38583#issuecomment-1213803959
Comment:
I've added the patch and and changed the khal template accordingly. I've also removed the `sphinx_rtd_theme` dependency. After that I successful build the package.
The push does no longer contain the `python3-sphinxcontrib-newsfeed` package.
^ permalink raw reply [flat|nested] 63+ messages in thread
* Re: [PR PATCH] [Merged]: khal: update to 0.10.5.
2022-08-10 16:40 [PR PATCH] khal: update to 0.10.5 dataCobra
` (60 preceding siblings ...)
2022-08-13 6:15 ` dataCobra
@ 2022-08-13 6:23 ` classabbyamp
61 siblings, 0 replies; 63+ messages in thread
From: classabbyamp @ 2022-08-13 6:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
There's a merged pull request on the void-packages repository
khal: update to 0.10.5.
https://github.com/void-linux/void-packages/pull/38583
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
Since version 0.10.5 there is no longer a `__khal` file. This is why I deleted line 26.
^ permalink raw reply [flat|nested] 63+ messages in thread