From 9abca819b631fc3dd1da5a035dbaf70b7a338943 Mon Sep 17 00:00:00 2001 From: Oz Tiram Date: Thu, 25 Apr 2024 12:19:39 +0200 Subject: [PATCH] Bump plette to v2.0.2 Signed-off-by: Oz Tiram --- pipenv/vendor/plette/__init__.py | 3 +-- pipenv/vendor/plette/__main__.py | 32 ------------------------- pipenv/vendor/plette/lockfiles.py | 4 ++-- pipenv/vendor/plette/models/__init__.py | 4 ++-- pipenv/vendor/plette/pipfiles.py | 2 +- pipenv/vendor/vendor.txt | 2 +- 6 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 pipenv/vendor/plette/__main__.py diff --git a/pipenv/vendor/plette/__init__.py b/pipenv/vendor/plette/__init__.py index 56f90cc1e6..dbd68f55e2 100644 --- a/pipenv/vendor/plette/__init__.py +++ b/pipenv/vendor/plette/__init__.py @@ -3,8 +3,7 @@ "Lockfile", "Pipfile", ] -# not yet released -__version__ = '2.0.0pre' +__version__ = '2.0.2' from .lockfiles import Lockfile from .pipfiles import Pipfile diff --git a/pipenv/vendor/plette/__main__.py b/pipenv/vendor/plette/__main__.py deleted file mode 100644 index 8242b80e7b..0000000000 --- a/pipenv/vendor/plette/__main__.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -A simple entry point which can be use to test Pipfiles - -e.g. - -python -m plette -f examples/Pipfile.valid.list -python -m plette -f examples/Pipfile.valid.editable -# throws exception -python -m plette -f examples/Pipfile.invalid.list - -""" - -import argparse - -import tomlkit - -from plette import Pipfile, Lockfile - - -parser = argparse.ArgumentParser() -parser.add_argument("-f", "--file", help="Input file") - -args = parser.parse_args() - -dest = args.file - -with open(dest) as f: - try: - pipfile = Pipfile.load(f) - except tomlkit.exceptions.EmptyKeyError: - f.seek(0) - lockfile = Lockfile.load(f) diff --git a/pipenv/vendor/plette/lockfiles.py b/pipenv/vendor/plette/lockfiles.py index caa05816ed..fcb8779d03 100644 --- a/pipenv/vendor/plette/lockfiles.py +++ b/pipenv/vendor/plette/lockfiles.py @@ -4,7 +4,7 @@ import collections.abc as collections_abc -from pipenv.vendor.plette.models import DataModel, Meta, PackageCollection +from .models import DataModel, Meta, PackageCollection class _LockFileEncoder(json.JSONEncoder): @@ -115,7 +115,7 @@ def __getitem__(self, key): return value def __setitem__(self, key, value): - if isinstance(value, DataView): + if isinstance(value, DataModel): self._data[key] = value._data else: self._data[key] = value diff --git a/pipenv/vendor/plette/models/__init__.py b/pipenv/vendor/plette/models/__init__.py index babe1f9410..9f9b1637da 100644 --- a/pipenv/vendor/plette/models/__init__.py +++ b/pipenv/vendor/plette/models/__init__.py @@ -1,6 +1,6 @@ __all__ = [ - "DataView", "DataModelCollection", "DataModelMapping", "DataModelSequence", - "validate", "DataValidationError", + "DataModel", "DataModelCollection", "DataModelMapping", "DataModelSequence", + "DataValidationError", "Hash", "Package", "Requires", "Source", "Script", "Meta", "PackageCollection", "ScriptCollection", "SourceCollection", ] diff --git a/pipenv/vendor/plette/pipfiles.py b/pipenv/vendor/plette/pipfiles.py index 1aa4dddb58..9b01a37400 100644 --- a/pipenv/vendor/plette/pipfiles.py +++ b/pipenv/vendor/plette/pipfiles.py @@ -72,7 +72,7 @@ def __getitem__(self, key): return value def __setitem__(self, key, value): - if isinstance(value, DataView): + if isinstance(value, DataModel): self._data[key] = value._data else: self._data[key] = value diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index a672c385b3..37f510fa04 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -4,7 +4,7 @@ colorama==0.4.6 dparse==0.6.3 pexpect==4.9.0 pipdeptree==2.16.2 -plette==0.4.4 +plette==2.0.2 ptyprocess==0.7.0 python-dotenv==1.0.1 pythonfinder==2.1.0