From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
Date: Sat, 6 Jan 2024 14:08:27 +0000 (UTC) [thread overview]
Message-ID: <1704549739.9e00c0c4caaaab999c2ab4cd8262bca7db9d2b01.mgorny@gentoo> (raw)
commit: 9e00c0c4caaaab999c2ab4cd8262bca7db9d2b01
Author: Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Thu Jan 4 14:21:32 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 14:02:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e00c0c4
dev-python/pipenv: Fix import paths from pipdeptree
Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34644
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...env-2023.11.15-fix-import-path-PackageDAG.patch | 28 ++++++++++++++++++++++
dev-python/pipenv/pipenv-2023.11.15.ebuild | 1 +
2 files changed, 29 insertions(+)
diff --git a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch b/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
new file mode 100644
index 000000000000..25035da66115
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
@@ -0,0 +1,28 @@
+From b1e69d07afc4f94c6148f4ec65834e341a67b10d Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Thu, 4 Jan 2024 14:59:33 +0100
+Subject: [PATCH 1/2] Fix import path of PackageDAG
+
+pipdeptree moved it in the recent versions.
+
+Signed-off-by: Oz Tiram <oz.tiram@gmail.com>
+---
+ pipenv/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/environment.py b/pipenv/environment.py
+index 26975ce0d..7e0206ade 100644
+--- a/pipenv/environment.py
++++ b/pipenv/environment.py
+@@ -678,7 +678,7 @@ class Environment:
+ def get_package_requirements(self, pkg=None):
+ from itertools import chain
+
+- from pipdeptree import PackageDAG
++ from pipdeptree._models import PackageDAG
+
+ flatten = chain.from_iterable
+
+--
+2.41.0
+
diff --git a/dev-python/pipenv/pipenv-2023.11.15.ebuild b/dev-python/pipenv/pipenv-2023.11.15.ebuild
index 5c845f96c9f0..8201894fcfd6 100644
--- a/dev-python/pipenv/pipenv-2023.11.15.ebuild
+++ b/dev-python/pipenv/pipenv-2023.11.15.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~riscv"
PATCHES=(
"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
+ "${FILESDIR}/pipenv-2023.11.15-fix-import-path-PackageDAG.patch"
)
RDEPEND="
next reply other threads:[~2024-01-06 14:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-06 14:08 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-27 3:25 [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/ Sam James
2023-10-27 3:25 Sam James
2023-08-11 7:31 Joonas Niilola
2023-05-20 12:32 Joonas Niilola
2023-05-05 22:37 Sam James
2022-05-16 13:11 Michał Górny
2022-01-09 1:23 Sam James
2021-08-18 13:33 Joonas Niilola
2020-05-08 17:26 Sebastian Pipping
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=1704549739.9e00c0c4caaaab999c2ab4cd8262bca7db9d2b01.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