[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/files/

[Aaron Bauman]

commit:     6703ef63b742029343c2055c322e5e1ad0d2cc70
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 13:28:16 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:19:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6703ef63

dev-python/pipenv: remove unused patch(es)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16871
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 ...nv-2020.4.1_beta1-disable-networked-tests.patch | 41 ----------------------
 1 file changed, 41 deletions(-)

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
deleted file mode 100644
index f3ba4ff6502..00000000000
--- a/dev-python/pipenv/files/pipenv-2020.4.1_beta1-disable-networked-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/files/

[Joonas Niilola]

commit:     6939a1be7ec70c66ea2b17800dde3007bb1d5ea0
Author:     Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
AuthorDate: Thu Oct  6 10:58:06 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 16:34:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6939a1be

dev-python/pipenv: fix import errors

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

 .../pipenv-2022.9.24-inject-site-packages.patch    | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
new file mode 100644
index 000000000000..04cf0ed9e317
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
@@ -0,0 +1,34 @@
+diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
+index b424ab20..79d52838 100644
+--- a/pipenv/patched/pip/__main__.py
++++ b/pipenv/patched/pip/__main__.py
+@@ -28,6 +28,13 @@ 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)
+diff --git a/pipenv/resolver.py b/pipenv/resolver.py
+index 3fea0a1e..a0d9da29 100644
+--- a/pipenv/resolver.py
++++ b/pipenv/resolver.py
+@@ -6,6 +6,11 @@ import sys
+ 
+ os.environ["PIP_PYTHON_PATH"] = str(sys.executable)
+ 
++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(

[gentoo-commits] repo/gentoo:master commit in: dev-python/pipenv/files/

[Conrad Kostecki]

commit:     78fb60ae2b554d2845509d1e90aa6aaa87b27269
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 17 12:22:34 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 20:00:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fb60ae

dev-python/pipenv: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...env-2023.11.15-fix-import-path-PackageDAG.patch | 28 ----------------------
 1 file changed, 28 deletions(-)

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
deleted file mode 100644
index 25035da66115..000000000000
--- a/dev-python/pipenv/files/pipenv-2023.11.15-fix-import-path-PackageDAG.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-