subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-python\/pipenv\/files\/, dev\-python\/pipenv\/"

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2021-11-22 Thread Joonas Niilola

commit: d2f4c2dab721df906bd5443ae9dd060eba35
Author: Oz N Tiram  gmail  com>
AuthorDate: Thu Nov 11 12:52:31 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4c2dc

dev-python/pipenv: add 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22900
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |  1 +
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 ++
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 +
 4 files changed, 158 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 705aed4da95d..62ae2d9f3907 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
+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-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
new file mode 100644
index ..2454d04f12ef
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
@@ -0,0 +1,25 @@
+From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:13 +0100
+Subject: [PATCH 1/2] Remove vendored attr.
+
+---
+ pipenv/installers.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pipenv/installers.py b/pipenv/installers.py
+index 5baa1933..f7982ab6 100644
+--- a/pipenv/installers.py
 b/pipenv/installers.py
+@@ -3,7 +3,7 @@ import operator
+ import re
+ from abc import ABCMeta, abstractmethod
+ 
+-from pipenv.vendor import attr
++import attr
+ from pipenv.utils import find_windows_executable, subprocess_run
+ 
+ 
+-- 
+2.32.0
+

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
new file mode 100644
index ..4677b0860da2
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
@@ -0,0 +1,67 @@
+From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+Date: Thu, 11 Nov 2021 13:05:41 +0100
+Subject: [PATCH 2/2] Remove vendored colorama
+
+---
+ pipenv/patched/crayons.py   | 2 +-
+ pipenv/vendor/yaspin/core.py| 2 +-
+ tasks/vendoring/patches/patched/crayons.patch   | 2 +-
+ tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+ 
+diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
+index d8a0716c..c9be016c 100644
+--- a/pipenv/vendor/yaspin/core.py
 b/pipenv/vendor/yaspin/core.py
+@@ -19,7 +19,7 @@ import time
+ from typing import List, Set, Union
+ 
+ from termcolor import colored
+-from pipenv.vendor import colorama
++import colorama
+ from pipenv.vendor.vistir import cursor
+ 
+ from .base_spinner import Spinner, default_spinner
+diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
+index 2760ca81..d021bfb1 100644
+--- a/tasks/vendoring/patches/patched/crayons.patch
 b/tasks/vendoring/patches/patched/crayons.patch
+@@ -10,7 +10,7 @@ index 455d3e90..de735daf 100644
+ -
+ -import colorama
+ +from pipenv.vendor import shellingham
+-+from pipenv.vendor import colorama
+++import colorama
+  
+ +PY3 = sys.version_info[0] >= 3
+ +
+diff --git a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch 
b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+index 705650c3..95feb1c0 100644
+--- a/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
 b/tasks/vendoring/patches/vendor/yaspin-signal-handling.patch
+@@ -6,7 +6,7 @@ index 76dc2439..d8a0

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

2022-04-18 Thread Arthur Zamarin

commit: b749584b82fbccb124d67d319762b7e7aa6a68cd
Author: Oz N Tiram  gmail  com>
AuthorDate: Mon Apr 11 21:57:46 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 19 05:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b749584b

dev-python/pipenv: drop 2021.11.9

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24999
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-python/pipenv/Manifest |  1 -
 ...ipenv-2021-11-9-remove-attr-vendor-import.patch | 25 
 ...v-2021-11-9-remove-colorama-vendor-import.patch | 67 --
 dev-python/pipenv/pipenv-2021.11.9.ebuild  | 65 -
 4 files changed, 158 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 62ddd605ba4e..3bcdf0bbc623 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,4 +1,3 @@
 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-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-2021-11-9-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
deleted file mode 100644
index 2454d04f12ef..
--- a/dev-python/pipenv/files/pipenv-2021-11-9-remove-attr-vendor-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c31638a41a95ada109a3fd13e1e8380d2b8a731 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:13 +0100
-Subject: [PATCH 1/2] Remove vendored attr.
-

- pipenv/installers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pipenv/installers.py b/pipenv/installers.py
-index 5baa1933..f7982ab6 100644
 a/pipenv/installers.py
