public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2020-05-08 17:26 Sebastian Pipping
  0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2020-05-08 17:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2d0b36ec9ef5edc463a2d2ea9933a2a9aa8143b7
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Mon May  4 18:17:58 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri May  8 17:25:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d0b36ec

dev-python/pipenv: 2020.4.1_beta1

Closes: https://github.com/gentoo/gentoo/pull/15645
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |  1 +
 ...nv-2020.4.1_beta1-disable-networked-tests.patch | 41 +++++++++++++++++++
 dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild     | 46 ++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 28df266db99..cf530a16f7e 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
 DIST pipenv-2018.11.26.tar.gz 6560580 BLAKE2B a3846de696733b5f3f393163999d7f333b52accdcebadfd800507defd1108ac4ccb288b39fb805ecf03e417cfe0d1a8b2fc714a95e8ee4485f8622ff8fe4a1ca SHA512 59582ad4a0730083ea58867f7a5d9714290d62947f56bec80e154d4359fe1dff16e44974a7fba3841e5f2516f2ce9709baf9954c9fc40fd66ebc46c3060d4dea
+DIST pipenv-2020.4.1_beta1.tar.gz 11331009 BLAKE2B 55ac81238b885bdf0293199ca1caf44a78f3cdbec75c9df259411b949dec8b385161e7ef46160ca099ef51041410d8c5d1274ad200eba5c2a9d06c8a5f61c5f1 SHA512 a5de90ae9910a30666ac7323ccf83b78ee11d8993aef1a2108a44f4256d365d0c1abfff72c83748ef82215914931090c670a10eeb511cb48483762b54c80e5c7

