From 09bee9f8fe9823bdc6a3d84f83f6e62235e183bd Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Tue, 30 May 2023 09:37:31 +0200 Subject: www-apps/paperless-ngx Address msgpack dependency issue --- dev-python/channels-redis/Manifest | 4 +- .../channels-redis/channels-redis-4.0.0.ebuild | 73 ---------------------- .../channels-redis/channels-redis-4.1.0.ebuild | 71 +++++++++++++++++++++ dev-python/channels/Manifest | 2 +- dev-python/channels/channels-4.0.0.ebuild | 1 + 5 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 dev-python/channels-redis/channels-redis-4.0.0.ebuild create mode 100644 dev-python/channels-redis/channels-redis-4.1.0.ebuild (limited to 'dev-python') diff --git a/dev-python/channels-redis/Manifest b/dev-python/channels-redis/Manifest index ecbcabe..4b5faa9 100644 --- a/dev-python/channels-redis/Manifest +++ b/dev-python/channels-redis/Manifest @@ -1,5 +1,5 @@ DIST channels-redis-3.4.1.gh.tar.gz 29918 BLAKE2B 4b586f9dc4538986935ae04a719ef62b7d316cc8e43a3f35132bb91d22d781fcef5bb40f8667799b1857f6be44b3a143980d254e7d5e872332ce2f57639a33b5 SHA512 748d3d2061bbe70ed720e2acc8bc80368105bcd81ab58fe5f55342d7147ffc3abae24d21cdc0aca9fefa38fb483ffe6b4278687962bc8bb54825ca9ecd5c7d1f -DIST channels-redis-4.0.0.gh.tar.gz 27781 BLAKE2B 20fe5d8d742ce2986d6598116bf86a06f89bcdd3840be6e8b3df4af2c53b881fd8560dbdee9d9a9f871c4b3ced3f797472bf42e23219b404d6d7362e85ca0e2d SHA512 1be61a52c750e5d0fa76e2cfb51942de12f92d9ae518bcf7aa83a796f685b75d0b4ca1c056239e77267b39570b877b686b12f78acc6aed7a557e081f98be9eb3 +DIST channels-redis-4.1.0.gh.tar.gz 28471 BLAKE2B 04ef90dcd488ed61069ae31a1f184c691c48f48388532fcdd4b7558659cbe299287612bd5ad542436deca8da86b6fed44be65b5fe4a3198ceeaa65a2cad13ad1 SHA512 c1abddc2ada660a44ecadaff6f4fe6c89dd47485839b5ace4b753f8f4697d8a0a6b7ca71cb8289848143cb73a5cacc837a371dda05cef5482c743bde9fb7d135 EBUILD channels-redis-3.4.1.ebuild 2592 BLAKE2B 7698475c285dbabbf2608dd8317fd3d342c0481c62635bb6d29a44cc50264ae47e2f52f0926620975a0d77eabb770ea085847c29ee9f157d3c3885c77de0378c SHA512 9009200711e858921a260d840e6dfae3d1e96fa527b5cae67b83c628ea49f10f0b6e0633d15cca5ae36ea7b075c3663681a8965992f6e2110dc7c6090f13810c -EBUILD channels-redis-4.0.0.ebuild 1694 BLAKE2B 2399fb58da820be8566132461586829a195ba2a24705d5c41dda1bbeaa16785b08c259776bd0d88a0603d6c10d8595d20d9e0020690d54c9c942e56a21810f5c SHA512 966188739c0d1b4ea84830e46fd8fe4a7174746d8433f1279433999497ba1b9a2a22169efcab2ba7a898912d5600b7cebc9611918e80d52c67c595f68950bdab +EBUILD channels-redis-4.1.0.ebuild 1571 BLAKE2B 76055240ceb25d8d28ec1151d2cdf1f37cf53ac3752a5c4f82776272d4f55602adb73a497e91fcab24b8c611887027028ba53329f5e77cafdd82badb815fbaac SHA512 c31c03284c09504df3a91d85910599cc0e6c0a4b441e1885ef57ac23cf848a930e1641542e31ab0d3426f532018518665e0b6c65df014540f219b1085c9bf2d3 MISC metadata.xml 463 BLAKE2B 2a0f6991eacc13262dbce02c797d074939f88c608abc791625d6b73e281836092f6937fd6d21a7b49c06a9d24d710eebe89278e60ebeb3fef7b7c09e10dd91a8 SHA512 30c97610d0ca3c4798c3b4405b6e99a1d0df6250a4ccb53baa95f966250bccec37025e40a49a01e6ab5f4bae39a30e1ed699fffcd95785a46d0435dbf30e1e9f diff --git a/dev-python/channels-redis/channels-redis-4.0.0.ebuild b/dev-python/channels-redis/channels-redis-4.0.0.ebuild deleted file mode 100644 index 8b31c7c..0000000 --- a/dev-python/channels-redis/channels-redis-4.0.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -inherit distutils-r1 - -MY_P=${P/-/_} -DESCRIPTION="Provides Django Channels channel layers that use Redis as a backing store." -HOMEPAGE="https://github.com/django/channels_redis" -SRC_URI="https://github.com/django/${PN/-/_}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-python/channels[${PYTHON_USEDEP}] - >=dev-python/django-3.2[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-db/redis - dev-python/async-timeout[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - >=dev-python/redis-4.2.0[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.rst ) - -distutils_enable_tests pytest - -EPYTEST_DESELECT=( - # Hangs - tests/test_core.py::test_message_expiry__group_send__one_channel_expires_message - # Fails with: TypeError: int() argument must be a string, a bytes-like object or a real number, not 'NoneType' - tests/test_core.py::test_receive_cancel -) - -python_prepare_all() { - # Remove sentinel tests - rm tests/test{_pubsub,}_sentinel.py - - distutils-r1_python_prepare_all -} - -src_test() { - local redis_pid="${T}"/redis.pid - local redis_port=6379 - - einfo "Spawning Redis" - einfo "NOTE: Port ${redis_port} must be free" - "${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die - daemonize yes - pidfile ${redis_pid} - port ${redis_port} - bind 127.0.0.1 - EOF - - # Run the tests - distutils-r1_src_test - - # Clean up afterwards - kill "$(<"${redis_pid}")" || die -} diff --git a/dev-python/channels-redis/channels-redis-4.1.0.ebuild b/dev-python/channels-redis/channels-redis-4.1.0.ebuild new file mode 100644 index 0000000..d8cf3f1 --- /dev/null +++ b/dev-python/channels-redis/channels-redis-4.1.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 optfeature + +MY_P=${P/-/_} +DESCRIPTION="Provides Django Channels channel layers that use Redis as a backing store." +HOMEPAGE="https://github.com/django/channels_redis" +SRC_URI="https://github.com/django/${PN/-/_}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}] + dev-python/channels[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + >=dev-python/redis-4.5.3[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-db/redis + dev-python/async-timeout[${PYTHON_USEDEP}] + >=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + ) +" + +DOCS=( README.rst ) + +distutils_enable_tests pytest + +python_prepare_all() { + # Remove sentinel tests + rm tests/test{_pubsub,}_sentinel.py + + distutils-r1_python_prepare_all +} + +src_test() { + local redis_pid="${T}"/redis.pid + local redis_port=6379 + + einfo "Spawning Redis" + einfo "NOTE: Port ${redis_port} must be free" + "${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die + daemonize yes + pidfile ${redis_pid} + port ${redis_port} + bind 127.0.0.1 + EOF + + # Run the tests + distutils-r1_src_test + + # Clean up afterwards + kill "$(<"${redis_pid}")" || die +} + +pkg_postinst() { + optfeature "Backend encrytion support" dev-python/cryptography +} diff --git a/dev-python/channels/Manifest b/dev-python/channels/Manifest index bde8fec..6ac4914 100644 --- a/dev-python/channels/Manifest +++ b/dev-python/channels/Manifest @@ -1,5 +1,5 @@ DIST channels-3.0.5.gh.tar.gz 200118 BLAKE2B 7a7653f986face1e87369917317db013e5c9fc912c6e2d7c737054ffef167bd01feb48f7e2d00d0d331e7a16093478e5416645717aed59e46dfec8f9b3641a2e SHA512 b12d1aec9602b702b5a097e9ca52dccad49940f82fcbe5594890c9bd1f1879a2fcf0f29630ca53e4972a26853df8f71d07d7b2cccd876abbf2417a76dee281bf DIST channels-4.0.0.gh.tar.gz 191192 BLAKE2B 36c42573a6438f11cc81011c3fdb45b2b10cad117e642e1a6c6ff32e9e85e685f169b311fac74646f18001520216eb92cc5e184d609f29b65b504e4f6eadc3bd SHA512 5c8573931586dbd313ef30139be04dc28cf6ffc5e82d4f2af8c6cdca21a0f18dcd3ce6f42ddcddf12771428fe9ba94c7ac914c7ef519b83c25c8f67f0cc5ecd8 EBUILD channels-3.0.5.ebuild 944 BLAKE2B 6c21ba2b414c958437ba2a894b1a67e28f1db1cc12c247cc9c73eb083eb0fe12bb614602dc6261d5156ac513abed8179ef3a656e8ab243a675299e66fd7f4054 SHA512 999ee10fb06f79a9b6fdb8f417cfc85d74933f47a167df9151e6c99c16222d24eb9a1896d25f6c77b9d545ea6e2442dff8650ab3b2365f28b0ca9ceca44dbd3a -EBUILD channels-4.0.0.ebuild 752 BLAKE2B 1db5bf98811646351e2f21e3d6ce89322e3c4ec0d9c1d586eb5aa2947e8fc216f8ebc5ad3b471511e8741b03a737418594f90a4fc0fe4dc78fdc9fada6b85ec9 SHA512 7d8d1f7f6b92675a6d29babde554757d0f5c543eff559b9c6be06821ca6434237fdf4b1491c6023776c37c20f78140939944a3b5f550a1b8710546651d23ae6e +EBUILD channels-4.0.0.ebuild 798 BLAKE2B 1809f7c75390a6d8f97ed70ad1782b7b8ffe228d2b16ccaf8efce37a341eecac08a9ca607db263145a8dafdcbd5c53c2c45f4957cca95f2e94ee60c02fa86836 SHA512 06c5d45e576ef161ddc6ae7e5956058f9fc1414ef522e88469640fc1596ab28b0c17036af071c59b8579532f5bc729e4fe1479d54c60ee07f5c602e02bb32d81 MISC metadata.xml 445 BLAKE2B b4c0a41d6caadfbc53cbba3c41f8b7689a286b3f8d285c37a88a1f79d8dc350b82fea255048c022b92091a1e0cc67bf19645d6c32183b82a6dd49cccadf5078f SHA512 380c8b98efe8d9a2513c51899b7de90b115d4a51f104f46b552ff8929c322850e511e245a2ba0e976213416ae7241a17292ca98248caacfc891fcdcf5cea5d44 diff --git a/dev-python/channels/channels-4.0.0.ebuild b/dev-python/channels/channels-4.0.0.ebuild index 6fc7f1b..7c5d61b 100644 --- a/dev-python/channels/channels-4.0.0.ebuild +++ b/dev-python/channels/channels-4.0.0.ebuild @@ -18,6 +18,7 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" + >=dev-python/asgiref-3.5.0[${PYTHON_USEDEP}] >=dev-python/django-3.2[${PYTHON_USEDEP}] " BDEPEND=" -- cgit v1.2.3