-+++ b/pipenv/installers.py
-@@ -3,7 +3,7 @@ import operator
- import re
- from abc import ABCMeta, abstractmethod
- 
--from pipenv.vendor import attr
-+import attr
- from pipenv.utils import find_windows_executable, subprocess_run
- 
- 
--- 
-2.32.0
-

diff --git 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
deleted file mode 100644
index 4677b0860da2..
--- 
a/dev-python/pipenv/files/pipenv-2021-11-9-remove-colorama-vendor-import.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6e994dbc81c326b507c6f3119dfab56113dc17c3 Mon Sep 17 00:00:00 2001
-From: Oz N Tiram 
-Date: Thu, 11 Nov 2021 13:05:41 +0100
-Subject: [PATCH 2/2] Remove vendored colorama
-

- pipenv/patched/crayons.py   | 2 +-
- pipenv/vendor/yaspin/core.py| 2 +-
- tasks/vendoring/patches/patched/crayons.patch   | 2 +-
- tasks/vendoring/patches/vendor/yaspin-signal-handling.patch | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-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
- 
-diff --git a/pipenv/vendor/yaspin/core.py b/pipenv/vendor/yaspin/core.py
-index d8a0716c..c9be016c 100644
 a/pipenv/vendor/yaspin/core.py
-+++ b/pipenv/vendor/yaspin/core.py
-@@ -19,7 +19,7 @@ import time
- from typing import List, Set, Union
- 
- from termcolor import colored
--from pipenv.vendor import colorama
-+import colorama
- from pipenv.vendor.vistir import cursor
- 
- from .base_spinner import Spinner, default_spinner
-diff --git a/tasks/vendoring/patches/patched/crayons.patch 
b/tasks/vendoring/patches/patched/crayons.patch
-index 2760ca81..d021bfb1 100644
 a/tasks/vendoring

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2021-08-03 Thread Joonas Niilola

commit: 8e0be56464cc537990c3ae58a9f89cca081af059
Author: Oz N Tiram  gmail  com>
AuthorDate: Fri Jul 23 22:01:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug  3 07:09:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0be564

dev-python/pipenv: remove vendored jinja2 and attr.

Since pipenv bundles tons of packages, these will be
removed in a slow pace. If no bugs are reported, the
removal of bundled packages and addition of dependencies
can continue.

Bug: https://bugs.gentoo.org/717666

Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21828
Signed-off-by: Joonas Niilola  gentoo.org>

 ...nv-2021-5-29-r1-remove-attr-vendor-import.patch | 95 ++
 dev-python/pipenv/pipenv-2021.5.29-r1.ebuild   | 54 
 2 files changed, 149 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
new file mode 100644
index 000..3437c2a2f33
--- /dev/null
+++ 
b/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
@@ -0,0 +1,95 @@
+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/pipenv-2021.5.29-r1.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
new file mode 100644
index 000..403619ae607
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r1.ebuild
@@ -0,0 +1,54 @@
+# 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_{7,8,9} )
+
+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="htt

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

2021-08-18 Thread Joonas Niilola

commit: 6f583f0ebf698afcd5cc227f00aae83837f4047c
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Aug 10 08:34:49 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 18 13:33:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f583f0e

dev-python/pipenv: bump rev-2

 * Disable py3.7
 * Fix attr->attrs

Signed-off-by: Oz N Tiram  gmail.com>
Bug: https://bugs.gentoo.org/show_bug.cgi?id=717666
Closes: https://github.com/gentoo/gentoo/pull/21925
Signed-off-by: Joonas Niilola  gentoo.org>

 ...v-2021-5-29-r2-remove-attr-vendor-import.patch} |  0
 ...21-5-29-r2-remove-colorama-vendor-import.patch} |  0
 dev-python/pipenv/pipenv-2021.5.29-r2.ebuild   | 61 ++
 3 files changed, 61 insertions(+)

diff --git 
a/dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch 
b/dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-attr-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-attr-vendor-import.patch

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-r2-remove-colorama-vendor-import.patch
similarity index 100%
rename from 
dev-python/pipenv/files/pipenv-2021-5-29-r1-remove-colorama-vendor-import.patch
rename to 
dev-python/pipenv/files/pipenv-2021-5-29-r2-remove-colorama-vendor-import.patch