diff --git a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch b/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
new file mode 100644
index 00000000000..f3ba4ff6502
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
@@ -0,0 +1,41 @@
+From 7cf8c7ee7eaba1b5a11562a7ef656b0606383fe8 Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Mon, 4 May 2020 21:52:09 +0000
+Subject: [PATCH] Disable test cases that requires network
+
+---
+ tests/unit/test_utils.py | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
+index 4b9cd75c..1c73964b 100644
+--- a/tests/unit/test_utils.py
++++ b/tests/unit/test_utils.py
+@@ -47,16 +47,6 @@ DEP_PIP_PAIRS = [
+         },
+         "-e svn+svn://svn.myproject.org/svn/MyProject#egg=MyProject",
+     ),
+-    (
+-        # Extras in url
+-        {
+-            "discord.py": {
+-                "file": "https://github.com/Rapptz/discord.py/archive/async.zip",
+-                "extras": ["voice"],
+-            }
+-        },
+-        "https://github.com/Rapptz/discord.py/archive/async.zip#egg=discord.py[voice]",
+-    ),
+     (
+         {
+             "requests": {
+@@ -222,6 +212,7 @@ class TestUtils:
+         assert pipenv.utils.is_valid_url(url)
+         assert pipenv.utils.is_valid_url(not_url) is False
+ 
++    @pytest.mark.skip("Network required. Gentoo tests run in a sendbox without network")
+     @pytest.mark.utils
+     def test_download_file(self):
+         url = "https://github.com/pypa/pipenv/blob/master/README.md"
+-- 
+2.26.2
+

diff --git a/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild b/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
new file mode 100644
index 00000000000..8182443641b
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2020.4.1_beta1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/pip-18.0[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36.2.1[${PYTHON_USEDEP}]"
+DEPEND="test? (
+		${RDEPEND}
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		<dev-python/pytest-5[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.4.1_beta1-disable-networked-tests.patch"
+)
+
+python_test() {
+	pytest -m "not cli" -vv tests/unit || die
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2021-08-18 13:33 Joonas Niilola
  0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-08-18 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     7d2579a842be44fd0d4ed5fe50c37820d2344348
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Mon Aug  9 11:40:29 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 13:33:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2579a8

dev-python/pipenv: fixed vendored packages

 * Fix missing deps on jinja and attr
 * Remove vendored colorama, add dep on system colorama
 * Enable Python-3.10

Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...nv-2021-5-29-r1-remove-colorama-vendor-import.patch | 18 ++++++++++++++++++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild           | 11 +++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
new file mode 100644
index 00000000000..5c50788d032
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
@@ -0,0 +1,18 @@
+diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
+index d7644a21..19b0d695 100644
+--- a/pipenv/patched/crayons.py
++++ b/pipenv/patched/crayons.py
+@@ -13,7 +13,7 @@ import re
+ import sys
+ 
+ from pipenv.vendor import shellingham
+-from pipenv.vendor import colorama
++import colorama
+ 
+ PY3 = sys.version_info[0] >= 3
+ 
+Submodule tests/pypi f5530013..1881ecb4 (rewind):
+  < Update setuptools version
+  < Add sha256 checksum files
+  < Update url reference
+  < Add pep 508 subdirectory fixtures

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
index 403619ae607..11e51647f26 100644
--- a/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 inherit distutils-r1
 
@@ -20,11 +20,17 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES="${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+PATCHES=( 
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
+	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch"
+	)
 
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-python/attr[${PYTHON_USEDEP}]
 	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
 	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
@@ -45,6 +51,7 @@ src_prepare() {
 	# remove vendored versions
 	# see https://bugs.gentoo.org/717666
 	rm -vR "${S}/${PN}/vendor/attr/" || die
+	rm -vR "${S}/${PN}/vendor/colorama/" || die
 	rm -vR "${S}/${PN}/vendor/jinja2/" || die
 	distutils-r1_src_prepare
 }


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2022-01-09  1:23 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-01-09  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     685f93af6c7131bd05b95cbb45e94a89fd3459f8
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Sun Dec 26 01:21:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 01:22:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=685f93af

dev-python/pipenv: drop 2021.5.29-r2

Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23516
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |  1 -
 ...nv-2021-5-29-r2-remove-attr-vendor-import.patch | 95 ----------------------
 ...021-5-29-r2-remove-colorama-vendor-import.patch | 18 ----
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild       | 61 --------------
 4 files changed, 175 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 9bce1fb9615a..621cd3ceea21 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,3 +1,2 @@
 DIST pipenv-2021.11.23.tar.gz 11378116 BLAKE2B aa30c86aa3b20333d0bffc8c49761869cc9e86b69920abe5e58a0aa7ccf35a8faf6b8b29ce408c85239624a999ca4e67f4a687e1e9aa15271bea31a135acdb7d SHA512 3873a3e7de33677b63bb133e397f46030ec28a24479b38009a4c409d93277327e8f53694fa56fdb8120f9cd632e849fde6f4205e29d9f5704c8844101e8e8298
 DIST pipenv-2021.11.9.tar.gz 11652360 BLAKE2B ab7d733e0c44a8551d2b786680646f5efa9effdc6b6a74fc0b8286336c84b9795229036cc8b7179a4ee3d6c91701d82fdd2e8303c7c9a9da1e06eb78fb2a0214 SHA512 6ad44fe70d3e3f5bbdedb891c76ad1c37863e6f4215c34f2ef6aa1a35b89fb6262f8c55f7f2e71544e550d66d20567f12ce4698f9e3a899853aa49a0849c3189
-DIST pipenv-2021.5.29.tar.gz 11607230 BLAKE2B 8eef8e79fbdfaf85a949437d06d9f8b48f7eaa6e4769f6d4ed90b01c0ebf70c282fc90581cce5ffcab0aeb6bc9ad770a8b4425f355a06e0fc4cd56fb221386e2 SHA512 4fa018c13d4babe856bf5671cf5d18a95f4af4b6d4fc64c4919825fe04004ed3d8979ca335b851c6e24dad081475f6fb5b925eeff58c6fb5cffc450b967ed1cd

diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
deleted file mode 100644
index 3437c2a2f33f..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 1e81047d..ccfd639c 100644
---- a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -6,8 +6,11 @@ from abc import ABCMeta, abstractmethod
- 
- 
- from .environments import PIPENV_INSTALL_TIMEOUT
--from .vendor import attr, delegator
- from .utils import find_windows_executable
-+# future version of pipenv drops this
-+# hence, this stays here for a while
-+from .vendor import delegator
-+import attr
- 
- 
- @attr.s
-diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
-index c7807c05..f6e037d6 100644
---- a/pipenv/vendor/passa/models/projects.py
-+++ b/pipenv/vendor/passa/models/projects.py
-@@ -6,7 +6,7 @@ import collections
- import io
- import os
- 
--from pipenv.vendor import attr
-+import attr
- import packaging.markers
- import packaging.utils
- import plette
-diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
-index aeba0443..76327115 100644
---- a/pipenv/vendor/pythonfinder/models/mixins.py
-+++ b/pipenv/vendor/pythonfinder/models/mixins.py
-@@ -5,7 +5,7 @@ import abc
- import operator
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- import six
- 
- from ..compat import fs_str
-diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
-index e8c13429..7a197181 100644
---- a/pipenv/vendor/pythonfinder/models/path.py
-+++ b/pipenv/vendor/pythonfinder/models/path.py
-@@ -7,7 +7,7 @@ import sys
- from collections import defaultdict
- from itertools import chain
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from cached_property import cached_property
- from ..compat import Path, fs_str
-diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
-index 4f7e5563..d001a1e5 100644
---- a/pipenv/vendor/pythonfinder/models/python.py
-+++ b/pipenv/vendor/pythonfinder/models/python.py
-@@ -7,7 +7,7 @@ import platform
- import sys
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from packaging.version import Version
- 
-diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
-index c69b9484..fb36a272 100644
---- a/pipenv/vendor/pythonfinder/models/windows.py
-+++ b/pipenv/vendor/pythonfinder/models/windows.py
-@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
- import operator
- from collections import defaultdict
- 
--from pipenv.vendor import attr
-+import attr
- 
- from ..environment import MYPY_RUNNING
- from ..exceptions import InvalidPythonVersion
-diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
-index bcea7f3e..41d2d59a 100644
---- a/pipenv/vendor/pythonfinder/utils.py
-+++ b/pipenv/vendor/pythonfinder/utils.py
-@@ -10,7 +10,7 @@ from collections import OrderedDict
- from fnmatch import fnmatch
- from threading import Timer
- 
--from pipenv.vendor import attr
-+import attr
- import six
- from packaging.version import LegacyVersion, Version
- 

diff --git a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
deleted file mode 100644
index 5c50788d0320..000000000000
--- a/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pipenv/patched/crayons.py b/pipenv/patched/crayons.py
-index d7644a21..19b0d695 100644
---- a/pipenv/patched/crayons.py
-+++ b/pipenv/patched/crayons.py
-@@ -13,7 +13,7 @@ import re
- import sys
- 
- from pipenv.vendor import shellingham
--from pipenv.vendor import colorama
-+import colorama
- 
- PY3 = sys.version_info[0] >= 3
- 
-Submodule tests/pypi f5530013..1881ecb4 (rewind):
-  < Update setuptools version
-  < Add sha256 checksum files
-  < Update url reference
-  < Add pep 508 subdirectory fixtures

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
deleted file mode 100644
index 77de678dfaf3..000000000000
--- a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
+++ /dev/null
@@ -1,61 +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_{8..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( 
-	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-attr-vendor-import.patch"
-	"${FILESDIR}/${PN}-${PV//./-}-${PR}-remove-colorama-vendor-import.patch"
-	)
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# remove vendored version of PyYAML that is backported to Python2
-	rm -vR "${S}/${PN}/patched/yaml2/" || die
-	# remove vendored versions
-	# see https://bugs.gentoo.org/717666
-	rm -vR "${S}/${PN}/vendor/attr/" || die
-	rm -vR "${S}/${PN}/vendor/colorama/" || die
-	rm -vR "${S}/${PN}/vendor/jinja2/" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2022-05-16 13:11 Michał Górny
  0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2022-05-16 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     64f4f36a361e4158e6422d49aace70cd39ef99c5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 13:10:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 16 13:10:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f4f36a

dev-python/pipenv: Remove old

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

 dev-python/pipenv/Manifest                         |   2 -
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 ---------------------
 dev-python/pipenv/pipenv-2021.11.23.ebuild         |  81 -----------
 dev-python/pipenv/pipenv-2022.1.8.ebuild           |  99 -------------
 4 files changed, 344 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 3bcdf0bbc623..a96ecdd88fcd 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,3 +1 @@
-DIST pipenv-2021.11.23.tar.gz 11378116 BLAKE2B aa30c86aa3b20333d0bffc8c49761869cc9e86b69920abe5e58a0aa7ccf35a8faf6b8b29ce408c85239624a999ca4e67f4a687e1e9aa15271bea31a135acdb7d SHA512 3873a3e7de33677b63bb133e397f46030ec28a24479b38009a4c409d93277327e8f53694fa56fdb8120f9cd632e849fde6f4205e29d9f5704c8844101e8e8298
-DIST pipenv-2022.1.8.tar.gz 11379235 BLAKE2B b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0 SHA512 9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0
 DIST pipenv-2022.4.8.tar.gz 11822017 BLAKE2B b647bf5dbbdb6a38ace41bc58c3178199c0c7cada826f18d0f58c6f3cd60290fa714ca434d19cf468cf316d51ac0895460cb007d677b53462a7efc86f3d3bb2e SHA512 8c0ed65b9431b785f86bc4fa0a0a55d96228ed2f9483805536fa3056853dbfabeac02578f694e9a3f2e00be579183d10dcbb957fb834d475e1621de6a05ebd2e

diff --git a/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
deleted file mode 100644
index a8ff7d107f9c..000000000000
--- a/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram <oz.tiram@gmail.com>
-Date: Sun, 9 Jan 2022 23:52:06 +0100
-Subject: [PATCH] Remove vendored first
-
-While first is nice to have, it adds a lot of code in vendor.
-This patch achieves the same with less code in vendor (~80 lines less).
----
- pipenv/core.py              |  4 +-
- pipenv/vendor/first.LICENSE | 19 ---------
- pipenv/vendor/first.py      | 78 -------------------------------------
- pipenv/vendor/vendor.txt    |  1 -
- 4 files changed, 2 insertions(+), 100 deletions(-)
- delete mode 100644 pipenv/vendor/first.LICENSE
- delete mode 100644 pipenv/vendor/first.py
-
-diff --git a/pipenv/core.py b/pipenv/core.py
-index 92811f74..1c04047c 100644
---- a/pipenv/core.py
-+++ b/pipenv/core.py
-@@ -2525,7 +2525,6 @@ def do_check(
-     args=None,
-     pypi_mirror=None
- ):
--    from first import first
-     from pipenv.vendor.vistir.compat import JSONDecodeError
- 
-     if not system:
-@@ -2569,7 +2568,8 @@ def do_check(
-     if not system:
-         python = project._which("python")
-     else:
--        python = first(system_which(p) for p in ("python", "python3", "python2"))
-+        interpreters = [system_which(p) for p in ("python", "python3", "python2")]
-+        python = interpreters[0] if interpreters else None
-     if not python:
-         click.echo(crayons.red("The Python interpreter can't be found."), err=True)
-         sys.exit(1)
-diff --git a/pipenv/vendor/first.LICENSE b/pipenv/vendor/first.LICENSE
-deleted file mode 100644
-index a9c8c9db..00000000
---- a/pipenv/vendor/first.LICENSE
-+++ /dev/null
-@@ -1,19 +0,0 @@
--Copyright (c) 2012 Hynek Schlawack
--
--Permission is hereby granted, free of charge, to any person obtaining a copy of
--this software and associated documentation files (the "Software"), to deal in
--the Software without restriction, including without limitation the rights to
--use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
--of the Software, and to permit persons to whom the Software is furnished to do
--so, subject to the following conditions:
--
--The above copyright notice and this permission notice shall be included in all
--copies or substantial portions of the Software.
--
--THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--SOFTWARE.
-diff --git a/pipenv/vendor/first.py b/pipenv/vendor/first.py
-deleted file mode 100644
-index 8cf9d2d1..00000000
---- a/pipenv/vendor/first.py
-+++ /dev/null
-@@ -1,78 +0,0 @@
--## -*- coding: utf-8 -*-
--
--"""
--first
--=====
--
--first is the function you always missed in Python.
--
--In the simplest case, it returns the first true element from an iterable:
--
-->>> from first import first
-->>> first([0, False, None, [], (), 42])
--42
--
--Or None if there is none:
--
-->>> from first import first
-->>> first([]) is None
--True
-->>> first([0, False, None, [], ()]) is None
--True
--
--It also supports the passing of a key argument to help selecting the first
--match in a more advanced way.
--
-->>> from first import first
-->>> first([1, 1, 3, 4, 5], key=lambda x: x % 2 == 0)
--4
--
--:copyright: (c) 2012 by Hynek Schlawack.
--:license: MIT, see LICENSE for more details.
--
--"""
--
--__title__ = 'first'
--__version__ = '2.0.2'
--__author__ = 'Hynek Schlawack'
--__license__ = 'MIT'
--__copyright__ = 'Copyright 2012 Hynek Schlawack'
--
--
--def first(iterable, default=None, key=None):
--    """
--    Return first element of `iterable` that evaluates true, else return None
--    (or an optional default value).
--
--    >>> first([0, False, None, [], (), 42])
--    42
--
--    >>> first([0, False, None, [], ()]) is None
--    True
--
--    >>> first([0, False, None, [], ()], default='ohai')
--    'ohai'
--
--    >>> import re
--    >>> m = first(re.match(regex, 'abc') for regex in ['b.*', 'a(.*)'])
--    >>> m.group(1)
--    'bc'
--
--    The optional `key` argument specifies a one-argument predicate function
--    like that used for `filter()`.  The `key` argument, if supplied, must be
--    in keyword form.  For example:
--
--    >>> first([1, 1, 3, 4, 5], key=lambda x: x % 2 == 0)
--    4
--
--    """
--    if key is None:
--        for el in iterable:
--            if el:
--                return el
--    else:
--        for el in iterable:
--            if key(el):
--                return el
--
--    return default
-diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt
-index 0530062e..3d7b39ea 100644
---- a/pipenv/vendor/vendor.txt
-+++ b/pipenv/vendor/vendor.txt
-@@ -10,7 +10,6 @@ colorama==0.4.4
- distlib==0.3.2
- docopt==0.6.2
- dparse==0.5.1
--first==2.0.2
- funcsigs==1.0.2
- idna==3.2
- importlib-metadata==4.6.1
--- 
-2.32.0
-

diff --git a/dev-python/pipenv/pipenv-2021.11.23.ebuild b/dev-python/pipenv/pipenv-2021.11.23.ebuild
deleted file mode 100644
index 091b0495a4ac..000000000000
--- a/dev-python/pipenv/pipenv-2021.11.23.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-
-	local jobs=$(makeopts_jobs)
-	local packages=( attr colorama idna pexpect dateutil requests urllib3 zipp )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e 's/from pipenv.vendor import '"${pkgName}"'/import '"${pkgName}"'/g' \
-				-e 's/from pipenv.vendor.'"${pkgName}"'\(.*\) import \(\w*\)/from '"${pkgName}"'\1 import \2/g' \
-				-e 's/import pipenv.vendor.'"${pkgName}"' as '"${pkgName}"'/import '"${pkgName}"'/g'
-	done
-	assert "Failed to sed sources"
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		 find ./pipenv/vendor/ -name "${pkgName}*" -prune -exec rm -rvf {} + || die
-	done
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}

diff --git a/dev-python/pipenv/pipenv-2022.1.8.ebuild b/dev-python/pipenv/pipenv-2022.1.8.ebuild
deleted file mode 100644
index 36de6a9b7856..000000000000
--- a/dev-python/pipenv/pipenv-2022.1.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-${PV//./-}-remove-first-vendor-import.patch"
-	)
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	<dev-python/tomli-2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.7[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.36.0[${PYTHON_USEDEP}]
-	>=dev-python/zipp-3.6.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-
-	local jobs=$(makeopts_jobs)
-	local packages=( attr cerberus cached_property colorama docopt first idna pexpect dateutil requests \
-						toml tomli urllib3 zipp )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e 's/from pipenv.vendor import '"${pkgName}"'/import '"${pkgName}"'/g' \
-				-e 's/from pipenv.vendor.'"${pkgName}"'\(.*\) import \(\w*\)/from '"${pkgName}"'\1 import \2/g' \
-				-e 's/import pipenv.vendor.'"${pkgName}"' as '"${pkgName}"'/import '"${pkgName}"'/g' \
-				-e 's/from .vendor import '"${pkgName}"'/import '"${pkgName}"'/g'
-	done
-	assert "Failed to sed sources"
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		# remove all packages toml* also catches tomlkit. Remove this when tomlkit is stable
-		find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -prune -exec rm -rvf {} + || die
-		# find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -print
-
-		# package names can be foo-bar, their module will be however foo_bar
-		find ./pipenv/vendor/ -maxdepth 1 ! -name tomlkit -name "${pkgName/_/-}*" -prune -exec rm -rvf {} + || die
-
-	done
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	pytest -vvv -x -m "not cli and not needs_internet" tests/unit/ || die
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2023-05-05 22:37 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-05-05 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a5db7dc669c20b0a5b5b79b230a0adb21c49064e
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Fri May  5 22:32:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 22:37:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5db7dc6

dev-python/pipenv: remove toml dependency

Patch the upstream package to use tomli, also
declare tomli as dependency only if python is less than 3.11

Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30866
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pipenv-2023.4.29-fix-toml-in-vendor.patch      | 76 ++++++++++++++++++++++
 dev-python/pipenv/pipenv-2023.4.29.ebuild          | 10 +--
 2 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
new file mode 100644
index 000000000000..cb0f3f70d48b
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
@@ -0,0 +1,76 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index ed43cf2bc..903667639 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -13,6 +13,13 @@ import urllib.parse
+ from json.decoder import JSONDecodeError
+ from pathlib import Path
+ 
++import click, tomlkit
++
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from pipenv.cmdparse import Script
+ from pipenv.environment import Environment
+ from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
+diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
+index d4157d01c..27d9975ae 100644
+--- a/pipenv/utils/toml.py
++++ b/pipenv/utils/toml.py
+@@ -1,4 +1,9 @@
+-from pipenv.vendor import toml, tomlkit
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
++import tomlkit
+ 
+ 
+ def cleanup_toml(tml):
+diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
+index faaad2e8e..4c59474e9 100644
+--- a/pipenv/vendor/dparse/parser.py
++++ b/pipenv/vendor/dparse/parser.py
+@@ -10,6 +10,11 @@ from io import StringIO
+ from configparser import ConfigParser, NoOptionError
+ from pathlib import PurePath
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ from .errors import MalformedDependencyFileError
+ from .regex import HASH_REGEX
+ 
+@@ -17,7 +22,6 @@ from .dependencies import DependencyFile, Dependency
+ from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
+     InvalidRequirement
+ from . import filetypes
+-import pipenv.vendor.toml as toml
+ from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
+ from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
+ import json
+diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
+index 7b7ba9a53..fe20a213f 100644
+--- a/pipenv/vendor/dparse/updater.py
++++ b/pipenv/vendor/dparse/updater.py
+@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
+ import re
+ import json
+ import tempfile
+-import pipenv.vendor.toml as toml
+ import os
+ 
++try:
++    import tomllib as toml
++except ImportError:
++    import tomli as toml
++
+ 
+ class RequirementsTXTUpdater(object):
+     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"

diff --git a/dev-python/pipenv/pipenv-2023.4.29.ebuild b/dev-python/pipenv/pipenv-2023.4.29.ebuild
index 1ae17db21361..5fdc0ff53f40 100644
--- a/dev-python/pipenv/pipenv-2023.4.29.ebuild
+++ b/dev-python/pipenv/pipenv-2023.4.29.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
 	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
 	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
+	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
 )
 
 RDEPEND="
@@ -33,7 +34,7 @@ RDEPEND="
 	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
 	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
@@ -90,13 +91,6 @@ src_prepare() {
 		sed --in-place \
 			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
 
-	# remove tomlkit from vendoring
-	for fname in pipenv/utils/toml.py tests/integration/conftest.py; do
-		sed --in-place -e "s/from pipenv\.vendor import toml, tomlkit/from pipenv\.vendor import toml\\nimport tomlkit/g" $fname || die "Failed sed in $fname"
-	done
-	#for fname in "tests/unit/test_vendor.py "; do
-	#	sed --in-place -e "s/from pipenv\.vendor import tomlkit/import tomlkit/g" $fname || die "Failed sed in tomlkit"
-	#done
 	# remove python ruaml yaml
 	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
 	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2023-05-20 12:32 Joonas Niilola
  0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2023-05-20 12:32 UTC (permalink / raw
  To: gentoo-commits

commit:     827ece915c1a98e3dad5a1c2f1358451ab52b496
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Sun May  7 02:53:38 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 20 12:18:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827ece91

dev-python/pipenv: fix patch for imports

Bug: https://bugs.gentoo.org/905793
Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30907
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch  | 18 ++++++++++++++++++
 .../files/pipenv-2023.4.29-fix-toml-in-vendor.patch    | 11 ++++++++++-
 dev-python/pipenv/pipenv-2023.4.29.ebuild              |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
new file mode 100644
index 000000000000..8218d0f59e1c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
@@ -0,0 +1,18 @@
+diff --git a/pipenv/project.py b/pipenv/project.py
+index 55251bc5f..9fd46f089 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -183,9 +183,9 @@ class Project:
+                 "name": "pypi",
+             }
+ 
+-        default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}"
++        default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}"
+         for pip_conf_index in pip_conf_indexes:
+-            default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}"
++            default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}"
+         plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml
+ 
+         # Hack to skip this during pipenv run, or -r.
+
+

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
index cb0f3f70d48b..e23a42e46b59 100644
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
@@ -1,5 +1,5 @@
 diff --git a/pipenv/project.py b/pipenv/project.py
-index ed43cf2bc..903667639 100644
+index ed43cf2bc..55251bc5f 100644
 --- a/pipenv/project.py
 +++ b/pipenv/project.py
 @@ -13,6 +13,13 @@ import urllib.parse
@@ -16,6 +16,15 @@ index ed43cf2bc..903667639 100644
  from pipenv.cmdparse import Script
  from pipenv.environment import Environment
  from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
+@@ -43,8 +50,6 @@ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
+ from pipenv.vendor import plette
+ from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
+ 
+-import click, toml, tomlkit
+-
+ try:
+     # this is only in Python3.8 and later
+     from functools import cached_property
 diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
 index d4157d01c..27d9975ae 100644
 --- a/pipenv/utils/toml.py

diff --git a/dev-python/pipenv/pipenv-2023.4.29.ebuild b/dev-python/pipenv/pipenv-2023.4.29.ebuild
index 5fdc0ff53f40..123b4de71625 100644
--- a/dev-python/pipenv/pipenv-2023.4.29.ebuild
+++ b/dev-python/pipenv/pipenv-2023.4.29.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
 	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
 	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
+	"${FILESDIR}/pipenv-2023.4.29-fix-toml-dump.patch"
 )
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2023-08-11  7:31 Joonas Niilola
  0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2023-08-11  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     6441c883daae2ff5d6a4c4c5d947a2b1d6b8fca3
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Tue Jul 18 22:25:11 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 07:31:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6441c883

dev-python/pipenv: add 2023.7.11

Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31949
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |   1 +
 .../files/pipenv-2023.7.11-fix-imports-utils.patch |  15 +++
 .../files/pipenv-2023.7.11-fix-imports.patch       |  39 ++++++++
 dev-python/pipenv/pipenv-2023.7.11.ebuild          | 108 +++++++++++++++++++++
 4 files changed, 163 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 4cc9ee5fb090..f0b6618dab16 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
 DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
+DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193

diff --git a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch
new file mode 100644
index 000000000000..2e348bf8e440
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch
@@ -0,0 +1,15 @@
+diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
+index 2e066eef2..219d8f9e5 100644
+--- a/pipenv/utils/environment.py
++++ b/pipenv/utils/environment.py
+@@ -1,7 +1,9 @@
+ import os
+ 
++import click
++import dotenv
++
+ from pipenv import environments
+-from pipenv.vendor import click, dotenv
+ 
+ 
+ def load_dot_env(project, as_dict=False, quiet=False):

diff --git a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports.patch
new file mode 100644
index 000000000000..a437d55b6964
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports.patch
@@ -0,0 +1,39 @@
+diff --git a/pipenv/environment.py b/pipenv/environment.py
+index dbb89b011..89f2aaf9e 100644
+--- a/pipenv/environment.py
++++ b/pipenv/environment.py
+@@ -14,7 +14,9 @@ from sysconfig import get_paths, get_python_version, get_scheme_names
+ from urllib.parse import urlparse
+ from urllib.request import url2pathname
+ 
++import click
+ import pipenv
++
+ from pipenv.patched.pip._internal.commands.install import InstallCommand
+ from pipenv.patched.pip._internal.index.package_finder import PackageFinder
+ from pipenv.patched.pip._vendor import pkg_resources
+@@ -23,7 +25,6 @@ from pipenv.utils.funktools import chunked, unnest
+ from pipenv.utils.indexes import prepare_pip_source_args
+ from pipenv.utils.processes import subprocess_run
+ from pipenv.utils.shell import make_posix
+-from pipenv.vendor import click
+ from pipenv.vendor.pythonfinder.utils import is_in_path
+ from pipenv.vendor.requirementslib.fileutils import normalize_path, temp_path
+ from pipenv.vendor.requirementslib.utils import temp_environ
+diff --git a/pipenv/project.py b/pipenv/project.py
+index f865988b9..e8714ef63 100644
+--- a/pipenv/project.py
++++ b/pipenv/project.py
+@@ -44,9 +44,11 @@ from pipenv.utils.shell import (
+     system_which,
+ )
+ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
+-from pipenv.vendor import click, plette, tomlkit
++from pipenv.vendor import plette
+ from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
+ 
++import click, tomlkit
++
+ try:
+     # this is only in Python3.8 and later
+     from functools import cached_property

diff --git a/dev-python/pipenv/pipenv-2023.7.11.ebuild b/dev-python/pipenv/pipenv-2023.7.11.ebuild
new file mode 100644
index 000000000000..754900f42659
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2023.7.11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
+	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
+	"${FILESDIR}/pipenv-2023.7.11-fix-imports.patch"
+	"${FILESDIR}/pipenv-2023.7.11-fix-imports-utils.patch"
+)
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( attr attrs cerberus colorama dotenv markupsafe \
+					 pexpect ptyprocess pyparsing requests urllib3 tomlkit )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
+				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
+				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
+				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	find ./ -type f -print0 | \
+		xargs --max-procs="${jobs}" --null \
+		sed --in-place \
+			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
+
+	# remove python ruaml yaml
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+
+	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
+
+	for fname in Makefile README.md README.rst ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname"
+	done
+
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2023-10-27  3:25 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-10-27  3:25 UTC (permalink / raw
  To: gentoo-commits

commit:     b7d00239ce93b213031e3b716b42522d4cdd40a1
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Sun Sep 24 07:52:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 03:23:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d00239

dev-python/pipenv: add 2023.9.8

Bug: https://bugs.gentoo.org/717666
Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |   1 +
 ...8-append-always-install-to-pip-extra-args.patch |  34 ++++++
 .../pipenv-2023.9.8-inject-system-packages.patch   |  53 +++++++++
 dev-python/pipenv/pipenv-2023.9.8.ebuild           | 124 +++++++++++++++++++++
 4 files changed, 212 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index f0b6618dab16..123eb06e474d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
 DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193
+DIST pipenv-2023.9.8.gh.tar.gz 10819425 BLAKE2B 3fd67d5aa7022251660c09d47e6d2487eabca507dbac8ebb2c298ef46cae452e6f2330615053d80a404f98ce523e5ff15ef89adbc85779305633b45e6b989423 SHA512 328cab44cea16bb685f745f80804e2a8b951e93a24379d5b61faeae4730e58d48cff663652f785800dd1dffc7a05f398ca54eb5118cd4fcfa43c35dad86f60eb

diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch
new file mode 100644
index 000000000000..d97987fd0db3
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch
@@ -0,0 +1,34 @@
+From 8ee76835b2d615156bb6d329417d6ce8d19bfa3a Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Wed, 20 Sep 2023 23:11:27 +0200
+Subject: [PATCH 2/4] Append always install to pip extra args
+
+---
+ pipenv/routines/install.py | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
+index 2f135b435..e30f2da52 100644
+--- a/pipenv/routines/install.py
++++ b/pipenv/routines/install.py
+@@ -459,6 +459,17 @@ def batch_install_iteration(
+     allow_global=False,
+     extra_pip_args=None,
+ ):
++    # Gentoo patch:
++    # Install dependencies into the venv even if they exist
++    # in the system.
++    # This is needed because pipenv imports the system packages to run.
++    # It does not change your system's packages.
++
++    if (extra_pip_args is not None) and ("-I" not in extra_pip_args):
++        extra_pip_args.append("-I")
++
++    # End of Gentoo patch
++
+     with temp_environ():
+         if not allow_global:
+             os.environ["PIP_USER"] = "0"
+-- 
+2.41.0
+

diff --git a/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch
new file mode 100644
index 000000000000..cf211f1ab846
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.9.8-inject-system-packages.patch
@@ -0,0 +1,53 @@
+From b6b25911c050f0bec192e5ccb09ddc6dc3d5fa7d Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Wed, 20 Sep 2023 23:03:57 +0200
+Subject: [PATCH 1/4] Inject system packages
+
+---
+ pipenv/patched/pip/__main__.py | 8 ++++++++
+ pipenv/resolver.py             | 6 ++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
+index 032297163..59f7ad19e 100644
+--- a/pipenv/patched/pip/__main__.py
++++ b/pipenv/patched/pip/__main__.py
+@@ -21,10 +21,18 @@ if __package__ == "":
+ if __name__ == "__main__":
+     import importlib.util
+     import sys
++
++    SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
++
++    # Inject site directory into system path.
++    sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
+     spec = importlib.util.spec_from_file_location(
+         "pipenv", location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py"))
+     pipenv = importlib.util.module_from_spec(spec)
+     sys.modules["pipenv"] = pipenv
++
++
+     spec.loader.exec_module(pipenv)
+     from pipenv.patched.pip._internal.cli.main import main as _main
+ 
+diff --git a/pipenv/resolver.py b/pipenv/resolver.py
+index 82e01ca39..29461b878 100644
+--- a/pipenv/resolver.py
++++ b/pipenv/resolver.py
+@@ -10,6 +10,12 @@ except ImportError:
+     cached_property = property
+ 
+ 
++SITE_PACKAGES_ROOT = os.path.dirname(os.path.dirname(__file__))
++
++# Inject site directory into system path.
++sys.path.insert(-1, SITE_PACKAGES_ROOT)
++
++
+ def _ensure_modules():
+     spec = importlib.util.spec_from_file_location(
+         "typing_extensions",
+-- 
+2.41.0
+

diff --git a/dev-python/pipenv/pipenv-2023.9.8.ebuild b/dev-python/pipenv/pipenv-2023.9.8.ebuild
new file mode 100644
index 000000000000..6b7786ff6f88
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2023.9.8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
+	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
+)
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/dparse[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	dev-python/pipdeptree[${PYTHON_USEDEP}]
+	dev-python/plette[${PYTHON_USEDEP}]
+	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2.0.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pythonfinder[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
+
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
+					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
+					 requests urllib3 shellingham tomli tomlkit )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
+				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
+				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
+				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	find ./ -type f -print0 | \
+		xargs --max-procs="${jobs}" --null \
+		sed --in-place \
+			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
+
+	# remove python ruaml yaml
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+
+	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
+
+	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
+	done
+
+	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
+	
+	rm -Rfv pipenv/vendor || die "Could not vendor"
+	rm -Rfv examples || die "Could not remove examples"
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2023-10-27  3:25 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-10-27  3:25 UTC (permalink / raw
  To: gentoo-commits

commit:     98572adff48f1145aaefc60aed1655622ea4c4a7
Author:     Oz Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Sun Sep 24 07:55:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 03:23:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98572adf

dev-python/pipenv: drop 2023.4.29-r1

Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33026
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/pipenv/Manifest                         |   1 -
 .../files/pipenv-2023.4.29-fix-imports.patch       |  31 ------
 .../files/pipenv-2023.4.29-fix-toml-dump.patch     |  18 ----
 .../pipenv-2023.4.29-fix-toml-in-vendor.patch      |  85 ----------------
 dev-python/pipenv/pipenv-2023.4.29-r1.ebuild       | 109 ---------------------
 5 files changed, 244 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 123eb06e474d..55f477212328 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,3 +1,2 @@
-DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1 SHA512 870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff
 DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991 SHA512 d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193
 DIST pipenv-2023.9.8.gh.tar.gz 10819425 BLAKE2B 3fd67d5aa7022251660c09d47e6d2487eabca507dbac8ebb2c298ef46cae452e6f2330615053d80a404f98ce523e5ff15ef89adbc85779305633b45e6b989423 SHA512 328cab44cea16bb685f745f80804e2a8b951e93a24379d5b61faeae4730e58d48cff663652f785800dd1dffc7a05f398ca54eb5118cd4fcfa43c35dad86f60eb

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
deleted file mode 100644
index eeae85039e12..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index 75ee7d401..ed43cf2bc 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -40,9 +40,11 @@ from pipenv.utils.shell import (
-     system_which,
- )
- from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
--from pipenv.vendor import click, plette, toml, tomlkit
-+from pipenv.vendor import plette
- from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
- 
-+import click, toml, tomlkit
-+
- try:
-     # this is only in Python3.8 and later
-     from functools import cached_property
-diff --git a/pipenv/utils/environment.py b/pipenv/utils/environment.py
-index 2e066eef2..9385689bf 100644
---- a/pipenv/utils/environment.py
-+++ b/pipenv/utils/environment.py
-@@ -1,7 +1,8 @@
- import os
-+import dotenv
-+import click
- 
- from pipenv import environments
--from pipenv.vendor import click, dotenv
- 
- 
- def load_dot_env(project, as_dict=False, quiet=False):

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
deleted file mode 100644
index 8218d0f59e1c..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-dump.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index 55251bc5f..9fd46f089 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -183,9 +183,9 @@ class Project:
-                 "name": "pypi",
-             }
- 
--        default_sources_toml = f"[[source]]\n{toml.dumps(self.default_source)}"
-+        default_sources_toml = f"[[source]]\n{tomlkit.dumps(self.default_source)}"
-         for pip_conf_index in pip_conf_indexes:
--            default_sources_toml += f"\n\n[[source]]\n{toml.dumps(pip_conf_index)}"
-+            default_sources_toml += f"\n\n[[source]]\n{tomlkit.dumps(pip_conf_index)}"
-         plette.pipfiles.DEFAULT_SOURCE_TOML = default_sources_toml
- 
-         # Hack to skip this during pipenv run, or -r.
-
-

diff --git a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch b/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
deleted file mode 100644
index e23a42e46b59..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.4.29-fix-toml-in-vendor.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/pipenv/project.py b/pipenv/project.py
-index ed43cf2bc..55251bc5f 100644
---- a/pipenv/project.py
-+++ b/pipenv/project.py
-@@ -13,6 +13,13 @@ import urllib.parse
- from json.decoder import JSONDecodeError
- from pathlib import Path
- 
-+import click, tomlkit
-+
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- from pipenv.cmdparse import Script
- from pipenv.environment import Environment
- from pipenv.environments import Setting, is_in_virtualenv, normalize_pipfile_path
-@@ -43,8 +50,6 @@ from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
- from pipenv.vendor import plette
- from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
- 
--import click, toml, tomlkit
--
- try:
-     # this is only in Python3.8 and later
-     from functools import cached_property
-diff --git a/pipenv/utils/toml.py b/pipenv/utils/toml.py
-index d4157d01c..27d9975ae 100644
---- a/pipenv/utils/toml.py
-+++ b/pipenv/utils/toml.py
-@@ -1,4 +1,9 @@
--from pipenv.vendor import toml, tomlkit
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
-+import tomlkit
- 
- 
- def cleanup_toml(tml):
-diff --git a/pipenv/vendor/dparse/parser.py b/pipenv/vendor/dparse/parser.py
-index faaad2e8e..4c59474e9 100644
---- a/pipenv/vendor/dparse/parser.py
-+++ b/pipenv/vendor/dparse/parser.py
-@@ -10,6 +10,11 @@ from io import StringIO
- from configparser import ConfigParser, NoOptionError
- from pathlib import PurePath
- 
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- from .errors import MalformedDependencyFileError
- from .regex import HASH_REGEX
- 
-@@ -17,7 +22,6 @@ from .dependencies import DependencyFile, Dependency
- from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement,\
-     InvalidRequirement
- from . import filetypes
--import pipenv.vendor.toml as toml
- from pipenv.patched.pip._vendor.packaging.specifiers import SpecifierSet
- from pipenv.patched.pip._vendor.packaging.version import Version, InvalidVersion
- import json
-diff --git a/pipenv/vendor/dparse/updater.py b/pipenv/vendor/dparse/updater.py
-index 7b7ba9a53..fe20a213f 100644
---- a/pipenv/vendor/dparse/updater.py
-+++ b/pipenv/vendor/dparse/updater.py
-@@ -3,9 +3,13 @@ from __future__ import absolute_import, print_function, unicode_literals
- import re
- import json
- import tempfile
--import pipenv.vendor.toml as toml
- import os
- 
-+try:
-+    import tomllib as toml
-+except ImportError:
-+    import tomli as toml
-+
- 
- class RequirementsTXTUpdater(object):
-     SUB_REGEX = r"^{}(?=\s*\r?\n?$)"

diff --git a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild b/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild
deleted file mode 100644
index 123b4de71625..000000000000
--- a/dev-python/pipenv/pipenv-2023.4.29-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
-	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-imports.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-toml-in-vendor.patch"
-	"${FILESDIR}/pipenv-2023.4.29-fix-toml-dump.patch"
-)
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( attr attrs cerberus colorama dotenv markupsafe \
-					 pexpect ptyprocess pyparsing requests urllib3 tomlkit )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e "s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md README.rst ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname"
-	done
-
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/
@ 2024-01-06 14:08 Michał Górny
  0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2024-01-06 14:08 UTC (permalink / raw
  To: gentoo-commits

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="


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-01-06 14:08 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-08 17:26 [gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/, dev-python/pipenv/files/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2021-08-18 13:33 Joonas Niilola
2022-01-09  1:23 Sam James
2022-05-16 13:11 Michał Górny
2023-05-05 22:37 Sam James
2023-05-20 12:32 Joonas Niilola
2023-08-11  7:31 Joonas Niilola
2023-10-27  3:25 Sam James
2023-10-27  3:25 Sam James
2024-01-06 14:08 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox