Commit Graph

379 Commits

Author SHA1 Message Date
Matt Davis 8d81d07a55 Add patch for ruamel __init__.py file. 2022-12-04 03:44:20 -05:00
Matt Davis c58c371f6b Vendor new safety (#5217) (#5218)
* Vendor new safety (#5217)

* Closest to correct vendoring of ruamel.

* Fix lint

* New pipenv check with minimal output.

* Remove decode_for_output use in pipenv check functions.

* Use click.secho where is possible.

* Rerun vendoring to get the latest safety version.

* skip this test for now.

Co-authored-by: Yeison Vargas <yeisonvargasjf@gmail.com>
2022-11-22 21:14:24 -05:00
Fidel Ramos 2921b80de7 Fix syntax error in requirementslib vendor (#5483)
Compiling this file raised a SyntaxError:

    ***   File "/gnu/store/62ms8p25ilrw7vrz5fn8fjf4pds10b02-pipenv-2022.11.11/lib/python3.9/site-packages/pipenv/vendor/requirementslib/models/metadata.py", line 17
        from pipenv.patched.pip._vendor.distlib.metadata import import Metadata
                                                                ^
    SyntaxError: invalid syntax

Found through `python -m compileall /pipenv/source/` when trying to add pipenv to
[Guix](https://guix.gnu.org/).

Also include fix for root cause: wrong replacement in vendoring task.
2022-11-22 17:54:52 -05:00
Oz Tiram d1716a7b26 vendor: remove references to parse in vendor script
Install parse in the vendor environment, as it is still
used.
2022-11-20 17:25:03 +01:00
Oz Tiram e6a4cd3c48 vendor: remove unused patches for yaspin 2022-11-19 21:09:17 +01:00
Oz Tiram 2cb30cead2 vendor: drop unused cerberus code
We don't need to ship tests and benchmarks to our users.
2022-11-13 10:31:35 +01:00
Matt Davis e3c999f1b9 Roll back change vendoring of colorama. (#5460)
* Roll back change vendoring of colorama.

* Add back colorama version that worked.

* Add news fragment.
2022-11-05 02:34:27 -04:00
Oz N Tiram d6964452dd vendoring: fix broken attrs
We can't rename attrs to attr, since versionn 22.1 distributes
two modules one named attrs and one names attr.
2022-11-01 21:29:42 +01:00
Oz N Tiram 45ed8448e7 Vendoring script: fix linting issue 2022-11-01 20:35:20 +01:00
Oz Tiram 93f40ace77 Vendor: more disltlib import fixes 2022-11-01 20:31:06 +01:00
Oz Tiram 973d47715b Vendoring: drop our included version of colorma
Use the one from pip._vendor instead.
2022-11-01 20:30:59 +01:00
Oz Tiram 69507b1b79 vendoring: remove library rename zipp
This module is an old backport we no longer distribute.
 The except ImportError in pep517/meta.py never happens
 in Python3.6 and later.
2022-11-01 20:30:54 +01:00
Oz Tiram c5f6016689 Vendor: drop distlib - use the one from pip._vendor 2022-11-01 20:30:48 +01:00
Oz N Tiram e3052f2de9 Remove vendored platformdirs - use the one from pip._vendor 2022-10-30 18:51:38 +01:00
Oz N Tiram 73149a970c Merge branch 'main' into pip-22.3 2022-10-25 10:06:33 +02:00
Oz N Tiram bf7978de45 Remove appdirs.py in favor of platformdirs
platformdirs is the actively maintained fork of appdirs.
In addition, platformdirs is included in pip, so we can use that directly.
2022-10-17 23:12:54 +02:00
Matt Davis 02de74907d Fix patch to what it had before that is working. 2022-10-16 09:37:31 -04:00
Matt Davis c079b9d503 Update pip index safety patch for pip 22.3 2022-10-16 07:53:47 -04:00
Matt Davis 31a9e235d9 Update pip index safety patch for pip 22.3 2022-10-16 07:42:11 -04:00
Matt Davis cb1ca34c28 Apply vendoring.update script. 2022-10-08 22:48:51 -04:00
Matt Davis 35b996df76 merge in main and resolve conflict. 2022-10-04 05:32:31 -04:00
Oz N Tiram d2fe28a8b0 Bump dparse version to 0.6.2 2022-10-02 23:58:38 +02:00
Matt Davis 8e81ddadc1 resolve merge conflict with main. 2022-09-21 21:41:12 -04:00
Matt Davis 450cc59a80 Undo this vendoring change. 2022-09-21 06:58:55 -04:00
Matt Davis 4f451be802 undo attempt at vendoring change. 2022-09-21 06:54:12 -04:00
Matt Davis 0e5e4ea05b Port change from safety vendoring PR to make the vendor renames work the same as patch. 2022-09-21 06:38:37 -04:00
Matt Davis 2e51612d9e Port change from safety vendoring PR to make the vendor renames work the same as patch. 2022-09-21 06:31:49 -04:00
Matt Davis e514767042 Port change from safety vendoring PR to make the vendor renames work the same as patch. 2022-09-21 06:27:51 -04:00
Matt Davis ea051b4a73 Prep for plette vendoring. 2022-09-21 06:19:38 -04:00
Matt Davis d5c63a06a1 Fix import of plette. 2022-09-19 17:12:29 -04:00
Oz N Tiram 3a57dd0f21 Merge branch 'main' into replace-pipfile-with-plette 2022-09-15 15:08:18 +02:00
Matt Davis 4f49739c5f Fix pep517 import issue. 2022-09-14 08:14:45 -04:00
Oz N Tiram 097e253d1d Remove patched pipefile and patch 2022-09-12 23:22:46 +02:00
Matt Davis 55d6f5b66d Merge branch 'main' into issue-5349 2022-09-10 22:09:00 -04:00
Matt Davis 61552ef2bf Remove pip_shims renames. 2022-09-09 22:06:41 -04:00
Matt Davis e9f24a9b60 Undo dir rename because it affected the license file location. 2022-09-09 22:03:23 -04:00
Matt Davis 79d1184923 Use importlib to ensure pipenv and ensure pkg_resource is importable. 2022-09-09 21:57:20 -04:00
Oz N Tiram f910bc3b7c Ducktape for downloading LICENSE of pipdeptree
This package uses hatchling as a build backend and required special
case.
There should be a better way, but for now this works.
2022-09-08 15:26:07 +02:00
Oz N Tiram 6437584792 Try and bumnp pipdeptree 2022-09-08 12:44:59 +02:00
Matt Davis e4cc8f2550 Vendor in requirementslib==2.0.0 & drop pip-shims & revert sysconfig patch w/ safer setuptools usage (#5228)
* Vendor in requirementslib 2.0.0

* Drop sysconfig default patch.

* Remove setuptools import usages in pipenv.

* Add news fragment.
2022-08-24 14:09:17 -04:00
Matt Davis 1b6fa94245 Use sysconfig on all supported python versions. 2022-08-19 07:52:08 +02:00
Matt Davis 59bebd6dc9 Revert "Remove yaspin and termcolor"
This reverts commit bc56a44f4f.
2022-08-17 02:17:45 -04:00
Matt Davis e65468639a Adjust patch file. 2022-08-17 06:50:00 +02:00
Oz N Tiram bc56a44f4f Remove yaspin and termcolor
Termcolor is a dependency of yaspin. Yaspin isn't used
anywhere in pipenv. There is a patch for it, and there is also
vistir dependency for it, but we have our own spinner.

Side note, we can consider using rich, which pip uses.
2022-08-17 06:47:44 +02:00
Oz N Tiram 3cfdf799fe Remove vendored cached_property (#5249)
The class cached_property is available in the Python STL from
version 3.8 onwards. In addition, it is redifend in included libraries
so we can just use it from there.
2022-08-13 23:04:25 -04:00
Oz N Tiram d791db89a7 Remove vendored pep517, use it from pip._vendor 2022-08-08 14:36:05 +02:00
Oz N Tiram 4d99ce9e3a Remove unused function - write_backports_imports 2022-08-08 14:36:05 +02:00
Matt Davis 00b3499600 Apply linter. 2022-08-05 10:47:57 -04:00
Matt Davis f50a12a8c5 add back release vendoring import -- unintentionally removed. 2022-08-05 10:45:02 -04:00
Oz N Tiram 13b023b986 Remove urllib3 from vendor, use pip._vendor
See #5174
2022-08-01 15:40:57 +02:00