diff options
Diffstat (limited to 'dev-vcs/pre-commit')
| -rw-r--r-- | dev-vcs/pre-commit/Manifest | 8 | ||||
| -rw-r--r-- | dev-vcs/pre-commit/metadata.xml | 17 | ||||
| -rw-r--r-- | dev-vcs/pre-commit/pre-commit-3.7.0.ebuild | 60 | ||||
| -rw-r--r-- | dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild (renamed from dev-vcs/pre-commit/pre-commit-3.6.0.ebuild) | 56 |
4 files changed, 48 insertions, 93 deletions
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest index fe5af690fd22..c0f76984ddee 100644 --- a/dev-vcs/pre-commit/Manifest +++ b/dev-vcs/pre-commit/Manifest @@ -1,6 +1,4 @@ AUX pre-commit-3.1.1-tests_git_file_transport.patch 1527 BLAKE2B 18d047f3b8a6fdc3da77aa5b8d9f60970ab5b69adc3790489ceffc17839a4cd21ed46428c5e2e98b50278b2c4dc49e35a09dd778000546828327ae96f910f95b SHA512 36cb194250dc0fefad2900452447ab590f678e6cd5edf07a7f072363733c263b7cb1167297c465a9372d4a38ab77a6c057046c66b872a958132a97d1a937d029 -DIST pre-commit-3.6.0.gh.tar.gz 268891 BLAKE2B 42c52bcd320defe877fdce51af972e177e26956c2baba5e04e9441d7a99fcdc6467dc7913b21f9300efe9ca821c7d06c8d972f3fb79f10f2212dbecb3299040a SHA512 4997dfe15d262b8d0c6de711b2543162fffe14f24ce41d3a3ba2014354861ef72eb3a9cc115125ed57ef3c25a12886f858189d684d343252ad8f46cc0c364935 -DIST pre-commit-3.7.0.gh.tar.gz 269999 BLAKE2B 9ca1b2279e1ed753a09c3da83f6de19fc9b36821ba6f642962b9be1da29894e3260c48a2cdb582eb5331543fa6c7e9065d799fde7ab4e84dd54032c2ff84e4a7 SHA512 2a238e74ce2f080914e4403b7ce7b8dbd2a257a736d8292e2ec299c8015d3c4611e51f4be1a95ff2bd29db4888f6997e335346931567e943a8b5d78be7c14725 -EBUILD pre-commit-3.6.0.ebuild 1945 BLAKE2B 67edbe26415c84be705bdebe1e909951b116cb53b6d9296a7794114bfce325016892d9219c463930eb6ba014ac899e02c2977652d081cce34b685a9afde98566 SHA512 56ef1fc5575dd90736494acdc267355fe30814bc91f190aa306c77aa3247dda2010b42abccd769a19e42b5e1da571b2712df02a81d3bc98860c9c989a1b2c065 -EBUILD pre-commit-3.7.0.ebuild 1947 BLAKE2B 3aee60f9bbea261adcef1be4827c78e4432da8b7aa24d334ff62afdc791305afacb1b5e35277820a3664951468a1c2f1c15a1fda1197038da3ff4eb30f65b3b0 SHA512 34fa01959ef55e02fb57c055df46626228a6494bf57e570fce0e7aeee481f15bb4dfdcb7f9287d75550dc8606d66e242d5e1aebb349d1a0dbb1df1e234211904 -MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb +DIST pre-commit-3.8.0.gh.tar.gz 270925 BLAKE2B febb7b6bb2e43aec096e454b064b01b0973cd9d04b2d792a4ce7cef9df4f9c9c2e3bf1200f584e163c829c12ca17f57761375b297ab5c3d97dce569d5c219bdd SHA512 b6970ac00c5033938462675c20ea5e13c0439dc4f70cd627f11b22b0f87fb0a3590e9b3e9c677bfb66e4b3420f40de66ca7ccbc969847ee5fa8994532a558cd1 +EBUILD pre-commit-3.8.0-r1.ebuild 2132 BLAKE2B 5bda58bacf4e98a4328db604a058e70399ed91ad4413f40a849149931eafd28005b5bf944aff4205ecda081e65b6ee5370faf5a9bebf88e3bcd45d13b9b28c74 SHA512 7ea6a4c5d5a21f485d8cf06269d7ef591b97771650c92be31cfb7388852020f461f7ce2d09af5d6465366e790de9dcb15f19ba74dd08b049243cae488b98d65e +MISC metadata.xml 391 BLAKE2B 08aea5db96326e51f252d2392f655100d2721dfa8eedfbb361221d92b0b0e0645152b8e1c2ccc11e8b50f24b59869fa2e1fc7dfaa42fdb23614ddbc963e9f102 SHA512 799e0df03afd4baef6296590b9133b45487d1e41f09e933a738367f0bcb3c6510ec8e26547b16ea5c07525d99b026ba1848d21e4001505c33a564b14746897c6 diff --git a/dev-vcs/pre-commit/metadata.xml b/dev-vcs/pre-commit/metadata.xml index a623a99b13ea..333884838656 100644 --- a/dev-vcs/pre-commit/metadata.xml +++ b/dev-vcs/pre-commit/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> + <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <upstream> - <remote-id type="github">pre-commit/pre-commit</remote-id> - <remote-id type="pypi">pre-commit</remote-id> - </upstream> + <maintainer type="person"> + <email>xgqt@gentoo.org</email> + <name>Maciej Barć</name> + </maintainer> + <upstream> + <remote-id type="github">pre-commit/pre-commit</remote-id> + <remote-id type="pypi">pre-commit</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-vcs/pre-commit/pre-commit-3.7.0.ebuild b/dev-vcs/pre-commit/pre-commit-3.7.0.ebuild deleted file mode 100644 index 616a26bf373d..000000000000 --- a/dev-vcs/pre-commit/pre-commit-3.7.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks" -HOMEPAGE="https://pre-commit.com/" -SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" - -RDEPEND="dev-vcs/git - $(python_gen_cond_dep ' - >=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}] - >=dev-python/identify-1.0.0[${PYTHON_USEDEP}] - >=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}] - ')" -# coreutils requirement: see Bug #885559 -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/pytest-env[${PYTHON_USEDEP}] - dev-python/re-assert[${PYTHON_USEDEP}] - ') - sys-apps/coreutils[-multicall] -)" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-tests_git_file_transport.patch -) - -DOCS=( CHANGELOG.md CONTRIBUTING.md README.md ) - -EPYTEST_DESELECT=( - # All of these require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run - # and while some of them do include "skip if not found" logic, most of them do not. - tests/languages/ - tests/repository_test.py - # These three consistently fail with - # Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git". - # including with the sandbox disabled. - tests/main_test.py::test_all_cmds - tests/main_test.py::test_hook_stage_migration - tests/main_test.py::test_try_repo - # These two fail if pre-commit is already installed (Bug #894502) - tests/commands/install_uninstall_test.py::test_environment_not_sourced - tests/commands/install_uninstall_test.py::test_installed_from_venv -) - -distutils_enable_tests pytest diff --git a/dev-vcs/pre-commit/pre-commit-3.6.0.ebuild b/dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild index 90ea7eb7e160..5de721b64f53 100644 --- a/dev-vcs/pre-commit/pre-commit-3.6.0.ebuild +++ b/dev-vcs/pre-commit/pre-commit-3.8.0-r1.ebuild @@ -3,55 +3,71 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="sqlite" +DISTUTILS_SINGLE_IMPL="ON" +DISTUTILS_USE_PEP517="setuptools" inherit distutils-r1 DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks" -HOMEPAGE="https://pre-commit.com/" -SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +HOMEPAGE="https://pre-commit.com/ + https://github.com/pre-commit/pre-commit/" + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + + KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 x86" -RDEPEND="dev-vcs/git +RDEPEND=" + dev-vcs/git $(python_gen_cond_dep ' >=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}] >=dev-python/identify-1.0.0[${PYTHON_USEDEP}] >=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}] >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] >=dev-python/virtualenv-20.10.0[${PYTHON_USEDEP}] - ')" -# coreutils requirement: see Bug #885559 -BDEPEND="test? ( - $(python_gen_cond_dep ' - dev-python/pytest-env[${PYTHON_USEDEP}] - dev-python/re-assert[${PYTHON_USEDEP}] ') +" +# coreutils requirement, see bug #885559 +BDEPEND=" sys-apps/coreutils[-multicall] -)" + test? ( + $(python_gen_cond_dep ' + dev-python/pytest-env[${PYTHON_USEDEP}] + dev-python/re-assert[${PYTHON_USEDEP}] + ') + ) +" -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-tests_git_file_transport.patch -) +PATCHES=( "${FILESDIR}/${PN}-3.1.1-tests_git_file_transport.patch" ) DOCS=( CHANGELOG.md CONTRIBUTING.md README.md ) EPYTEST_DESELECT=( - # All of these require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run - # and while some of them do include "skip if not found" logic, most of them do not. + # All of these require a boatload of dependencies (e.g. Conda, Go, R and + # more) in order to run and while some of them do include + # "skip if not found" logic, most of them do not. tests/languages/ tests/repository_test.py + # These three consistently fail with - # Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git". + # Calling "git rev-parse" fails with "fatal: + # not a git repository (or any of the parent directories): .git". # including with the sandbox disabled. tests/main_test.py::test_all_cmds tests/main_test.py::test_hook_stage_migration tests/main_test.py::test_try_repo + # These two fail if pre-commit is already installed (Bug #894502) tests/commands/install_uninstall_test.py::test_environment_not_sourced tests/commands/install_uninstall_test.py::test_installed_from_venv |