diff options
Diffstat (limited to 'dev-python/watchdog')
| -rw-r--r-- | dev-python/watchdog/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch | 76 | ||||
| -rw-r--r-- | dev-python/watchdog/watchdog-1.0.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/watchdog/watchdog-2.0.3.ebuild | 40 | ||||
| -rw-r--r-- | dev-python/watchdog/watchdog-2.1.2.ebuild | 8 | ||||
| -rw-r--r-- | dev-python/watchdog/watchdog-2.1.4.ebuild (renamed from dev-python/watchdog/watchdog-2.1.1.ebuild) | 6 |
6 files changed, 91 insertions, 52 deletions
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest index 7364bb3368a3..421c36375797 100644 --- a/dev-python/watchdog/Manifest +++ b/dev-python/watchdog/Manifest @@ -1,9 +1,8 @@ +AUX watchdog-2.1.2-big-endian.patch 2861 BLAKE2B 05849a6c6a23b4ef55c5f92a46ab57cf8a76cc34624e570287c966ab4911023383e776ba8c13c098994fe3a7088b8dbc984c11717dcf3bda4e7f6480dfeaa5b2 SHA512 8347eefea383db8ea9648560bba03103c3fbce640ad54c2da479ea3525b9e944deab10671dcdf100c7cfab9f6a3fd85987a16c07fca2e784416226e1ee862395 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e -DIST watchdog-2.0.3.tar.gz 95524 BLAKE2B 568e9d66efbfa98c19dab704681dbc48f869b59d51d7c7ff7ce1fd7465efcc6233f871e7f9276f2732692645491f2fd197a639b17e9a3d8abb76d0148a934796 SHA512 e1c506e4ead8c3ee8d19e456b67623f3a1823007be6c1fad0d76c697205696183e7bd15e46c21bf61abce6dd16d267e55da8986633eeee337d10c609318fb958 -DIST watchdog-2.1.1.tar.gz 96703 BLAKE2B cbcaff41de6111a3c9c2ff00b7c0a9ce1a769bb2b0f8e2af841a0783dd7f3a55f46003863b05eb983531211743fd112a6e63944193e10e8dd296523a1da27d59 SHA512 5b9eb75bc7b8642a8246f426a992265bbe2e5d82a3fcdd543289db7734701bdca1a868b02edfdc26ea239a89d80dd5322e410b949e419c66bdcc0645241d826b DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1 -EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7 -EBUILD watchdog-2.0.3.ebuild 892 BLAKE2B e4be44b841127430ac9f7fc683b8ad7d088fe51d7579cbda444517be3435ec4051c3568ec030dd4ef6a7332a3e8f4d5550f0b76bf96da00746ba820b8e21fa43 SHA512 871894c2e566a524ce7abb58f7e324def71d0a80871a6aee11c5d37f85455e7121e60b9bee3d25535e23386fd537d06a8e218b8b1c777174c84cd9df6a26ce3f -EBUILD watchdog-2.1.1.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9 -EBUILD watchdog-2.1.2.ebuild 1042 BLAKE2B 1418bfff491d1f0694b71dca2b28c177fbe783a247f1f095f8d1644bacd44b523a8f3854dafb6177953bb03120bd4e3f27826cb167d57e72fe1a1027371ed3b8 SHA512 9d0b4f8b76e8d897327e66667d3a62639cb9a85206f2afd2320931ddd90ee629d2c9b9ee05c579dea942ec6a1827a963c84fbfdb612cf6ebc6b9417d45b5ed70 +DIST watchdog-2.1.4.tar.gz 98695 BLAKE2B 2a15b362c6e776146df4738096fe0cd8ec49894c6b767e86ed5749c2f97447fb890f172ec989a17140594070eefa1fa2b40275aff5ba9d212f77a059ac3ead25 SHA512 88bed725c045f59091902a1fe4673036a679d263c71269e36125df2a4c851864bddee0cf4f8c3f20bfc2d5f735804b7c7b1ff07a3d89d8649bfa16d3e7e1fe21 +EBUILD watchdog-1.0.2.ebuild 965 BLAKE2B 35bf7d74d9da00f8a7b69e6394619867c4cf6947e5c14d8aa833ea1a099515529f7bdb5bb02a59a76c5629e7e38dfd560df0fc63d23fef5210d5b42ac0dd9a7e SHA512 a709f107fce0b758f9a4e522052fc8a6b7bcc0c7b87aa79fb53cf8c8ce035bdd4141df117b983d869f21af7410c7d6cc373fb65069f74c049e2b703863c06fbe +EBUILD watchdog-2.1.2.ebuild 1105 BLAKE2B 1761e1cf618be7b611c7483a13a3fc399b0164f064a138361bc4226ac2a7d329dd48aee62afaa4e57776f146c78a8ff960b556ceee0e42a1fb0791e2bf33f6a3 SHA512 98532227f30ee84a91005b303e959cd720aa2cfa508d7c7392a969482e7d1b4917b846a0f358a5f3103a0e937a224d0d2d2e1562aa5f2d249b72806ec9942d42 +EBUILD watchdog-2.1.4.ebuild 1046 BLAKE2B 52b42d15c8a712005fa02dd9ab5405ceaecf2f86eff9f56f227b2df05dc00979d7aae4a73ac320806180f1168ba6a67334080b9297173ead2571485f175b9c34 SHA512 ecd0f21a72849edd23828b5bbd45546e90eb855679a9773e59beb635167ea2a9614f21e3d42a825c6d672bf0baf24d5377168c95def22d8588fb3d37557c61ff MISC metadata.xml 462 BLAKE2B b18ac987fd2ea50f8f05f5ada3cf82db92cfedd0e032759b0063407d54acdf3ace017ac4321af37cdcc5a4d2a2872185db22971226aebe1914596e5f8bbbf580 SHA512 46c75850890be381d2d45d00c5118d862aa97ccbac569fa3b44a85d880de2a2c6a6c0d266d518826f4e4206003d2aedc508707258890b60c5e42c2a564459ab2 diff --git a/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch b/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch new file mode 100644 index 000000000000..61ddff816a88 --- /dev/null +++ b/dev-python/watchdog/files/watchdog-2.1.2-big-endian.patch @@ -0,0 +1,76 @@ +From ab6508716f95fb65481ab6232301a095452e9b49 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Thu, 19 Aug 2021 15:13:39 +0200 +Subject: [PATCH] Fix test mocks for big endian systems + +Fix the mocked inotify data to respect system endianness. Instead of +harcoding the raw data, reconstruct it using struct.pack(), respecting +host endianness. This should also benefit readability a bit. + +Closes #804 +--- + tests/test_inotify_c.py | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/tests/test_inotify_c.py b/tests/test_inotify_c.py +index 81f6586..dc336a3 100644 +--- a/tests/test_inotify_c.py ++++ b/tests/test_inotify_c.py +@@ -10,6 +10,7 @@ import ctypes + import errno + import logging + import os ++import struct + from functools import partial + from queue import Queue + +@@ -52,6 +53,19 @@ def teardown_function(function): + pass + + ++def struct_inotify(wd, mask, cookie, length, name): ++ assert len(name) <= length ++ struct_format = ( ++ "=" # (native endianness, standard sizes) ++ "i" # int wd ++ "i" # uint32_t mask ++ "i" # uint32_t cookie ++ "i" # uint32_t len ++ "%ds" % (length,) # char[] name ++ ) ++ return struct.pack(struct_format, wd, mask, cookie, length, name) ++ ++ + def test_late_double_deletion(monkeypatch): + inotify_fd = type(str("FD"), (object,), {})() # Empty object + inotify_fd.last = 0 +@@ -60,20 +74,18 @@ def test_late_double_deletion(monkeypatch): + # CREATE DELETE CREATE DELETE DELETE_SELF IGNORE DELETE_SELF IGNORE + inotify_fd.buf = ( + # IN_CREATE|IS_DIR (wd = 1, path = subdir1) +- b"\x01\x00\x00\x00\x00\x01\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00" +- b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(1, 0x40000100, 0, 16, b"subdir1") + + # IN_DELETE|IS_DIR (wd = 1, path = subdir1) +- b"\x01\x00\x00\x00\x00\x02\x00\x40\x00\x00\x00\x00\x10\x00\x00\x00" +- b"\x73\x75\x62\x64\x69\x72\x31\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(1, 0x40000200, 0, 16, b"subdir1") + ) * 2 + ( + # IN_DELETE_SELF (wd = 2) +- b"\x02\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(2, 0x00000400, 0, 0, b"") + + # IN_IGNORE (wd = 2) +- b"\x02\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(2, 0x00008000, 0, 0, b"") + + # IN_DELETE_SELF (wd = 3) +- b"\x03\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(3, 0x00000400, 0, 0, b"") + + # IN_IGNORE (wd = 3) +- b"\x03\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" ++ struct_inotify(3, 0x00008000, 0, 0, b"") + ) + + os_read_bkp = os.read +-- +2.33.0 + diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild index 8e5e59165960..1dc52e0423d5 100644 --- a/dev-python/watchdog/watchdog-1.0.2.ebuild +++ b/dev-python/watchdog/watchdog-1.0.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc x86" +KEYWORDS="~amd64 ~x86" CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" RDEPEND="${CDEPEND} diff --git a/dev-python/watchdog/watchdog-2.0.3.ebuild b/dev-python/watchdog/watchdog-2.0.3.ebuild deleted file mode 100644 index 9a7040e89d03..000000000000 --- a/dev-python/watchdog/watchdog-2.0.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Python API and shell utilities to monitor file system events" -HOMEPAGE="https://github.com/gorakhargosh/watchdog" -SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc x86" - -CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" -RDEPEND="${CDEPEND} - dev-python/argh[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND} - test? ( - >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -src_prepare() { - sed -i -e '/--cov/d' setup.cfg || die - default -} - -python_test() { - epytest -p no:django -} - -pkg_postinst() { - optfeature "Bash completion" dev-python/argcomplete -} diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild index 9ed9de0edfef..cac5d8992dd1 100644 --- a/dev-python/watchdog/watchdog-2.1.2.ebuild +++ b/dev-python/watchdog/watchdog-2.1.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 optfeature DESCRIPTION="Python API and shell utilities to monitor file system events" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" RDEPEND="${CDEPEND} @@ -25,6 +25,10 @@ DEPEND="${CDEPEND} distutils_enable_tests pytest src_prepare() { + local PATCHES=( + "${FILESDIR}"/${P}-big-endian.patch + ) + sed -i -e '/--cov/d' setup.cfg || die default } diff --git a/dev-python/watchdog/watchdog-2.1.1.ebuild b/dev-python/watchdog/watchdog-2.1.4.ebuild index ab944b67adbb..7b9fe168c229 100644 --- a/dev-python/watchdog/watchdog-2.1.1.ebuild +++ b/dev-python/watchdog/watchdog-2.1.4.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 optfeature DESCRIPTION="Python API and shell utilities to monitor file system events" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" RDEPEND="${CDEPEND} |