public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-shutil/
Date: Mon,  5 Jul 2021 22:54:14 +0000 (UTC)	[thread overview]
Message-ID: <1625525642.1cbd13afa14a227b1434e04a02153b338bf0551c.mgorny@gentoo> (raw)

commit:     1cbd13afa14a227b1434e04a02153b338bf0551c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  5 21:18:19 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 22:54:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbd13af

dev-python/pytest-shutil: Remove stale contextlib2 dep

contextlib2 is needed only on Python 2.  Strip the unconditional dep
from setup.py (upstream made it conditional in newer git).

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...shutil-1.7.0-r1.ebuild => pytest-shutil-1.7.0-r2.ebuild} | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
similarity index 82%
rename from dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
rename to dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
index cee304ff4f5..8ee1fa7aea6 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
@@ -18,7 +17,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/contextlib2[${PYTHON_USEDEP}]
 	dev-python/execnet[${PYTHON_USEDEP}]
 	dev-python/path-py[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
@@ -34,11 +32,12 @@ BDEPEND="
 	dev-python/setuptools-git[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests --install setup.py
+distutils_enable_tests --install pytest
 
 python_prepare_all() {
-	# keeps trying to install this in tests
-	sed -i 's:path.py::' setup.py || die
+	# remove unnecessary deps
+	# (contextlib2 is not used in py3)
+	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
 
 	distutils-r1_python_prepare_all
 }


             reply	other threads:[~2021-07-05 22:54 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-05 22:54 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-27 12:01 [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-shutil/ Michał Górny
2023-06-27  6:43 Sam James
2023-03-17 15:23 Michał Górny
2023-02-17  8:52 Sam James
2022-06-13  8:20 Michał Górny
2022-05-12 13:15 Michał Górny
2022-05-12 13:15 Michał Górny
2022-01-26 22:42 James Le Cuirot
2021-07-28 23:38 Marek Szuba
2021-05-23 13:41 Michał Górny
2021-03-28 12:17 Sam James
2020-09-21 16:06 Michał Górny
2020-08-14 23:22 Andreas Sturmlechner
2020-07-12 20:19 Michał Górny
2020-07-11  7:51 Michał Górny
2020-07-11  7:51 Michał Górny
2020-07-09  8:59 Agostino Sarubbo
2020-07-09  7:06 Sergei Trofimovich
2020-07-06 11:57 Michał Górny
2020-06-15  2:35 Aaron Bauman
2020-06-04 14:41 Sergei Trofimovich
2020-06-04 14:06 Michał Górny
2020-06-03 19:46 Agostino Sarubbo
2020-06-03 19:44 Agostino Sarubbo
2020-06-03 15:17 Agostino Sarubbo
2020-06-02 22:21 Mart Raudsepp
2020-06-02 21:20 Sergei Trofimovich
2020-06-01 20:51 Sergei Trofimovich
2020-05-25 20:16 Michał Górny
2020-05-03 20:03 Michał Górny
2020-04-04 10:52 Sergei Trofimovich
2020-03-29 21:21 Sergei Trofimovich
2020-03-16  6:07 Matt Turner
2020-03-16  6:07 Matt Turner
2020-03-14 22:11 Sergei Trofimovich
2020-03-11 19:53 Mart Raudsepp
2020-03-08  8:25 Michał Górny
2020-03-08  8:25 Michał Górny
2020-03-08  8:25 Michał Górny
2019-12-16 14:38 Michał Górny
2019-12-16 14:38 Michał Górny
2019-11-23  4:12 Patrick McLean
2018-12-08 17:41 Mikle Kolyada
2018-04-21 23:55 Thomas Deutschmann
2018-04-09 20:22 Stephen Klimaszewski
2018-03-21 19:41 Markus Meier
2018-03-15  1:03 Matt Turner
2018-03-11 23:12 Matt Turner
2018-02-21 17:20 Michał Górny
2018-01-07 22:27 Mikle Kolyada
2017-12-27 20:37 Sergei Trofimovich
2017-12-27 20:06 Sergei Trofimovich
2017-12-26 16:22 Jason Zaman
2017-12-23 21:58 Sergei Trofimovich
2017-12-23 11:17 Markus Meier
2017-12-21 22:34 Sergei Trofimovich
2017-12-19 23:02 Sergei Trofimovich
2017-12-04  2:30 Matt Turner
2017-09-23 13:05 Sergei Trofimovich
2017-09-23 10:39 Sergei Trofimovich
2017-09-22 19:40 Sergei Trofimovich
2017-09-21  5:16 Tim Harder
2017-09-21  5:16 Tim Harder
2017-03-17  4:24 Brian Dolbec
2017-03-17  0:45 Brian Dolbec
2017-01-04  4:49 Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1625525642.1cbd13afa14a227b1434e04a02153b338bf0551c.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox