From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8BBA413835A for ; Fri, 16 Apr 2021 18:25:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E096BE0828; Fri, 16 Apr 2021 18:25:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CACEAE0828 for ; Fri, 16 Apr 2021 18:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0873335D54 for ; Fri, 16 Apr 2021 18:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27E30706 for ; Fri, 16 Apr 2021 18:25:06 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1618597485.70fd6ae560a759cf83d80360f709a4be4829524d.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/pre-commit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/pre-commit/pre-commit-2.12.0.ebuild X-VCS-Directories: dev-vcs/pre-commit/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 70fd6ae560a759cf83d80360f709a4be4829524d X-VCS-Branch: master Date: Fri, 16 Apr 2021 18:25:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2186bf74-35df-4908-8c3f-789f7b84b7cf X-Archives-Hash: bd5d7f531967deea6335b28b7bae228c commit: 70fd6ae560a759cf83d80360f709a4be4829524d Author: Marek Szuba gentoo org> AuthorDate: Fri Apr 16 16:12:31 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Apr 16 18:24:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fd6ae5 dev-vcs/pre-commit: use pytest-env now that it is in the tree Signed-off-by: Marek Szuba gentoo.org> dev-vcs/pre-commit/pre-commit-2.12.0.ebuild | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild index 8dc97acfe00..c494bc22f84 100644 --- a/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild +++ b/dev-vcs/pre-commit/pre-commit-2.12.0.ebuild @@ -25,8 +25,6 @@ KEYWORDS="~amd64" # Ditto # - tests/commands/install_uninstall_test.py::test_installed_from_venv # "git commit" returns 1 instead of 0, again no details -# even with the environment variables normally handled by pytest-env (which we haven't got in the tree yet) -# explicitly declared in python_test(). #RESTRICT="test" RDEPEND="dev-vcs/git @@ -39,7 +37,10 @@ RDEPEND="dev-vcs/git >=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}] ')" BDEPEND="test? ( - $(python_gen_cond_dep 'dev-python/re-assert[${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-python/pytest-env[${PYTHON_USEDEP}] + dev-python/re-assert[${PYTHON_USEDEP}] + ') )" DOCS=( CHANGELOG.md CONTRIBUTING.md README.md ) @@ -53,15 +54,3 @@ src_prepare() { # and while some of them do include "skip if not found" logic, most of them do not. rm -rf tests/languages tests/repository_test.py } - -python_test() { - # TODO: add pytest-env to the tree so that these can be read from tox.ini - declare -x GIT_AUTHOR_NAME=test - declare -x GIT_COMMITTER_NAME=test - declare -x GIT_AUTHOR_EMAIL=test@example.com - declare -x GIT_COMMITTER_EMAIL=test@example.com - declare -x VIRTUALENV_NO_DOWNLOAD=1 - declare -x PRE_COMMIT_NO_CONCURRENCY=1 - - distutils-r1_python_test -}