Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-05-14 23:18:37 +00:00
3 changed files with 18 additions and 15 deletions

View File

@@ -1,10 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_11 )
PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1
@@ -34,7 +34,15 @@ DEPEND="
distutils_enable_tests pytest
python_test() {
# Ignore broken tests (due to network-sandbox)
pytest -v --ignore tests/stream/test_playback.py || die
}
EPYTEST_IGNORE=(
# Upstream uses a mix of pytest and unittest
# Since most tests are pytest, let's ignore unittest tests
tests/http/test_server.py
tests/http/test_handlers.py
)
EPYTEST_DESELECT=(
# Broken test due to network-sandbox
tests/stream/test_playback.py
tests/test_help.py::HelpTest::test_help_has_mopidy_options
)

View File

@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_COMPAT=( python3_{10..12} )
inherit git-r3 python-single-r1
@@ -16,19 +16,15 @@ S="${WORKDIR}/${P%_p2}"
LICENSE="GPL-3"
SLOT="0"
MY_PLUGINS="acronyms_expander anti_spam clients_icons length_notifier
message_box_size now_listen omemo openpgp pgp plugins_translations
message_box_size now_listen openpgp pgp plugins_translations
quick_replies triggers"
IUSE="$(printf '+%s ' ${MY_PLUGINS[@]})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
net-im/gajim[${PYTHON_SINGLE_USEDEP}]
omemo? (
net-im/gajim[omemo]
dev-python/python-axolotl[${PYTHON_USEDEP}]
dev-python/qrcode[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}] )
pgp? (
>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}]
)

View File

@@ -11,7 +11,6 @@
<flag name="length_notifier">Plugin: Notifies you when message length reaches a limit</flag>
<flag name="message_box_size">Plugin: Allows you to adjust the height of the new message input field</flag>
<flag name="now_listen">Plugin: Copy tune info to conversation input box</flag>
<flag name="omemo">Plugin: OMEMO Multi-End Message and Object Encryption for 1:1 chats, groupchats, and file transfers</flag>
<flag name="openpgp">Plugin: Encrypt your messages with OpenPGP (XEP-0373)</flag>
<flag name="pgp">Plugin: Encrypt your messages with PGP (XEP-0027)</flag>
<flag name="plugins_translations">Plugin: Translation files for Gajim Plugins</flag>