diff --git a/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild 
b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
new file mode 100644
index 000..77de678dfaf
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2021.5.29-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

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

2022-01-12 Thread Sam James

commit: 1a0ef72d2208774b6598ff30da002c07f7569934
Author: Oz N Tiram  gmail  com>
AuthorDate: Tue Jan 11 09:20:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 12 22:38:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ef72d

dev-python/pipenv: add 2022.1.8

Dropped ~x86 due to unkeyworded dev-python/cerberus,
rekeywording pending.

Bug: https://bugs.gentoo.org/830982
Signed-off-by: Oz N Tiram  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23720
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 ...ipenv-2022-1-8-remove-first-vendor-import.patch | 162 +
 dev-python/pipenv/pipenv-2022.1.8.ebuild   |  96 
 3 files changed, 259 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 621cd3ceea21..e15fa639e79d 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 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-2022.1.8.tar.gz 11379235 BLAKE2B 
b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0
 SHA512 
9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0

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
new file mode 100644
index ..a8ff7d107f9c
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
@@ -0,0 +1,162 @@
+From eefc2db1adcfdd9afc1955c81d73dc3d32c65a57 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram 
+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..
+--- 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 TH

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

2024-03-12 Thread Michał Górny

commit: 6745a575d276f0cc18c27540776797efb1dfd4bc
Author: Oz Tiram  gmail  com>
AuthorDate: Mon Mar 11 19:24:43 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Mar 12 15:33:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6745a575

dev-python/pipenv: drop 2023.7.11

Signed-off-by: Oz Tiram  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pipenv/Manifest |   1 -
 .../pipenv-2022.9.24-inject-site-packages.patch|  34 ---
 .../pipenv-2023.4.29-append-always-install.patch   |  19 
 .../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 -
 6 files changed, 216 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 98862f7c9984..875a700fe60b 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1 @@
 DIST pipenv-2023.11.15.gh.tar.gz 10837840 BLAKE2B 
611bac2cda46236264026bb3aa4183e4458dfee07dc43640f902bb85840033beb32e4617584d8a243c640d84893368f91a1d91454cdfd477d6c075fc56a04dd2
 SHA512 
662190a43529724e24a2e1e4b967867c7fa4ddd99fd903d45659e2a685880b2a0086df69dfb3ed3c2973da8aec5604be6935d21d8ce5e224b5418a6adabc12b7
-DIST pipenv-2023.7.11.gh.tar.gz 10828051 BLAKE2B 
3eeab9c5328dc5914e7e024f07bf105241ca777187ce50d5765f0ca1bb7270d8c6bda6a842b188fcacb57ba8bf5d0ed5f7b29b9edce5d45e485c8079691ac991
 SHA512 
d37cf030f4f77d4c95d0f0883140b1e829d4473b43fdc3f61c3d39827fdf9c98ecfc794d3eacf3ebedb55dadb018416c1250938a193a6382ac61ce859d19e193

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
deleted file mode 100644
index 04cf0ed9e317..
--- a/dev-python/pipenv/files/pipenv-2022.9.24-inject-site-packages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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(

diff --git 
a/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch 
b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
deleted file mode 100644
index 25a9c604e5b4..
--- a/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
-index 4b8b2bf8c..a3e1fbcf7 100644
 a/pipenv/routines/install.py
-+++ b/pipenv/routines/install.py
-@@ -580,6 +580,14 @@ def batch_install_iteration(
- strip_extras_markers_from_requirement,
- )
- 
-+# 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")
-+
- is_artifact = False
- for dep in deps_to_install:
- if dep.req.req:

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
deleted file mode 100644
index 2e348bf8e440..
--- a/dev-python/pipenv/files/pipenv-2023.7.11-fix-imports-utils.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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

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

2023-05-05 Thread Sam James

commit: b49ac8b31d3d99cad724b7ca4d756de8373d3740
Author: Oz Tiram  gmail  com>
AuthorDate: Thu May  4 09:01:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 22:37:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49ac8b3

dev-python/pipenv: add 2023.4.29

Signed-off-by: Oz Tiram  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 .../pipenv-2023.4.29-append-always-install.patch   |  19 
 .../files/pipenv-2023.4.29-fix-imports.patch   |  31 ++
 dev-python/pipenv/pipenv-2023.4.29.ebuild  | 114 +
 4 files changed, 165 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 3fefbc1c596d..49abe2e62372 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1 +1,2 @@
 DIST pipenv-2022.12.19.gh.tar.gz 8843 BLAKE2B 
812aa7eacd2b1eaa42a586e64b73e7a13d2ac3ed4c2abf834e190ed5a8a4398d3d17999c1e196de6b01eb755f6771493967b8497710ac3fe20d73408f6251f80
 SHA512 
edd1e43cb3e91ed0001aff0a590f72e510f9b4c5f436a1c81d1e8a815d22f5bcf199254e5faf78dbdfec3ee0d4b51709b6de28163cf01e58d6f0de044ae99fdc
+DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 
31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1
 SHA512 
870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff

diff --git 
a/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch 
b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
new file mode 100644
index ..25a9c604e5b4
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-append-always-install.patch
@@ -0,0 +1,19 @@
+diff --git a/pipenv/routines/install.py b/pipenv/routines/install.py
+index 4b8b2bf8c..a3e1fbcf7 100644
+--- a/pipenv/routines/install.py
 b/pipenv/routines/install.py
+@@ -580,6 +580,14 @@ def batch_install_iteration(
+ strip_extras_markers_from_requirement,
+ )
+ 
++# 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")
++
+ is_artifact = False
+ for dep in deps_to_install:
+ if dep.req.req:

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
new file mode 100644
index ..eeae85039e12
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2023.4.29-fix-imports.patch
@@ -0,0 +1,31 @@
+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/pipenv-2023.4.29.ebuild 
b/dev-python/pipenv/pipenv-2023.4.29.ebuild
new file mode 100644
index ..1ae17db21361
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2023.4.29.ebuild
@@ -0,0 +1,114 @@
+# 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"
+)
+
+RDEPEND="
+   dev-python/attrs[${PYTHON_USEDEP}]
+   >=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+   dev-python/click[${PYTHON_USEDEP}]
+   >=dev-python/colorama-0.

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

2023-05-05 Thread Sam James

commit: 85a7838c9b865d9757ad76df4451401b2279724f
Author: Oz Tiram  gmail  com>
AuthorDate: Thu May  4 09:01:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 22:37:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a7838c

dev-python/pipenv: drop 2022.12.19

Signed-off-by: Oz Tiram  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 dev-python/pipenv/Manifest |   1 -
 .../pipenv-2022.12.19-append-always-install.patch  |  17 
 dev-python/pipenv/pipenv-2022.12.19.ebuild | 112 -
 3 files changed, 130 deletions(-)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 49abe2e62372..4cc9ee5fb090 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1 @@
-DIST pipenv-2022.12.19.gh.tar.gz 8843 BLAKE2B 
812aa7eacd2b1eaa42a586e64b73e7a13d2ac3ed4c2abf834e190ed5a8a4398d3d17999c1e196de6b01eb755f6771493967b8497710ac3fe20d73408f6251f80
 SHA512 
edd1e43cb3e91ed0001aff0a590f72e510f9b4c5f436a1c81d1e8a815d22f5bcf199254e5faf78dbdfec3ee0d4b51709b6de28163cf01e58d6f0de044ae99fdc
 DIST pipenv-2023.4.29.gh.tar.gz 10808706 BLAKE2B 
31432b80f82b041969e75d0ec0a28ca90068395be25dac94a7f34526f0b638adfae59e9396b147fa61592ee78af2d9cfb4a1b65dedea9bbb299b2624a6d6e9a1
 SHA512 
870b33ced4ed909b23b9d345ec788f4b5fffde4b253755e8a41b0629e885ef49ca14e9a68b5919b70074829002603fe427e8b77f41028a7de33d269a910354ff

diff --git 
a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch 
b/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
deleted file mode 100644
index a5746fdb8ebe..
--- a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pipenv/core.py b/pipenv/core.py
-index e42f184d1..02f8994de 100644
 a/pipenv/core.py
-+++ b/pipenv/core.py
-@@ -791,6 +791,12 @@ def batch_install_iteration(
- strip_extras_markers_from_requirement,
- )
- 
-+# 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")
-+
- is_artifact = False
- for dep in deps_to_install:
- if dep.req.req:

diff --git a/dev-python/pipenv/pipenv-2022.12.19.ebuild 
b/dev-python/pipenv/pipenv-2022.12.19.ebuild
deleted file mode 100644
index 1f9dabc494e4..
--- a/dev-python/pipenv/pipenv-2022.12.19.ebuild
+++ /dev/null
@@ -1,112 +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-2022.12.19-append-always-install.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}]
-   >=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 click colorama dotenv markupsafe \
-pexpect ptyprocess pyparsing requests 
urllib3 tomlkit )
-   for pkgName

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

2023-01-20 Thread Joonas Niilola

commit: 1e72e92290879e1caf8e516bfa57fc086a5e5406
Author: Oz Tiram  gmail  com>
AuthorDate: Wed Jan 11 13:02:33 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 20 14:01:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e72e922

dev-python/pipenv: add 2022.12.19

Closes: https://github.com/gentoo/gentoo/pull/29062
Signed-off-by: Oz Tiram  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-python/pipenv/Manifest |   1 +
 .../pipenv-2022.12.19-append-always-install.patch  |  17 
 dev-python/pipenv/pipenv-2022.12.19.ebuild | 112 +
 3 files changed, 130 insertions(+)

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 31007319ee35..741296050027 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1,3 @@
 DIST pipenv-2022.11.30.gh.tar.gz 11120234 BLAKE2B 
3d33475932a59dfb862869becb792aea420b8c9fffd9179866dc01eb5e0b2ba77a23c5de8be5570f9ed2e46f098bc000173d74766d42953f93ab2439c20d7f2c
 SHA512 
a44409d41196388b05f2b9620b9d0f45f4af7f244f8243143278b62560e54063574670356e141e07807b56b1181ad27f701f84b91bc045bf47b5701455b36c66
+DIST pipenv-2022.12.19.gh.tar.gz 8843 BLAKE2B 
812aa7eacd2b1eaa42a586e64b73e7a13d2ac3ed4c2abf834e190ed5a8a4398d3d17999c1e196de6b01eb755f6771493967b8497710ac3fe20d73408f6251f80
 SHA512 
edd1e43cb3e91ed0001aff0a590f72e510f9b4c5f436a1c81d1e8a815d22f5bcf199254e5faf78dbdfec3ee0d4b51709b6de28163cf01e58d6f0de044ae99fdc
 DIST pipenv-2022.9.24.gh.tar.gz 11543711 BLAKE2B 
e875068383c8ca55864bfcb53288ae9a02adc578c09ad7392bf50a7ebe07e2eb5944bc225cfefad2ca8265d8dcbb17af96b34e8c0fd51a709921148207021f2b
 SHA512 
d29a728d914d8c762469fd2d72de7be41050165b4587c3304ebc03235a1946967f78473651e1834e5a69a35395d0cf9087e1515fd746450057774fc22e61e092

diff --git 
a/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch 
b/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
new file mode 100644
index ..a5746fdb8ebe
--- /dev/null
+++ b/dev-python/pipenv/files/pipenv-2022.12.19-append-always-install.patch
@@ -0,0 +1,17 @@
+diff --git a/pipenv/core.py b/pipenv/core.py
+index e42f184d1..02f8994de 100644
+--- a/pipenv/core.py
 b/pipenv/core.py
+@@ -791,6 +791,12 @@ def batch_install_iteration(
+ strip_extras_markers_from_requirement,
+ )
+ 
++# 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")
++
+ is_artifact = False
+ for dep in deps_to_install:
+ if dep.req.req:

diff --git a/dev-python/pipenv/pipenv-2022.12.19.ebuild 
b/dev-python/pipenv/pipenv-2022.12.19.ebuild
new file mode 100644
index ..1f9dabc494e4
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.12.19.ebuild
@@ -0,0 +1,112 @@
+# 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-2022.12.19-append-always-install.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}]
+   >=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

44 matches

Mail list logo